Change free text field to choice field within cancel reason form

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

.changes/unreleased/DX-20250401-144728.yaml

@@ -1,6 +0,0 @@
-kind: DX
-body: Allow TranslatableMessage in flash messages
-time: 2025-04-01T14:47:28.814268801+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/DX-20250407-121010.yaml

@@ -1,44 +0,0 @@
-kind: DX
-body: |
-    Rewrite exports to run them asynchronously
-
-changelog: |
-    - Add new methods to serialize data using the rector rule
-    - Remove all references to the Request in filters, aggregators, filters. Actually, the most frequent occurence is `$security->getUser()`.
-    - Refactor manually the initializeQuery method
-    - Remove the injection of ExportManager into the constructor of each export element:
-
-      ```diff
-
-      - class MyFormatter implements FormatterInterface
-      + class MyFormatter implements FormatterInterface, \Chill\MainBundle\Export\ExportManagerAwareInterface
-      {
-      +    use \Chill\MainBundle\Export\Helper\ExportManagerAwareTrait;
-
-      -    public function __construct(private ExportManager $exportmanager) {}
-
-           public function MyMethod(): void
-           {
-      -          $this->exportManager->getFilter('alias');
-      +          $this->getExportManager()->getFilter('alias');
-           }
-      }
-      ```
-    - configure messenger to handle export in a queue:
-
-    ```diff
-    # config/packages/messenger.yaml
-    framework:
-        messenger:
-            routing:
-    +            'Chill\MainBundle\Export\Messenger\ExportRequestGenerationMessage': priority
-    ```
-
-
-
-
-
-time: 2025-04-07T12:10:10.682561327+02:00
-custom:
-    Issue: ""
-    SchemaChange: Add columns or tables

.changes/unreleased/DX-20250430-144550.yaml

@@ -1,6 +0,0 @@
-kind: DX
-body: Remove dead code for wopi-link module
-time: 2025-04-30T14:45:50.406111606+02:00
-custom:
-    Issue: "352"
-    SchemaChange: No schema change

.changes/unreleased/DX-20250528-165813.yaml

@@ -1,6 +0,0 @@
-kind: DX
-body: Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)
-time: 2025-05-28T16:58:13.226870341+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Feature-20250211-142243.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: Allow the merge of two accompanying period works
-time: 2025-02-11T14:22:43.134106669+01:00
-custom:
-    Issue: "359"
-    SchemaChange: No schema change

.changes/unreleased/Feature-20250424-142211.yaml

@@ -1,7 +0,0 @@
-kind: Feature
-body: Add the document file name to the document title when a user upload a document,
-  unless there is already a document title.
-time: 2025-04-24T14:22:11.800975422+02:00
-custom:
-  Issue: "377"
-  SchemaChange: No schema change

.changes/unreleased/Feature-20250520-095628.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: Add desactivation date for social action and issue csv export
-time: 2025-05-20T09:56:28.108941934+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Feature-20250523-133341.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: Add Emoji and Fullscreen feature to ckeditor configuration
-time: 2025-05-23T13:33:41.645095128+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Feature-20250523-133434.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: Create editor which allow us to toggle between rich and simple text editor
-time: 2025-05-23T13:34:34.56795603+02:00
-custom:
-    Issue: "321"
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20250424-133943.yaml

@@ -1,7 +0,0 @@
-kind: Fixed
-body: trying to prevent bug of typeerror in doc-history + improved display of document
-  history
-time: 2025-04-24T13:39:43.878468232+02:00
-custom:
-  Issue: "376"
-  SchemaChange: No schema change

.changes/unreleased/Fixed-20250424-163746.yaml

@@ -1,7 +0,0 @@
-kind: Fixed
-body: Display previous participation in acc course work even if the person has left
-  the acc course
-time: 2025-04-24T16:37:46.970203594+02:00
-custom:
-  Issue: "381"
-  SchemaChange: No schema change

.changes/unreleased/Fixed-20250505-102715.yaml

@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix display of text in calendar events
-time: 2025-05-05T10:27:15.461493066+02:00
-custom:
-    Issue: "372"
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20250514-145339.yaml

@@ -1,6 +0,0 @@
-kind: Fixed
-body: Add missing translation for user_group.no_user_groups
-time: 2025-05-14T14:53:39.53927329+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20250520-140008.yaml

@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix retrieve schema to form full tablename and construct sql statements correctly in Thirdparty merger.
-time: 2025-05-20T14:00:08.987229634+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20250520-140433.yaml

@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix add missing translation
-time: 2025-05-20T14:04:33.612140549+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20250520-164429.yaml

@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix the transfer of evaluations and documents during of accompanyingperiodwork
-time: 2025-05-20T16:44:29.093304653+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20250918-114044.yaml

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

.changes/unreleased/UX-20250423-172624.yaml

@@ -1,6 +0,0 @@
-kind: UX
-body: Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page
-time: 2025-04-23T17:26:24.45777387+02:00
-custom:
-    Issue: "374"
-    SchemaChange: No schema change

.changes/v3.12.0.md

@@ -0,0 +1,22 @@
+## v3.12.0 - 2025-06-30
+### Feature
+* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.   
+* Add desactivation date for social action and issue csv export   
+* Add Emoji and Fullscreen feature to ckeditor configuration   
+* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor   
+* Do not remove workflow which are automatically canceled after staling for more than 30 days   
+### Fixed
+* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history   
+* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course   
+* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events   
+* Add missing translation for user_group.no_user_groups   
+* Fix admin entity edit actions for event admin entities and activity reason (category) entities   
+* ([#392](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/392)) Allow null and cast as string to setContent method for NewsItem
+   
+* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.   
+### DX
+* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module   
+* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)   
+### UX
+* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page   
+* Improve labeling of fields in person resource creation form   

.changes/v3.12.1.md

@@ -0,0 +1,3 @@
+## v3.12.1 - 2025-06-30
+### Fixed
+* Fix loading of the list of documents   

.changes/v4.0.0.md

@@ -0,0 +1,74 @@
+## v4.0.0 - 2025-07-08
+### Feature
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works
+### Fixed
+* ([#390](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/390)) Display the list of participant in the results, even if there is only one participant and that the search result display the requestor
+* Fix admin entity edit actions for event admin entities and activity reason (category) entities
+* Fix translations for social action fields in admin form: results, goals, evaluations
+### DX
+* Rewrite exports to run them asynchronously
+
+  **Schema Change**: Add columns or tables
+* Allow TranslatableMessage in flash messages
+### UX
+* Improve labeling of fields in person resource creation form
+
+
+**Release notes**
+
+- Add new methods to serialize data using the rector rule
+- Remove all references to the Request in filters, aggregators, filters. Actually, the most frequent occurence is `$security->getUser()`.
+- Refactor manually the initializeQuery method
+- Remove the injection of ExportManager into the constructor of each export element:
+
+  ```diff
+
+  - class MyFormatter implements FormatterInterface
+  + class MyFormatter implements FormatterInterface, \Chill\MainBundle\Export\ExportManagerAwareInterface
+  {
+  +    use \Chill\MainBundle\Export\Helper\ExportManagerAwareTrait;
+
+  -    public function __construct(private ExportManager $exportmanager) {}
+
+       public function MyMethod(): void
+       {
+  -          $this->exportManager->getFilter('alias');
+  +          $this->getExportManager()->getFilter('alias');
+       }
+  }
+  ```
+- configure messenger to handle export in a queue:
+
+```diff
+# config/packages/messenger.yaml
+framework:
+    messenger:
+        routing:
++            'Chill\MainBundle\Export\Messenger\ExportRequestGenerationMessage': priority
+```
+
+- add missing methods to exports, aggregators, filters, formatter:
+
+  ```php
+  public function normalizeFormData(array $formData): array;
+
+  public function denormalizeFormData(array $formData, int $fromVersion): array;
+  ```
+
+  There are rector rules to generate those methods:
+
+  - `Chill\Utils\Rector\Rector\ChillBundleAddNormalizationMethodsOnExportRector`
+
+  See:
+
+  ```php
+  // upgrade chill exports
+  $rectorConfig->rules([\Chill\Utils\Rector\Rector\ChillBundleAddNormalizationMethodsOnExportRector::class]);
+  ```
+
+  This rule will create most of the work necessary, but some manuals changes are still necessary:
+
+  - we must set manually the correct repository for method `denormalizeDoctrineEntity`;
+  - when the form data contains some entities, and the form type is not one of EntityType::class, PickUserDynamicType::class, PickUserLocationType::class, PickThirdpartyDynamicType::class, Select2CountryType::class, then we must handle the normalization manually (using the `\Chill\MainBundle\Export\ExportDataNormalizerTrait`)
+
+

.changes/v4.0.1.md

@@ -0,0 +1,4 @@
+## v4.0.1 - 2025-07-08
+### Fixed
+* Fix package.json for compilation
+   

.changes/v4.0.2.md

@@ -0,0 +1,4 @@
+## v4.0.2 - 2025-07-09
+### Fixed
+* Fix add missing translation   
+* Fix the transfer of evaluations and documents during of accompanyingperiodwork   

.changes/v4.1.0.md

@@ -0,0 +1,12 @@
+## v4.1.0 - 2025-08-26
+### Feature
+* ([#400](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/400)) Add filter to social actions list to filter out actions where current user intervenes   
+* ([#399](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/399)) Show filters on list pages unfolded by default   
+* Expansion of event module with new fields in the creation form: thematic, internal/external animator, responsable, and budget elements. Filtering options in the event list + adapted exports   
+
+  **Schema Change**: Add columns or tables
+### Fixed
+* ([#382](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/382)) adjust display logic for accompanying period dates, include closing date if period is closed.   
+* ([#384](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/384)) add min and step attributes to integer field in DateIntervalType   
+### UX
+* Limit display of participations in event list   

.changes/v4.2.0.md

@@ -0,0 +1,10 @@
+## v4.2.0 - 2025-09-02
+### Feature
+* ([#64](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/64)) Add external identifier for a Person
+
+  **Schema Change**: Add columns or tables
+* ([#330](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/330) Allow users to choose for which notifications they want to receive an email
+### Fixed
+* ([#422](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/422)) Fixed html layout of pages for recovering password
+* Fix typo in 'uncheckAll' script for centers selection
+* Fix incorrect parameter name in event details link

.changes/v4.2.1.md

@@ -0,0 +1,6 @@
+## v4.2.1 - 2025-09-03
+### Fixed
+* Fix exports to work with DirectExportInterface   
+### DX
+* Improve error message when a stored object cannot be written on local disk
+   

.changes/v4.3.0.md

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

.changes/v4.4.0.md

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

.changes/v4.4.1.md

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

.changes/v4.4.2.md

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

.eslint-baseline.json

@@ -7,14 +7,6 @@
         "message": "'app' is assigned a value but never used.",
         "hash": "f8c2979921289906e3baabae31ba101ead91504f"
     },
-    {
-        "path": "src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js",
-        "line": 57,
-        "column": 23,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'event' is defined but never used.",
-        "hash": "cf0cf378f71403f62a6425f384ccbbdec433d1f2"
-    },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/module/Invite/answer.js",
         "line": 7,
@@ -127,46 +119,6 @@
         "message": "'payload' is defined but never used.",
         "hash": "66c545917093ba30f1d6ca10ddaa676140e749bd"
     },
-    {
-        "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue",
-        "line": 224,
-        "column": 10,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reactive' is defined but never used.",
-        "hash": "96ed76a9828138fb125fc36c4b55e900bbfe87c2"
-    },
-    {
-        "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue",
-        "line": 230,
-        "column": 5,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'DropArg' is defined but never used.",
-        "hash": "bd405399a4091d65e8391404bfb0c4611816c8e0"
-    },
-    {
-        "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue",
-        "line": 251,
-        "column": 9,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'t' is assigned a value but never used.",
-        "hash": "bc09207a496405f7a71c178e522b89aeb1f7ebd3"
-    },
-    {
-        "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue",
-        "line": 356,
-        "column": 32,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'arg' is defined but never used.",
-        "hash": "aeae152f0669b946a1ad681dd52b0ef03393ae79"
-    },
-    {
-        "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue",
-        "line": 434,
-        "column": 11,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'changedEvent' is assigned a value but never used.",
-        "hash": "a7a81a6bf09d00c0364e3aa8207ffad853f0547b"
-    },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/Components/EditLocation.vue",
         "line": 77,
@@ -399,14 +351,6 @@
         "message": "'error' is defined but never used.",
         "hash": "e26e5e101e90d2b7ee84d6f5de8c819e52129c17"
     },
-    {
-        "path": "src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/index.ts",
-        "line": 29,
-        "column": 14,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'vm' is defined but never used.",
-        "hash": "8e7f5e89dd72c54459cf82156389b88988f97d63"
-    },
     {
         "path": "src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js",
         "line": 39,
@@ -615,14 +559,6 @@
         "message": "'ref' is defined but never used.",
         "hash": "2a27cd6d06a26e1326654c929068e3704137e24b"
     },
-    {
-        "path": "src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonList.vue",
-        "line": 57,
-        "column": 17,
-        "ruleId": "vue/valid-v-for",
-        "message": "Custom elements in iteration require 'v-bind:key' directives.",
-        "hash": "cce787939524e83dd135869e13738ef332d7156c"
-    },
     {
         "path": "src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue",
         "line": 15,
@@ -983,22 +919,6 @@
         "message": "'_e' is defined but never used.",
         "hash": "1d6448401778e8c56554020fe5abd47851ed33f3"
     },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/module/wopi-link/index.js",
-        "line": 21,
-        "column": 55,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'e' is defined but never used.",
-        "hash": "eae499e4f6e9f43a9d17f9cd917cb6d3d97be25c"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/page/export/download-export.js",
-        "line": 3,
-        "column": 55,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'e' is defined but never used.",
-        "hash": "088fd383e7807e484aefc9825209bc7c8942bd22"
-    },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.js",
         "line": 9,
@@ -1089,115 +1009,19 @@
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 247,
-        "column": 5,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'postAddressToPerson' is defined but never used.",
-        "hash": "8a41c437cf2b5554cbbe1704cd51f3102b3d5994"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 248,
-        "column": 5,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'postAddressToHousehold' is defined but never used.",
-        "hash": "66dec84b2ece299daf21308e5e60d497ba442b27"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 490,
+        "line": 516,
         "column": 21,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"context\" prop.",
-        "hash": "0d3f40c47974a4371072b3b9ee04b197c830162d"
+        "hash": "984c4203f2ac1e1bb65f9ce76ecd03b763cfaa83"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 491,
+        "line": 517,
         "column": 21,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"context\" prop.",
-        "hash": "8e877b7e588c30e182f7b572bdb9685360f9cf99"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 508,
-        "column": 47,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reject' is defined but never used.",
-        "hash": "5a3e3401bc3c765d91faaf4cfde57697af1262b7"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 525,
-        "column": 47,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reject' is defined but never used.",
-        "hash": "35a741d90379574b9323279f5802193d0c98a9dc"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 553,
-        "column": 47,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reject' is defined but never used.",
-        "hash": "c23d1ddf6c0d10ae97948e74aee9c14b9320b86c"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 572,
-        "column": 47,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reject' is defined but never used.",
-        "hash": "4322e81c6ea9d9734c680633a724d5bd4fabacb2"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 803,
-        "column": 47,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reject' is defined but never used.",
-        "hash": "7928a6461b9d394c7d97f048933553936f7d8963"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 852,
-        "column": 47,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reject' is defined but never used.",
-        "hash": "e5afdb8efccb5470a08dde48f755b1268fa947b5"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
-        "line": 93,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "68f5e1cf5c03f9ada59c9e0afca0b74c7f3fca4b"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
-        "line": 101,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "50d730f6109092baff2db66adc44dc1315e2bda2"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
-        "line": 109,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "573e4c041ce663f28b933d7a675c2a525aba644c"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
-        "line": 117,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "293f845eeab515b1df4649d136c2d8219ed59c4d"
+        "hash": "c9fb019bc21bfa77d989ed596913b99dd653c594"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
@@ -1224,204 +1048,180 @@
         "hash": "2d5a5e680ff207ad97c7e7b7d999064b561dfd8a"
     },
     {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 106,
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
+        "line": 149,
         "column": 17,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "d52356f2af31d0167c02330ec22d09fbfa6b2b9f"
+        "hash": "e4c1ecd7ae77d46ac3625c5bbe92a24d6a964db9"
     },
     {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 114,
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
+        "line": 157,
         "column": 17,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "c8e8e06f370f93bf05867e93b5f037dfa46937b1"
+        "hash": "4dece2db87c6ce1c04ae06c088ddfe916c1c0c61"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
+        "line": 165,
+        "column": 17,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "facc7a0f17bdf19396fae3d0de3da82e60503c0d"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
+        "line": 173,
+        "column": 17,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "19de32c76518387218264d7c4dab914d143a9cca"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 128,
-        "column": 13,
+        "line": 130,
+        "column": 17,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "9abaf71ca4b4f292b3b01e724d0a7733365e71f1"
+        "hash": "239ac02a02694d5b20ab30d4c7ce5838c51d1515"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 129,
-        "column": 13,
+        "line": 138,
+        "column": 17,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "0b0743959778a9e3d93089b132608816ee4e6646"
+        "hash": "a54f9bc6d1edfa4df93c7dd7d409cfef3fccf99e"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 132,
+        "line": 152,
         "column": 13,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "9759da7b7859b8ee8efaf74876430658ac6b6fe2"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 133,
-        "column": 13,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "dba8be9a27ab74ec743b7d9e07c05d857b407dd3"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 134,
-        "column": 13,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "9b1f5bce779aafc46b19d7a5d266eaa29f8f9be9"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 139,
-        "column": 13,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "fe6fc4aea0994ba9da15b7c09d308842b67958cb"
+        "hash": "74a5f664d18f3916ea908897fcd0291cb0128f29"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
         "line": 153,
-        "column": 55,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reject' is defined but never used.",
-        "hash": "bd0e024fcad2e3f4566f15293e3c25c840f6dd3e"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 154,
-        "column": 37,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "596c4b180b926b7829f987384328bf5636cd367a"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 171,
-        "column": 59,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reject' is defined but never used.",
-        "hash": "5b41d5f9b45da074fb7bbbbd45e0da501da72071"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 172,
-        "column": 41,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "d92b92a25043244cca809bd129633b7e024e26b4"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 190,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "dd9a85ea740742d620e864796f67c5bff834486d"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 191,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "e3e59960d0d50709a57b336f66b586710b774892"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 192,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "fe11b0e54396511e7b3b08615a78d22fc27e2fad"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 222,
         "column": 13,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "63c14c2150c33ec701bc4a0ff94efde69537d490"
+        "hash": "740ea5d793c7a34c9f352d8b333f3aa04cc80ee8"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
+        "line": 156,
+        "column": 13,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "af8aca18f0226a5988ed90d44d95e2d607bfb5e6"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
+        "line": 157,
+        "column": 13,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "7bc2453017793ae20cd6c10005f941d384b59d84"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
+        "line": 158,
+        "column": 13,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "571b4ee5f22358dd165ec59696bb3439b7c9ff6c"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
+        "line": 163,
+        "column": 13,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "cfcb5946c86e289fc61623a794284a5a272d02e8"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
+        "line": 178,
+        "column": 37,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "0ec402e43cb08bf129e0737c0d2c4f6d0c7af8bd"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
+        "line": 196,
+        "column": 41,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "ec178d33e067aac892e015002afb6f3a2ff98762"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
+        "line": 214,
+        "column": 17,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "c0f4e5454e672b6064eb9cf6c235c6810f7bfa80"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
+        "line": 215,
+        "column": 17,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "e3dd840d2474f9865a45822872bf9ecfb15961d7"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
+        "line": 216,
+        "column": 17,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "a32a60382b145cc7a4a7ebe01ec435b8e3103320"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
+        "line": 246,
+        "column": 13,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "082447e5c731012f3acc282943502775dfd24797"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 96,
+        "line": 118,
         "column": 20,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "d2a9fdaeef0e2810f480022d4c6f99e4f76a818e"
+        "hash": "d4fba4fe09af3c0937c0dd164928c8930c1591b5"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 96,
+        "line": 118,
         "column": 20,
         "ruleId": "vue/no-side-effects-in-computed-properties",
         "message": "Unexpected side effect in \"cities\" computed property.",
-        "hash": "dd92a60a9b1ebefeb9a90941d45326fbfa483733"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 102,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "04be01ab638ce01f568fb0216929e65e1175ca23"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 110,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "8619c8e0b63e87d09268832f90e4fba06b87e41f"
+        "hash": "1113a114d5aaf9f32f442916d25458541c5af35c"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 124,
-        "column": 13,
+        "column": 17,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "281f918da00635079501418b1e6b2c05b62eb4a7"
+        "hash": "fa56a7c93583f0a9d0c2ecac10228c4f4fc1bc3a"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 125,
-        "column": 13,
+        "line": 132,
+        "column": 17,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "c131b09fa67ab1d069f1d04a54582d6b0f206153"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 126,
-        "column": 13,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "3d3a2a4add64c291b8f5f1cddd90a173cd6a819d"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 131,
-        "column": 21,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "ed48f4988914d7897018a2e06830a97e6740b3e8"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 145,
-        "column": 13,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "744f3a7610d4d6015e50e25149bceffd6c6e2763"
+        "hash": "9fe87937ea67d1dae95fb3d44d4be0da2eba0905"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
@@ -1441,115 +1241,139 @@
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 149,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "1e7b1ad55866f708baaca72dfa4ff26d6f8e5d21"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 152,
+        "line": 148,
         "column": 13,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "84779331536ffceec8d4a8c5ca4307310b882549"
+        "hash": "ab4f478fbfbc954b8dff75176dcd432f9ff28cfc"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 161,
+        "line": 153,
+        "column": 21,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "1d907d149f9ddb62e32140a90efe9a74b3e71fef"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 167,
         "column": 13,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "0789999841be671a4d8ab080d6fdb679f843eb52"
+        "hash": "8aa37d2d4f011773e68838a2c88017875de563b5"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 170,
-        "column": 51,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reject' is defined but never used.",
-        "hash": "bbb17afa114f016e2058d90aa32d2a625804f0d1"
+        "line": 168,
+        "column": 13,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "a4827a357e52a51fa9262319114d81a130296acf"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 169,
+        "column": 13,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "a4c9715664202949e3242b8d4aa4098288b46dc4"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 171,
+        "column": 17,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "f3e9e21e433e90ec7b615b8940d43c4177372b66"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 174,
+        "column": 13,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "770b7a24cc24b380e88db47d62422c8e1ece2571"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 183,
+        "column": 13,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "2aef3c519a9ec6abcfe7573989d3de19d5c4c752"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 193,
         "column": 33,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "5fbe407ceceb37bff2ac800ceddd7942540132f1"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 190,
-        "column": 55,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reject' is defined but never used.",
-        "hash": "e2af91def877befbabef8e93deba4c58a3ee2ded"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 191,
-        "column": 37,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "ee8544ee45681a650ed7d4918ae979685cdd8f0f"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 210,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "5d9d2217c8c7e6571bc9f72a98ea5b370edb4968"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 211,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "6e04619b373c23c91f6c36c2aad314ac16cdb697"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 212,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "39df045639a62f64ccdb03a80e286bc3ad772587"
+        "hash": "5d1f97e4d7d9f47399d312e8b9f95ef9e3843b8c"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 213,
-        "column": 17,
+        "column": 37,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "c399a43fa797a8ce61c9d96a644a39cc84a387b7"
+        "hash": "c1df874f790ef0c036bf58ae8a8db1ee173685d4"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 245,
+        "line": 232,
+        "column": 17,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "476e6588a28ac9382e8b9d2e63a8babecd23bad8"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 233,
+        "column": 17,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "6a0c82ba72d6d87217bf33a6ad8e40a4b81bc802"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 234,
+        "column": 17,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "741d5af6c7d90041c0dc1c1df2e8699b80fca69a"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 235,
+        "column": 17,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "c3ffd141f58d532663875cc5c7d338ed00db2a6d"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 267,
         "column": 13,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "04337a07944caaa4819cfebcf29e1a7cbfdf248b"
+        "hash": "2700f258396516a2fe971618fafbcdf72cdda3ab"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue",
-        "line": 76,
+        "line": 94,
         "column": 13,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "373a2e31f110d138c66d77f1faf5dc61545c55af"
+        "hash": "4be1b0592efa775092a91a1d744e16ce98bd216e"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue",
-        "line": 81,
+        "line": 99,
         "column": 13,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "421eb6a63224b4b1d81b216677a710c5c99ddee3"
+        "hash": "19b54b6d76c30249d520a296f826eda9d6eb0668"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue",
@@ -1569,19 +1393,19 @@
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue",
-        "line": 155,
+        "line": 169,
         "column": 17,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "b3a822914fcb5e2fcf28efc331a45b9205002eeb"
+        "hash": "dcb7b34098062760ddbb849655a5bb3ca65c36d3"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue",
-        "line": 164,
+        "line": 178,
         "column": 17,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "72c7d850f6cdeaf65b373a33234222f9766ee30b"
+        "hash": "86b3ecf201025cac36878c5e4bf8850fb9d58cb5"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js",
@@ -1631,14 +1455,6 @@
         "message": "'app' is assigned a value but never used.",
         "hash": "9e6125f4fc387dc362c69cc6e3ce360eb2851f1b"
     },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue",
-        "line": 60,
-        "column": 22,
-        "ruleId": "vue/require-valid-default-prop",
-        "message": "Type of the default value for 'suggested' prop must be a function.",
-        "hash": "d30212820bc2e97fa02d75dbc3a014558693f169"
-    },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsMap.vue",
         "line": 24,
@@ -1727,14 +1543,6 @@
         "message": "'tags' is assigned a value but never used.",
         "hash": "ae9bb2e0651c118ed9efd227e88b86cc83f5d80d"
     },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue",
-        "line": 116,
-        "column": 18,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'event' is defined but never used.",
-        "hash": "201f182769c6dfb87148b841e7d9b592be429669"
-    },
     {
         "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js",
         "line": 19,
@@ -1767,14 +1575,6 @@
         "message": "'app' is assigned a value but never used.",
         "hash": "aaaaa63e7a60443b8cbf8191feb9142852ebdf1c"
     },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue",
-        "line": 79,
-        "column": 13,
-        "ruleId": "vue/require-v-for-key",
-        "message": "Elements in iteration expect to have 'v-bind:key' directives.",
-        "hash": "422f53925922e59655d0f71624c19af75d41628c"
-    },
     {
         "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/index.js",
         "line": 12,
@@ -1815,22 +1615,6 @@
         "message": "'evalFQDN' is assigned a value but never used.",
         "hash": "7fc32caafa23addddf44f3acbc5045b4523a0271"
     },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js",
-        "line": 611,
-        "column": 9,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'errors' is assigned a value but never used.",
-        "hash": "c41cf979fc1626c38328dbf1028800c3395496bd"
-    },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/App.vue",
-        "line": 282,
-        "column": 7,
-        "ruleId": "@typescript-eslint/no-unused-expressions",
-        "message": "Expected an assignment or function call and instead saw an expression.",
-        "hash": "de3a6e2bb10a80a2bacba665be74266c7efc7d64"
-    },
     {
         "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/index.js",
         "line": 16,
@@ -1847,38 +1631,6 @@
         "message": "'app' is assigned a value but never used.",
         "hash": "2f161e663689e3e4dfe2c53b0d64c91a4d2b1a60"
     },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue",
-        "line": 263,
-        "column": 19,
-        "ruleId": "vue/return-in-computed-property",
-        "message": "Expected to return a value in \"refreshNetwork\" computed property.",
-        "hash": "2c1b08a49098c83b09058cedc0a962126e91e544"
-    },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue",
-        "line": 270,
-        "column": 7,
-        "ruleId": "vue/no-side-effects-in-computed-properties",
-        "message": "Unexpected side effect in \"legendLayers\" computed property.",
-        "hash": "760948d2187c853f17ac9a1bd7107e883092d4f4"
-    },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue",
-        "line": 281,
-        "column": 5,
-        "ruleId": "vue/no-dupe-keys",
-        "message": "Duplicate key 'checkedLayers'. May cause name collision in script or template tag.",
-        "hash": "447edb461e15e3ff5c60c8ecba88131e442539aa"
-    },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue",
-        "line": 353,
-        "column": 7,
-        "ruleId": "@typescript-eslint/no-unused-expressions",
-        "message": "Expected an assignment or function call and instead saw an expression.",
-        "hash": "9cf656cbf1eb3d7cc0082e63adcd320b6093d14f"
-    },
     {
         "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/index.js",
         "line": 20,
@@ -1887,22 +1639,6 @@
         "message": "'app' is assigned a value but never used.",
         "hash": "9e94e6412b8a44e47bfe8e66218cad09cff5bed4"
     },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue",
-        "line": 42,
-        "column": 16,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'response' is defined but never used.",
-        "hash": "62de07b13c662e32332bb062038acee23978ea70"
-    },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue",
-        "line": 356,
-        "column": 28,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'_response' is defined but never used.",
-        "hash": "097e7788a2b5dea500b80b8a3cf968e57063a66a"
-    },
     {
         "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue",
         "line": 6,
@@ -1918,45 +1654,5 @@
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'UserRenderBoxBadge' is defined but never used.",
         "hash": "99eba0d8633b2c9497417f4f61ec4194dbb2a96b"
-    },
-    {
-        "path": "src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts",
-        "line": 4,
-        "column": 3,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'StoredObjectStatus' is defined but never used.",
-        "hash": "63f8c4572293916850d6165647774b27d4b732c6"
-    },
-    {
-        "path": "src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts",
-        "line": 5,
-        "column": 3,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'StoredObjectStatusChange' is defined but never used.",
-        "hash": "a87c178e3eb5999bf0f46b3fa1c6da77e1be08b9"
-    },
-    {
-        "path": "src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts",
-        "line": 30,
-        "column": 61,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'e' is defined but never used.",
-        "hash": "02953121583f4f73742a19adab099ab63df9076e"
-    },
-    {
-        "path": "src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts",
-        "line": 31,
-        "column": 32,
-        "ruleId": "@typescript-eslint/no-explicit-any",
-        "message": "Unexpected any. Specify a different type.",
-        "hash": "af48e21a1651b6017ede882dab249c00a818a44d"
-    },
-    {
-        "path": "src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts",
-        "line": 37,
-        "column": 16,
-        "ruleId": "@typescript-eslint/no-explicit-any",
-        "message": "Unexpected any. Specify a different type.",
-        "hash": "7513ea552a0a649ce4ab93b6cf9d40bfef4f68d9"
     }
 ]

.gitignore

@@ -18,6 +18,9 @@ migrations/*
 templates/*
 translations/*
 
+# we allow developers to add customization on their installation, without commiting it
+config/packages/dev/*
+
 ###> symfony/framework-bundle ###
 /.env.local
 /.env.local.php

.junie/guidelines.md

@@ -22,16 +22,16 @@ Chill is a comprehensive web application built as a set of Symfony bundles. It i
 - **Backend**: PHP 8.3+, Symfony 5.4
 - **Frontend**: JavaScript/TypeScript, Vue.js 3, Bootstrap 5
 - **Build Tools**: Webpack Encore, Yarn
-- **Database**: PostgreSQL with materialized views
+- **Database**: PostgreSQL with materialized views. We do not support other databases.
 - **Other Services**: Redis, AMQP (RabbitMQ), SMTP
 
 ## Project Structure
 
-Note: This is a project which exists from a long time ago, and we found multiple structure inside each bundle. When having the choice, the developers should choose the new structure.
+Note: This is a project that's existed for a long time, and throughout the years we've used multiple structures inside each bundle. When having the choice, the developers should choose the new structure.
 
 The project follows a standard Symfony bundle structure:
 - `/src/Bundle/`: Contains all the Chill bundles. The code is either at the root of the bundle directory, or within a `src/` directory (preferred). See psr4 mapping at the root's `composer.json`.
-- each bundle come with his own tests, either in the `Tests` directory (when the code is directly within the bundle directory (for instance `src/Bundle/ChillMainBundle/Tests`, `src/Bundle/ChillPersonBundle/Tests`)), or inside the `tests` directory, alongside to the `src/` sub-directory (example: `src/Bundle/ChillWopiBundle/tests`) (this is the preferred way).
+- each bundle comes with its own tests, either in the `Tests` directory (when the code is directly within the bundle directory (for instance `src/Bundle/ChillMainBundle/Tests`, `src/Bundle/ChillPersonBundle/Tests`)), or inside the `tests` directory, alongside the `src/` sub-directory (example: `src/Bundle/ChillWopiBundle/tests`) (this is the preferred way).
 - `/docs/`: Contains project documentation
 
 Each bundle typically has the following structure:
@@ -46,13 +46,13 @@ Each bundle typically has the following structure:
 
 ### A special word about TicketBundle
 
-The ticket bundle is developed using a kind of "Command" pattern. The controller fill a "Command", and a "CommandHandler" handle this command. They are savec in the `src/Bundle/ChillTicketBundle/src/Action` directory.
+The ticket bundle is developed using a kind of "Command" pattern. The controller fills a "Command," and a "CommandHandler" handles this command. They are saved in the `src/Bundle/ChillTicketBundle/src/Action` directory.
 
 ## Development Guidelines
 
 ### Building and Configuration Instructions
 
-All the command should be run through the `symfony` command, which will configure the required variables.
+All the commands should be run through the `symfony` command, which will configure the required variables.
 
 For assets, we must ensure that we use node at version `^20.0.0`. This is done using `nvm use 20`.
 
@@ -87,7 +87,7 @@ For assets, we must ensure that we use node at version `^20.0.0`. This is done u
    docker compose up -d
    ```
 
-5. **Set Up the Database**:
+6. **Set Up the Database**:
    ```bash
    # Create the database
    symfony console doctrine:database:create
@@ -99,20 +99,20 @@ For assets, we must ensure that we use node at version `^20.0.0`. This is done u
    symfony console doctrine:fixtures:load
    ```
 
-6. **Build Assets**:
+7. **Build Assets**:
    ```bash
    nvm use 20
    yarn run encore dev
    ```
 
-7. **Start the Development Server**:
+8. **Start the Development Server**:
    ```bash
    symfony server:start -d
    ```
 
 #### Docker Setup
 
-The project includes Docker configuration for easier development:
+The project includes a Docker configuration for easier development:
 
 1. **Start Docker Services**:
    ```bash
@@ -149,14 +149,93 @@ Key configuration files:
 - `package.json`: JavaScript dependencies and scripts
 - `.env`: Default environment variables. Must usually not be updated: use `.env.local` instead.
 
+### Database migrations
+
+Each time a doctrine entity is created, we generate migration to adapt the database.
+
+The migration is created using the command `symfony console doctrine:migrations:diff --no-interaction --namespace <namespace>`, where the namespace is the relevant namespace for migration. As this is a bash script, remember to quote the `\` (`\` must become `\\` in your command).
+
+Each bundle has his own namespace for migration (always ask me to confirm that command with a list of updated / created entities so that I can confirm to you that it is ok):
+
+- `Chill\Bundle\ActivityBundle` writes migrations to `Chill\Migrations\Activity`;
+- `Chill\Bundle\BudgetBundle` writes migrations to `Chill\Migrations\Budget`;
+- `Chill\Bundle\CustomFieldsBundle` writes migrations to `Chill\Migrations\CustomFields`;
+- `Chill\Bundle\DocGeneratorBundle` writes migrations to `Chill\Migrations\DocGenerator`;
+- `Chill\Bundle\DocStoreBundle` writes migrations to `Chill\Migrations\DocStore`;
+- `Chill\Bundle\EventBundle` writes migrations to `Chill\Migrations\Event`;
+- `Chill\Bundle\CalendarBundle` writes migrations to `Chill\Migrations\Calendar`;
+- `Chill\Bundle\FamilyMembersBundle` writes migrations to `Chill\Migrations\FamilyMembers`;
+- `Chill\Bundle\FranceTravailApiBundle` writes migrations to `Chill\Migrations\FranceTravailApi`;
+- `Chill\Bundle\JobBundle` writes migrations to `Chill\Migrations\Job`;
+- `Chill\Bundle\MainBundle` writes migrations to `Chill\Migrations\Main`;
+- `Chill\Bundle\PersonBundle` writes migrations to `Chill\Migrations\Person`;
+- `Chill\Bundle\ReportBundle` writes migrations to `Chill\Migrations\Report`;
+- `Chill\Bundle\TaskBundle` writes migrations to `Chill\Migrations\Task`;
+- `Chill\Bundle\ThirdPartyBundle` writes migrations to `Chill\Migrations\ThirdParty`;
+- `Chill\Bundle\TicketBundle` writes migrations to `Chill\Migrations\Ticket`;
+- `Chill\Bundle\WopiBundle` writes migrations to `Chill\Migrations\Wopi`;
+
+Once created the, comment's classes should be removed and a description of the changes made to the entities should be added to the migrations, using the `getDescription` method. The migration should not be cleaned by any artificial intelligence, as modifying this migration is error prone.
+
+### Guidelines related to code structure and requirements
+
+#### Usage of clock
+
+When we need to use a DateTime or DateTimeImmutable that need to express "now", we prefer the usage of
+`Symfony\Component\Clock\ClockInterface`, where possible. This is usually not possible in doctrine entities,
+where injection does not work when restoring an entity from a database, but usually possible in services.
+
+In test, we use `\Symfony\Component\Clock\MockClock` which is an implementation of `Symfony\Component\Clock\ClockInterface`
+where we have full and easy control of the date.
+
 ### Testing Information
 
 The project uses PHPUnit for testing. Each bundle has its own test suite, and there's also a global test suite at the root level.
 
+#### Use of mock in tests
+
+##### General mocking
+
 For creating mock, we prefer using prophecy (library phpspec/prophecy).
 
+##### Useful helpers and tips that avoid creating a mock
+
+Some notable implementations that are test helpers and avoid creating a mock:
+
+- `\Psr\Log\NullLogger`, an implementation of `\Psr\Log\LoggerInterface`;
+- `\Symfony\Component\Clock\MockClock`, an implementation of `Symfony\Component\Clock\ClockInterface` (already mentioned above);
+- `\Symfony\Component\HttpClient\MockHttpClient`, an implementation of `\Symfony\Contracts\HttpClient\HttpClientInterface`;
+- When using `\Symfony\Component\Mailer\MailerInterface`, we can create the mock with "InMemoryTransport":
+
+    ```php
+    use Symfony\Component\Mailer\Transport\InMemoryTransport;
+    use \Symfony\Component\Mailer\Mailer;
+
+    $transport = new InMemoryTransport();
+    $mailer = new Mailer($transport);
+
+    // After sending:
+    $messages = $transport->getSent(); // array of SentMessage
+    ```
+- When using `\Symfony\Contracts\EventDispatcher\EventDispatcherInterface`, we can use directly an instance of `\Symfony\Component\EventDispatcher\EventDispatcher`;
+
+##### When we prefer not creating a mock
+
+- When we use Doctrine Entities related to the project, we prefer not to use a mock: we instantiate them directly (unless it requires too much code to write);
+
+##### Mocking final and readonly classes
+
+Classes marked as final can't be mocked. To avoid that, either:
+
+- we remove the `final` keyword from the class;
+- we extract an interface from the final class.
+
+This must be a decision made by a human, not by an AI. Every AI task must abort with an explicit message in that case.
+
 #### Running Tests
 
+The tests are run from the project's root (not from the bundle's root).
+
 ```bash
 # Run all tests
 vendor/bin/phpunit
@@ -218,7 +297,7 @@ class TicketTest extends TestCase
 
 #### Test Database
 
-For tests that require a database, the project uses an in-memory SQLite database by default. You can configure a different database for testing in the `.env.test` file.
+For tests that require a database, the project uses a postgresql database filled with fixtures (usage of doctrine-fixtures). You can configure a different database for testing in the `.env.test` file.
 
 ### Code Quality Tools
 

CHANGELOG.md

@@ -6,6 +6,197 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.4.2 - 2025-09-12
+### Fixed
+* Fix document generation and workflow generation do not work on accompanying period work documents   
+
+## v4.4.1 - 2025-09-11
+### Fixed
+* fix translations in duplicate evaluation document modal and realign close modal button   
+
+## v4.4.0 - 2025-09-11
+### Feature
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works   
+* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation   
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works   
+### Fixed
+* Fix display of 'duplicate' and 'merge' buttons in CRUD templates   
+* Fix saving notification preferences in user's profile   
+
+## v4.3.0 - 2025-09-08
+### Feature
+* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges   
+* Add a command to generate a list of permissions   
+* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date   
+
+  **Schema Change**: Add columns or tables
+### Fixed
+* fix date formatting in calendar range display   
+* Change route URL to avoid clash with person duplicate controller method   
+
+## v4.2.1 - 2025-09-03
+### Fixed
+* Fix exports to work with DirectExportInterface   
+### DX
+* Improve error message when a stored object cannot be written on local disk
+   
+
+## v4.2.0 - 2025-09-02
+### Feature
+* ([#64](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/64)) Add external identifier for a Person
+
+  **Schema Change**: Add columns or tables
+* ([#330](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/330) Allow users to choose for which notifications they want to receive an email
+### Fixed
+* ([#422](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/422)) Fixed html layout of pages for recovering password
+* Fix typo in 'uncheckAll' script for centers selection
+* Fix incorrect parameter name in event details link
+
+## v4.1.0 - 2025-08-26
+### Feature
+* ([#400](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/400)) Add filter to social actions list to filter out actions where current user intervenes   
+* ([#399](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/399)) Show filters on list pages unfolded by default   
+* Expansion of event module with new fields in the creation form: thematic, internal/external animator, responsable, and budget elements. Filtering options in the event list + adapted exports   
+
+  **Schema Change**: Add columns or tables
+### Fixed
+* ([#382](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/382)) adjust display logic for accompanying period dates, include closing date if period is closed.   
+* ([#384](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/384)) add min and step attributes to integer field in DateIntervalType   
+### UX
+* Limit display of participations in event list   
+
+## v4.0.2 - 2025-07-09
+### Fixed
+* Fix add missing translation   
+* Fix the transfer of evaluations and documents during of accompanyingperiodwork   
+
+## v4.0.1 - 2025-07-08
+### Fixed
+* Fix package.json for compilation
+   
+
+## v4.0.0 - 2025-07-08
+### Feature
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works
+### Fixed
+* ([#390](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/390)) Display the list of participant in the results, even if there is only one participant and that the search result display the requestor
+* Fix admin entity edit actions for event admin entities and activity reason (category) entities
+* Fix translations for social action fields in admin form: results, goals, evaluations
+### DX
+* Rewrite exports to run them asynchronously
+
+  **Schema Change**: Add columns or tables
+* Allow TranslatableMessage in flash messages
+### UX
+* Improve labeling of fields in person resource creation form
+
+
+**Release notes**
+
+- Add new methods to serialize data using the rector rule
+- Remove all references to the Request in filters, aggregators, filters. Actually, the most frequent occurence is `$security->getUser()`.
+- Refactor manually the initializeQuery method
+- Remove the injection of ExportManager into the constructor of each export element:
+
+  ```diff
+
+  - class MyFormatter implements FormatterInterface
+  + class MyFormatter implements FormatterInterface, \Chill\MainBundle\Export\ExportManagerAwareInterface
+  {
+  +    use \Chill\MainBundle\Export\Helper\ExportManagerAwareTrait;
+
+  -    public function __construct(private ExportManager $exportmanager) {}
+
+       public function MyMethod(): void
+       {
+  -          $this->exportManager->getFilter('alias');
+  +          $this->getExportManager()->getFilter('alias');
+       }
+  }
+  ```
+- configure messenger to handle export in a queue:
+
+```diff
+# config/packages/messenger.yaml
+framework:
+    messenger:
+        routing:
++            'Chill\MainBundle\Export\Messenger\ExportRequestGenerationMessage': priority
+```
+
+- add missing methods to exports, aggregators, filters, formatter:
+
+  ```php
+  public function normalizeFormData(array $formData): array;
+
+  public function denormalizeFormData(array $formData, int $fromVersion): array;
+  ```
+
+  There are rector rules to generate those methods:
+
+  - `Chill\Utils\Rector\Rector\ChillBundleAddNormalizationMethodsOnExportRector`
+
+  See:
+
+  ```php
+  // upgrade chill exports
+  $rectorConfig->rules([\Chill\Utils\Rector\Rector\ChillBundleAddNormalizationMethodsOnExportRector::class]);
+  ```
+
+  This rule will create most of the work necessary, but some manuals changes are still necessary:
+
+  - we must set manually the correct repository for method `denormalizeDoctrineEntity`;
+  - when the form data contains some entities, and the form type is not one of EntityType::class, PickUserDynamicType::class, PickUserLocationType::class, PickThirdpartyDynamicType::class, Select2CountryType::class, then we must handle the normalization manually (using the `\Chill\MainBundle\Export\ExportDataNormalizerTrait`)
+
+
+
+## v3.12.1 - 2025-06-30
+### Fixed
+* Fix loading of the list of documents   
+
+## v3.12.0 - 2025-06-30
+### Feature
+* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.   
+* Add desactivation date for social action and issue csv export   
+* Add Emoji and Fullscreen feature to ckeditor configuration   
+* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor   
+* Do not remove workflow which are automatically canceled after staling for more than 30 days   
+### Fixed
+* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history   
+* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course   
+* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events   
+* Add missing translation for user_group.no_user_groups   
+* Fix admin entity edit actions for event admin entities and activity reason (category) entities   
+* ([#392](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/392)) Allow null and cast as string to setContent method for NewsItem
+   
+* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.   
+### DX
+* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module   
+* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)   
+### UX
+* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page   
+* Improve labeling of fields in person resource creation form   
+
+## v3.11.0 - 2025-04-17
+### Feature
+* ([#365](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/365)) Add counters of actions and activities, with 2 boxes to (1) show the number of active actions on total actions and (2) show the number of activities in a accompanying period, and pills in menus for showing the number of active actions and the number of activities.
+* ([#364](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/364)) Added a second phone number "telephone2" to the thirdParty entity. Adapted twig templates and vuejs apps to handle this phone number
+
+  **Schema Change**: Add columns or tables
+* Signature: add a button to go directly to the signature zone, even if there is only one
+### Fixed
+* Fixed wrong translations in the on-the-fly for creation of thirdParty
+* Fixed update of phone number in on-the-fly edition of thirdParty
+* Fixed closing of modal when editing thirdParty in accompanying course works
+* Shorten the delay between two execution of AccompanyingPeriodStepChangeCronjob, to ensure at least one execution in a day
+* ([#102](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/102)) Fix display of title in document list
+* When cleaning the old stored object versions, do not throw an error if the stored object is not found on disk
+* Add consistent log prefix and key to logs when stale workflows are automatically canceled
+* ([#380](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/380)) Remove the "not null" validation constraint on recently added properties on HouseholdComposition
+
+### DX
+* Add new chill-col style for displaying title and aside in a flex table
+
 ## v3.10.3 - 2025-03-18
 ### DX
 * Eslint fixes   

config/packages/messenger.yaml

@@ -62,8 +62,10 @@ framework:
             'Chill\MainBundle\Workflow\Messenger\PostSignatureStateChangeMessage': priority
             'Chill\MainBundle\Workflow\Messenger\PostPublicViewMessage': async
             'Chill\MainBundle\Service\Workflow\CancelStaleWorkflowMessage': async
+            'Chill\MainBundle\Notification\Email\NotificationEmailMessages\SendImmediateNotificationEmailMessage': async
             'Chill\MainBundle\Export\Messenger\ExportRequestGenerationMessage': priority
             'Chill\MainBundle\Export\Messenger\RemoveExportGenerationMessage': async
+            'Chill\MainBundle\Notification\Email\NotificationEmailMessages\ScheduleDailyNotificationDigestMessage': async
             # end of routes added by chill-bundles recipes
             # Route your messages to the transports
             # 'App\Message\YourMessage': async

phpstan-baseline.neon

@@ -2154,11 +2154,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
 
-		-
-			message: "#^Instanceof between string and DateTimeInterface will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
-
 		-
 			message: "#^PHPDoc tag @var for property Chill\\\\MainBundle\\\\Export\\\\Helper\\\\ExportAddressHelper\\:\\:\\$unitNamesKeysCache contains unresolvable type\\.$#"
 			count: 1

rector.php

@@ -37,9 +37,6 @@ return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rule(Rector\TypeDeclaration\Rector\Class_\MergeDateTimePropertyTypeDeclarationRector::class);
     $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationBasedOnParentClassMethodRector::class);
 
-    // upgrade chill exports
-    $rectorConfig->rules([\Chill\Utils\Rector\Rector\ChillBundleAddNormalizationMethodsOnExportRector::class]);
-
     // part of the symfony 54 rules
     $rectorConfig->rule(\Rector\Symfony\Symfony53\Rector\StaticPropertyFetch\KernelTestCaseContainerPropertyDeprecationRector::class);
     $rectorConfig->rule(\Rector\Symfony\Symfony60\Rector\MethodCall\GetHelperControllerToServiceRector::class);

src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php

@@ -48,28 +48,6 @@ class ActivityReasonCategoryController extends AbstractController
         ]);
     }
 
-    /**
-     * Displays a form to edit an existing ActivityReasonCategory entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/edit', name: 'chill_activity_activityreasoncategory_edit')]
-    public function editAction(mixed $id)
-    {
-        $em = $this->managerRegistry->getManager();
-
-        $entity = $em->getRepository(ActivityReasonCategory::class)->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
-        }
-
-        $editForm = $this->createEditForm($entity);
-
-        return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
-            'entity' => $entity,
-            'edit_form' => $editForm->createView(),
-        ]);
-    }
-
     /**
      * Lists all ActivityReasonCategory entities.
      */
@@ -100,29 +78,10 @@ class ActivityReasonCategoryController extends AbstractController
         ]);
     }
 
-    /**
-     * Finds and displays a ActivityReasonCategory entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/show', name: 'chill_activity_activityreasoncategory_show')]
-    public function showAction(mixed $id)
-    {
-        $em = $this->managerRegistry->getManager();
-
-        $entity = $em->getRepository(ActivityReasonCategory::class)->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
-        }
-
-        return $this->render('@ChillActivity/ActivityReasonCategory/show.html.twig', [
-            'entity' => $entity,
-        ]);
-    }
-
     /**
      * Edits an existing ActivityReasonCategory entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/update', name: 'chill_activity_activityreasoncategory_update', methods: ['POST', 'PUT'])]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/update', name: 'chill_activity_activityreasoncategory_update')]
     public function updateAction(Request $request, mixed $id)
     {
         $em = $this->managerRegistry->getManager();
@@ -139,7 +98,7 @@ class ActivityReasonCategoryController extends AbstractController
         if ($editForm->isSubmitted() && $editForm->isValid()) {
             $em->flush();
 
-            return $this->redirectToRoute('chill_activity_activityreasoncategory_edit', ['id' => $id]);
+            return $this->redirectToRoute('chill_activity_activityreasoncategory', ['id' => $id]);
         }
 
         return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
@@ -178,7 +137,7 @@ class ActivityReasonCategoryController extends AbstractController
     {
         $form = $this->createForm(ActivityReasonCategoryType::class, $entity, [
             'action' => $this->generateUrl('chill_activity_activityreasoncategory_update', ['id' => $entity->getId()]),
-            'method' => 'PUT',
+            'method' => 'POST',
         ]);
 
         $form->add('submit', SubmitType::class, ['label' => 'Update']);

src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php

@@ -17,7 +17,6 @@ use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * ActivityReason controller.
@@ -50,28 +49,6 @@ class ActivityReasonController extends AbstractController
         ]);
     }
 
-    /**
-     * Displays a form to edit an existing ActivityReason entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/edit', name: 'chill_activity_activityreason_edit')]
-    public function editAction(mixed $id)
-    {
-        $em = $this->managerRegistry->getManager();
-
-        $entity = $em->getRepository(ActivityReason::class)->find($id);
-
-        if (null === $entity) {
-            throw new NotFoundHttpException('Unable to find ActivityReason entity.');
-        }
-
-        $editForm = $this->createEditForm($entity);
-
-        return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [
-            'entity' => $entity,
-            'edit_form' => $editForm->createView(),
-        ]);
-    }
-
     /**
      * Lists all ActivityReason entities.
      */
@@ -102,29 +79,10 @@ class ActivityReasonController extends AbstractController
         ]);
     }
 
-    /**
-     * Finds and displays a ActivityReason entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/show', name: 'chill_activity_activityreason_show')]
-    public function showAction(mixed $id)
-    {
-        $em = $this->managerRegistry->getManager();
-
-        $entity = $em->getRepository(ActivityReason::class)->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
-        }
-
-        return $this->render('@ChillActivity/ActivityReason/show.html.twig', [
-            'entity' => $entity,
-        ]);
-    }
-
     /**
      * Edits an existing ActivityReason entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/update', name: 'chill_activity_activityreason_update', methods: ['POST', 'PUT'])]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/update', name: 'chill_activity_activityreason_update')]
     public function updateAction(Request $request, mixed $id)
     {
         $em = $this->managerRegistry->getManager();
@@ -180,7 +138,7 @@ class ActivityReasonController extends AbstractController
     {
         $form = $this->createForm(ActivityReasonType::class, $entity, [
             'action' => $this->generateUrl('chill_activity_activityreason_update', ['id' => $entity->getId()]),
-            'method' => 'PUT',
+            'method' => 'POST',
         ]);
 
         $form->add('submit', SubmitType::class, ['label' => 'Update']);

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js

@@ -2,7 +2,7 @@ import "es6-promise/auto";
 import { createStore } from "vuex";
 import { postLocation } from "./api";
 import prepareLocations from "./store.locations.js";
-import {fetchResults, makeFetch} from "ChillMainAssets/lib/api/apiMethods";
+import { fetchResults, makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 
 const debug = process.env.NODE_ENV !== "production";
 //console.log('window.activity', window.activity);
@@ -369,7 +369,7 @@ const store = createStore({
         // console.log('works', works);
         commit("setAccompanyingPeriodWorks", works);
       } catch (error) {
-        console.error('Failed to fetch works:', error);
+        console.error("Failed to fetch works:", error);
       }
     },
     getWhoAmI({ commit }) {

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig

@@ -3,7 +3,7 @@
 {% block admin_content %}
     <h1>{{ 'ActivityReason list'|trans }}</h1>
 
-    <table class="records_list">
+    <table class="table table-bordered border-dark align-middle">
         <thead>
             <tr>
                 <th>{{ 'Name'|trans }}</th>
@@ -29,10 +29,7 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
-                        </li>
-                        <li>
-                            <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                            <a href="{{ path('chill_activity_activityreason_update', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                         </li>
                     </ul>
                 </td>

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig

@@ -3,7 +3,7 @@
 {% block admin_content %}
     <h1>{{ 'ActivityReasonCategory list'|trans }}</h1>
 
-    <table class="records_list">
+    <table class="table table-bordered border-dark align-middle">
         <thead>
             <tr>
                 <th>{{ 'Name'|trans }}</th>
@@ -23,10 +23,7 @@
                 <td>
                     <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
-                    </li>
-                    <li>
-                        <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreasoncategory_update', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php

@@ -22,6 +22,52 @@ use Symfony\Component\Security\Core\Role\Role;
  */
 final class ActivityControllerTest extends WebTestCase
 {
+    /**
+     * @dataProvider getSecuredPagesUnauthenticated
+     */
+    public function testAccessIsDeniedForUnauthenticated(mixed $url)
+    {
+        $client = $this->createClient();
+
+        $client->request('GET', $url);
+
+        $this->assertEquals(302, $client->getResponse()->getStatusCode());
+        $this->assertTrue(
+            $client->getResponse()->isRedirect('http://localhost/login'),
+            sprintf('the page "%s" does not redirect to http://localhost/login', $url)
+        );
+    }
+
+    /**
+     * Provide a client unauthenticated and.
+     */
+    public function getSecuredPagesUnauthenticated()
+    {
+        self::bootKernel();
+        $person = $this->getPersonFromFixtures();
+        $activities = $this->getActivitiesForPerson($person);
+
+        return [
+            [sprintf('fr/person/%d/activity/', $person->getId())],
+            [sprintf('fr/person/%d/activity/new', $person->getId())],
+            [sprintf('fr/person/%d/activity/%d/show', $person->getId(), $activities[0]->getId())],
+            [sprintf('fr/person/%d/activity/%d/edit', $person->getId(), $activities[0]->getId())],
+        ];
+    }
+
+    /**
+     * @dataProvider getSecuredPagesAuthenticated
+     *
+     * @param type $client
+     * @param type $url
+     */
+    public function testAccessIsDeniedForUnauthorized($client, $url)
+    {
+        $client->request('GET', $url);
+
+        $this->assertEquals(403, $client->getResponse()->getStatusCode());
+    }
+
     public function getSecuredPagesAuthenticated()
     {
         self::bootKernel();
@@ -55,52 +101,6 @@ final class ActivityControllerTest extends WebTestCase
         ];
     }
 
-    /**
-     * Provide a client unauthenticated and.
-     */
-    public function getSecuredPagesUnauthenticated()
-    {
-        self::bootKernel();
-        $person = $this->getPersonFromFixtures();
-        $activities = $this->getActivitiesForPerson($person);
-
-        return [
-            [sprintf('fr/person/%d/activity/', $person->getId())],
-            [sprintf('fr/person/%d/activity/new', $person->getId())],
-            [sprintf('fr/person/%d/activity/%d/show', $person->getId(), $activities[0]->getId())],
-            [sprintf('fr/person/%d/activity/%d/edit', $person->getId(), $activities[0]->getId())],
-        ];
-    }
-
-    /**
-     * @dataProvider getSecuredPagesUnauthenticated
-     */
-    public function testAccessIsDeniedForUnauthenticated(mixed $url)
-    {
-        $client = $this->createClient();
-
-        $client->request('GET', $url);
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $this->assertTrue(
-            $client->getResponse()->isRedirect('http://localhost/login'),
-            sprintf('the page "%s" does not redirect to http://localhost/login', $url)
-        );
-    }
-
-    /**
-     * @dataProvider getSecuredPagesAuthenticated
-     *
-     * @param type $client
-     * @param type $url
-     */
-    public function testAccessIsDeniedForUnauthorized($client, $url)
-    {
-        $client->request('GET', $url);
-
-        $this->assertEquals(403, $client->getResponse()->getStatusCode());
-    }
-
     public function testCompleteScenario()
     {
         // Create a new client to browse the application

src/Bundle/ChillActivityBundle/Tests/Repository/ActivityACLAwareRepositoryTest.php

@@ -137,6 +137,64 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
         self::assertIsArray($actual);
     }
 
+    public function provideDataFindByAccompanyingPeriod(): iterable
+    {
+        $this->setUp();
+
+        if (null === $period = $this->entityManager
+            ->createQueryBuilder()
+            ->select('a')
+            ->from(AccompanyingPeriod::class, 'a')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getSingleResult()) {
+            throw new \RuntimeException('no period found');
+        }
+
+        if ([] === $types = $this->entityManager
+            ->createQueryBuilder()
+            ->select('t')
+            ->from(ActivityType::class, 't')
+            ->setMaxResults(2)
+            ->getQuery()
+            ->getResult()) {
+            throw new \RuntimeException('no types');
+        }
+
+        if ([] === $jobs = $this->entityManager
+            ->createQueryBuilder()
+            ->select('j')
+            ->from(UserJob::class, 'j')
+            ->setMaxResults(2)
+            ->getQuery()
+            ->getResult()
+        ) {
+            $job = new UserJob();
+            $job->setLabel(['fr' => 'test']);
+            $this->entityManager->persist($job);
+            $this->entityManager->flush();
+        }
+
+        if (null === $user = $this->entityManager
+            ->createQueryBuilder()
+            ->select('u')
+            ->from(User::class, 'u')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getSingleResult()
+        ) {
+            throw new \RuntimeException('no user found');
+        }
+
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], []];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['my_activities' => true]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['types' => $types]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['jobs' => $jobs]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago')]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['before' => new \DateTimeImmutable('1 year ago')]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago'), 'before' => new \DateTimeImmutable('1 month ago')]];
+    }
+
     /**
      * @dataProvider provideDataFindByPerson
      */
@@ -291,62 +349,4 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
         yield [$person, $user, $centers, $scopes, ActivityVoter::SEE, 0, 5, ['date' => 'DESC'], ['before' => new \DateTimeImmutable('1 year ago')]];
         yield [$person, $user, $centers, $scopes, ActivityVoter::SEE, 0, 5, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago'), 'before' => new \DateTimeImmutable('1 month ago')]];
     }
-
-    public function provideDataFindByAccompanyingPeriod(): iterable
-    {
-        $this->setUp();
-
-        if (null === $period = $this->entityManager
-            ->createQueryBuilder()
-            ->select('a')
-            ->from(AccompanyingPeriod::class, 'a')
-            ->setMaxResults(1)
-            ->getQuery()
-            ->getSingleResult()) {
-            throw new \RuntimeException('no period found');
-        }
-
-        if ([] === $types = $this->entityManager
-            ->createQueryBuilder()
-            ->select('t')
-            ->from(ActivityType::class, 't')
-            ->setMaxResults(2)
-            ->getQuery()
-            ->getResult()) {
-            throw new \RuntimeException('no types');
-        }
-
-        if ([] === $jobs = $this->entityManager
-            ->createQueryBuilder()
-            ->select('j')
-            ->from(UserJob::class, 'j')
-            ->setMaxResults(2)
-            ->getQuery()
-            ->getResult()
-        ) {
-            $job = new UserJob();
-            $job->setLabel(['fr' => 'test']);
-            $this->entityManager->persist($job);
-            $this->entityManager->flush();
-        }
-
-        if (null === $user = $this->entityManager
-            ->createQueryBuilder()
-            ->select('u')
-            ->from(User::class, 'u')
-            ->setMaxResults(1)
-            ->getQuery()
-            ->getSingleResult()
-        ) {
-            throw new \RuntimeException('no user found');
-        }
-
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], []];
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['my_activities' => true]];
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['types' => $types]];
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['jobs' => $jobs]];
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago')]];
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['before' => new \DateTimeImmutable('1 year ago')]];
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago'), 'before' => new \DateTimeImmutable('1 month ago')]];
-    }
 }

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

@@ -57,6 +57,46 @@ final class ActivityVoterTest extends KernelTestCase
         $this->prophet = new \Prophecy\Prophet();
     }
 
+    public function testNullUser()
+    {
+        $token = $this->prepareToken();
+        $center = $this->prepareCenter(1, 'center');
+        $person = $this->preparePerson($center);
+        $scope = $this->prepareScope(1, 'default');
+        $activity = $this->prepareActivity($scope, $person);
+
+        $this->assertEquals(
+            VoterInterface::ACCESS_DENIED,
+            $this->voter->vote($token, $activity, ['CHILL_ACTIVITY_SEE']),
+            'assert that a null user is not allowed to see'
+        );
+    }
+
+    /**
+     * @dataProvider dataProvider_testVoteAction
+     *
+     * @param type   $expectedResult
+     * @param string $attribute
+     * @param string $message
+     */
+    public function testVoteAction(
+        $expectedResult,
+        User $user,
+        Scope $scope,
+        Center $center,
+        $attribute,
+        $message,
+    ) {
+        $token = $this->prepareToken($user);
+        $activity = $this->prepareActivity($scope, $this->preparePerson($center));
+
+        $this->assertEquals(
+            $expectedResult,
+            $this->voter->vote($token, $activity, [$attribute]),
+            $message
+        );
+    }
+
     public function dataProvider_testVoteAction()
     {
         $centerA = $this->prepareCenter(1, 'center A');
@@ -110,46 +150,6 @@ final class ActivityVoterTest extends KernelTestCase
         ];
     }
 
-    public function testNullUser()
-    {
-        $token = $this->prepareToken();
-        $center = $this->prepareCenter(1, 'center');
-        $person = $this->preparePerson($center);
-        $scope = $this->prepareScope(1, 'default');
-        $activity = $this->prepareActivity($scope, $person);
-
-        $this->assertEquals(
-            VoterInterface::ACCESS_DENIED,
-            $this->voter->vote($token, $activity, ['CHILL_ACTIVITY_SEE']),
-            'assert that a null user is not allowed to see'
-        );
-    }
-
-    /**
-     * @dataProvider dataProvider_testVoteAction
-     *
-     * @param type   $expectedResult
-     * @param string $attribute
-     * @param string $message
-     */
-    public function testVoteAction(
-        $expectedResult,
-        User $user,
-        Scope $scope,
-        Center $center,
-        $attribute,
-        $message,
-    ) {
-        $token = $this->prepareToken($user);
-        $activity = $this->prepareActivity($scope, $this->preparePerson($center));
-
-        $this->assertEquals(
-            $expectedResult,
-            $this->voter->vote($token, $activity, [$attribute]),
-            $message
-        );
-    }
-
     /**
      * prepare a token interface with correct rights.
      *

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

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

src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php

@@ -30,6 +30,18 @@ final class AsideActivityControllerTest extends WebTestCase
         self::ensureKernelShutdown();
     }
 
+    /**
+     * @dataProvider generateAsideActivityId
+     */
+    public function testEditWithoutUsers(int $asideActivityId)
+    {
+        self::ensureKernelShutdown();
+        $client = $this->getClientAuthenticated();
+        $client->request('GET', "/fr/asideactivity/{$asideActivityId}/edit");
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+    }
+
     public static function generateAsideActivityId(): iterable
     {
         self::bootKernel();
@@ -58,18 +70,6 @@ final class AsideActivityControllerTest extends WebTestCase
         self::ensureKernelShutdown();
     }
 
-    /**
-     * @dataProvider generateAsideActivityId
-     */
-    public function testEditWithoutUsers(int $asideActivityId)
-    {
-        self::ensureKernelShutdown();
-        $client = $this->getClientAuthenticated();
-        $client->request('GET', "/fr/asideactivity/{$asideActivityId}/edit");
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-    }
-
     public function testIndexWithoutUsers()
     {
         self::ensureKernelShutdown();

src/Bundle/ChillCalendarBundle/Controller/CalendarController.php

@@ -13,6 +13,7 @@ namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Form\CalendarType;
+use Chill\CalendarBundle\Form\CancelType;
 use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
 use Chill\CalendarBundle\Repository\CalendarACLAwareRepositoryInterface;
 use Chill\CalendarBundle\Security\Voter\CalendarVoter;
@@ -30,6 +31,7 @@ use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Doctrine\ORM\EntityManagerInterface;
 use http\Exception\UnexpectedValueException;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -60,6 +62,7 @@ class CalendarController extends AbstractController
         private readonly UserRepositoryInterface $userRepository,
         private readonly TranslatorInterface $translator,
         private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
+        private readonly EntityManagerInterface $em,
     ) {}
 
     /**
@@ -111,6 +114,55 @@ class CalendarController extends AbstractController
         ]);
     }
 
+    #[Route(path: '/{_locale}/calendar/calendar/{id}/cancel', name: 'chill_calendar_calendar_cancel')]
+    public function cancelAction(Calendar $calendar, Request $request): Response
+    {
+        // Deal with sms being sent or not
+        // Communicate cancellation with the remote calendar.
+
+        $this->denyAccessUnlessGranted(CalendarVoter::EDIT, $calendar);
+
+        [$person, $accompanyingPeriod] = [$calendar->getPerson(), $calendar->getAccompanyingPeriod()];
+
+        $form = $this->createForm(CancelType::class, $calendar);
+        $form->add('submit', SubmitType::class);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = '@ChillCalendar/Calendar/cancelCalendarByAccompanyingCourse.html.twig';
+            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_period', ['id' => $accompanyingPeriod->getId()]);
+        } elseif ($person instanceof Person) {
+            $view = '@ChillCalendar/Calendar/cancelCalendarByPerson.html.twig';
+            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_person', ['id' => $person->getId()]);
+        } else {
+            throw new \RuntimeException('nor person or accompanying period');
+        }
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+
+            $this->logger->notice('A calendar event has been cancelled', [
+                'by_user' => $this->getUser()->getUsername(),
+                'calendar_id' => $calendar->getId(),
+            ]);
+
+            $calendar->setStatus($calendar::STATUS_CANCELED);
+            $calendar->setSmsStatus($calendar::SMS_CANCEL_PENDING);
+            $this->em->flush();
+
+            $this->addFlash('success', $this->translator->trans('chill_calendar.calendar_canceled'));
+
+            return new RedirectResponse($redirectRoute);
+        }
+
+        return $this->render($view, [
+            'calendar' => $calendar,
+            'form' => $form->createView(),
+            'accompanyingCourse' => $accompanyingPeriod,
+            'person' => $person,
+        ]);
+    }
+
     /**
      * Edit a calendar item.
      */

src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php

@@ -35,7 +35,7 @@ class LoadCancelReason extends Fixture implements FixtureGroupInterface
         $arr = [
             ['name' => CancelReason::CANCELEDBY_USER],
             ['name' => CancelReason::CANCELEDBY_PERSON],
-            ['name' => CancelReason::CANCELEDBY_DONOTCOUNT],
+            ['name' => CancelReason::CANCELEDBY_OTHER],
         ];
 
         foreach ($arr as $a) {

src/Bundle/ChillCalendarBundle/Entity/CancelReason.php

@@ -18,14 +18,14 @@ use Doctrine\ORM\Mapping as ORM;
 #[ORM\Table(name: 'chill_calendar.cancel_reason')]
 class CancelReason
 {
-    final public const CANCELEDBY_DONOTCOUNT = 'CANCELEDBY_DONOTCOUNT';
+    final public const CANCELEDBY_OTHER = 'CANCELEDBY_OTHER';
 
     final public const CANCELEDBY_PERSON = 'CANCELEDBY_PERSON';
 
     final public const CANCELEDBY_USER = 'CANCELEDBY_USER';
 
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN)]
-    private ?bool $active = null;
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, options: ['default' => true])]
+    private bool $active = true;
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 255)]
     private ?string $canceledBy = null;

src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php

@@ -15,7 +15,7 @@ use Chill\CalendarBundle\Entity\CancelReason;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -28,7 +28,14 @@ class CancelReasonType extends AbstractType
             ->add('active', CheckboxType::class, [
                 'required' => false,
             ])
-            ->add('canceledBy', TextType::class);
+            ->add('canceledBy', ChoiceType::class, [
+                'choices' => [
+                    'chill_calendar.canceled_by.user' => CancelReason::CANCELEDBY_USER,
+                    'chill_calendar.canceled_by.person' => CancelReason::CANCELEDBY_PERSON,
+                    'chill_calendar.canceled_by.other' => CancelReason::CANCELEDBY_OTHER,
+                ],
+                'required' => true,
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)

src/Bundle/ChillCalendarBundle/Form/CancelType.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Form;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CancelReason;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class CancelType extends AbstractType
+{
+    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('cancelReason', EntityType::class, [
+            'class' => CancelReason::class,
+            'required' => true,
+            'choice_label' => fn (CancelReason $cancelReason) => $this->translatableStringHelper->localize($cancelReason->getName()),
+        ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => Calendar::class,
+
+        ]);
+    }
+}

src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php

@@ -21,6 +21,7 @@ namespace Chill\CalendarBundle\Messenger\Doctrine;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Messenger\Message\CalendarMessage;
 use Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage;
+use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\Event\PostPersistEventArgs;
 use Doctrine\ORM\Event\PostRemoveEventArgs;
 use Doctrine\ORM\Event\PostUpdateEventArgs;
@@ -31,6 +32,17 @@ class CalendarEntityListener
 {
     public function __construct(private readonly MessageBusInterface $messageBus, private readonly Security $security) {}
 
+    private function getAuthenticatedUser(): User
+    {
+        $user = $this->security->getUser();
+
+        if (!$user instanceof User) {
+            throw new \LogicException('Expected an instance of User.');
+        }
+
+        return $user;
+    }
+
     public function postPersist(Calendar $calendar, PostPersistEventArgs $args): void
     {
         if (!$calendar->preventEnqueueChanges) {
@@ -38,7 +50,7 @@ class CalendarEntityListener
                 new CalendarMessage(
                     $calendar,
                     CalendarMessage::CALENDAR_PERSIST,
-                    $this->security->getUser()
+                    $this->getAuthenticatedUser()
                 )
             );
         }
@@ -50,7 +62,7 @@ class CalendarEntityListener
             $this->messageBus->dispatch(
                 new CalendarRemovedMessage(
                     $calendar,
-                    $this->security->getUser()
+                    $this->getAuthenticatedUser()
                 )
             );
         }
@@ -58,12 +70,19 @@ class CalendarEntityListener
 
     public function postUpdate(Calendar $calendar, PostUpdateEventArgs $args): void
     {
-        if (!$calendar->preventEnqueueChanges) {
+        if ($calendar->getStatus() === $calendar::STATUS_CANCELED) {
+            $this->messageBus->dispatch(
+                new CalendarRemovedMessage(
+                    $calendar,
+                    $this->getAuthenticatedUser()
+                )
+            );
+        } elseif (!$calendar->preventEnqueueChanges) {
             $this->messageBus->dispatch(
                 new CalendarMessage(
                     $calendar,
                     CalendarMessage::CALENDAR_UPDATE,
-                    $this->security->getUser()
+                    $this->getAuthenticatedUser()
                 )
             );
         }

src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php

@@ -70,6 +70,8 @@ class CalendarRemovedMessage
 
     public function getRemoteId(): string
     {
+        dump($this->remoteId);
+
         return $this->remoteId;
     }
 }

src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml

@@ -1,5 +1,6 @@
 services:
     Chill\CalendarBundle\Controller\:
         autowire: true
+        autoconfigure: true
         resource: '../../../Controller'
         tags: ['controller.service_arguments']

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

@@ -70,6 +70,8 @@
                         <option value="00:10:00">10 minutes</option>
                         <option value="00:15:00">15 minutes</option>
                         <option value="00:30:00">30 minutes</option>
+                        <option value="00:45:00">45 minutes</option>
+                        <option value="00:60:00">60 minutes</option>
                     </select>
                     <label class="input-group-text" for="slotMinTime">De</label>
                     <select

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

@@ -32,6 +32,8 @@
                     <option value="00:10:00">10 minutes</option>
                     <option value="00:15:00">15 minutes</option>
                     <option value="00:30:00">30 minutes</option>
+                    <option value="00:45:00">45 minutes</option>
+                    <option value="00:60:00">60 minutes</option>
                 </select>
                 <label class="input-group-text" for="slotMinTime">De</label>
                 <select
@@ -102,7 +104,8 @@
                     event.title
                 }}</b>
                 <b v-else-if="event.extendedProps.is === 'range'"
-                    >{{ formatDate(event.startStr) }} -
+                    >{{ formatDate(event.startStr, "time") }} -
+                    {{ formatDate(event.endStr, "time") }}:
                     {{ event.extendedProps.locationName }}</b
                 >
                 <b v-else-if="event.extendedProps.is === 'local'">{{
@@ -294,9 +297,26 @@ const nextWeeks = computed((): Weeks[] =>
     }),
 );
 
-const formatDate = (datetime: string) => {
-    console.log(typeof datetime);
-    return ISOToDate(datetime);
+const formatDate = (datetime: string, format: null | "time" = null) => {
+    const date = ISOToDate(datetime);
+    if (!date) return "";
+
+    if (format === "time") {
+        return date.toLocaleTimeString("fr-FR", {
+            hour: "2-digit",
+            minute: "2-digit",
+        });
+    }
+
+    // French date formatting
+    return date.toLocaleDateString("fr-FR", {
+        weekday: "short",
+        year: "numeric",
+        month: "short",
+        day: "numeric",
+        hour: "2-digit",
+        minute: "2-digit",
+    });
 };
 
 const baseOptions = ref<CalendarOptions>({

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

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

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

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

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

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

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

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

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

@@ -24,7 +24,11 @@ use Doctrine\ORM\EntityManagerInterface;
 
 class CalendarForShortMessageProvider
 {
-    public function __construct(private readonly CalendarRepository $calendarRepository, private readonly EntityManagerInterface $em, private readonly RangeGeneratorInterface $rangeGenerator) {}
+    public function __construct(
+        private readonly CalendarRepository $calendarRepository,
+        private readonly EntityManagerInterface $em,
+        private readonly RangeGeneratorInterface $rangeGenerator,
+    ) {}
 
     /**
      * Generate calendars instance.

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

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

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

@@ -42,6 +42,32 @@ final class CalendarControllerTest extends WebTestCase
         self::ensureKernelShutdown();
     }
 
+    /**
+     * @dataProvider provideAccompanyingPeriod
+     */
+    public function testList(int $accompanyingPeriodId)
+    {
+        $this->client->request(
+            Request::METHOD_GET,
+            sprintf('/fr/calendar/calendar/by-period/%d', $accompanyingPeriodId)
+        );
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+    }
+
+    /**
+     * @dataProvider provideAccompanyingPeriod
+     */
+    public function testNew(int $accompanyingPeriodId)
+    {
+        $this->client->request(
+            Request::METHOD_GET,
+            sprintf('/fr/calendar/calendar/new?accompanying_period_id=%d', $accompanyingPeriodId)
+        );
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+    }
+
     public static function provideAccompanyingPeriod(): iterable
     {
         self::bootKernel();
@@ -82,30 +108,4 @@ final class CalendarControllerTest extends WebTestCase
 
         self::ensureKernelShutdown();
     }
-
-    /**
-     * @dataProvider provideAccompanyingPeriod
-     */
-    public function testList(int $accompanyingPeriodId)
-    {
-        $this->client->request(
-            Request::METHOD_GET,
-            sprintf('/fr/calendar/calendar/by-period/%d', $accompanyingPeriodId)
-        );
-
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-    }
-
-    /**
-     * @dataProvider provideAccompanyingPeriod
-     */
-    public function testNew(int $accompanyingPeriodId)
-    {
-        $this->client->request(
-            Request::METHOD_GET,
-            sprintf('/fr/calendar/calendar/new?accompanying_period_id=%d', $accompanyingPeriodId)
-        );
-
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-    }
 }

src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderTest.php

@@ -45,20 +45,6 @@ class MSUserAbsenceReaderTest extends TestCase
         self::assertEquals($expected, $absenceReader->isUserAbsent($user), $message);
     }
 
-    public function testIsUserAbsentWithoutRemoteId(): void
-    {
-        $user = new User();
-        $client = new MockHttpClient();
-
-        $mapUser = $this->prophesize(MapCalendarToUser::class);
-        $mapUser->getUserId($user)->willReturn(null);
-        $clock = new MockClock(new \DateTimeImmutable('2023-07-07T12:00:00'));
-
-        $absenceReader = new MSUserAbsenceReader($client, $mapUser->reveal(), $clock);
-
-        self::assertNull($absenceReader->isUserAbsent($user), 'when no user found, absence should be null');
-    }
-
     public static function provideDataTestUserAbsence(): iterable
     {
         // contains data that was retrieved from microsoft graph api on 2023-07-06
@@ -173,4 +159,18 @@ class MSUserAbsenceReaderTest extends TestCase
             'User is absent: absence is always enabled',
         ];
     }
+
+    public function testIsUserAbsentWithoutRemoteId(): void
+    {
+        $user = new User();
+        $client = new MockHttpClient();
+
+        $mapUser = $this->prophesize(MapCalendarToUser::class);
+        $mapUser->getUserId($user)->willReturn(null);
+        $clock = new MockClock(new \DateTimeImmutable('2023-07-07T12:00:00'));
+
+        $absenceReader = new MSUserAbsenceReader($client, $mapUser->reveal(), $clock);
+
+        self::assertNull($absenceReader->isUserAbsent($user), 'when no user found, absence should be null');
+    }
 }

src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php

@@ -21,7 +21,6 @@ namespace Chill\CalendarBundle\Tests\Service\ShortMessageNotification;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\CalendarBundle\Service\ShortMessageNotification\CalendarForShortMessageProvider;
-use Chill\CalendarBundle\Service\ShortMessageNotification\DefaultRangeGenerator;
 use Chill\CalendarBundle\Service\ShortMessageNotification\RangeGeneratorInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
@@ -82,10 +81,16 @@ final class CalendarForShortMessageProviderTest extends TestCase
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->clear()->shouldBeCalled();
 
+        $calendarRangeGenerator = $this->prophesize(RangeGeneratorInterface::class);
+        $calendarRangeGenerator->generateRange(Argument::any())->willReturn([
+            'startDate' => new \DateTimeImmutable('yesterday'),
+            'endDate' => new \DateTimeImmutable('now'),
+        ]);
+
         $provider = new CalendarForShortMessageProvider(
             $calendarRepository->reveal(),
             $em->reveal(),
-            new DefaultRangeGenerator()
+            $calendarRangeGenerator->reveal(),
         );
 
         $calendars = iterator_to_array($provider->getCalendars(new \DateTimeImmutable('now')));
@@ -103,26 +108,32 @@ final class CalendarForShortMessageProviderTest extends TestCase
             Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
             Argument::exact(0)
-        )->will(static fn ($args) => array_fill(0, 1, new Calendar()))->shouldBeCalledTimes(1);
+        )->will(static fn ($args) => array_fill(0, 10, new Calendar()))->shouldBeCalledTimes(1);
         $calendarRepository->findByNotificationAvailable(
             Argument::type(\DateTimeImmutable::class),
             Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
-            Argument::not(0)
+            Argument::exact(10)
         )->will(static fn ($args) => [])->shouldBeCalledTimes(1);
 
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->clear()->shouldBeCalled();
 
+        $calendarRangeGenerator = $this->prophesize(RangeGeneratorInterface::class);
+        $calendarRangeGenerator->generateRange(Argument::any())->willReturn([
+            'startDate' => new \DateTimeImmutable('yesterday'),
+            'endDate' => new \DateTimeImmutable('now'),
+        ]);
+
         $provider = new CalendarForShortMessageProvider(
             $calendarRepository->reveal(),
             $em->reveal(),
-            new DefaultRangeGenerator()
+            $calendarRangeGenerator->reveal(),
         );
 
         $calendars = iterator_to_array($provider->getCalendars(new \DateTimeImmutable('now')));
 
-        $this->assertEquals(1, \count($calendars));
+        $this->assertEquals(10, \count($calendars));
         $this->assertContainsOnly(Calendar::class, $calendars);
     }
 }

src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultRangeGeneratorTest.php

@@ -28,6 +28,24 @@ use PHPUnit\Framework\TestCase;
  */
 final class DefaultRangeGeneratorTest extends TestCase
 {
+    /**
+     * @dataProvider generateData
+     */
+    public function testGenerateRange(\DateTimeImmutable $date, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate)
+    {
+        $generator = new DefaultRangeGenerator();
+
+        ['startDate' => $actualStartDate, 'endDate' => $actualEndDate] = $generator->generateRange($date);
+
+        if (null === $startDate) {
+            $this->assertNull($actualStartDate);
+            $this->assertNull($actualEndDate);
+        } else {
+            $this->assertEquals($startDate->format(\DateTimeImmutable::ATOM), $actualStartDate->format(\DateTimeImmutable::ATOM));
+            $this->assertEquals($endDate->format(\DateTimeImmutable::ATOM), $actualEndDate->format(\DateTimeImmutable::ATOM));
+        }
+    }
+
     /**
      * * Lundi => Envoi des rdv du mardi et mercredi.
      * * Mardi => Envoi des rdv du jeudi.
@@ -79,22 +97,4 @@ final class DefaultRangeGeneratorTest extends TestCase
             null,
         ];
     }
-
-    /**
-     * @dataProvider generateData
-     */
-    public function testGenerateRange(\DateTimeImmutable $date, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate)
-    {
-        $generator = new DefaultRangeGenerator();
-
-        ['startDate' => $actualStartDate, 'endDate' => $actualEndDate] = $generator->generateRange($date);
-
-        if (null === $startDate) {
-            $this->assertNull($actualStartDate);
-            $this->assertNull($actualEndDate);
-        } else {
-            $this->assertEquals($startDate->format(\DateTimeImmutable::ATOM), $actualStartDate->format(\DateTimeImmutable::ATOM));
-            $this->assertEquals($endDate->format(\DateTimeImmutable::ATOM), $actualEndDate->format(\DateTimeImmutable::ATOM));
-        }
-    }
 }

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

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

src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldsDefaultGroupRepository.php

@@ -0,0 +1,29 @@
+<?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\CustomFieldsBundle\EntityRepository;
+
+use Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+class CustomFieldsDefaultGroupRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, CustomFieldsDefaultGroup::class);
+    }
+
+    public function findOneByEntity(string $className): ?CustomFieldsDefaultGroup
+    {
+        return $this->findOneBy(['entity' => $className]);
+    }
+}

src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php

@@ -49,80 +49,6 @@ final class CustomFieldsChoiceTest extends KernelTestCase
         parent::tearDown();
     }
 
-    /**
-     * provide empty data in different possible representations.
-     * Those data are supposed to be deserialized.
-     *
-     * @return array
-     */
-    public static function emptyDataProvider()
-    {
-        return [
-            // 0
-            [
-                // signle
-                '',
-            ],
-            // 1
-            [
-                // single
-                null,
-            ],
-            // 2
-            [
-                // signle with allow other
-                ['_other' => 'something', '_choices' => ''],
-            ],
-            // 3
-            [
-                // multiple
-                [],
-            ],
-            // 4
-            [
-                // multiple with allow other
-                ['_other' => 'something', '_choices' => []],
-            ],
-            // 5
-            [
-                // multiple with allow other
-                ['_other' => '', '_choices' => []],
-            ],
-            // 6
-            [
-                // empty
-                ['_other' => null, '_choices' => null],
-            ],
-            // 7
-            [
-                // empty
-                [null],
-            ],
-        ];
-    }
-
-    public static function serializedRepresentationDataProvider()
-    {
-        return [
-            [
-                // multiple => false, allow_other => false
-                'my-value',
-            ],
-            [
-                // multiple => true, allow_ther => false
-                ['my-value'],
-            ],
-            [
-                // multiple => false, allow_other => true, current value not in other
-                ['_other' => '', '_choices' => 'my-value'],
-            ],
-            [
-                // multiple => true, allow_other => true, current value not in other
-                ['_other' => '', '_choices' => ['my-value']],
-            ],
-        ];
-    }
-
     /**
      * Test if the representation of the data is deserialized to an array text
      * with an "allow_other" field.
@@ -412,6 +338,58 @@ final class CustomFieldsChoiceTest extends KernelTestCase
         $this->assertTrue($isEmpty);
     }
 
+    /**
+     * provide empty data in different possible representations.
+     * Those data are supposed to be deserialized.
+     *
+     * @return array
+     */
+    public static function emptyDataProvider()
+    {
+        return [
+            // 0
+            [
+                // signle
+                '',
+            ],
+            // 1
+            [
+                // single
+                null,
+            ],
+            // 2
+            [
+                // signle with allow other
+                ['_other' => 'something', '_choices' => ''],
+            ],
+            // 3
+            [
+                // multiple
+                [],
+            ],
+            // 4
+            [
+                // multiple with allow other
+                ['_other' => 'something', '_choices' => []],
+            ],
+            // 5
+            [
+                // multiple with allow other
+                ['_other' => '', '_choices' => []],
+            ],
+            // 6
+            [
+                // empty
+                ['_other' => null, '_choices' => null],
+            ],
+            // 7
+            [
+                // empty
+                [null],
+            ],
+        ];
+    }
+
     // ///////////////////////////////////////
     //
     // test function isEmptyValue
@@ -435,6 +413,28 @@ final class CustomFieldsChoiceTest extends KernelTestCase
         $this->assertFalse($isEmpty);
     }
 
+    public static function serializedRepresentationDataProvider()
+    {
+        return [
+            [
+                // multiple => false, allow_other => false
+                'my-value',
+            ],
+            [
+                // multiple => true, allow_ther => false
+                ['my-value'],
+            ],
+            [
+                // multiple => false, allow_other => true, current value not in other
+                ['_other' => '', '_choices' => 'my-value'],
+            ],
+            [
+                // multiple => true, allow_other => true, current value not in other
+                ['_other' => '', '_choices' => ['my-value']],
+            ],
+        ];
+    }
+
     /**
      * @param array $options
      *

src/Bundle/ChillCustomFieldsBundle/config/services.yaml

@@ -127,3 +127,7 @@ services:
         factory: ["@doctrine", getRepository]
         arguments:
             - "Chill\\CustomFieldsBundle\\Entity\\CustomFieldLongChoice\\Option"
+
+    Chill\CustomFieldsBundle\EntityRepository\CustomFieldsDefaultGroupRepository:
+        autowire: true
+        autoconfigure: true

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

@@ -58,6 +58,7 @@
 
 <script>
 import { buildLink } from "ChillDocGeneratorAssets/lib/document-generator";
+import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 export default {
     name: "PickTemplate",
@@ -113,6 +114,9 @@ export default {
         },
     },
     methods: {
+        localizeString(str) {
+            return localizeString(str);
+        },
         clickGenerate(event, link) {
             if (!this.preventDefaultMoveToGenerate) {
                 window.location.assign(link);

src/Bundle/ChillDocGeneratorBundle/Resources/views/Email/send_data_dump_to_admin.txt.twig

@@ -1,7 +1,5 @@
 {{ 'docgen.data_dump_email.Dear'|trans }}
 
-{{ 'docgen.data_dump_email.data_dump_ready_and_link'|trans }}
+{{ 'docgen.data_dump_email.data_dump_ready_and_attached'|trans }}
 
-{{ link }}
-
-{{ 'docgen.data_dump_email.link_valid_until'|trans({validity: validity}) }}
+{{ 'docgen.data_dump_email.filename'|trans({filename: filename}) }}

src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php

@@ -11,13 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\Service\Messenger;
 
-use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
-use Chill\DocGeneratorBundle\Service\Generator\Generator;
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepositoryInterface;
 use Chill\DocGeneratorBundle\Service\Generator\GeneratorException;
-use Chill\DocStoreBundle\AsyncUpload\TempUrlGeneratorInterface;
+use Chill\DocGeneratorBundle\Service\Generator\GeneratorInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
-use Chill\DocStoreBundle\Repository\StoredObjectRepository;
+use Chill\DocStoreBundle\Repository\StoredObjectRepositoryInterface;
+use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
@@ -37,15 +37,15 @@ class RequestGenerationHandler implements MessageHandlerInterface
     private const LOG_PREFIX = '[docgen message handler] ';
 
     public function __construct(
-        private readonly DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
+        private readonly DocGeneratorTemplateRepositoryInterface $docGeneratorTemplateRepository,
         private readonly EntityManagerInterface $entityManager,
-        private readonly Generator $generator,
+        private readonly GeneratorInterface $generator,
         private readonly LoggerInterface $logger,
-        private readonly StoredObjectRepository $storedObjectRepository,
+        private readonly StoredObjectRepositoryInterface $storedObjectRepository,
         private readonly UserRepositoryInterface $userRepository,
         private readonly MailerInterface $mailer,
-        private readonly TempUrlGeneratorInterface $tempUrlGenerator,
         private readonly TranslatorInterface $translator,
+        private readonly StoredObjectManagerInterface $storedObjectManager,
     ) {}
 
     public function __invoke(RequestGenerationMessage $message)
@@ -90,7 +90,7 @@ class RequestGenerationHandler implements MessageHandlerInterface
 
                 $this->sendDataDump($destinationStoredObject, $message);
             } else {
-                $destinationStoredObject = $this->generator->generateDocFromTemplate(
+                $this->generator->generateDocFromTemplate(
                     $template,
                     $message->getEntityId(),
                     $message->getContextGenerationData(),
@@ -122,19 +122,20 @@ class RequestGenerationHandler implements MessageHandlerInterface
 
     private function sendDataDump(StoredObject $destinationStoredObject, RequestGenerationMessage $message): void
     {
-        $url = $this->tempUrlGenerator->generate('GET', $destinationStoredObject->getFilename(), 3600);
-        $parts = [];
-        parse_str(parse_url($url->url)['query'], $parts);
-        $validity = \DateTimeImmutable::createFromFormat('U', $parts['temp_url_expires']);
+        // Get the content of the document
+        $content = $this->storedObjectManager->read($destinationStoredObject);
+        $filename = $destinationStoredObject->getFilename();
+        $contentType = $destinationStoredObject->getType();
 
+        // Create the email with the document as an attachment
         $email = (new TemplatedEmail())
             ->to($message->getSendResultToEmail())
             ->textTemplate('@ChillDocGenerator/Email/send_data_dump_to_admin.txt.twig')
             ->context([
-                'link' => $url->url,
-                'validity' => $validity,
+                'filename' => $filename,
             ])
-            ->subject($this->translator->trans('docgen.data_dump_email.subject'));
+            ->subject($this->translator->trans('docgen.data_dump_email.subject'))
+            ->attach($content, $filename, $contentType);
 
         $this->mailer->send($email);
     }

src/Bundle/ChillDocGeneratorBundle/Tests/Service/Messenger/RequestGenerationHandlerTest.php

@@ -0,0 +1,132 @@
+<?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\DocGeneratorBundle\Tests\Service\Messenger;
+
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepositoryInterface;
+use Chill\DocGeneratorBundle\Service\Generator\GeneratorInterface;
+use Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationHandler;
+use Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Repository\StoredObjectRepositoryInterface;
+use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Log\NullLogger;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class RequestGenerationHandlerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testGenerationHappyScenario(): void
+    {
+        // Create entities
+        $template = new DocGeneratorTemplate();
+        $this->setPrivateProperty($template, 'id', 1);
+
+        $storedObject = new StoredObject();
+        $this->setPrivateProperty($storedObject, 'id', 2);
+
+        $creator = new User();
+        $creator->setEmail('test@example.com');
+        $this->setPrivateProperty($creator, 'id', 3);
+
+        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+        $docGeneratorTemplateRepository->find(1)->willReturn($template);
+
+        $storedObjectRepository = $this->prophesize(StoredObjectRepositoryInterface::class);
+        $storedObjectRepository->find(2)->willReturn($storedObject);
+
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $userRepository->find(3)->willReturn($creator);
+
+        // Create a mock for the Query object
+        $query = $this->prophesize(Query::class);
+        $query->setParameter('id', 2)->willReturn($query->reveal());
+        $query->execute()->shouldBeCalled();
+
+        // Create a mock for the EntityManager
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->createQuery(Argument::containingString('UPDATE'))->willReturn($query->reveal());
+        $entityManager->flush()->shouldBeCalled();
+
+        $generator = $this->prophesize(GeneratorInterface::class);
+        $generator->generateDocFromTemplate(
+            $template,
+            123, // entityId
+            ['key' => 'value'], // contextGenerationData
+            $storedObject,
+            $creator
+        )
+            ->willReturn($storedObject)->shouldBeCalled();
+
+        $logger = new NullLogger();
+
+        $mailer = $this->prophesize(MailerInterface::class);
+
+        $translator = $this->prophesize(TranslatorInterface::class);
+
+        $storedObjectManager = $this->prophesize(StoredObjectManagerInterface::class);
+
+        // Create handler
+        $handler = new RequestGenerationHandler(
+            $docGeneratorTemplateRepository->reveal(),
+            $entityManager->reveal(),
+            $generator->reveal(),
+            $logger,
+            $storedObjectRepository->reveal(),
+            $userRepository->reveal(),
+            $mailer->reveal(),
+            $translator->reveal(),
+            $storedObjectManager->reveal()
+        );
+
+        // Create message
+        $message = new RequestGenerationMessage(
+            $creator,
+            $template,
+            123, // entityId
+            $storedObject,
+            ['key' => 'value'], // contextGenerationData
+            false, // isTest
+            null, // sendResultToEmail
+            false // dumpOnly
+        );
+
+        // Invoke handler
+        $handler->__invoke($message);
+
+        // Assertions
+        // The assertions are handled by the shouldBeCalled() expectations on the mocks
+        $this->assertTrue(true); // Just to have an assertion in the test
+    }
+
+    private function setPrivateProperty(object $object, string $propertyName, $value): void
+    {
+        $reflection = new \ReflectionClass($object);
+        $property = $reflection->getProperty($propertyName);
+        $property->setAccessible(true);
+        $property->setValue($object, $value);
+    }
+}

src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php

@@ -31,6 +31,36 @@ final class DocGenEncoderTest extends TestCase
         $this->encoder = new DocGenEncoder();
     }
 
+    public function testEmbeddedLoopsThrowsException()
+    {
+        $this->expectException(UnexpectedValueException::class);
+
+        $data = [
+            'data' => [
+                ['item' => 'one'],
+                [
+                    'embedded' => [
+                        [
+                            ['subitem' => 'two'],
+                            ['subitem' => 'three'],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $this->encoder->encode($data, 'docgen');
+    }
+
+    /**
+     * @dataProvider generateEncodeData
+     */
+    public function testEncode(mixed $expected, mixed $data, string $msg)
+    {
+        $generated = $this->encoder->encode($data, 'docgen');
+        $this->assertEquals($expected, $generated, $msg);
+    }
+
     public static function generateEncodeData()
     {
         yield [['tests' => 'ok'], ['tests' => 'ok'], 'A simple test with a simple array'];
@@ -93,34 +123,4 @@ final class DocGenEncoderTest extends TestCase
             'a longer list, with near real data inside and embedded associative arrays',
         ];
     }
-
-    public function testEmbeddedLoopsThrowsException()
-    {
-        $this->expectException(UnexpectedValueException::class);
-
-        $data = [
-            'data' => [
-                ['item' => 'one'],
-                [
-                    'embedded' => [
-                        [
-                            ['subitem' => 'two'],
-                            ['subitem' => 'three'],
-                        ],
-                    ],
-                ],
-            ],
-        ];
-
-        $this->encoder->encode($data, 'docgen');
-    }
-
-    /**
-     * @dataProvider generateEncodeData
-     */
-    public function testEncode(mixed $expected, mixed $data, string $msg)
-    {
-        $generated = $this->encoder->encode($data, 'docgen');
-        $this->assertEquals($expected, $generated, $msg);
-    }
 }

src/Bundle/ChillDocGeneratorBundle/translations/messages+intl-icu.fr.yml

@@ -1,4 +1,2 @@
 docgen:
-    data_dump_email:
-        link_valid_until: >-
-            Ce lien est valide jusqu'au {validity, date, full}, {validity, time, medium}
+    # No ICU messages needed for data_dump_email anymore

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

@@ -34,8 +34,10 @@ docgen:
     data_dump_email:
         subject: Contenu des données de génération de document disponible
         Dear: Cher
-        data_dump_ready_and_link: >-
-            Le contenu des données est disponible. Vous pouvez le télécharger à l'aide du lien suivant:
+        data_dump_ready_and_attached: >-
+            Le contenu des données est disponible. Vous le trouverez en pièce jointe à cet email.
+        filename: >-
+            Nom du fichier: %filename%
 
 
 

src/Bundle/ChillDocStoreBundle/AsyncUpload/Driver/LocalStorage/StoredObjectManager.php

@@ -18,6 +18,7 @@ use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
 use Chill\DocStoreBundle\Service\Cryptography\KeyGenerator;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Filesystem\Exception\IOExceptionInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Filesystem\Path;
 
@@ -147,16 +148,11 @@ class StoredObjectManager implements StoredObjectManagerInterface
     public function writeContent(string $filename, string $encryptedContent): void
     {
         $fullPath = $this->buildPath($filename);
-        $dir = Path::getDirectory($fullPath);
 
-        if (!$this->filesystem->exists($dir)) {
-            $this->filesystem->mkdir($dir);
-        }
-
-        $result = file_put_contents($fullPath, $encryptedContent);
-
-        if (false === $result) {
-            throw StoredObjectManagerException::unableToStoreDocumentOnDisk();
+        try {
+            $this->filesystem->dumpFile($fullPath, $encryptedContent);
+        } catch (IOExceptionInterface $exception) {
+            throw StoredObjectManagerException::unableToStoreDocumentOnDisk($exception);
         }
     }
 

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

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

src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/LocalStorage/TempUrlLocalStorageGeneratorTest.php

@@ -85,6 +85,69 @@ class TempUrlLocalStorageGeneratorTest extends TestCase
         self::assertEquals($expected, $urlGenerator->validateSignature($signature, $method, $objectName, $expiration), $message);
     }
 
+    public static function generateValidateSignatureData(): iterable
+    {
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('GET', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            'GET',
+            $object_name,
+            $expiration,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            true,
+            'Valid signature, not expired',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('HEAD', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            'HEAD',
+            $object_name,
+            $expiration,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            true,
+            'Valid signature, not expired',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('GET', $object_name = 'testABC', $expiration = 1734307200 + 180).'A',
+            'GET',
+            $object_name,
+            $expiration,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            false,
+            'Invalid signature',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('GET', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            'GET',
+            $object_name,
+            $expiration,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration + 1)),
+            false,
+            'Signature expired',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('GET', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            'GET',
+            $object_name.'____',
+            $expiration,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            false,
+            'Invalid object name',
+        ];
+
+        yield [
+            TempUrlLocalStorageGeneratorTest::expectedSignature('POST', $object_name = 'testABC', $expiration = 1734307200 + 180),
+            'POST',
+            $object_name,
+            $expiration,
+            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
+            false,
+            'Wrong method',
+        ];
+    }
+
     /**
      * @dataProvider generateValidateSignaturePostData
      */
@@ -164,69 +227,6 @@ class TempUrlLocalStorageGeneratorTest extends TestCase
         ];
     }
 
-    public static function generateValidateSignatureData(): iterable
-    {
-        yield [
-            TempUrlLocalStorageGeneratorTest::expectedSignature('GET', $object_name = 'testABC', $expiration = 1734307200 + 180),
-            'GET',
-            $object_name,
-            $expiration,
-            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
-            true,
-            'Valid signature, not expired',
-        ];
-
-        yield [
-            TempUrlLocalStorageGeneratorTest::expectedSignature('HEAD', $object_name = 'testABC', $expiration = 1734307200 + 180),
-            'HEAD',
-            $object_name,
-            $expiration,
-            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
-            true,
-            'Valid signature, not expired',
-        ];
-
-        yield [
-            TempUrlLocalStorageGeneratorTest::expectedSignature('GET', $object_name = 'testABC', $expiration = 1734307200 + 180).'A',
-            'GET',
-            $object_name,
-            $expiration,
-            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
-            false,
-            'Invalid signature',
-        ];
-
-        yield [
-            TempUrlLocalStorageGeneratorTest::expectedSignature('GET', $object_name = 'testABC', $expiration = 1734307200 + 180),
-            'GET',
-            $object_name,
-            $expiration,
-            \DateTimeImmutable::createFromFormat('U', (string) ($expiration + 1)),
-            false,
-            'Signature expired',
-        ];
-
-        yield [
-            TempUrlLocalStorageGeneratorTest::expectedSignature('GET', $object_name = 'testABC', $expiration = 1734307200 + 180),
-            'GET',
-            $object_name.'____',
-            $expiration,
-            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
-            false,
-            'Invalid object name',
-        ];
-
-        yield [
-            TempUrlLocalStorageGeneratorTest::expectedSignature('POST', $object_name = 'testABC', $expiration = 1734307200 + 180),
-            'POST',
-            $object_name,
-            $expiration,
-            \DateTimeImmutable::createFromFormat('U', (string) ($expiration - 10)),
-            false,
-            'Wrong method',
-        ];
-    }
-
     private function buildGenerator(?UrlGeneratorInterface $urlGenerator = null, ?ClockInterface $clock = null): TempUrlLocalStorageGenerator
     {
         return new TempUrlLocalStorageGenerator(

src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/OpenstackObjectStore/StoredObjectManagerTest.php

@@ -31,6 +31,20 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
  */
 final class StoredObjectManagerTest extends TestCase
 {
+    /**
+     * @dataProvider getDataProviderForRead
+     */
+    public function testRead(StoredObject $storedObject, string $encodedContent, string $clearContent, ?string $exceptionClass = null)
+    {
+        if (null !== $exceptionClass) {
+            $this->expectException($exceptionClass);
+        }
+
+        $storedObjectManager = $this->getSubject($storedObject, $encodedContent);
+
+        self::assertEquals($clearContent, $storedObjectManager->read($storedObject));
+    }
+
     public static function getDataProviderForRead(): \Generator
     {
         /* HAPPY SCENARIO */
@@ -96,6 +110,40 @@ final class StoredObjectManagerTest extends TestCase
         ];
     }
 
+    /**
+     * @dataProvider getDataProviderForWrite
+     */
+    public function testWrite(StoredObject $storedObject, string $encodedContent, string $clearContent, ?string $exceptionClass = null, ?int $errorCode = null)
+    {
+        if (null !== $exceptionClass) {
+            $this->expectException($exceptionClass);
+        }
+
+        $previousVersion = $storedObject->getCurrentVersion();
+        $previousFilename = $previousVersion->getFilename();
+
+        $client = new MockHttpClient(function ($method, $url, $options) use ($encodedContent, $previousFilename, $errorCode) {
+            self::assertEquals('PUT', $method);
+            self::assertStringStartsWith('https://example.com/', $url);
+            self::assertStringNotContainsString($previousFilename, $url, 'test that the PUT operation is not performed on the same file');
+            self::assertArrayHasKey('body', $options);
+            self::assertEquals($encodedContent, $options['body']);
+
+            if (-1 === $errorCode) {
+                throw new TransportException();
+            }
+
+            return new MockResponse('', ['http_code' => $errorCode ?? 201]);
+        });
+
+        $storedObjectManager = new StoredObjectManager($client, $this->getTempUrlGenerator($storedObject));
+
+        $newVersion = $storedObjectManager->write($storedObject, $clearContent);
+
+        self::assertNotSame($previousVersion, $newVersion);
+        self::assertSame($storedObject->getCurrentVersion(), $newVersion);
+    }
+
     public static function getDataProviderForWrite(): \Generator
     {
         /* HAPPY SCENARIO */
@@ -150,54 +198,6 @@ final class StoredObjectManagerTest extends TestCase
         ];
     }
 
-    /**
-     * @dataProvider getDataProviderForRead
-     */
-    public function testRead(StoredObject $storedObject, string $encodedContent, string $clearContent, ?string $exceptionClass = null)
-    {
-        if (null !== $exceptionClass) {
-            $this->expectException($exceptionClass);
-        }
-
-        $storedObjectManager = $this->getSubject($storedObject, $encodedContent);
-
-        self::assertEquals($clearContent, $storedObjectManager->read($storedObject));
-    }
-
-    /**
-     * @dataProvider getDataProviderForWrite
-     */
-    public function testWrite(StoredObject $storedObject, string $encodedContent, string $clearContent, ?string $exceptionClass = null, ?int $errorCode = null)
-    {
-        if (null !== $exceptionClass) {
-            $this->expectException($exceptionClass);
-        }
-
-        $previousVersion = $storedObject->getCurrentVersion();
-        $previousFilename = $previousVersion->getFilename();
-
-        $client = new MockHttpClient(function ($method, $url, $options) use ($encodedContent, $previousFilename, $errorCode) {
-            self::assertEquals('PUT', $method);
-            self::assertStringStartsWith('https://example.com/', $url);
-            self::assertStringNotContainsString($previousFilename, $url, 'test that the PUT operation is not performed on the same file');
-            self::assertArrayHasKey('body', $options);
-            self::assertEquals($encodedContent, $options['body']);
-
-            if (-1 === $errorCode) {
-                throw new TransportException();
-            }
-
-            return new MockResponse('', ['http_code' => $errorCode ?? 201]);
-        });
-
-        $storedObjectManager = new StoredObjectManager($client, $this->getTempUrlGenerator($storedObject));
-
-        $newVersion = $storedObjectManager->write($storedObject, $clearContent);
-
-        self::assertNotSame($previousVersion, $newVersion);
-        self::assertSame($storedObject->getCurrentVersion(), $newVersion);
-    }
-
     public function testDelete(): void
     {
         $storedObject = new StoredObject();

src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/OpenstackObjectStore/TempUrlOpenstackGeneratorTest.php

@@ -82,6 +82,38 @@ class TempUrlOpenstackGeneratorTest extends KernelTestCase
         self::assertEquals($expected, $signedUrl);
     }
 
+    public static function dataProviderGenerate(): iterable
+    {
+        $now = \DateTimeImmutable::createFromFormat('U', '1702041743');
+        $expireDelay = 1800;
+        $baseUrls = [
+            'https://objectstore.example/v1/my_account/container/',
+            'https://objectstore.example/v1/my_account/container',
+        ];
+        $objectName = 'object';
+        $method = 'GET';
+        $key = 'MYKEY';
+
+        $signedUrl = new SignedUrl(
+            'GET',
+            'https://objectstore.example/v1/my_account/container/object?temp_url_sig=0aeef353a5f6e22d125c76c6ad8c644a59b222ba1b13eaeb56bf3d04e28b081d11dfcb36601ab3aa7b623d79e1ef03017071bbc842fb7b34afec2baff895bf80&temp_url_expires=1702043543',
+            \DateTimeImmutable::createFromFormat('U', '1702043543'),
+            $objectName
+        );
+
+        foreach ($baseUrls as $baseUrl) {
+            yield [
+                $baseUrl,
+                $now,
+                $key,
+                $method,
+                $objectName,
+                $expireDelay,
+                $signedUrl,
+            ];
+        }
+    }
+
     /**
      * @dataProvider dataProviderGeneratePost
      */
@@ -125,38 +157,6 @@ class TempUrlOpenstackGeneratorTest extends KernelTestCase
         self::assertGreaterThanOrEqual(20, strlen($signedUrl->prefix));
     }
 
-    public static function dataProviderGenerate(): iterable
-    {
-        $now = \DateTimeImmutable::createFromFormat('U', '1702041743');
-        $expireDelay = 1800;
-        $baseUrls = [
-            'https://objectstore.example/v1/my_account/container/',
-            'https://objectstore.example/v1/my_account/container',
-        ];
-        $objectName = 'object';
-        $method = 'GET';
-        $key = 'MYKEY';
-
-        $signedUrl = new SignedUrl(
-            'GET',
-            'https://objectstore.example/v1/my_account/container/object?temp_url_sig=0aeef353a5f6e22d125c76c6ad8c644a59b222ba1b13eaeb56bf3d04e28b081d11dfcb36601ab3aa7b623d79e1ef03017071bbc842fb7b34afec2baff895bf80&temp_url_expires=1702043543',
-            \DateTimeImmutable::createFromFormat('U', '1702043543'),
-            $objectName
-        );
-
-        foreach ($baseUrls as $baseUrl) {
-            yield [
-                $baseUrl,
-                $now,
-                $key,
-                $method,
-                $objectName,
-                $expireDelay,
-                $signedUrl,
-            ];
-        }
-    }
-
     public static function dataProviderGeneratePost(): iterable
     {
         $now = \DateTimeImmutable::createFromFormat('U', '1702041743');

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

@@ -61,6 +61,55 @@ class StoredObjectContentToLocalStorageControllerTest extends TestCase
         $controller->contentOperate($request);
     }
 
+    public static function generateOperateContentWithExceptionDataProvider(): iterable
+    {
+        yield [
+            new Request(['object_name' => '', 'sig' => '', 'exp' => 0]),
+            BadRequestHttpException::class,
+            'Object name parameter is missing',
+            false,
+            '',
+            false,
+        ];
+
+        yield [
+            new Request(['object_name' => 'testABC', 'sig' => '', 'exp' => 0]),
+            BadRequestHttpException::class,
+            'Expiration is not set or equal to zero',
+            false,
+            '',
+            false,
+        ];
+
+        yield [
+            new Request(['object_name' => 'testABC', 'sig' => '', 'exp' => (new \DateTimeImmutable())->getTimestamp()]),
+            BadRequestHttpException::class,
+            'Signature is not set or is a blank string',
+            false,
+            '',
+            false,
+        ];
+
+        yield [
+            new Request(['object_name' => 'testABC', 'sig' => '1234', 'exp' => (new \DateTimeImmutable())->getTimestamp()]),
+            AccessDeniedHttpException::class,
+            'Invalid signature',
+            false,
+            '',
+            false,
+        ];
+
+
+        yield [
+            new Request(['object_name' => 'testABC', 'sig' => '1234', 'exp' => (new \DateTimeImmutable())->getTimestamp()]),
+            NotFoundHttpException::class,
+            'Object does not exists on disk',
+            false,
+            '',
+            true,
+        ];
+    }
+
     public function testOperateContentGetHappyScenario(): void
     {
         $objectName = 'testABC';
@@ -286,53 +335,4 @@ class StoredObjectContentToLocalStorageControllerTest extends TestCase
             'Filename does not start with signed prefix',
         ];
     }
-
-    public static function generateOperateContentWithExceptionDataProvider(): iterable
-    {
-        yield [
-            new Request(['object_name' => '', 'sig' => '', 'exp' => 0]),
-            BadRequestHttpException::class,
-            'Object name parameter is missing',
-            false,
-            '',
-            false,
-        ];
-
-        yield [
-            new Request(['object_name' => 'testABC', 'sig' => '', 'exp' => 0]),
-            BadRequestHttpException::class,
-            'Expiration is not set or equal to zero',
-            false,
-            '',
-            false,
-        ];
-
-        yield [
-            new Request(['object_name' => 'testABC', 'sig' => '', 'exp' => (new \DateTimeImmutable())->getTimestamp()]),
-            BadRequestHttpException::class,
-            'Signature is not set or is a blank string',
-            false,
-            '',
-            false,
-        ];
-
-        yield [
-            new Request(['object_name' => 'testABC', 'sig' => '1234', 'exp' => (new \DateTimeImmutable())->getTimestamp()]),
-            AccessDeniedHttpException::class,
-            'Invalid signature',
-            false,
-            '',
-            false,
-        ];
-
-
-        yield [
-            new Request(['object_name' => 'testABC', 'sig' => '1234', 'exp' => (new \DateTimeImmutable())->getTimestamp()]),
-            NotFoundHttpException::class,
-            'Object does not exists on disk',
-            false,
-            '',
-            true,
-        ];
-    }
 }

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

@@ -136,63 +136,6 @@ class WebdavControllerTest extends KernelTestCase
         self::assertXmlStringEqualsXmlString($expectedXmlResponse, $response->getContent(), $message);
     }
 
-    /**
-     * @dataProvider generateDataPropfindDirectory
-     */
-    public function testPropfindDirectory(string $requestContent, int $expectedStatusCode, string $expectedXmlResponse, string $message): void
-    {
-        $controller = $this->buildController();
-
-        $request = new Request([], [], [], [], [], [], $requestContent);
-        $request->setMethod('PROPFIND');
-        $request->headers->add(['Depth' => '0']);
-        $response = $controller->propfindDirectory($this->buildDocument(), '1234', $request);
-
-        self::assertEquals($expectedStatusCode, $response->getStatusCode());
-        self::assertContains('content-type', $response->headers->keys());
-        self::assertStringContainsString('text/xml', $response->headers->get('content-type'));
-        self::assertTrue((new \DOMDocument())->loadXML($response->getContent()), $message.' test that the xml response is a valid xml');
-        self::assertXmlStringEqualsXmlString($expectedXmlResponse, $response->getContent(), $message);
-    }
-
-    public function testHeadDocument(): void
-    {
-        $controller = $this->buildController();
-        $response = $controller->headDocument($this->buildDocument());
-
-        self::assertEquals(200, $response->getStatusCode());
-        self::assertContains('content-length', $response->headers->keys());
-        self::assertContains('content-type', $response->headers->keys());
-        self::assertContains('etag', $response->headers->keys());
-        self::assertEquals('ab56b4d92b40713acc5af89985d4b786', $response->headers->get('etag'));
-        self::assertEquals('application/vnd.oasis.opendocument.text', $response->headers->get('content-type'));
-        self::assertEquals(5, $response->headers->get('content-length'));
-    }
-
-    public function testPutDocument(): void
-    {
-        $document = $this->buildDocument();
-        $entityManager = $this->createMock(EntityManagerInterface::class);
-        $storedObjectManager = $this->createMock(StoredObjectManagerInterface::class);
-
-        // entity manager must be flushed
-        $entityManager->expects($this->once())
-            ->method('flush');
-
-        // object must be written by StoredObjectManager
-        $storedObjectManager->expects($this->once())
-            ->method('write')
-            ->with($this->identicalTo($document), $this->identicalTo('1234'));
-
-        $controller = $this->buildController($entityManager, $storedObjectManager);
-
-        $request = new Request(content: '1234');
-        $response = $controller->putDocument($document, $request);
-
-        self::assertEquals(204, $response->getStatusCode());
-        self::assertEquals('', $response->getContent());
-    }
-
     public static function generateDataPropfindDocument(): iterable
     {
         $content =
@@ -347,6 +290,25 @@ class WebdavControllerTest extends KernelTestCase
         ];
     }
 
+    /**
+     * @dataProvider generateDataPropfindDirectory
+     */
+    public function testPropfindDirectory(string $requestContent, int $expectedStatusCode, string $expectedXmlResponse, string $message): void
+    {
+        $controller = $this->buildController();
+
+        $request = new Request([], [], [], [], [], [], $requestContent);
+        $request->setMethod('PROPFIND');
+        $request->headers->add(['Depth' => '0']);
+        $response = $controller->propfindDirectory($this->buildDocument(), '1234', $request);
+
+        self::assertEquals($expectedStatusCode, $response->getStatusCode());
+        self::assertContains('content-type', $response->headers->keys());
+        self::assertStringContainsString('text/xml', $response->headers->get('content-type'));
+        self::assertTrue((new \DOMDocument())->loadXML($response->getContent()), $message.' test that the xml response is a valid xml');
+        self::assertXmlStringEqualsXmlString($expectedXmlResponse, $response->getContent(), $message);
+    }
+
     public static function generateDataPropfindDirectory(): iterable
     {
         yield [
@@ -414,6 +376,44 @@ class WebdavControllerTest extends KernelTestCase
             'test creatableContentsInfo',
         ];
     }
+
+    public function testHeadDocument(): void
+    {
+        $controller = $this->buildController();
+        $response = $controller->headDocument($this->buildDocument());
+
+        self::assertEquals(200, $response->getStatusCode());
+        self::assertContains('content-length', $response->headers->keys());
+        self::assertContains('content-type', $response->headers->keys());
+        self::assertContains('etag', $response->headers->keys());
+        self::assertEquals('ab56b4d92b40713acc5af89985d4b786', $response->headers->get('etag'));
+        self::assertEquals('application/vnd.oasis.opendocument.text', $response->headers->get('content-type'));
+        self::assertEquals(5, $response->headers->get('content-length'));
+    }
+
+    public function testPutDocument(): void
+    {
+        $document = $this->buildDocument();
+        $entityManager = $this->createMock(EntityManagerInterface::class);
+        $storedObjectManager = $this->createMock(StoredObjectManagerInterface::class);
+
+        // entity manager must be flushed
+        $entityManager->expects($this->once())
+            ->method('flush');
+
+        // object must be written by StoredObjectManager
+        $storedObjectManager->expects($this->once())
+            ->method('write')
+            ->with($this->identicalTo($document), $this->identicalTo('1234'));
+
+        $controller = $this->buildController($entityManager, $storedObjectManager);
+
+        $request = new Request(content: '1234');
+        $response = $controller->putDocument($document, $request);
+
+        self::assertEquals(204, $response->getStatusCode());
+        self::assertEquals('', $response->getContent());
+    }
 }
 
 class MockedStoredObjectManager implements StoredObjectManagerInterface

src/Bundle/ChillDocStoreBundle/Tests/Repository/PersonDocumentACLAwareRepositoryTest.php

@@ -87,6 +87,16 @@ class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
         self::assertIsInt($nb, 'test that the query could be executed');
     }
 
+    public static function provideDataBuildFetchQueryForPerson(): iterable
+    {
+        yield [null, null, null];
+        yield [new \DateTimeImmutable('1 year ago'), null, null];
+        yield [null, new \DateTimeImmutable('1 year ago'), null];
+        yield [new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), null];
+        yield [null, null, 'test'];
+        yield [new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), 'test'];
+    }
+
     /**
      * @dataProvider provideDateForFetchQueryForAccompanyingPeriod
      */
@@ -142,14 +152,4 @@ class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
         yield [$period, null, null, 'test'];
         yield [$period, new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), 'test'];
     }
-
-    public static function provideDataBuildFetchQueryForPerson(): iterable
-    {
-        yield [null, null, null];
-        yield [new \DateTimeImmutable('1 year ago'), null, null];
-        yield [null, new \DateTimeImmutable('1 year ago'), null];
-        yield [new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), null];
-        yield [null, null, 'test'];
-        yield [new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), 'test'];
-    }
 }

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

@@ -50,19 +50,6 @@ class StoredObjectVoterTest extends TestCase
         self::assertEquals($expected, $voter->vote($token, $subject, [$attribute]));
     }
 
-    private function buildStoredObjectVoter(bool $supportsIsCalled, bool $supports, bool $voteOnAttribute): StoredObjectVoterInterface
-    {
-        $storedObjectVoter = $this->createMock(StoredObjectVoterInterface::class);
-        $storedObjectVoter->expects($supportsIsCalled ? $this->once() : $this->never())->method('supports')
-            ->with(self::isInstanceOf(StoredObjectRoleEnum::class), $this->isInstanceOf(StoredObject::class))
-            ->willReturn($supports);
-        $storedObjectVoter->expects($supportsIsCalled && $supports ? $this->once() : $this->never())->method('voteOnAttribute')
-            ->with(self::isInstanceOf(StoredObjectRoleEnum::class), $this->isInstanceOf(StoredObject::class), $this->isInstanceOf(TokenInterface::class))
-            ->willReturn($voteOnAttribute);
-
-        return $storedObjectVoter;
-    }
-
     public static function provideDataVote(): iterable
     {
         yield [
@@ -120,4 +107,17 @@ class StoredObjectVoterTest extends TestCase
             VoterInterface::ACCESS_GRANTED,
         ];
     }
+
+    private function buildStoredObjectVoter(bool $supportsIsCalled, bool $supports, bool $voteOnAttribute): StoredObjectVoterInterface
+    {
+        $storedObjectVoter = $this->createMock(StoredObjectVoterInterface::class);
+        $storedObjectVoter->expects($supportsIsCalled ? $this->once() : $this->never())->method('supports')
+            ->with(self::isInstanceOf(StoredObjectRoleEnum::class), $this->isInstanceOf(StoredObject::class))
+            ->willReturn($supports);
+        $storedObjectVoter->expects($supportsIsCalled && $supports ? $this->once() : $this->never())->method('voteOnAttribute')
+            ->with(self::isInstanceOf(StoredObjectRoleEnum::class), $this->isInstanceOf(StoredObject::class), $this->isInstanceOf(TokenInterface::class))
+            ->willReturn($voteOnAttribute);
+
+        return $storedObjectVoter;
+    }
 }

src/Bundle/ChillDocStoreBundle/Tests/Service/StoredObjectCleaner/RemoveOldVersionCronJobTest.php

@@ -40,29 +40,6 @@ class RemoveOldVersionCronJobTest extends KernelTestCase
         self::assertEquals($expected, $cronJob->canRun($cronJobExecution));
     }
 
-    public function testRun(): void
-    {
-        // we create a clock in the future. This led us a chance to having stored object to delete
-        $clock = new MockClock(new \DateTimeImmutable('2024-01-01 00:00:00', new \DateTimeZone('+00:00')));
-        $repository = $this->createMock(StoredObjectVersionRepository::class);
-        $repository->expects($this->once())
-            ->method('findIdsByVersionsOlderThanDateAndNotLastVersionAndNotPointInTime')
-            ->with(new \DateTime('2023-10-03 00:00:00', new \DateTimeZone('+00:00')))
-            ->willReturnCallback(function ($arg) {
-                yield 1;
-                yield 3;
-                yield 2;
-            })
-        ;
-
-        $cronJob = new RemoveOldVersionCronJob($clock, $this->buildMessageBus(true), $repository);
-
-        $results = $cronJob->run([]);
-
-        self::assertArrayHasKey('last-deleted-stored-object-version-id', $results);
-        self::assertIsInt($results['last-deleted-stored-object-version-id']);
-    }
-
     public static function buildTestCanRunData(): iterable
     {
         yield [
@@ -86,6 +63,29 @@ class RemoveOldVersionCronJobTest extends KernelTestCase
         ];
     }
 
+    public function testRun(): void
+    {
+        // we create a clock in the future. This led us a chance to having stored object to delete
+        $clock = new MockClock(new \DateTimeImmutable('2024-01-01 00:00:00', new \DateTimeZone('+00:00')));
+        $repository = $this->createMock(StoredObjectVersionRepository::class);
+        $repository->expects($this->once())
+            ->method('findIdsByVersionsOlderThanDateAndNotLastVersionAndNotPointInTime')
+            ->with(new \DateTime('2023-10-03 00:00:00', new \DateTimeZone('+00:00')))
+            ->willReturnCallback(function ($arg) {
+                yield 1;
+                yield 3;
+                yield 2;
+            })
+        ;
+
+        $cronJob = new RemoveOldVersionCronJob($clock, $this->buildMessageBus(true), $repository);
+
+        $results = $cronJob->run([]);
+
+        self::assertArrayHasKey('last-deleted-stored-object-version-id', $results);
+        self::assertIsInt($results['last-deleted-stored-object-version-id']);
+    }
+
     private function buildMessageBus(bool $expectDistpatchAtLeastOnce = false): MessageBusInterface
     {
         $messageBus = $this->createMock(MessageBusInterface::class);

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

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

src/Bundle/ChillEventBundle/Controller/Admin/EventBudgetKindController.php

@@ -0,0 +1,28 @@
+<?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\EventBundle\Controller\Admin;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\HttpFoundation\Request;
+
+class EventBudgetKindController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        /* @var QueryBuilder $query */
+        $query->addOrderBy('e.type', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}

src/Bundle/ChillEventBundle/Controller/EventController.php

@@ -23,11 +23,11 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Doctrine\Persistence\ManagerRegistry;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Csv;
 use PhpOffice\PhpSpreadsheet\Writer\Ods;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -41,6 +41,8 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
@@ -58,7 +60,8 @@ final class EventController extends AbstractController
         private readonly TranslatorInterface $translator,
         private readonly PaginatorFactory $paginator,
         private readonly Security $security,
-        private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
+        private readonly ManagerRegistry $managerRegistry,
+        private readonly NormalizerInterface $normalizer,
     ) {}
 
     #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/event/event/{event_id}/delete', name: 'chill_event__event_delete', requirements: ['event_id' => '\d+'], methods: ['GET', 'POST', 'DELETE'])]
@@ -75,6 +78,7 @@ final class EventController extends AbstractController
 
         /** @var array $participations */
         $participations = $event->getParticipations();
+        $budgetElements = $event->getBudgetElements();
 
         $form = $this->createDeleteForm($event_id);
 
@@ -86,6 +90,10 @@ final class EventController extends AbstractController
                     $em->remove($participation);
                 }
 
+                foreach ($budgetElements as $e) {
+                    $em->remove($e);
+                }
+
                 $em->remove($event);
                 $em->flush();
 
@@ -103,7 +111,7 @@ final class EventController extends AbstractController
         }
 
         return $this->render('@ChillEvent/Event/confirm_delete.html.twig', [
-            'event_id' => $event->getId(),
+            'id' => $event->getId(),
             'delete_form' => $form->createView(),
         ]);
     }
@@ -169,6 +177,8 @@ final class EventController extends AbstractController
 
     /**
      * Displays a form to create a new Event entity.
+     *
+     * @throws ExceptionInterface
      */
     #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/event/event/new', name: 'chill_event__event_new', methods: ['GET', 'POST'])]
     public function newAction(?Center $center, Request $request): Response
@@ -199,26 +209,23 @@ final class EventController extends AbstractController
             $this->addFlash('success', $this->translator
                 ->trans('The event was created'));
 
-            return $this->redirectToRoute('chill_event__event_show', ['event_id' => $entity->getId()]);
+            return $this->redirectToRoute('chill_event__event_show', ['id' => $entity->getId()]);
         }
 
+        $entity_array = $this->normalizer->normalize($entity, 'json', ['groups' => 'read']);
+
         return $this->render('@ChillEvent/Event/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
+            'entity_json' => $entity_array,
         ]);
     }
 
-    /**
-     * First step of new Event form.
-     */
     #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/event/event/new/pick-center', name: 'chill_event__event_new_pickcenter', options: [null])]
     public function newPickCenterAction(): Response
     {
         $role = 'CHILL_EVENT_CREATE';
 
-        /**
-         * @var Center $centers
-         */
         $centers = $this->authorizationHelper->getReachableCenters($this->getUser(), $role);
 
         if (1 === \count($centers)) {
@@ -238,7 +245,7 @@ final class EventController extends AbstractController
             ->add('center_id', EntityType::class, [
                 'class' => Center::class,
                 'choices' => $centers,
-                'placeholder' => '',
+                'placeholder' => $this->translator->trans('Pick a center'),
                 'label' => 'To which centre should the event be associated ?',
             ])
             ->add('submit', SubmitType::class, [
@@ -251,16 +258,7 @@ final class EventController extends AbstractController
         ]);
     }
 
-    /**
-     * Finds and displays a Event entity.
-     *
-     * @ParamConverter("event", options={"id": "event_id"})
-     *
-     * @return Response
-     *
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/event/event/{event_id}/show', name: 'chill_event__event_show')]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/event/event/{id}/show', name: 'chill_event__event_show')]
     public function showAction(Event $event, Request $request)
     {
         if (!$event) {
@@ -317,7 +315,7 @@ final class EventController extends AbstractController
 
             $this->addFlash('success', $this->translator->trans('The event was updated'));
 
-            return $this->redirectToRoute('chill_event__event_show', ['event_id' => $event_id]);
+            return $this->redirectToRoute('chill_event__event_show', ['id' => $event_id]);
         }
 
         return $this->render('@ChillEvent/Event/edit.html.twig', [

src/Bundle/ChillEventBundle/Controller/EventListController.php

@@ -15,11 +15,15 @@ use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Entity\EventType;
 use Chill\EventBundle\Repository\EventACLAwareRepositoryInterface;
 use Chill\EventBundle\Repository\EventTypeRepository;
+use Chill\EventBundle\Security\EventVoter;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormFactoryInterface;
@@ -29,17 +33,18 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Twig\Environment;
 
-final readonly class EventListController
+final class EventListController extends AbstractController
 {
     public function __construct(
-        private Environment $environment,
-        private EventACLAwareRepositoryInterface $eventACLAwareRepository,
-        private EventTypeRepository $eventTypeRepository,
-        private FilterOrderHelperFactory $filterOrderHelperFactory,
-        private FormFactoryInterface $formFactory,
-        private PaginatorFactoryInterface $paginatorFactory,
-        private TranslatableStringHelperInterface $translatableStringHelper,
-        private UrlGeneratorInterface $urlGenerator,
+        private readonly Environment $environment,
+        private readonly EventACLAwareRepositoryInterface $eventACLAwareRepository,
+        private readonly EventTypeRepository $eventTypeRepository,
+        private readonly FilterOrderHelperFactory $filterOrderHelperFactory,
+        private readonly FormFactoryInterface $formFactory,
+        private readonly PaginatorFactoryInterface $paginatorFactory,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly UrlGeneratorInterface $urlGenerator,
+        private readonly AuthorizationHelper $authorizationHelper,
     ) {}
 
     #[Route(path: '{_locale}/event/event/list', name: 'chill_event_event_list')]
@@ -50,6 +55,8 @@ final readonly class EventListController
             'q' => (string) $filter->getQueryString(),
             'dates' => $filter->getDateRangeData('dates'),
             'event_types' => $filter->getEntityChoiceData('event_types'),
+            'responsables' => $filter->getUserPickerData('responsables'),
+            'centers' => $filter->getEntityChoiceData('centers'),
         ];
         $total = $this->eventACLAwareRepository->countAllViewable($filterData);
         $pagination = $this->paginatorFactory->create($total);
@@ -73,6 +80,7 @@ final readonly class EventListController
     private function buildFilterOrder(): FilterOrderHelper
     {
         $types = $this->eventTypeRepository->findAllActive();
+        $centers = $this->authorizationHelper->getReachableCenters($this->getUser(), EventVoter::SEE);
 
         $builder = $this->filterOrderHelperFactory->create(__METHOD__);
         $builder
@@ -80,6 +88,16 @@ final readonly class EventListController
             ->addSearchBox(['name'])
             ->addEntityChoice('event_types', 'event.filter.event_types', EventType::class, $types, [
                 'choice_label' => fn (EventType $e) => $this->translatableStringHelper->localize($e->getName()),
+                'expanded' => false,
+                'required' => false,
+                'attr' => ['class' => 'select2'],
+            ])
+            ->addUserPicker('responsables', 'event.filter.pick_responsable', ['multiple' => true, 'required' => false])
+            ->addEntityChoice('centers', 'event.filter.center', Center::class, $centers, [
+                'choice_label' => fn (Center $c) => $c->getName(),
+                'expanded' => false,
+                'required' => false,
+                'attr' => ['class' => 'select2'],
             ]);
 
         return $builder->build();

src/Bundle/ChillEventBundle/Controller/EventThemeController.php

@@ -0,0 +1,44 @@
+<?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\EventBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class EventThemeController extends CRUDController
+{
+    protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
+    {
+        if ('new' === $action) {
+            return parent::createFormFor($action, $entity, $formClass, ['step' => 'create']);
+        }
+
+        if ('edit' === $action) {
+            return parent::createFormFor($action, $entity, $formClass, ['step' => 'edit']);
+        }
+
+        throw new \LogicException('action is not supported: '.$action);
+    }
+
+    /**
+     * @param QueryBuilder|mixed $query
+     */
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator): QueryBuilder
+    {
+        /* @var QueryBuilder $query */
+        return $query->orderBy('e.ordering', 'ASC')
+            ->addOrderBy('e.id', 'ASC');
+    }
+}

src/Bundle/ChillEventBundle/Controller/EventTypeController.php

@@ -48,30 +48,6 @@ class EventTypeController extends AbstractController
         ]);
     }
 
-    /**
-     * Deletes a EventType entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/event/event_type/{id}/delete', name: 'chill_eventtype_admin_delete', methods: ['POST', 'DELETE'])]
-    public function deleteAction(Request $request, mixed $id)
-    {
-        $form = $this->createDeleteForm($id);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $em = $this->managerRegistry->getManager();
-            $entity = $em->getRepository(EventType::class)->find($id);
-
-            if (!$entity) {
-                throw $this->createNotFoundException('Unable to find EventType entity.');
-            }
-
-            $em->remove($entity);
-            $em->flush();
-        }
-
-        return $this->redirectToRoute('chill_eventtype_admin');
-    }
-
     /**
      * Displays a form to edit an existing EventType entity.
      */
@@ -87,12 +63,10 @@ class EventTypeController extends AbstractController
         }
 
         $editForm = $this->createEditForm($entity);
-        $deleteForm = $this->createDeleteForm($id);
 
         return $this->render('@ChillEvent/EventType/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
-            'delete_form' => $deleteForm->createView(),
         ]);
     }
 
@@ -126,28 +100,6 @@ class EventTypeController extends AbstractController
         ]);
     }
 
-    /**
-     * Finds and displays a EventType entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/event/event_type/{id}/show', name: 'chill_eventtype_admin_show')]
-    public function showAction(mixed $id)
-    {
-        $em = $this->managerRegistry->getManager();
-
-        $entity = $em->getRepository(EventType::class)->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find EventType entity.');
-        }
-
-        $deleteForm = $this->createDeleteForm($id);
-
-        return $this->render('@ChillEvent/EventType/show.html.twig', [
-            'entity' => $entity,
-            'delete_form' => $deleteForm->createView(),
-        ]);
-    }
-
     /**
      * Edits an existing EventType entity.
      */
@@ -162,7 +114,6 @@ class EventTypeController extends AbstractController
             throw $this->createNotFoundException('Unable to find EventType entity.');
         }
 
-        $deleteForm = $this->createDeleteForm($id);
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
@@ -175,7 +126,6 @@ class EventTypeController extends AbstractController
         return $this->render('@ChillEvent/EventType/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
-            'delete_form' => $deleteForm->createView(),
         ]);
     }
 
@@ -198,22 +148,6 @@ class EventTypeController extends AbstractController
         return $form;
     }
 
-    /**
-     * Creates a form to delete a EventType entity by id.
-     *
-     * @return \Symfony\Component\Form\FormInterface The form
-     */
-    private function createDeleteForm(mixed $id)
-    {
-        return $this->createFormBuilder()
-            ->setAction($this->generateUrl(
-                'chill_eventtype_admin_delete',
-                ['id' => $id]
-            ))
-            ->add('submit', SubmitType::class, ['label' => 'Delete'])
-            ->getForm();
-    }
-
     /**
      * Creates a form to edit a EventType entity.
      *
@@ -228,7 +162,7 @@ class EventTypeController extends AbstractController
                 'chill_eventtype_admin_update',
                 ['id' => $entity->getId()]
             ),
-            'method' => 'PUT',
+            'method' => 'POST',
         ]);
 
         $form->add('submit', SubmitType::class, ['label' => 'Update']);

src/Bundle/ChillEventBundle/Controller/ParticipationController.php

@@ -228,7 +228,7 @@ final class ParticipationController extends AbstractController
             }
 
             return $this->redirectToRoute('chill_event__event_show', [
-                'event_id' => $participation->getEvent()->getId(),
+                'id' => $participation->getEvent()->getId(),
             ]);
         }
 
@@ -242,7 +242,7 @@ final class ParticipationController extends AbstractController
     /**
      * @param int $participation_id
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/event/participation/{participation_id}/delete', name: 'chill_event_participation_delete', requirements: ['participation_id' => '\d+'], methods: ['GET', 'DELETE'])]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/event/participation/{participation_id}/delete', name: 'chill_event_participation_delete', requirements: ['participation_id' => '\d+'])]
     public function deleteAction($participation_id, Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         $em = $this->managerRegistry->getManager();
@@ -273,7 +273,7 @@ final class ParticipationController extends AbstractController
                 );
 
                 return $this->redirectToRoute('chill_event__event_show', [
-                    'event_id' => $event->getId(),
+                    'id' => $event->getId(),
                 ]);
             }
         }
@@ -442,7 +442,7 @@ final class ParticipationController extends AbstractController
             ));
 
             return $this->redirectToRoute('chill_event__event_show', [
-                'event_id' => $participation->getEvent()->getId(),
+                'id' => $participation->getEvent()->getId(),
             ]);
         }
 

src/Bundle/ChillEventBundle/Controller/RoleController.php

@@ -48,30 +48,6 @@ class RoleController extends AbstractController
         ]);
     }
 
-    /**
-     * Deletes a Role entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/event/role/{id}/delete', name: 'chill_event_admin_role_delete', methods: ['POST', 'DELETE'])]
-    public function deleteAction(Request $request, mixed $id)
-    {
-        $form = $this->createDeleteForm($id);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $em = $this->managerRegistry->getManager();
-            $entity = $em->getRepository(Role::class)->find($id);
-
-            if (!$entity) {
-                throw $this->createNotFoundException('Unable to find Role entity.');
-            }
-
-            $em->remove($entity);
-            $em->flush();
-        }
-
-        return $this->redirectToRoute('chill_event_admin_role');
-    }
-
     /**
      * Displays a form to edit an existing Role entity.
      */
@@ -87,12 +63,10 @@ class RoleController extends AbstractController
         }
 
         $editForm = $this->createEditForm($entity);
-        $deleteForm = $this->createDeleteForm($id);
 
         return $this->render('@ChillEvent/Role/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
-            'delete_form' => $deleteForm->createView(),
         ]);
     }
 
@@ -126,28 +100,6 @@ class RoleController extends AbstractController
         ]);
     }
 
-    /**
-     * Finds and displays a Role entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/event/role/{id}/show', name: 'chill_event_admin_role_show')]
-    public function showAction(mixed $id)
-    {
-        $em = $this->managerRegistry->getManager();
-
-        $entity = $em->getRepository(Role::class)->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Role entity.');
-        }
-
-        $deleteForm = $this->createDeleteForm($id);
-
-        return $this->render('@ChillEvent/Role/show.html.twig', [
-            'entity' => $entity,
-            'delete_form' => $deleteForm->createView(),
-        ]);
-    }
-
     /**
      * Edits an existing Role entity.
      */
@@ -162,7 +114,6 @@ class RoleController extends AbstractController
             throw $this->createNotFoundException('Unable to find Role entity.');
         }
 
-        $deleteForm = $this->createDeleteForm($id);
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
@@ -175,7 +126,6 @@ class RoleController extends AbstractController
         return $this->render('@ChillEvent/Role/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
-            'delete_form' => $deleteForm->createView(),
         ]);
     }
 
@@ -198,20 +148,6 @@ class RoleController extends AbstractController
         return $form;
     }
 
-    /**
-     * Creates a form to delete a Role entity by id.
-     *
-     * @return \Symfony\Component\Form\FormInterface The form
-     */
-    private function createDeleteForm(mixed $id)
-    {
-        return $this->createFormBuilder()
-            ->setAction($this->generateUrl('chill_event_admin_role_delete', ['id' => $id]))
-            ->setMethod('DELETE')
-            ->add('submit', SubmitType::class, ['label' => 'Delete'])
-            ->getForm();
-    }
-
     /**
      * Creates a form to edit a Role entity.
      *
@@ -226,7 +162,7 @@ class RoleController extends AbstractController
                 'chill_event_admin_role_update',
                 ['id' => $entity->getId()]
             ),
-            'method' => 'PUT',
+            'method' => 'POST',
         ]);
 
         $form->add('submit', SubmitType::class, ['label' => 'Update']);

src/Bundle/ChillEventBundle/Controller/StatusController.php

@@ -48,30 +48,6 @@ class StatusController extends AbstractController
         ]);
     }
 
-    /**
-     * Deletes a Status entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/event/status/{id}/delete', name: 'chill_event_admin_status_delete', methods: ['POST', 'DELETE'])]
-    public function deleteAction(Request $request, mixed $id)
-    {
-        $form = $this->createDeleteForm($id);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $em = $this->managerRegistry->getManager();
-            $entity = $em->getRepository(Status::class)->find($id);
-
-            if (!$entity) {
-                throw $this->createNotFoundException('Unable to find Status entity.');
-            }
-
-            $em->remove($entity);
-            $em->flush();
-        }
-
-        return $this->redirectToRoute('chill_event_admin_status');
-    }
-
     /**
      * Displays a form to edit an existing Status entity.
      */
@@ -87,12 +63,10 @@ class StatusController extends AbstractController
         }
 
         $editForm = $this->createEditForm($entity);
-        $deleteForm = $this->createDeleteForm($id);
 
         return $this->render('@ChillEvent/Status/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
-            'delete_form' => $deleteForm->createView(),
         ]);
     }
 
@@ -126,28 +100,6 @@ class StatusController extends AbstractController
         ]);
     }
 
-    /**
-     * Finds and displays a Status entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/event/status/{id}/show', name: 'chill_event_admin_status_show')]
-    public function showAction(mixed $id)
-    {
-        $em = $this->managerRegistry->getManager();
-
-        $entity = $em->getRepository(Status::class)->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Status entity.');
-        }
-
-        $deleteForm = $this->createDeleteForm($id);
-
-        return $this->render('@ChillEvent/Status/show.html.twig', [
-            'entity' => $entity,
-            'delete_form' => $deleteForm->createView(),
-        ]);
-    }
-
     /**
      * Edits an existing Status entity.
      */
@@ -162,7 +114,6 @@ class StatusController extends AbstractController
             throw $this->createNotFoundException('Unable to find Status entity.');
         }
 
-        $deleteForm = $this->createDeleteForm($id);
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
@@ -175,7 +126,6 @@ class StatusController extends AbstractController
         return $this->render('@ChillEvent/Status/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
-            'delete_form' => $deleteForm->createView(),
         ]);
     }
 
@@ -198,19 +148,6 @@ class StatusController extends AbstractController
         return $form;
     }
 
-    /**
-     * Creates a form to delete a Status entity by id.
-     *
-     * @return \Symfony\Component\Form\FormInterface The form
-     */
-    private function createDeleteForm(mixed $id)
-    {
-        return $this->createFormBuilder()
-            ->setAction($this->generateUrl('chill_event_admin_status_delete', ['id' => $id]))
-            ->add('submit', SubmitType::class, ['label' => 'Delete'])
-            ->getForm();
-    }
-
     /**
      * Creates a form to edit a Status entity.
      *
@@ -222,7 +159,7 @@ class StatusController extends AbstractController
     {
         $form = $this->createForm(StatusType::class, $entity, [
             'action' => $this->generateUrl('chill_event_admin_status_update', ['id' => $entity->getId()]),
-            'method' => 'PUT',
+            'method' => 'POST',
         ]);
 
         $form->add('submit', SubmitType::class, ['label' => 'Update']);

src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php

@@ -11,6 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\DependencyInjection;
 
+use Chill\EventBundle\Controller\Admin\EventBudgetKindController;
+use Chill\EventBundle\Controller\EventThemeController;
+use Chill\EventBundle\Entity\EventBudgetKind;
+use Chill\EventBundle\Entity\EventTheme;
+use Chill\EventBundle\Form\EventBudgetKindType;
+use Chill\EventBundle\Form\EventThemeType;
 use Chill\EventBundle\Security\EventVoter;
 use Chill\EventBundle\Security\ParticipationVoter;
 use Symfony\Component\Config\FileLocator;
@@ -26,7 +32,10 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
  */
 class ChillEventExtension extends Extension implements PrependExtensionInterface
 {
-    public function load(array $configs, ContainerBuilder $container)
+    /**
+     * @throws \Exception
+     */
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
@@ -45,16 +54,17 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
     /** (non-PHPdoc).
      * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
      */
-    public function prepend(ContainerBuilder $container)
+    public function prepend(ContainerBuilder $container): void
     {
         $this->prependAuthorization($container);
+        $this->prependCruds($container);
         $this->prependRoute($container);
     }
 
     /**
      * add authorization hierarchy.
      */
-    protected function prependAuthorization(ContainerBuilder $container)
+    protected function prependAuthorization(ContainerBuilder $container): void
     {
         $container->prependExtensionConfig('security', [
             'role_hierarchy' => [
@@ -70,7 +80,7 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
     /**
      * add route to route loader for chill.
      */
-    protected function prependRoute(ContainerBuilder $container)
+    protected function prependRoute(ContainerBuilder $container): void
     {
         // add routes for custom bundle
         $container->prependExtensionConfig('chill_main', [
@@ -81,4 +91,54 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
             ],
         ]);
     }
+
+    protected function prependCruds(ContainerBuilder $container): void
+    {
+        $container->prependExtensionConfig('chill_main', [
+            'cruds' => [
+                [
+                    'class' => EventTheme::class,
+                    'name' => 'event_theme',
+                    'base_path' => '/admin/event/theme',
+                    'form_class' => EventThemeType::class,
+                    'controller' => EventThemeController::class,
+                    'actions' => [
+                        'index' => [
+                            'template' => '@ChillEvent/Admin/EventTheme/index.html.twig',
+                            'role' => 'ROLE_ADMIN',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillEvent/Admin/EventTheme/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillEvent/Admin/EventTheme/edit.html.twig',
+                        ],
+                    ],
+                ],
+                [
+                    'class' => EventBudgetKind::class,
+                    'name' => 'event_budget_kind',
+                    'base_path' => '/admin/event/budget',
+                    'form_class' => EventBudgetKindType::class,
+                    'controller' => EventBudgetKindController::class,
+                    'actions' => [
+                        'index' => [
+                            'template' => '@ChillEvent/Admin/BudgetKind/index.html.twig',
+                            'role' => 'ROLE_ADMIN',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillEvent/Admin/BudgetKind/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillEvent/Admin/BudgetKind/edit.html.twig',
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+    }
 }

src/Bundle/ChillEventBundle/Entity/BudgetTypeEnum.php

@@ -0,0 +1,18 @@
+<?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\EventBundle\Entity;
+
+enum BudgetTypeEnum: string
+{
+    case CHARGE = 'Charge';
+    case RESOURCE = 'Resource';
+}