Merge branch '1828-1829-fix-bugs-empty-motive-list-and-suggestion-caller' into 'ticket-app-master'

FIX: Frontend: La liste des motifs reste vide et Frontend: l'appelant apparait deux fois dans les suggestions

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

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

@@ -0,0 +1,6 @@
+kind: Feature
+body: |
+  Upgrade import of address list to the last version of compiled addresses of belgian-best-address
+time: 2024-05-30T16:00:03.440767606+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20240531-190242.yaml

@@ -0,0 +1,6 @@
+kind: Feature
+body: |
+  Upgrade CKEditor and refactor configuration with use of typescript
+time: 2024-05-31T19:02:42.776662753+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20250808-120802.yaml

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

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

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

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

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

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

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

.editorconfig

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

.junie/guidelines.md

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

.prettierrc

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

.vscode/launch.json

@@ -0,0 +1,30 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Chill Debug",
+            "type": "php",
+            "request": "launch",
+            "port": 9000,
+            "pathMappings": {
+                "/var/www/html": "${workspaceFolder}"
+            },
+            "preLaunchTask": "symfony"
+        },
+        {
+            "name": "Yarn Encore Dev (Watch)",
+            "type": "node-terminal",
+            "request": "launch",
+            "command": "yarn encore dev --watch",
+            "cwd": "${workspaceFolder}"
+        }
+    ],
+    "compounds": [
+        {
+            "name": "Chill Debug + Yarn Encore Dev (Watch)",
+            "configurations": ["Chill Debug", "Yarn Encore Dev (Watch)"]
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,23 @@
+{
+    "tasks": [
+        {
+            "type": "shell",
+            "command": "symfony",
+            "args": [
+                "server:start",
+                "--allow-http",
+                "--no-tls",
+                "--port=8000",
+                "--allow-all-ip",
+                "-d"
+            ],
+            "label": "symfony"
+        },
+        {
+            "type": "shell",
+            "command": "yarn",
+            "args": ["encore", "dev", "--watch"],
+            "label": "webpack"
+        }
+    ]
+}

CONVENTIONS-fr.md

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

assets/translator.ts

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

composer.json

@@ -133,6 +133,7 @@
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
             "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src",
+            "Chill\\TicketBundle\\": "src/Bundle/ChillTicketBundle/src",
             "Chill\\Utils\\Rector\\": "utils/rector/src"
         }
     },

config/bundles.php

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

config/packages/chill_doc_store.yaml

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

config/packages/chill_ticket.yaml

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

config/packages/doctrine_migrations_chill.yaml

@@ -14,6 +14,7 @@ doctrine_migrations:
         'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations'
         'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations'
         'Chill\Migrations\Report': '@ChillReportBundle/migrations'
+        'Chill\Migrations\Ticket': '@ChillTicketBundle/migrations'
     all_or_nothing:
         true
 

config/packages/messenger.yaml

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

config/routes/chill_ticket.yaml

@@ -0,0 +1,2 @@
+chill_ticket_bundle:
+    resource: '@ChillTicketBundle/config/routes.yaml'

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

@@ -11,24 +11,94 @@
 Create a new bundle
 *******************
 
-Create your own bundle is not a trivial task.
-
-The easiest way to achieve this is seems to be : 
-
-1. Prepare a fresh installation of the chill project, in a new directory
-2. Create a new bundle in this project, in the src directory
-3. Initialize a git repository **at the root bundle**, and create your initial commit.
-4. Register the bundle with composer/packagist. If you do not plan to distribute your bundle with packagist, you may use a custom repository for achieve this [#f1]_
-5. Move to a development installation, made as described in the :ref:`installation-for-development` section, and add your new repository to the composer.json file
-6. Work as :ref:`usual <editing-code-and-commiting>`
-
 .. warning::
 
     This part of the doc is not yet tested
 
-TODO
+Create a new directory with Bundle class
+----------------------------------------
+
+.. code-block:: bash
+
+   mkdir -p src/Bundle/ChillSomeBundle/src/config
+   mkdir -p src/Bundle/ChillSomeBundle/src/Controller
+
+Add a bundle file
+
+.. code-block:: php
+
+    <?php
+
+    declare(strict_types=1);
+
+    /*
+     * Chill is a software for social workers
+     *
+     * For the full copyright and license information, please view
+     * the LICENSE file that was distributed with this source code.
+     */
+
+    namespace Chill\SomeBundle;
+
+    use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+    class ChillSomeBundle extends Bundle {}
+
+And a route file:
+
+.. code-block:: yaml
+
+   chill_ticket_controller:
+       resource: '@ChillTicketBundle/Controller/'
+       type: annotation
+
+Register the new psr-4 namespace
+--------------------------------
+
+In composer.json, add the new psr4 namespace
+
+.. code-block:: diff
+
+    {
+    "autoload": {
+        "psr-4": {
+    +        "Chill\\SomeBundle\\": "src/Bundle/ChillSomeBundle/src",
+        }
+    }
+    }
 
 
-.. rubric:: Footnotes
+Register the bundle
+-------------------
+
+Register in the file :code:`config/bundles.php`:
+
+.. code-block:: php
+
+    Vendor\Bundle\YourBundle\YourBundle::class => ['all' => true],
+
+And import routes in :code:`config/routes/chill_some_bundle.yaml`:
+
+.. code-block:: yaml
+
+   chill_ticket_bundle:
+       resource: '@ChillSomeBundle/config/routes.yaml'
+
+Add the doctrine_migration namespace
+------------------------------------
+
+Add the namespace to :code:`config/packages/doctrine_migrations_chill.yaml`
+
+.. code-block:: diff
+
+   doctrine_migrations:
+       migrations_paths:
+   +        'Chill\Some\Ticket': '@ChillSomeBundle/migrations'
+
+Dump autoloading
+----------------
+
+.. code-block:: bash
+
+   symfony composer dump-autoload
 
-.. [#f1] Be aware that we use the Affero GPL Licence, which ensure that all users must have access to derivative works done with this software.

package.json

@@ -41,6 +41,7 @@
     "typescript": "^5.6.3",
     "typescript-eslint": "^8.13.0",
     "vue-loader": "^17.0.0",
+    "vue-tsc": "^3.1.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
   },
@@ -80,12 +81,12 @@
     "dev": "encore dev",
     "watch": "encore dev --watch",
     "build": "encore production --progress",
-    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
+    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml src/Bundle/ChillTicketBundle/chill.api.specs.yaml> templates/api/specs.yaml",
     "specs-validate": "swagger-cli validate templates/api/specs.yaml",
     "specs-create-dir": "mkdir -p templates/api",
     "specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",
     "version": "node --version",
-    "eslint": "npx eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
+    "eslint": "eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
   },
   "private": true
 }

phpunit.xml.dist

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

resources/ticket_motives_import/README.md

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

resources/ticket_motives_import/motives.yaml

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

resources/translation_override/README.md

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

resources/translation_override/overrides.yaml

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

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

@@ -10,10 +10,7 @@
       />
     </div>
     <div
-            v-if="
+      v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0"
-                getContext === 'accompanyingCourse' &&
-                suggestedEntities.length > 0
-            "
     >
       <ul class="list-suggest add-items inline">
         <li

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue

@@ -39,17 +39,11 @@
                 <option selected disabled value="">
                   {{ trans(ACTIVITY_CHOOSE_LOCATION_TYPE) }}
                 </option>
-                                <option
+                <option v-for="t in locationTypes" :value="t" :key="t.id">
-                                    v-for="t in locationTypes"
-                                    :value="t"
-                                    :key="t.id"
-                                >
                   {{ localizeString(t.title) }}
                 </option>
               </select>
-                            <label>{{
+              <label>{{ trans(ACTIVITY_LOCATION_FIELDS_TYPE) }}</label>
-                                trans(ACTIVITY_LOCATION_FIELDS_TYPE)
-                            }}</label>
             </div>
 
             <div class="form-floating mb-3">
@@ -108,10 +102,7 @@
           </form>
         </template>
         <template #footer>
-                    <button
+          <button class="btn btn-save" @click.prevent="saveNewLocation">
-                        class="btn btn-save"
-                        @click.prevent="saveNewLocation"
-                    >
             {{ trans(SAVE) }}
           </button>
         </template>
@@ -244,8 +235,7 @@ export default {
     },
     hasPhonenumber1() {
       return (
-                this.selected.phonenumber1 !== null &&
+        this.selected.phonenumber1 !== null && this.selected.phonenumber1 !== ""
-                this.selected.phonenumber1 !== ""
       );
     },
     showAddAddress() {

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

@@ -10,9 +10,7 @@
         :value="issue"
       />
       <label class="form-check-label" :for="issue.id">
-                <span class="badge bg-chill-l-gray text-dark">{{
+        <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
-                    issue.text
-                }}</span>
       </label>
     </div>
   </span>

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.
      */
@@ -266,7 +318,7 @@ class CalendarController extends AbstractController
         }
 
         if (!$this->getUser() instanceof User) {
-            throw new UnauthorizedHttpException('you are not an user');
+            throw new UnauthorizedHttpException('you are not a user');
         }
 
         $view = '@ChillCalendar/Calendar/listByUser.html.twig';

src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php

@@ -0,0 +1,58 @@
+<?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\Controller;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Repository\InviteRepository;
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepositoryInterface;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+
+class MyInvitationsController extends AbstractController
+{
+    public function __construct(private readonly InviteRepository $inviteRepository, private readonly PaginatorFactory $paginator, private readonly DocGeneratorTemplateRepositoryInterface $docGeneratorTemplateRepository) {}
+
+    #[Route(path: '/{_locale}/calendar/invitations/my', name: 'chill_calendar_invitations_list_my')]
+    public function myInvitations(Request $request): Response
+    {
+        $this->denyAccessUnlessGranted('ROLE_USER');
+
+        $user = $this->getUser();
+
+        if (!$user instanceof User) {
+            throw new UnauthorizedHttpException('you are not a user');
+        }
+
+        $total = count($this->inviteRepository->findBy(['user' => $user]));
+        $paginator = $this->paginator->create($total);
+
+        $invitations = $this->inviteRepository->findBy(
+            ['user' => $user],
+            ['createdAt' => 'DESC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+
+        $view = '@ChillCalendar/Invitations/listByUser.html.twig';
+
+        return $this->render($view, [
+            'invitations' => $invitations,
+            'paginator' => $paginator,
+            'templates' => $this->docGeneratorTemplateRepository->findByEntity(Calendar::class),
+        ]);
+    }
+}

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

@@ -269,6 +269,11 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         return $this->cancelReason;
     }
 
+    public function isCanceled(): bool
+    {
+        return null !== $this->cancelReason;
+    }
+
     public function getCenters(): ?iterable
     {
         return match ($this->getContext()) {

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)]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, options: ['default' => true])]
-    private ?bool $active = null;
+    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/Menu/UserMenuBuilder.php

@@ -25,6 +25,13 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         if ($this->security->isGranted('ROLE_USER')) {
             $menu->addChild('My calendar list', [
                 'route' => 'chill_calendar_calendar_list_my',
+            ])
+                ->setExtras([
+                    'order' => 8,
+                    'icon' => 'tasks',
+                ]);
+            $menu->addChild('invite.list.title', [
+                'route' => 'chill_calendar_invitations_list_my',
             ])
                 ->setExtras([
                     'order' => 9,

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/Repository/CalendarRepository.php

@@ -191,6 +191,7 @@ class CalendarRepository implements ObjectRepository
                     $qb->expr()->eq('c.mainUser', ':user'),
                     $qb->expr()->gte('c.startDate', ':startDate'),
                     $qb->expr()->lte('c.endDate', ':endDate'),
+                    $qb->expr()->isNull('c.cancelReason'),
                 )
             )
             ->setParameters([

src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php

@@ -41,7 +41,7 @@ class InviteRepository implements ObjectRepository
     /**
      * @return array|Invite[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         return $this->entityRepository->findBy($criteria, $orderBy, $limit, $offset);
     }

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

@@ -68,9 +68,7 @@ export type EventInputCalendarRange = EventInput & {
 export function isEventInputCalendarRange(
   toBeDetermined: EventInputCalendarRange | EventInput,
 ): toBeDetermined is EventInputCalendarRange {
-    return (
+  return typeof toBeDetermined.is === "string" && toBeDetermined.is === "range";
-        typeof toBeDetermined.is === "string" && toBeDetermined.is === "range"
-    );
 }
 
 export {};

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/Components/CalendarActive.vue

@@ -4,18 +4,9 @@
       {{ user.text }}
       <template v-if="invite !== null">
         <i v-if="invite.status === 'accepted'" class="fa fa-check" />
-                <i
+        <i v-else-if="invite.status === 'declined'" class="fa fa-times" />
-                    v-else-if="invite.status === 'declined'"
+        <i v-else-if="invite.status === 'pending'" class="fa fa-question-o" />
-                    class="fa fa-times"
+        <i v-else-if="invite.status === 'tentative'" class="fa fa-question" />
-                />
-                <i
-                    v-else-if="invite.status === 'pending'"
-                    class="fa fa-question-o"
-                />
-                <i
-                    v-else-if="invite.status === 'tentative'"
-                    class="fa fa-question"
-                />
         <span v-else="">{{ invite.status }}</span>
       </template>
     </span>
@@ -69,8 +60,7 @@ export default {
   computed: {
     style() {
       return {
-                backgroundColor: this.$store.getters.getUserData(this.user)
+        backgroundColor: this.$store.getters.getUserData(this.user).mainColor,
-                    .mainColor,
       };
     },
     rangeShow: {
@@ -81,9 +71,7 @@ export default {
         });
       },
       get() {
-                return this.$store.getters.isRangeShownOnCalendarForUser(
+        return this.$store.getters.isRangeShownOnCalendarForUser(this.user);
-                    this.user,
-                );
       },
     },
     remoteShow: {
@@ -94,9 +82,7 @@ export default {
         });
       },
       get() {
-                return this.$store.getters.isRemoteShownOnCalendarForUser(
+        return this.$store.getters.isRemoteShownOnCalendarForUser(this.user);
-                    this.user,
-                );
       },
     },
   },

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

@@ -22,33 +22,25 @@
     </button>
     <ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
       <li v-if="status !== Statuses.ACCEPTED">
-                <a
+        <a class="dropdown-item" @click="changeStatus(Statuses.ACCEPTED)"
-                    class="dropdown-item"
+          ><i class="fa fa-check" aria-hidden="true"></i> {{ $t("Accept") }}</a
-                    @click="changeStatus(Statuses.ACCEPTED)"
-                    ><i class="fa fa-check" aria-hidden="true"></i>
-                    {{ $t("Accept") }}</a
         >
       </li>
       <li v-if="status !== Statuses.DECLINED">
-                <a
+        <a class="dropdown-item" @click="changeStatus(Statuses.DECLINED)"
-                    class="dropdown-item"
+          ><i class="fa fa-times" aria-hidden="true"></i> {{ $t("Decline") }}</a
-                    @click="changeStatus(Statuses.DECLINED)"
-                    ><i class="fa fa-times" aria-hidden="true"></i>
-                    {{ $t("Decline") }}</a
         >
       </li>
       <li v-if="status !== Statuses.TENTATIVELY_ACCEPTED">
         <a
           class="dropdown-item"
           @click="changeStatus(Statuses.TENTATIVELY_ACCEPTED)"
-                    ><i class="fa fa-question"></i>
+          ><i class="fa fa-question"></i> {{ $t("Tentatively_accept") }}</a
-                    {{ $t("Tentatively_accept") }}</a
         >
       </li>
       <li v-if="status !== Statuses.PENDING">
         <a class="dropdown-item" @click="changeStatus(Statuses.PENDING)"
-                    ><i class="fa fa-hourglass-o"></i>
+          ><i class="fa fa-hourglass-o"></i> {{ $t("Set_pending") }}</a
-                    {{ $t("Set_pending") }}</a
         >
       </li>
     </ul>
@@ -91,9 +83,7 @@ export default defineComponent({
     },
   },
   emits: {
-        statusChanged(
+    statusChanged(payload: "accepted" | "declined" | "pending" | "tentative") {
-            payload: "accepted" | "declined" | "pending" | "tentative",
-        ) {
       return true;
     },
   },

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

@@ -41,9 +41,7 @@ const futureStore = function (): Promise<Store<State>> {
     });
 
     store.commit("me/setWhoAmi", user, { root: true });
-        store
+    store.dispatch("locations/getLocations", null, { root: true }).then((_) => {
-            .dispatch("locations/getLocations", null, { root: true })
-            .then((_) => {
       return store.dispatch("locations/getCurrentLocation", null, {
         root: true,
       });

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarLocals.ts

@@ -29,10 +29,7 @@ export default {
       (state: CalendarLocalsState) =>
       ({ start, end }: { start: Date; end: Date }): boolean => {
         for (const range of state.localsLoaded) {
-                    if (
+          if (start.getTime() === range.start && end.getTime() === range.end) {
-                        start.getTime() === range.start &&
-                        end.getTime() === range.end
-                    ) {
             return true;
           }
         }
@@ -54,10 +51,7 @@ export default {
       });
       state.key = state.key + toAdd.length;
     },
-        addLoaded(
+    addLoaded(state: CalendarLocalsState, payload: { start: Date; end: Date }) {
-            state: CalendarLocalsState,
-            payload: { start: Date; end: Date },
-        ) {
       state.localsLoaded.push({
         start: payload.start.getTime(),
         end: payload.end.getTime(),
@@ -85,11 +79,7 @@ export default {
         end: end,
       });
 
-            return fetchCalendarLocalForUser(
+      return fetchCalendarLocalForUser(ctx.rootGetters["me/getMe"], start, end)
-                ctx.rootGetters["me/getMe"],
-                start,
-                end,
-            )
         .then((remotes: CalendarLight[]) => {
           // to be add when reactivity problem will be solve ?
           //ctx.commit('addRemotes', remotes);

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts

@@ -40,10 +40,7 @@ export default {
       (state: CalendarRangesState) =>
       ({ start, end }: { start: Date; end: Date }): boolean => {
         for (const range of state.rangesLoaded) {
-                    if (
+          if (start.getTime() === range.start && end.getTime() === range.end) {
-                        start.getTime() === range.start &&
-                        end.getTime() === range.end
-                    ) {
             return true;
           }
         }
@@ -110,9 +107,7 @@ export default {
       state: CalendarRangesState,
       externalEvents: (EventInput & { id: string })[],
     ) {
-            const toAdd = externalEvents.filter(
+      const toAdd = externalEvents.filter((r) => !state.rangesIndex.has(r.id));
-                (r) => !state.rangesIndex.has(r.id),
-            );
 
       toAdd.forEach((r) => {
         state.rangesIndex.add(r.id);
@@ -120,10 +115,7 @@ export default {
       });
       state.key = state.key + toAdd.length;
     },
-        addLoaded(
+    addLoaded(state: CalendarRangesState, payload: { start: Date; end: Date }) {
-            state: CalendarRangesState,
-            payload: { start: Date; end: Date },
-        ) {
       state.rangesLoaded.push({
         start: payload.start.getTime(),
         end: payload.end.getTime(),
@@ -142,17 +134,12 @@ export default {
     },
     removeRange(state: CalendarRangesState, calendarRangeId: number) {
       const found = state.ranges.find(
-                (r) =>
+        (r) => r.calendarRangeId === calendarRangeId && r.is === "range",
-                    r.calendarRangeId === calendarRangeId && r.is === "range",
       );
 
       if (found !== undefined) {
         state.ranges = state.ranges.filter(
-                    (r) =>
+          (r) => !(r.calendarRangeId === calendarRangeId && r.is === "range"),
-                        !(
-                            r.calendarRangeId === calendarRangeId &&
-                            r.is === "range"
-                        ),
         );
 
         if (typeof found.id === "string") {
@@ -211,11 +198,7 @@ export default {
     },
     createRange(
       ctx: Context,
-            {
+      { start, end, location }: { start: Date; end: Date; location: Location },
-                start,
-                end,
-                location,
-            }: { start: Date; end: Date; location: Location },
     ): Promise<null> {
       const url = `/api/1.0/calendar/calendar-range.json?`;
 
@@ -240,11 +223,7 @@ export default {
         },
       } as CalendarRangeCreate;
 
-            return makeFetch<CalendarRangeCreate, CalendarRange>(
+      return makeFetch<CalendarRangeCreate, CalendarRange>("POST", url, body)
-                "POST",
-                url,
-                body,
-            )
         .then((newRange) => {
           ctx.commit("addRange", newRange);
 
@@ -281,11 +260,7 @@ export default {
         },
       } as CalendarRangeEdit;
 
-            return makeFetch<CalendarRangeEdit, CalendarRange>(
+      return makeFetch<CalendarRangeEdit, CalendarRange>("PATCH", url, body)
-                "PATCH",
-                url,
-                body,
-            )
         .then((range) => {
           ctx.commit("updateRange", range);
           return Promise.resolve(null);
@@ -310,11 +285,7 @@ export default {
         },
       } as CalendarRangeEdit;
 
-            return makeFetch<CalendarRangeEdit, CalendarRange>(
+      return makeFetch<CalendarRangeEdit, CalendarRange>("PATCH", url, body)
-                "PATCH",
-                url,
-                body,
-            )
         .then((range) => {
           ctx.commit("updateRange", range);
           return Promise.resolve(null);
@@ -334,20 +305,14 @@ export default {
 
       for (const r of rangesToCopy) {
         const start = new Date(ISOToDatetime(r.start) as Date);
-                start.setFullYear(
+        start.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
-                    to.getFullYear(),
-                    to.getMonth(),
-                    to.getDate(),
-                );
         const end = new Date(ISOToDatetime(r.end) as Date);
         end.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
         const location = ctx.rootGetters["locations/getLocationById"](
           r.locationId,
         );
 
-                promises.push(
+        promises.push(ctx.dispatch("createRange", { start, end, location }));
-                    ctx.dispatch("createRange", { start, end, location }),
-                );
       }
 
       return Promise.all(promises).then(() => Promise.resolve(null));
@@ -369,9 +334,7 @@ export default {
           r.locationId,
         );
 
-                promises.push(
+        promises.push(ctx.dispatch("createRange", { start, end, location }));
-                    ctx.dispatch("createRange", { start, end, location }),
-                );
       }
 
       return Promise.all(promises).then(() => Promise.resolve(null));

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts

@@ -29,10 +29,7 @@ export default {
       (state: CalendarRemotesState) =>
       ({ start, end }: { start: Date; end: Date }): boolean => {
         for (const range of state.remotesLoaded) {
-                    if (
+          if (start.getTime() === range.start && end.getTime() === range.end) {
-                        start.getTime() === range.start &&
-                        end.getTime() === range.end
-                    ) {
             return true;
           }
         }
@@ -85,11 +82,7 @@ export default {
         end: end,
       });
 
-            return fetchCalendarRemoteForUser(
+      return fetchCalendarRemoteForUser(ctx.rootGetters["me/getMe"], start, end)
-                ctx.rootGetters["me/getMe"],
-                start,
-                end,
-            )
         .then((remotes: CalendarRemote[]) => {
           // to be add when reactivity problem will be solve ?
           //ctx.commit('addRemotes', remotes);

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue

@@ -112,11 +112,8 @@ export default {
 
               results.forEach((i) => {
                 if (!users.some((j) => i.user.id === j.id)) {
-                                    let ratio = Math.floor(
+                  let ratio = Math.floor(users.length / COLORS.length);
-                                        users.length / COLORS.length,
+                  let colorIndex = users.length - ratio * COLORS.length;
-                                    );
-                                    let colorIndex =
-                                        users.length - ratio * COLORS.length;
                   users.push({
                     id: i.user.id,
                     username: i.user.username,
@@ -153,45 +150,29 @@ export default {
                 (me) =>
                   new Promise((resolve, reject) => {
                     this.users.logged = me;
-                                        let currentUser = users.find(
+                    let currentUser = users.find((u) => u.id === me.id);
-                                            (u) => u.id === me.id,
-                                        );
                     this.value = currentUser;
 
                     fetchCalendar(currentUser.id).then(
                       (calendar) =>
-                                                new Promise(
+                        new Promise((resolve, reject) => {
-                                                    (resolve, reject) => {
+                          let results = calendar.results;
-                                                        let results =
+                          let events = results.map((i) => ({
-                                                            calendar.results;
+                            start: i.startDate.datetime,
-                                                        let events =
+                            end: i.endDate.datetime,
-                                                            results.map(
+                          }));
-                                                                (i) => ({
+                          let calendarEventsCurrentUser = {
-                                                                    start: i
-                                                                        .startDate
-                                                                        .datetime,
-                                                                    end: i
-                                                                        .endDate
-                                                                        .datetime,
-                                                                }),
-                                                            );
-                                                        let calendarEventsCurrentUser =
-                                                            {
                             events: events,
                             color: "darkblue",
                             id: 1000,
                             editable: false,
                           };
-                                                        this.calendarEvents.user =
+                          this.calendarEvents.user = calendarEventsCurrentUser;
-                                                            calendarEventsCurrentUser;
 
-                                                        this.selectUsers(
+                          this.selectUsers(currentUser);
-                                                            currentUser,
-                                                        );
 
                           resolve();
-                                                    },
+                        }),
-                                                ),
                     );
 
                     resolve();
@@ -209,9 +190,7 @@ export default {
       return `${value.username}`;
     },
     coloriseSelectedValues() {
-            let tags = document.querySelectorAll(
+      let tags = document.querySelectorAll("div.multiselect__tags-wrap")[0];
-                "div.multiselect__tags-wrap",
-            )[0];
 
       if (tags.hasChildNodes()) {
         let children = tags.childNodes;
@@ -232,8 +211,8 @@ export default {
     },
     selectEvents() {
       let selectedUsersId = this.users.selected.map((a) => a.id);
-            this.calendarEvents.selected = this.calendarEvents.loaded.filter(
+      this.calendarEvents.selected = this.calendarEvents.loaded.filter((a) =>
-                (a) => selectedUsersId.includes(a.id),
+        selectedUsersId.includes(a.id),
       );
     },
     selectUsers(value) {
@@ -243,9 +222,7 @@ export default {
       this.updateEventsSource();
     },
     unSelectUsers(value) {
-            this.users.selected = this.users.selected.filter(
+      this.users.selected = this.users.selected.filter((a) => a.id != value.id);
-                (a) => a.id != value.id,
-            );
       this.selectEvents();
       this.updateEventsSource();
     },

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

@@ -1,17 +1,23 @@
-{# list used in context of person or accompanyingPeriod #}
+{# list used in context of person, accompanyingPeriod or user #}
-
-{% if calendarItems|length > 0 %}
-    <div class="flex-table list-records context-accompanyingCourse">
-
-        {% for calendar in calendarItems %}
 
 <div class="item-bloc">
     <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 +25,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 +35,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">
@@ -103,12 +114,13 @@
         </div>
     {% endif %}
 
+    {% if calendar.documents is not empty %}
         <div class="item-row separator column">
             <div>
-
                 {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
             </div>
         </div>
+    {% endif %}
 
     {% if calendar.activity is not null %}
         <div class="item-row separator">
@@ -151,7 +163,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 +203,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"
@@ -200,7 +213,7 @@
                 </li>
             {% endif %}
 
-                        {% if (calendar.isInvited(app.user)) %}
+            {% if calendar.isInvited(app.user) and not calendar.isCanceled %}
                             {% set invite = calendar.inviteForUser(app.user) %}
                             <li>
                                 <div invite-answer data-status="{{ invite.status|e('html_attr') }}"
@@ -213,12 +226,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-action"><i class="bi bi-x-circle"></i> {{ '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 } ) }}"
@@ -230,11 +249,5 @@
     </div>
 
 </div>
-        {% endfor %}
 
-        {% if calendarItems|length < paginator.getTotalItems %}
-            {{ chill_pagination(paginator) }}
-        {% endif %}
 
-    </div>
-{% endif %}

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="cancel">
+            <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="cancel">
+            <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/Calendar/listByAccompanyingCourse.html.twig

@@ -34,7 +34,18 @@
             {% endif %}
         </p>
     {% else %}
+        {% if calendarItems|length > 0 %}
+            <div class="flex-table list-records context-accompanyingCourse">
+                {% for calendar in calendarItems %}
                     {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'accompanying_course'}) }}
+                {% endfor %}
+            </div>
+
+            {% if calendarItems|length < paginator.getTotalItems %}
+                {{ chill_pagination(paginator) }}
+            {% endif %}
+
+        {% endif %}
     {% endif %}
 
     <ul class="record_actions sticky-form-buttons">

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

@@ -33,7 +33,17 @@
             {% endif %}
         </p>
     {% else %}
+        {% if calendarItems|length > 0 %}
+            <div class="flex-table list-records context-person">
+                {% for calendar in calendarItems %}
                     {{ include ('@ChillCalendar/Calendar/_list.html.twig', {context: 'person'}) }}
+                {% endfor %}
+            </div>
+
+            {% if calendarItems|length < paginator.getTotalItems %}
+                {{ chill_pagination(paginator) }}
+            {% endif %}
+        {% endif %}
     {% endif %}
 
     <ul class="record_actions sticky-form-buttons">

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 %}

src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig

@@ -0,0 +1,40 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_invitations_list' %}
+
+{% block title %}{{ 'invite.list.title'|trans }}{% endblock title %}
+
+{% block content %}
+
+    <h1>{{ 'invite.list.title'|trans }}</h1>
+
+    {% if invitations|length == 0 %}
+        <p class="chill-no-data-statement">
+            {{ "invite.list.none"|trans }}
+        </p>
+    {% else %}
+        <div class="flex-table list-records">
+            {% for invitation in invitations %}
+                {% set calendar = invitation.getCalendar %}
+                {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'user'}) }}
+            {% endfor %}
+        </div>
+
+        {% if invitations|length < paginator.getTotalItems %}
+            {{ chill_pagination(paginator) }}
+        {% endif %}
+    {% endif %}
+
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_answer') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_answer') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
+{% endblock %}

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

@@ -0,0 +1,292 @@
+<?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\Tests\Controller;
+
+use Chill\CalendarBundle\Controller\MyInvitationsController;
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\Invite;
+use Chill\CalendarBundle\Repository\InviteRepository;
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepositoryInterface;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Twig\Environment;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class MyInvitationsControllerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    private MyInvitationsController $controller;
+
+    protected function setUp(): void
+    {
+        // Create prophecies for dependencies
+        $inviteRepository = $this->prophesize(InviteRepository::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+
+        // Create controller instance
+        $this->controller = new MyInvitationsController(
+            $inviteRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $docGeneratorTemplateRepository->reveal()
+        );
+
+        // Set up necessary services for AbstractController
+        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+        $tokenStorage = $this->prophesize(TokenStorageInterface::class);
+        $twig = $this->prophesize(Environment::class);
+
+        // Use reflection to set the container
+        $reflection = new \ReflectionClass($this->controller);
+        $containerProperty = $reflection->getParentClass()->getProperty('container');
+        $containerProperty->setAccessible(true);
+
+        // Create a mock container
+        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+        $container->has('security.authorization_checker')->willReturn(true);
+        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+        $container->has('security.token_storage')->willReturn(true);
+        $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
+        $container->has('twig')->willReturn(true);
+        $container->get('twig')->willReturn($twig->reveal());
+
+        $containerProperty->setValue($this->controller, $container->reveal());
+    }
+
+    public function testMyInvitationsReturnsCorrectAmountOfInvitations(): void
+    {
+        // Create test user
+        $user = new User();
+        $user->setUsername('testuser');
+
+        // Create test invitations
+        $invite1 = new Invite();
+        $invite1->setUser($user);
+        $invite1->setStatus(Invite::PENDING);
+
+        $invite2 = new Invite();
+        $invite2->setUser($user);
+        $invite2->setStatus(Invite::ACCEPTED);
+
+        $invite3 = new Invite();
+        $invite3->setUser($user);
+        $invite3->setStatus(Invite::DECLINED);
+
+        $allInvitations = [$invite1, $invite2, $invite3];
+        $paginatedInvitations = [$invite1, $invite2]; // First page with 2 items per page
+
+        // Set up repository prophecies
+        $inviteRepository = $this->prophesize(InviteRepository::class);
+        $inviteRepository->findBy(['user' => $user])->willReturn($allInvitations);
+        $inviteRepository->findBy(
+            ['user' => $user],
+            ['createdAt' => 'DESC'],
+            2, // items per page
+            0  // offset
+        )->willReturn($paginatedInvitations);
+
+        // Set up paginator prophecies
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getItemsPerPage()->willReturn(2);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+        $paginatorFactory->create(3)->willReturn($paginator->reveal());
+
+        // Set up doc generator repository
+        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+        $docGeneratorTemplateRepository->findByEntity(Calendar::class)->willReturn([]);
+
+        // Create controller with mocked dependencies
+        $controller = new MyInvitationsController(
+            $inviteRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $docGeneratorTemplateRepository->reveal()
+        );
+
+        // Set up authorization checker to return true for ROLE_USER
+        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(true);
+
+        // Set up token storage to return user
+        $token = $this->prophesize(TokenInterface::class);
+        $token->getUser()->willReturn($user);
+        $tokenStorage = $this->prophesize(TokenStorageInterface::class);
+        $tokenStorage->getToken()->willReturn($token->reveal());
+
+        // Set up twig to return a response
+        $twig = $this->prophesize(Environment::class);
+        $twig->render('@ChillCalendar/Invitations/listByUser.html.twig', [
+            'invitations' => $paginatedInvitations,
+            'paginator' => $paginator->reveal(),
+            'templates' => [],
+        ])->willReturn('rendered content');
+
+        // Set up container
+        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+        $container->has('security.authorization_checker')->willReturn(true);
+        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+        $container->has('security.token_storage')->willReturn(true);
+        $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
+        $container->has('twig')->willReturn(true);
+        $container->get('twig')->willReturn($twig->reveal());
+
+        // Use reflection to set the container
+        $reflection = new \ReflectionClass($controller);
+        $containerProperty = $reflection->getParentClass()->getProperty('container');
+        $containerProperty->setAccessible(true);
+        $containerProperty->setValue($controller, $container->reveal());
+
+        // Create request
+        $request = new Request();
+
+        // Execute the action
+        $response = $controller->myInvitations($request);
+
+        // Assert that response is successful
+        self::assertInstanceOf(Response::class, $response);
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('rendered content', $response->getContent());
+    }
+
+    public function testMyInvitationsPageLoads(): void
+    {
+        // Create test user
+        $user = new User();
+        $user->setUsername('testuser');
+
+        // Set up repository prophecies - no invitations
+        $inviteRepository = $this->prophesize(InviteRepository::class);
+        $inviteRepository->findBy(['user' => $user])->willReturn([]);
+        $inviteRepository->findBy(
+            ['user' => $user],
+            ['createdAt' => 'DESC'],
+            20, // default items per page
+            0   // offset
+        )->willReturn([]);
+
+        // Set up paginator prophecies
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getItemsPerPage()->willReturn(20);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+        $paginatorFactory->create(0)->willReturn($paginator->reveal());
+
+        // Set up doc generator repository
+        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+        $docGeneratorTemplateRepository->findByEntity(Calendar::class)->willReturn([]);
+
+        // Create controller with mocked dependencies
+        $controller = new MyInvitationsController(
+            $inviteRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $docGeneratorTemplateRepository->reveal()
+        );
+
+        // Set up authorization checker to return true for ROLE_USER
+        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(true);
+
+        // Set up token storage to return user
+        $token = $this->prophesize(TokenInterface::class);
+        $token->getUser()->willReturn($user);
+        $tokenStorage = $this->prophesize(TokenStorageInterface::class);
+        $tokenStorage->getToken()->willReturn($token->reveal());
+
+        // Set up twig to return a response
+        $twig = $this->prophesize(Environment::class);
+        $twig->render('@ChillCalendar/Invitations/listByUser.html.twig', [
+            'invitations' => [],
+            'paginator' => $paginator->reveal(),
+            'templates' => [],
+        ])->willReturn('empty page content');
+
+        // Set up container
+        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+        $container->has('security.authorization_checker')->willReturn(true);
+        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+        $container->has('security.token_storage')->willReturn(true);
+        $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
+        $container->has('twig')->willReturn(true);
+        $container->get('twig')->willReturn($twig->reveal());
+
+        // Use reflection to set the container
+        $reflection = new \ReflectionClass($controller);
+        $containerProperty = $reflection->getParentClass()->getProperty('container');
+        $containerProperty->setAccessible(true);
+        $containerProperty->setValue($controller, $container->reveal());
+
+        // Create request
+        $request = new Request();
+
+        // Execute the action
+        $response = $controller->myInvitations($request);
+
+        // Assert that page loads successfully
+        self::assertInstanceOf(Response::class, $response);
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('empty page content', $response->getContent());
+    }
+
+    public function testMyInvitationsRequiresAuthentication(): void
+    {
+        // Create controller with minimal dependencies
+        $inviteRepository = $this->prophesize(InviteRepository::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+
+        $controller = new MyInvitationsController(
+            $inviteRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $docGeneratorTemplateRepository->reveal()
+        );
+
+        // Set up authorization checker to return false for ROLE_USER
+        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted('ROLE_USER')->willReturn(false);
+        $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(false);
+
+        // Set up container
+        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+        $container->has('security.authorization_checker')->willReturn(true);
+        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+
+        // Use reflection to set the container
+        $reflection = new \ReflectionClass($controller);
+        $containerProperty = $reflection->getParentClass()->getProperty('container');
+        $containerProperty->setAccessible(true);
+        $containerProperty->setValue($controller, $container->reveal());
+
+        // Create request
+        $request = new Request();
+
+        // Expect AccessDeniedException
+        $this->expectException(\Symfony\Component\Security\Core\Exception\AccessDeniedException::class);
+
+        // Execute the action
+        $controller->myInvitations($request);
+    }
+}

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: Annulé par
-Canceled by: supprimé 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.
@@ -86,6 +93,9 @@ invite:
     declined: Refusé
     pending: En attente
     tentative: Accepté provisoirement
+    list:
+        none: Il n'y aucun invitation
+        title: Mes invitations
 
 # exports
 Exports of calendar: Exports des rendez-vous

src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php

@@ -20,4 +20,9 @@ use Doctrine\Persistence\ObjectRepository;
 interface DocGeneratorTemplateRepositoryInterface extends ObjectRepository
 {
     public function countByEntity(string $entity): int;
+
+    /**
+     * @return array|DocGeneratorTemplate[]
+     */
+    public function findByEntity(string $entity, ?int $start = 0, ?int $limit = 50): array;
 }

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

@@ -20,10 +20,7 @@
                 </option>
                 <template v-for="t in templates" :key="t.id">
                   <option :value="t.id">
-                                        {{
+                    {{ localizeString(t.name) || "Aucun nom défini" }}
-                                            localizeString(t.name) ||
-                                            "Aucun nom défini"
-                                        }}
                   </option>
                 </template>
               </select>
@@ -31,9 +28,7 @@
                 v-if="canGenerate"
                 class="btn btn-update btn-sm change-icon"
                 :href="buildUrlGenerate"
-                                @click.prevent="
+                @click.prevent="clickGenerate($event, buildUrlGenerate)"
-                                    clickGenerate($event, buildUrlGenerate)
-                                "
                 ><i class="fa fa-fw fa-cog"
               /></a>
               <a

src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php

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

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

@@ -13,8 +13,9 @@ const startApp = (
 
   const inputTitle = collectionEntry?.querySelector("input[type='text']");
 
-    const input_stored_object: HTMLInputElement | null =
+  const input_stored_object: HTMLInputElement | null = divElement.querySelector(
-        divElement.querySelector("input[data-stored-object]");
+    "input[data-stored-object]",
+  );
   if (null === input_stored_object) {
     throw new Error("input to stored object not found");
   }
@@ -53,9 +54,7 @@ const startApp = (
         console.log("version added", stored_object_version);
         this.$data.existingDoc = stored_object;
         this.$data.existingDoc.currentVersion = stored_object_version;
-                input_stored_object.value = JSON.stringify(
+        input_stored_object.value = JSON.stringify(this.$data.existingDoc);
-                    this.$data.existingDoc,
-                );
         if (this.$data.inputTitle) {
           if (!this.$data.inputTitle?.value) {
             this.$data.inputTitle.value = file_name;

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

@@ -49,9 +49,7 @@
       <li v-if="isHistoryViewable">
         <history-button
           :stored-object="props.storedObject"
-                    :can-edit="
+          :can-edit="canEdit && props.storedObject._permissions.canEdit"
-                        canEdit && props.storedObject._permissions.canEdit
-                    "
         ></history-button>
       </li>
     </ul>
@@ -129,9 +127,7 @@ const props = withDefaults(defineProps<DocumentActionButtonsGroupConfig>(), {
   canDownload: true,
   canConvertPdf: true,
   returnPath:
-        window.location.pathname +
+    window.location.pathname + window.location.search + window.location.hash,
-        window.location.search +
-        window.location.hash,
 });
 
 /**

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

@@ -29,9 +29,7 @@
     </modal>
   </teleport>
   <div class="col-12 m-auto sticky-top">
-        <div
+    <div class="row justify-content-center border-bottom pdf-tools d-md-none">
-            class="row justify-content-center border-bottom pdf-tools d-md-none"
-        >
       <div class="col-5 text-center turn-page">
         <select
           class="form-select form-select-sm"
@@ -92,10 +90,7 @@
         v-if="signature.zones.length === 1 && signedState !== 'signed'"
         class="col-5 p-0 text-center turnSignature"
       >
-                <button
+        <button class="btn btn-light btn-sm" @click="goToSignatureZoneUnique">
-                    class="btn btn-light btn-sm"
-                    @click="goToSignatureZoneUnique"
-                >
           {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
         </button>
       </div>
@@ -150,10 +145,7 @@
           :title="trans(SIGNATURES_ADD_SIGN_ZONE)"
         >
           <template v-if="canvasEvent === 'add'">
-                        <div
+            <div class="spinner-border spinner-border-sm" role="status">
-                            class="spinner-border spinner-border-sm"
-                            role="status"
-                        >
               <span class="visually-hidden">Loading...</span>
             </div>
           </template>
@@ -207,10 +199,7 @@
         v-if="signature.zones.length === 1 && signedState !== 'signed'"
         class="col-4 d-xl-none text-center turnSignature p-0"
       >
-                <button
+        <button class="btn btn-light btn-sm" @click="goToSignatureZoneUnique">
-                    class="btn btn-light btn-sm"
-                    @click="goToSignatureZoneUnique"
-                >
           {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
         </button>
       </div>
@@ -238,10 +227,7 @@
         v-if="signature.zones.length === 1 && signedState !== 'signed'"
         class="col-4 d-none d-xl-flex p-0 text-center turnSignature"
       >
-                <button
+        <button class="btn btn-light btn-sm" @click="goToSignatureZoneUnique">
-                    class="btn btn-light btn-sm"
-                    @click="goToSignatureZoneUnique"
-                >
           {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
         </button>
       </div>
@@ -299,10 +285,7 @@
           </template>
           <template v-else>
             {{ trans(SIGNATURES_CLICK_ON_DOCUMENT) }}
-                        <div
+            <div class="spinner-border spinner-border-sm" role="status">
-                            class="spinner-border spinner-border-sm"
-                            role="status"
-                        >
               <span class="visually-hidden">Loading...</span>
             </div>
           </template>
@@ -562,14 +545,8 @@ const addCanvasEvents = () => {
       );
     });
   } else {
-        const canvas = document.querySelectorAll(
+    const canvas = document.querySelectorAll("canvas")[0] as HTMLCanvasElement;
-            "canvas",
+    canvas.addEventListener("pointerup", (e) => canvasClick(e, canvas), false);
-        )[0] as HTMLCanvasElement;
-        canvas.addEventListener(
-            "pointerup",
-            (e) => canvasClick(e, canvas),
-            false,
-        );
   }
 };
 
@@ -605,11 +582,7 @@ const hitSignature = (
     scaleYToCanvas(zone.y, canvas.height, zone.PDFPage.height) <
     xy[1] &&
   xy[1] <
-        scaleYToCanvas(
+    scaleYToCanvas(zone.height - zone.y, canvas.height, zone.PDFPage.height) +
-            zone.height - zone.y,
-            canvas.height,
-            zone.PDFPage.height,
-        ) +
       zone.PDFPage.height * zoom.value;
 
 const selectZone = async (z: SignatureZone, canvas: HTMLCanvasElement) => {
@@ -625,8 +598,7 @@ const selectZoneEvent = (e: PointerEvent, canvas: HTMLCanvasElement) =>
   signature.zones
     .filter(
       (z) =>
-                (z.PDFPage.index + 1 === getCanvasId(canvas) &&
+        (z.PDFPage.index + 1 === getCanvasId(canvas) && multiPage.value) ||
-                    multiPage.value) ||
         (z.PDFPage.index + 1 === page.value && !multiPage.value),
     )
     .map((z) => {

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

@@ -153,12 +153,10 @@ const handleFile = async (file: File): Promise<void> => {
       </p>
       <!-- todo i18n -->
       <p v-if="has_existing_doc">
-                Déposez un document ou cliquez ici pour remplacer le document
+        Déposez un document ou cliquez ici pour remplacer le document existant
-                existant
       </p>
       <p v-else>
-                Déposez un document ou cliquez ici pour ouvrir le navigateur de
+        Déposez un document ou cliquez ici pour ouvrir le navigateur de fichier
-                fichier
       </p>
     </div>
     <div v-else class="waiting">

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

@@ -35,9 +35,7 @@ async function download_and_open(event: Event): Promise<void> {
   if (null === state.content) {
     event.preventDefault();
 
-        const raw = await download_doc(
+    const raw = await download_doc(build_convert_link(props.storedObject.uuid));
-            build_convert_link(props.storedObject.uuid),
-        );
     state.content = window.URL.createObjectURL(raw);
 
     button.href = window.URL.createObjectURL(raw);

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

@@ -42,9 +42,7 @@ const editionUntilFormatted = computed<string>(() => {
     <modal v-if="state.modalOpened" @close="state.modalOpened = false">
       <template v-slot:body>
         <div class="desktop-edit">
-                    <p class="center">
+          <p class="center">Veuillez enregistrer vos modifications avant le</p>
-                        Veuillez enregistrer vos modifications avant le
-                    </p>
           <p>
             <strong>{{ editionUntilFormatted }}</strong>
           </p>
@@ -57,23 +55,21 @@ const editionUntilFormatted = computed<string>(() => {
 
           <p>
             <small
-                            >Le document peut être édité uniquement en utilisant
+              >Le document peut être édité uniquement en utilisant Libre
-                            Libre Office.</small
+              Office.</small
             >
           </p>
 
           <p>
             <small
-                            >En cas d'échec lors de l'enregistrement, sauver le
+              >En cas d'échec lors de l'enregistrement, sauver le document sur
-                            document sur le poste de travail avant de le déposer
+              le poste de travail avant de le déposer à nouveau ici.</small
-                            à nouveau ici.</small
             >
           </p>
 
           <p>
             <small
-                            >Vous pouvez naviguez sur d'autres pages pendant
+              >Vous pouvez naviguez sur d'autres pages pendant l'édition.</small
-                            l'édition.</small
             >
           </p>
         </div>

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

@@ -95,10 +95,7 @@ async function download_and_open(): Promise<void> {
   let raw;
 
   try {
-        raw = await download_and_decrypt_doc(
+    raw = await download_and_decrypt_doc(props.storedObject, props.atVersion);
-            props.storedObject,
-            props.atVersion,
-        );
   } catch (e) {
     console.error("error while downloading and decrypting document");
     console.error(e);

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

@@ -2,9 +2,7 @@
   <a
     :class="Object.assign(props.classes, { btn: true })"
     @click="beforeLeave($event)"
-        :href="
+    :href="build_wopi_editor_link(props.storedObject.uuid, props.returnPath)"
-            build_wopi_editor_link(props.storedObject.uuid, props.returnPath)
-        "
   >
     <i class="fa fa-paragraph"></i>
     Editer en ligne

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts

@@ -145,9 +145,7 @@ async function download_info_link(
 function build_wopi_editor_link(uuid: string, returnPath?: string) {
   if (returnPath === undefined) {
     returnPath =
-            window.location.pathname +
+      window.location.pathname + window.location.search + window.location.hash;
-            window.location.search +
-            window.location.hash;
   }
 
   return (
@@ -177,8 +175,6 @@ async function download_and_decrypt_doc(
     throw new Error("no version associated to stored object");
   }
 
-    // sometimes, the downloadInfo may be embedded into the storedObject
-    console.log("storedObject", storedObject);
   let downloadInfo;
   if (
     typeof storedObject._links !== "undefined" &&
@@ -186,10 +182,7 @@ async function download_and_decrypt_doc(
   ) {
     downloadInfo = storedObject._links.downloadLink;
   } else {
-        downloadInfo = await download_info_link(
+    downloadInfo = await download_info_link(storedObject, atVersionToDownload);
-            storedObject,
-            atVersionToDownload,
-        );
   }
 
   const rawResponse = await window.fetch(downloadInfo.url);
@@ -244,10 +237,7 @@ async function download_doc_as_pdf(storedObject: StoredObject): Promise<Blob> {
   }
 
   if (storedObject.currentVersion?.type === "application/pdf") {
-        return download_and_decrypt_doc(
+    return download_and_decrypt_doc(storedObject, storedObject.currentVersion);
-            storedObject,
-            storedObject.currentVersion,
-        );
   }
 
   const convertLink = build_convert_link(storedObject.uuid);

src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectVersionNormalizer.php

@@ -43,11 +43,17 @@ class StoredObjectVersionNormalizer implements NormalizerInterface, NormalizerAw
             'createdBy' => $this->normalizer->normalize($object->getCreatedBy(), $format, [...$context, UserNormalizer::AT_DATE => $object->getCreatedAt()]),
         ];
 
-        if (in_array(self::WITH_POINT_IN_TIMES_CONTEXT, $context[AbstractNormalizer::GROUPS] ?? [], true)) {
+        $normalizationGroups = $context[AbstractNormalizer::GROUPS] ?? [];
+
+        if (is_string($normalizationGroups)) {
+            $normalizationGroups = [$normalizationGroups];
+        }
+
+        if (in_array(self::WITH_POINT_IN_TIMES_CONTEXT, $normalizationGroups, true)) {
             $data['point-in-times'] = $this->normalizer->normalize($object->getPointInTimes(), $format, $context);
         }
 
-        if (in_array(self::WITH_RESTORED_CONTEXT, $context[AbstractNormalizer::GROUPS] ?? [], true)) {
+        if (in_array(self::WITH_RESTORED_CONTEXT, $normalizationGroups, true)) {
             $data['from-restored'] = $this->normalizer->normalize($object->getCreatedFrom(), $format, [AbstractNormalizer::GROUPS => ['read']]);
         }
 

src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php

@@ -102,7 +102,6 @@ class CRUDController extends AbstractController
                 Resolver::class => Resolver::class,
                 SerializerInterface::class => SerializerInterface::class,
                 FilterOrderHelperFactoryInterface::class => FilterOrderHelperFactoryInterface::class,
-                ManagerRegistry::class => ManagerRegistry::class,
             ]
         );
     }
@@ -674,7 +673,7 @@ class CRUDController extends AbstractController
 
     protected function getManagerRegistry(): ManagerRegistry
     {
-        return $this->container->get(ManagerRegistry::class);
+        return $this->container->get('doctrine');
     }
 
     /**

src/Bundle/ChillMainBundle/ChillMainBundle.php

@@ -14,7 +14,6 @@ namespace Chill\MainBundle;
 use Chill\MainBundle\Cron\CronJobInterface;
 use Chill\MainBundle\CRUD\CompilerPass\CRUDControllerCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\ACLFlagsCompilerPass;
-use Chill\MainBundle\DependencyInjection\CompilerPass\MenuCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\NotificationCounterCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\TimelineCompilerClass;
@@ -70,7 +69,6 @@ class ChillMainBundle extends Bundle
         $container->addCompilerPass(new TimelineCompilerClass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new WidgetsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new NotificationCounterCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
-        $container->addCompilerPass(new MenuCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new ACLFlagsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new CRUDControllerCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
     }

src/Bundle/ChillMainBundle/Command/OverrideTranslationCommand.php

@@ -0,0 +1,115 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Component\Translation\Reader\TranslationReaderInterface;
+use Symfony\Component\Translation\Writer\TranslationWriterInterface;
+use Symfony\Component\Yaml\Yaml;
+
+class OverrideTranslationCommand extends Command
+{
+    public function __construct(
+        private readonly TranslationReaderInterface $reader,
+        private readonly TranslationWriterInterface $writer,
+    ) {
+        $this->setName('chill:main:override_translation');
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setDescription('Generate a translation catalogue with translation remplacements based on replacements provided in a YAML file.')
+            ->addArgument('locale', InputArgument::REQUIRED, 'The locale to process (e.g. fr, en).')
+            ->addArgument('overrides', InputArgument::REQUIRED, 'Path to the overrides YAML file (list of {from, to}).');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $locale = (string) $input->getArgument('locale');
+        $overridesPath = (string) $input->getArgument('overrides');
+
+        $catalogue = $this->loadCatalogue($locale);
+        $overrides = $this->loadOverrides($overridesPath);
+
+
+        $toOverrideCatalogue = new MessageCatalogue($locale);
+        foreach ($catalogue->getDomains() as $domain) {
+            // hack: we have to replace the suffix ".intl-icu" by "+intl-ic"
+            $domain = str_replace('.intl-icu', '+intl-icu', $domain);
+            foreach ($catalogue->all($domain) as $key => $translation) {
+                foreach ($overrides as $changes) {
+                    $from = $changes['from'];
+                    $to = $changes['to'];
+
+                    if (is_string($translation) && str_contains($translation, $from)) {
+                        $newTranslation = strtr($translation, [$from => $to]);
+                        $toOverrideCatalogue->set($key, $newTranslation, $domain);
+                        $translation = $newTranslation;
+                    }
+                }
+            }
+        }
+
+        /** @var KernelInterface $kernel */
+        /* @phpstan-ignore-next-line */
+        $kernel = $this->getApplication()->getKernel();
+        $outputDir = rtrim($kernel->getProjectDir(), '/').'/translations';
+        if (!is_dir($outputDir)) {
+            @mkdir($outputDir, 0775, true);
+        }
+
+        // Writer expects the 'path' option to be a directory; it will create the proper file name
+        $this->writer->write($toOverrideCatalogue, 'yaml', ['path' => $outputDir]);
+
+        $output->writeln(sprintf('Override catalogue written to %s (domain: messages, locale: %s).', $outputDir, $locale));
+
+        return Command::SUCCESS;
+    }
+
+    /**
+     * @return list<array{from: string, to: string}>
+     */
+    private function loadOverrides(string $path): array
+    {
+        return Yaml::parseFile($path);
+    }
+
+    private function loadCatalogue(string $locale): MessageCatalogue
+    {
+        /** @var KernelInterface $kernel */
+        /* @phpstan-ignore-next-line */
+        $kernel = $this->getApplication()->getKernel();
+
+        // collect path for translations
+        $transPaths = [];
+        foreach ($kernel->getBundles() as $bundle) {
+            $bundleDir = $bundle->getPath();
+            $transPaths[] = is_dir($bundleDir.'/Resources/translations') ? $bundleDir.'/Resources/translations' : $bundle->getPath().'/translations';
+        }
+
+        $currentCatalogue = new MessageCatalogue($locale);
+        foreach ($transPaths as $path) {
+            if (is_dir($path)) {
+                $this->reader->read($path, $currentCatalogue);
+            }
+        }
+
+        return $currentCatalogue;
+    }
+}

src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php

@@ -27,6 +27,8 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatableInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
+// command to get the report with curl : curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff
+
 /**
  * Create a CSV List for the export.
  */

src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php

@@ -17,7 +17,7 @@ use Symfony\Component\Routing\RouterInterface;
 /**
  * Create paginator instances.
  */
-final readonly class PaginatorFactory implements PaginatorFactoryInterface
+class PaginatorFactory implements PaginatorFactoryInterface
 {
     final public const DEFAULT_CURRENT_PAGE_KEY = 'page';
 
@@ -29,16 +29,16 @@ final readonly class PaginatorFactory implements PaginatorFactoryInterface
         /**
          * the request stack.
          */
-        private RequestStack $requestStack,
+        private readonly RequestStack $requestStack,
         /**
          * the router and generator for url.
          */
-        private RouterInterface $router,
+        private readonly RouterInterface $router,
         /**
          * the default item per page. This may be overriden by
          * the request or inside the paginator.
          */
-        private int $itemPerPage = 20,
+        private readonly int $itemPerPage = 20,
     ) {}
 
     /**

src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php

@@ -76,6 +76,24 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             ->formatOutOfCountryCallingNumber($phoneNumber, $this->config['default_carrier_code']);
     }
 
+    /**
+     * @throws NumberParseException
+     */
+    public function parse(string $phoneNumber): PhoneNumber
+    {
+        $sanitizedPhoneNumber = $phoneNumber;
+
+        if (str_starts_with($sanitizedPhoneNumber, '00')) {
+            $sanitizedPhoneNumber = '+'.substr($sanitizedPhoneNumber, 2, null);
+        }
+
+        if (!str_starts_with($sanitizedPhoneNumber, '+') && !str_starts_with($sanitizedPhoneNumber, '0')) {
+            $sanitizedPhoneNumber = '+'.$sanitizedPhoneNumber;
+        }
+
+        return $this->phoneNumberUtil->parse($sanitizedPhoneNumber, $this->config['default_carrier_code']);
+    }
+
     /**
      * Get type (mobile, landline, ...) for phone number.
      */

src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts

@@ -5,11 +5,16 @@ export type fetchOption = Record<string, boolean | string | number | null>;
 
 export type Params = Record<string, number | string>;
 
-export interface PaginationResponse<T> {
+export interface Pagination {
-    pagination: {
+  first: number;
-        more: boolean;
   items_per_page: number;
-    };
+  more: boolean;
+  next: string | null;
+  previous: string | null;
+}
+
+export interface PaginationResponse<T> {
+  pagination: Pagination;
   results: T[];
   count: number;
 }

src/Bundle/ChillMainBundle/Resources/public/lib/localizationHelper/localizationHelper.ts

@@ -1,4 +1,5 @@
-import { TranslatableString } from "ChillMainAssets/types";
+import { DateTime, TranslatableString } from "ChillMainAssets/types";
+import { getLocale } from "translator";
 
 /**
  * Localizes a translatable string object based on the current locale.
@@ -8,6 +9,25 @@ import { TranslatableString } from "ChillMainAssets/types";
  * @param locale defaults to browser locale
  * @returns The localized string or null if no translation is available
  */
+
+/**
+ * Prepends the current HTML lang code to the given URL.
+ * Example: If lang="fr" and url="/about", returns "/fr/about"
+ *
+ * @param url The URL to localize
+ * @returns The localized URL
+ */
+export function localizedUrl(url: string): string {
+  const locale = getLocale();
+  // Ensure url starts with a slash and does not already start with /{lang}/
+  const normalizedUrl = url.startsWith("/") ? url : `/${url}`;
+  const langPrefix = `/${locale}`;
+  if (normalizedUrl.startsWith(langPrefix + "/")) {
+    return normalizedUrl;
+  }
+  return `${langPrefix}${normalizedUrl}`;
+}
+
 export function localizeString(
   translatableString: TranslatableString | null | undefined,
   locale?: string,
@@ -16,7 +36,7 @@ export function localizeString(
     return "";
   }
 
-    const currentLocale = locale || navigator.language.split("-")[0] || "fr";
+  const currentLocale = locale || getLocale();
 
   if (translatableString[currentLocale]) {
     return translatableString[currentLocale];
@@ -39,3 +59,47 @@ export function localizeString(
 
   return "";
 }
+
+const datetimeFormats: Record<
+  string,
+  Record<string, Intl.DateTimeFormatOptions>
+> = {
+  fr: {
+    short: {
+      year: "numeric",
+      month: "numeric",
+      day: "numeric",
+    },
+    text: {
+      year: "numeric",
+      month: "long",
+      day: "numeric",
+    },
+    long: {
+      year: "numeric",
+      month: "numeric",
+      day: "numeric",
+      hour: "numeric",
+      minute: "numeric",
+      hour12: false,
+    },
+    hoursOnly: {
+      hour: "numeric",
+      minute: "numeric",
+      hour12: false,
+    },
+  },
+};
+export function localizeDateTimeFormat(
+  dateTime: DateTime,
+  format: keyof typeof datetimeFormats.fr = "short",
+): string {
+  const locale = getLocale();
+  const options =
+    datetimeFormats[locale]?.[format] || datetimeFormats.fr[format];
+  return new Intl.DateTimeFormat(locale, options).format(
+    new Date(dateTime.datetime),
+  );
+}
+
+export default datetimeFormats;

src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js

@@ -126,7 +126,8 @@ function loadDynamicPicker(element) {
             -1 ===
               this.suggested.findIndex(
                 (e) => e.type === entity.type && e.id === entity.id,
-            )
+              ) &&
+            "me" !== entity
           ) {
             this.suggested.push(entity);
           }

src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.js

@@ -1,15 +0,0 @@
-import { createApp } from "vue";
-import { _createI18n } from "ChillMainAssets/vuejs/_js/i18n";
-import { appMessages } from "ChillMainAssets/vuejs/HomepageWidget/js/i18n";
-import { store } from "ChillMainAssets/vuejs/HomepageWidget/js/store";
-import App from "ChillMainAssets/vuejs/HomepageWidget/App";
-
-const i18n = _createI18n(appMessages);
-
-const app = createApp({
-  template: `<app></app>`,
-})
-  .use(store)
-  .use(i18n)
-  .component("app", App)
-  .mount("#homepage_widget");

src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.ts

@@ -0,0 +1,12 @@
+import App from "ChillMainAssets/vuejs/HomepageWidget/App.vue";
+import { createApp } from "vue";
+import { store } from "ChillMainAssets/vuejs/HomepageWidget/store";
+
+declare global {
+  interface Window {
+    homepage_config: string;
+  }
+}
+
+const _app = createApp(App);
+_app.use(store).mount("#homepage_widget");

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

@@ -15,6 +15,11 @@ export interface Civility {
   // TODO
 }
 
+export interface Household {
+  type: "household";
+  id: number;
+}
+
 export interface Job {
   id: number;
   type: "user_job";
@@ -291,6 +296,86 @@ export interface PrivateCommentEmbeddable {
   comments: Record<number, string>;
 }
 
+// API Exception types
+export interface TransportExceptionInterface {
+  name: string;
+}
+
+export interface ValidationExceptionInterface
+  extends TransportExceptionInterface {
+  name: "ValidationException";
+  error: object;
+  violations: string[];
+  titles: string[];
+  propertyPaths: string[];
+}
+
+export interface AccessExceptionInterface extends TransportExceptionInterface {
+  name: "AccessException";
+  violations: string[];
+}
+
+export interface NotFoundExceptionInterface
+  extends TransportExceptionInterface {
+  name: "NotFoundException";
+}
+
+export interface ServerExceptionInterface extends TransportExceptionInterface {
+  name: "ServerException";
+  message: string;
+  code: number;
+  body: string;
+}
+
+export interface ConflictHttpExceptionInterface
+  extends TransportExceptionInterface {
+  name: "ConflictHttpException";
+  violations: string[];
+}
+
+export type ApiException =
+  | ValidationExceptionInterface
+  | AccessExceptionInterface
+  | NotFoundExceptionInterface
+  | ServerExceptionInterface
+  | ConflictHttpExceptionInterface;
+
+export interface Modal {
+  showModal: boolean;
+  modalDialogClass: string;
+}
+
+export interface Selected {
+  result: UserGroupOrUser;
+}
+
+export interface addNewEntities {
+  selected: Selected[];
+  modal: Modal;
+}
+
+export enum HomepageTabs {
+  MyCustoms,
+  MyTickets,
+  MyNotifications,
+  MyAccompanyingCourses,
+  MyEvaluations,
+  MyTasks,
+  MyWorkflows,
+}
+
+export interface HomepageConfig {
+  defaultTab: HomepageTabs;
+  displayTabs: HomepageTabs[];
+}
+
+export interface TabDefinition {
+  key: HomepageTabs;
+  label: string;
+  icon: string | null;
+  counter: () => number;
+}
+
 /**
  * Possible states for the WaitingScreen Component.
  */

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue

@@ -148,10 +148,7 @@
         </template>
         <template #action>
           <li v-if="!this.context.edit && this.useDatePane">
-                        <button
+            <button class="btn btn-update change-icon" @click="closeEditPane">
-                            class="btn btn-update change-icon"
-                            @click="closeEditPane"
-                        >
               {{ trans(NEXT) }}
               <i class="fa fa-fw fa-arrow-right" />
             </button>
@@ -277,8 +274,7 @@ export default {
             PREVIOUS,
             NEXT,
         };
-    },
+    },props: ["context", "options", "addressChangedCallback"],
-    props: ["context", "options", "addressChangedCallback"],
   components: {
     Modal,
     ShowPane,
@@ -394,8 +390,7 @@ export default {
     getTextTitle() {
       if (
         typeof this.options.title !== "undefined" &&
-                (this.options.title.edit !== null ||
+        (this.options.title.edit !== null || this.options.title.create !== null)
-                    this.options.title.create !== null)
       ) {
         console.log("this.options.title", this.options.title);
 
@@ -515,10 +510,7 @@ export default {
         if (!this.context.edit) {
           this.context.edit = true;
           this.context.addressId = params.addressId;
-                    console.log(
+          console.log("context is now edit, with address", params.addressId);
-                        "context is now edit, with address",
-                        params.addressId,
-                    );
         }
       }
     },
@@ -645,9 +637,7 @@ export default {
         ? this.entity.address.confidential
         : false;
       this.entity.selected.isNoAddress =
-                this.context.edit && this.entity.address.text === ""
+        this.context.edit && this.entity.address.text === "" ? true : false;
-                    ? true
-                    : false;
 
       this.entity.selected.country = this.context.edit
         ? this.entity.address.country
@@ -742,8 +732,7 @@ export default {
       // add the address reference, if any
       if (this.entity.selected.address.addressReference !== undefined) {
         newAddress = Object.assign(newAddress, {
-                    addressReference:
+          addressReference: this.entity.selected.address.addressReference,
-                        this.entity.selected.address.addressReference,
         });
       } else {
         newAddress = Object.assign(newAddress, {
@@ -763,10 +752,7 @@ export default {
         });
       }
       if (this.validTo && null !== this.entity.selected.valid.to) {
-                console.log(
+        console.log("add validTo in fetch body", this.entity.selected.valid.to);
-                    "add validTo in fetch body",
-                    this.entity.selected.valid.to,
-                );
         newAddress = Object.assign(newAddress, {
           validTo: {
             datetime: `${this.entity.selected.valid.to.toISOString().split("T")[0]}T00:00:00+0100`,
@@ -778,10 +764,7 @@ export default {
         newPostcode = Object.assign(newPostcode, {
           country: { id: this.entity.selected.country.id },
         }); //TODO why not assign postcodeBody here = Object.assign(postcodeBody, {'origin': 3}); ?
-                console.log(
+        console.log("writeNew postcode is true! newPostcode: ", newPostcode);
-                    "writeNew postcode is true! newPostcode: ",
-                    newPostcode,
-                );
         newAddress = Object.assign(newAddress, {
           newPostcode: newPostcode,
         });

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue

@@ -72,10 +72,7 @@ export default {
           this.entity.addressMap.zoom,
         );
       } else {
-                this.map.setView(
+        this.map.setView(lonLatForLeaflet(this.addressPoint.coordinates), 15);
-                    lonLatForLeaflet(this.addressPoint.coordinates),
-                    15,
-                );
       }
 
       this.map.scrollWheelZoom.disable();
@@ -105,9 +102,7 @@ export default {
     },
     update() {
       if (this.marker && this.entity.addressMap.center) {
-                this.marker.setLatLng(
+        this.marker.setLatLng(lonLatForLeaflet(this.entity.addressMap.center));
-                    lonLatForLeaflet(this.entity.addressMap.center),
-                );
         this.map.panTo(lonLatForLeaflet(this.entity.addressMap.center));
       }
     },

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue

@@ -117,8 +117,7 @@ export default {
             ADDRESS_FILL_AN_ADDRESS,
             trans,
         };
-    },
+    },props: ["entity", "isNoAddress"],
-    props: ["entity", "isNoAddress"],
   computed: {
     floor: {
       set(value) {

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue

@@ -96,13 +96,10 @@ export default {
             ADDRESS_CREATE_ADDRESS,
             trans,
         };
-    },
+    },props: ["entity", "context", "updateMapCenter", "flag", "checkErrors"],
-    props: ["entity", "context", "updateMapCenter", "flag", "checkErrors"],
   data() {
     return {
-            value: this.context.edit
+      value: this.context.edit ? this.entity.address.addressReference : null,
-                ? this.entity.address.addressReference
-                : null,
       isLoading: false,
     };
   },
@@ -175,8 +172,7 @@ export default {
             .then(
               (addresses) =>
                 new Promise((resolve) => {
-                                    this.entity.loaded.addresses =
+                  this.entity.loaded.addresses = addresses.results;
-                                        addresses.results;
                   this.isLoading = false;
                   resolve();
                 }),
@@ -193,8 +189,7 @@ export default {
               .then(
                 (addresses) =>
                   new Promise((resolve) => {
-                                        this.entity.loaded.addresses =
+                    this.entity.loaded.addresses = addresses.results;
-                                            addresses.results;
                     this.isLoading = false;
                     resolve();
                   }),

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue

@@ -85,8 +85,7 @@ export default {
             ADDRESS_CREATE_POSTAL_CODE,
             trans,
         };
-    },
+    },props: [
-    props: [
     "entity",
     "context",
     "focusOnAddress",
@@ -158,9 +157,7 @@ export default {
   },
   methods: {
     transName(value) {
-            return value.code && value.name
+      return value.code && value.name ? `${value.name} (${value.code})` : "";
-                ? `${value.name} (${value.code})`
-                : "";
     },
     selectCity(value) {
       console.log(value);
@@ -168,8 +165,7 @@ export default {
       this.entity.selected.postcode.name = value.name;
       this.entity.selected.postcode.code = value.code;
       if (value.center) {
-                this.entity.selected.postcode.coordinates =
+        this.entity.selected.postcode.coordinates = value.center.coordinates;
-                    value.center.coordinates;
       }
       this.entity.selected.writeNew.postcode = false;
       this.$emit("getReferenceAddresses", value);
@@ -190,8 +186,7 @@ export default {
           .then(
             (cities) =>
               new Promise((resolve) => {
-                                this.entity.loaded.cities =
+                this.entity.loaded.cities = cities.results.filter(
-                                    cities.results.filter(
                   (c) => c.origin !== 3,
                 ); // filter out user-defined cities
                 this.isLoading = false;
@@ -210,8 +205,7 @@ export default {
             .then(
               (cities) =>
                 new Promise((resolve) => {
-                                    this.entity.loaded.cities =
+                  this.entity.loaded.cities = cities.results.filter(
-                                        cities.results.filter(
                     (c) => c.origin !== 3,
                   ); // filter out user-defined cities
                   this.isLoading = false;

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue

@@ -44,8 +44,7 @@ export default {
             ADDRESS_SELECT_COUNTRY,
             trans,
         };
-    },
+    },props: ["context", "entity", "flag", "checkErrors"],
-    props: ["context", "entity", "flag", "checkErrors"],
   emits: ["getCities"],
   data() {
     return {
@@ -60,12 +59,8 @@ export default {
     sortedCountries() {
       const countries = this.entity.loaded.countries;
       let sortedCountries = [];
-            sortedCountries.push(
+      sortedCountries.push(...countries.filter((c) => c.countryCode === "FR"));
-                ...countries.filter((c) => c.countryCode === "FR"),
+      sortedCountries.push(...countries.filter((c) => c.countryCode === "BE"));
-            );
-            sortedCountries.push(
-                ...countries.filter((c) => c.countryCode === "BE"),
-            );
       sortedCountries.push(
         ...countries
           .filter((c) => c.countryCode !== "FR")

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue

@@ -1,9 +1,6 @@
 <template>
   <div v-if="insideModal === false" class="loading">
-        <i
+    <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw" />
-            v-if="flag.loading"
-            class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"
-        />
     <span class="sr-only">{{ $t("loading") }}</span>
   </div>
 
@@ -142,8 +139,7 @@ export default {
         address["street"] = this.entity.selected.address.street
           ? this.entity.selected.address.street
           : null;
-                address["streetNumber"] = this.entity.selected.address
+        address["streetNumber"] = this.entity.selected.address.streetNumber
-                    .streetNumber
           ? this.entity.selected.address.streetNumber
           : null;
         address["floor"] = this.entity.selected.address.floor
@@ -158,12 +154,10 @@ export default {
         address["flat"] = this.entity.selected.address.flat
           ? this.entity.selected.address.flat
           : null;
-                address["buildingName"] = this.entity.selected.address
+        address["buildingName"] = this.entity.selected.address.buildingName
-                    .buildingName
           ? this.entity.selected.address.buildingName
           : null;
-                address["distribution"] = this.entity.selected.address
+        address["distribution"] = this.entity.selected.address.distribution
-                    .distribution
           ? this.entity.selected.address.distribution
           : null;
         address["extra"] = this.entity.selected.address.extra

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue

@@ -2,10 +2,7 @@
   <div class="address-form">
     <!-- Not display in modal -->
     <div v-if="insideModal === false" class="loading">
-            <i
+      <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw" />
-                v-if="flag.loading"
-                class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"
-            />
       <span class="sr-only">Loading...</span>
     </div>
 
@@ -132,8 +129,7 @@ export default {
             ADDRESS_IS_CONFIDENTIAL,
             ADDRESS_IS_NO_ADDRESS,
         };
-    },
+    },props: [
-    props: [
     "context",
     "options",
     "defaultz",

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue

@@ -1,10 +1,7 @@
 <template>
   <div v-if="!onlyButton" class="mt-4 flex-grow-1">
     <div class="loading">
-            <i
+      <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw" />
-                v-if="flag.loading"
-                class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"
-            />
       <span class="sr-only">{{ trans(ADDRESS_LOADING) }}</span>
     </div>
 
@@ -47,9 +44,7 @@
               name="button"
               :title="trans(getTextButton)"
             >
-                            <span v-if="displayTextButton">{{
+              <span v-if="displayTextButton">{{ trans(getTextButton) }}</span>
-                                trans(getTextButton)
-                            }}</span>
             </button>
           </template>
         </action-buttons>
@@ -62,9 +57,7 @@
       :use-date-pane="useDatePane"
     />
 
-        <div
+    <div v-if="this.context.target.name === 'household' || this.context.edit">
-            v-if="this.context.target.name === 'household' || this.context.edit"
-        >
       <action-buttons :options="this.options" :defaultz="this.defaultz">
         <template #action>
           <button
@@ -75,9 +68,7 @@
             name="button"
             :title="trans(getTextButton)"
           >
-                        <span v-if="displayTextButton">{{
+            <span v-if="displayTextButton">{{ trans(getTextButton) }}</span>
-                            trans(getTextButton)
-                        }}</span>
           </button>
         </template>
       </action-buttons>
@@ -99,9 +90,7 @@
           name="button"
           :title="trans(getTextButton)"
         >
-                    <span v-if="displayTextButton">{{
+          <span v-if="displayTextButton">{{ trans(getTextButton) }}</span>
-                        trans(getTextButton)
-                    }}</span>
         </button>
       </template>
     </action-buttons>
@@ -124,8 +113,7 @@ import {
 
 export default {
   name: "ShowPane",
-    methods: {},
+  methods: {},components: {
-    components: {
     AddressRenderBox,
     ActionButtons,
   },
@@ -140,8 +128,7 @@ export default {
             ADDRESS_ADDRESS_NEW_SUCCESS,
             ADDRESS_ADDRESS_EDIT_SUCCESS,
         };
-    },
+    },props: [
-    props: [
     "context",
     "defaultz",
     "options",
@@ -192,9 +179,7 @@ export default {
         : this.defaultz.button.text.create;
     },
     getSuccessText() {
-            return this.context.edit
+      return this.context.edit ? ADDRESS_ADDRESS_EDIT_SUCCESS : ADDRESS_ADDRESS_NEW_SUCCESS;
-                ? ADDRESS_ADDRESS_EDIT_SUCCESS
-                : ADDRESS_ADDRESS_NEW_SUCCESS;
     },
     onlyButton() {
       return typeof this.options.onlyButton !== "undefined"

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue

@@ -1,9 +1,6 @@
 <template>
   <div v-if="insideModal === false" class="loading">
-        <i
+    <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw" />
-            v-if="flag.loading"
-            class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"
-        />
     <span class="sr-only">{{ $t("loading") }}</span>
   </div>
 

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

@@ -1,155 +1,152 @@
 <template>
-    <h2>{{ $t("main_title") }}</h2>
+  <h2>{{ trans(MAIN_TITLE) }}</h2>
-
   <ul class="nav nav-tabs">
-        <li class="nav-item">
+    <li v-for="tab in displayedTabs" :key="tab.key" class="nav-item">
       <a
         class="nav-link"
-                :class="{ active: activeTab === 'MyCustoms' }"
+        :class="{ active: activeTab === tab.key }"
-                @click="selectTab('MyCustoms')"
+        @click="selectTab(tab.key)"
       >
-                <i class="fa fa-dashboard" />
+        <i v-if="tab.icon" :class="tab.icon" />
-            </a>
+        <span v-else>{{ tab.label }}</span>
-        </li>
+        <tab-counter v-if="tab.counter" :count="tab.counter()" />
-        <li class="nav-item">
-            <a
-                class="nav-link"
-                :class="{ active: activeTab === 'MyNotifications' }"
-                @click="selectTab('MyNotifications')"
-            >
-                {{ $t("my_notifications.tab") }}
-                <tab-counter :count="state.notifications.count" />
-            </a>
-        </li>
-        <li class="nav-item">
-            <a
-                class="nav-link"
-                :class="{ active: activeTab === 'MyAccompanyingCourses' }"
-                @click="selectTab('MyAccompanyingCourses')"
-            >
-                {{ $t("my_accompanying_courses.tab") }}
-            </a>
-        </li>
-        <!-- <li class="nav-item">
-         <a class="nav-link"
-            :class="{'active': activeTab === 'MyWorks'}"
-            @click="selectTab('MyWorks')">
-            {{ $t('my_works.tab') }}
-            <tab-counter :count="state.works.count"></tab-counter>
-         </a>
-      </li> -->
-        <li class="nav-item">
-            <a
-                class="nav-link"
-                :class="{ active: activeTab === 'MyEvaluations' }"
-                @click="selectTab('MyEvaluations')"
-            >
-                {{ $t("my_evaluations.tab") }}
-                <tab-counter :count="state.evaluations.count" />
-            </a>
-        </li>
-        <li class="nav-item">
-            <a
-                class="nav-link"
-                :class="{ active: activeTab === 'MyTasks' }"
-                @click="selectTab('MyTasks')"
-            >
-                {{ $t("my_tasks.tab") }}
-                <tab-counter
-                    :count="state.tasks.warning.count + state.tasks.alert.count"
-                />
-            </a>
-        </li>
-        <li class="nav-item">
-            <a
-                class="nav-link"
-                :class="{ active: activeTab === 'MyWorkflows' }"
-                @click="selectTab('MyWorkflows')"
-            >
-                {{ $t("my_workflows.tab") }}
-                <tab-counter
-                    :count="state.workflows.count + state.workflowsCc.count"
-                />
       </a>
     </li>
     <li class="nav-item loading ms-auto py-2" v-if="loading">
       <i
         class="fa fa-circle-o-notch fa-spin fa-lg text-chill-gray"
-                :title="$t('loading')"
+        :title="trans(LOADING)"
       />
     </li>
   </ul>
-
   <div class="my-4">
-        <my-customs v-if="activeTab === 'MyCustoms'" />
+    <MyCustoms v-if="activeTab === HomepageTabs.MyCustoms" />
-        <my-works v-else-if="activeTab === 'MyWorks'" />
+    <MyTickets v-else-if="activeTab === HomepageTabs.MyTickets" />
-        <my-evaluations v-else-if="activeTab === 'MyEvaluations'" />
+    <MyNotifications v-else-if="activeTab === HomepageTabs.MyNotifications" />
-        <my-tasks v-else-if="activeTab === 'MyTasks'" />
+    <MyAccompanyingCourses
-        <my-accompanying-courses
+      v-else-if="activeTab === HomepageTabs.MyAccompanyingCourses"
-            v-else-if="activeTab === 'MyAccompanyingCourses'"
     />
-        <my-notifications v-else-if="activeTab === 'MyNotifications'" />
+    <MyEvaluations v-else-if="activeTab === HomepageTabs.MyEvaluations" />
-        <my-workflows v-else-if="activeTab === 'MyWorkflows'" />
+    <MyTasks v-else-if="activeTab === HomepageTabs.MyTasks" />
+    <MyWorkflows v-else-if="activeTab === HomepageTabs.MyWorkflows" />
   </div>
 </template>
 
-<script>
+<script lang="ts" setup>
-import MyCustoms from "./MyCustoms";
+import { ref, computed, onMounted } from "vue";
-import MyWorks from "./MyWorks";
+import { useStore } from "vuex";
-import MyEvaluations from "./MyEvaluations";
-import MyTasks from "./MyTasks";
-import MyAccompanyingCourses from "./MyAccompanyingCourses";
-import MyNotifications from "./MyNotifications";
-import MyWorkflows from "./MyWorkflows.vue";
-import TabCounter from "./TabCounter";
-import { mapState } from "vuex";
 
-export default {
+// Components
-    name: "App",
+import MyCustoms from "./MyCustoms.vue";
-    components: {
+import MyEvaluations from "./MyEvaluations.vue";
-        MyCustoms,
+import MyTasks from "./MyTasks.vue";
-        MyWorks,
+import MyAccompanyingCourses from "./MyAccompanyingCourses.vue";
-        MyEvaluations,
+import MyNotifications from "./MyNotifications.vue";
-        MyTasks,
+import MyWorkflows from "./MyWorkflows.vue";
-        MyWorkflows,
+import MyTickets from "./MyTickets.vue";
-        MyAccompanyingCourses,
+import TabCounter from "./TabCounter.vue";
-        MyNotifications,
+
-        TabCounter,
+// Translations
+import {
+  MAIN_TITLE,
+  MY_TICKETS_TAB,
+  MY_EVALUATIONS_TAB,
+  MY_TASKS_TAB,
+  MY_ACCOMPANYING_COURSES_TAB,
+  MY_NOTIFICATIONS_TAB,
+  MY_WORKFLOWS_TAB,
+  LOADING,
+  trans,
+} from "translator";
+
+// Types
+import {
+  HomepageConfig,
+  HomepageTabs,
+  TabDefinition,
+} from "ChillMainAssets/types";
+
+const store = useStore();
+
+defineExpose({ HomepageTabs });
+
+const homepageConfig = ref<HomepageConfig>(JSON.parse(window.homepage_config));
+const state = computed(() => store.state.homepage);
+const ticketListState = computed(() => store.state.ticketList);
+
+const tabDefinitions: TabDefinition[] = [
+  {
+    key: HomepageTabs.MyCustoms,
+    label: "",
+    icon: "fa fa-dashboard",
+    counter: () => 0,
   },
-    data() {
+  {
-        return {
+    key: HomepageTabs.MyTickets,
-            activeTab: "MyCustoms",
+    label: trans(MY_TICKETS_TAB),
-        };
+    icon: null,
+    counter: () => ticketListState.value?.count,
   },
-    computed: {
+  {
-        ...mapState(["loading"]),
+    key: HomepageTabs.MyNotifications,
-        // just to see all in devtool :
+    label: trans(MY_NOTIFICATIONS_TAB),
-        ...mapState({
+    icon: null,
-            state: (state) => state,
+    counter: () => state.value?.notifications?.count,
-        }),
   },
-    methods: {
+  {
-        selectTab(tab) {
+    key: HomepageTabs.MyAccompanyingCourses,
-            if (tab !== "MyCustoms") {
+    label: trans(MY_ACCOMPANYING_COURSES_TAB),
-                this.$store.dispatch("getByTab", { tab: tab });
+    icon: null,
+    counter: () => state.value?.accompanyingCourses?.count,
+  },
+  {
+    key: HomepageTabs.MyEvaluations,
+    label: trans(MY_EVALUATIONS_TAB),
+    icon: null,
+    counter: () => state.value?.evaluations?.count,
+  },
+  {
+    key: HomepageTabs.MyTasks,
+    label: trans(MY_TASKS_TAB),
+    icon: null,
+    counter: () =>
+      state.value?.tasks?.warning?.count + state.value?.tasks?.alert?.count,
+  },
+  {
+    key: HomepageTabs.MyWorkflows,
+    label: trans(MY_WORKFLOWS_TAB),
+    icon: null,
+    counter: () =>
+      state.value?.workflows?.count + state.value?.workflowsCc?.count,
+  },
+];
+
+const displayedTabs = computed(() => {
+  const tabs = [] as TabDefinition[];
+  for (const tabEnum of homepageConfig.value.displayTabs) {
+    const def = tabDefinitions.find(
+      (t) => t.key === Number(HomepageTabs[tabEnum]),
+    );
+    if (def) tabs.push(def);
   }
-            this.activeTab = tab;
+  return tabs.filter(Boolean);
-            console.log(this.activeTab);
+});
-        },
+
-    },
+const activeTab = ref(Number(HomepageTabs[homepageConfig.value.defaultTab]));
-    mounted() {
+
-        for (const m of [
+const loading = computed(() => store.state.loading);
-            "MyNotifications",
+
-            "MyAccompanyingCourses",
+async function selectTab(tab: HomepageTabs) {
-            // 'MyWorks',
+  activeTab.value = tab;
-            "MyEvaluations",
-            "MyTasks",
-            "MyWorkflows",
-        ]) {
-            this.$store.dispatch("getByTab", { tab: m, param: "countOnly=1" });
 }
-    },
+
-};
+onMounted(() => {
+  for (const tab of displayedTabs.value) {
+    if (tab.key !== HomepageTabs.MyCustoms) {
+      store.dispatch("getByTab", { tab: tab.key, param: "countOnly=1" });
+    }
+  }
+});
 </script>
 
 <style scoped>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue

@@ -2,7 +2,9 @@
   <li>
     <h2>{{ props.item.title }}</h2>
     <time class="createdBy" datetime="{{item.startDate.datetime}}">{{
-            $d(newsItemStartDate(), "text")
+      props.item?.startDate
+        ? localizeDateTimeFormat(props.item?.startDate, "text")
+        : ""
     }}</time>
     <div class="content" v-if="shouldTruncate(item.content)">
       <div v-html="prepareContent(item.content)"></div>
@@ -25,11 +27,11 @@
       </template>
       <template #body>
         <p class="news-date">
-                    <time
+          <time class="createdBy" datetime="{{item.startDate.datetime}}">{{
-                        class="createdBy"
+            props.item?.startDate
-                        datetime="{{item.startDate.datetime}}"
+              ? localizeDateTimeFormat(props.item?.startDate, "text")
-                        >{{ $d(newsItemStartDate(), "text") }}</time
+              : ""
-                    >
+          }}</time>
         </p>
         <div v-html="convertMarkdownToHtml(item.content)"></div>
       </template>
@@ -44,7 +46,7 @@ import DOMPurify from "dompurify";
 import { NewsItemType } from "../../../types";
 import type { PropType } from "vue";
 import { ref } from "vue";
-import { ISOToDatetime } from "../../../chill/js/date";
+import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 const props = defineProps({
   item: {
@@ -93,10 +95,7 @@ const truncateContent = (content: string): string => {
 
   // Truncate if amount of lines are too many
   if (lines.length > props.maxLines && content.length < props.maxLength) {
-        const truncatedContent = lines
+    const truncatedContent = lines.slice(0, props.maxLines).join("\n").trim();
-            .slice(0, props.maxLines)
-            .join("\n")
-            .trim();
     return truncatedContent + "...";
   }
 
@@ -125,8 +124,7 @@ const truncateContent = (content: string): string => {
   if (linkStartIndex !== -1) {
     const linkEndIndex = content.indexOf(")", linkStartIndex);
     const url = content.slice(linkStartIndex + 1, linkEndIndex);
-        truncatedContent =
+    truncatedContent = truncatedContent.slice(0, linkStartIndex) + `(${url})`;
-            truncatedContent.slice(0, linkStartIndex) + `(${url})`;
   }
 
   truncatedContent += "...";
@@ -139,7 +137,7 @@ const preprocess = (markdown: string): string => {
 };
 
 const postprocess = (html: string): string => {
-    DOMPurify.addHook("afterSanitizeAttributes", (node: any) => {
+  DOMPurify.addHook("afterSanitizeAttributes", (node: Element) => {
     if ("target" in node) {
       node.setAttribute("target", "_blank");
       node.setAttribute("rel", "noopener noreferrer");
@@ -165,10 +163,6 @@ const prepareContent = (content: string): string => {
   const htmlContent = convertMarkdownToHtml(content);
   return truncateContent(htmlContent);
 };
-
-const newsItemStartDate = (): null | Date => {
-    return ISOToDatetime(props.item?.startDate.datetime);
-};
 </script>
 
 <style scoped>

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

@@ -1,47 +1,40 @@
 <template>
   <div class="alert alert-light">
-        {{ $t("my_accompanying_courses.description") }}
+    {{ trans(MY_ACCOMPANYING_COURSES_DESCRIPTION) }}
   </div>
-    <span v-if="noResults" class="chill-no-data-statement">{{
+  <span v-if="noResults" class="chill-no-data-statement">
-        $t("no_data")
+    {{ trans(NO_DATA) }}
-    }}</span>
+  </span>
   <tab-table v-else>
     <template #thead>
       <th scope="col">
-                {{ $t("opening_date") }}
+        {{ trans(OPENING_DATE) }}
       </th>
       <th scope="col">
-                {{ $t("social_issues") }}
+        {{ trans(SOCIAL_ISSUES) }}
       </th>
       <th scope="col">
-                {{ $t("concerned_persons") }}
+        {{ trans(CONCERNED_PERSONS) }}
       </th>
       <th scope="col" />
       <th scope="col" />
     </template>
     <template #tbody>
-            <tr
+      <tr v-for="(c, i) in accompanyingCourses.results" :key="`course-${i}`">
-                v-for="(c, i) in accompanyingCourses.results"
+        <td>{{ localizeDateTimeFormat(c.openingDate, "short") }}</td>
-                :key="`course-${i}`"
-            >
-                <td>{{ $d(c.openingDate.datetime, "short") }}</td>
         <td>
           <span
-                        v-for="(i, index) in c.socialIssues"
+            v-for="(issue, index) in c.socialIssues"
             :key="index"
             class="chill-entity entity-social-issue"
           >
             <span class="badge bg-chill-l-gray text-dark">
-                            {{ localizeString(i.title) }}
+              {{ localizeString(issue.title) }}
             </span>
           </span>
         </td>
         <td>
-                    <span
+          <span v-for="p in c.participations" class="me-1" :key="p.person.id">
-                        v-for="p in c.participations"
-                        class="me-1"
-                        :key="p.person.id"
-                    >
             <on-the-fly
               :type="p.person.type"
               :id="p.person.id"
@@ -52,20 +45,16 @@
           </span>
         </td>
         <td>
-                    <span
+          <span v-if="c.emergency" class="badge rounded-pill bg-danger me-1">{{
-                        v-if="c.emergency"
+            trans(EMERGENCY)
-                        class="badge rounded-pill bg-danger me-1"
+          }}</span>
-                        >{{ $t("emergency") }}</span
+          <span v-if="c.confidential" class="badge rounded-pill bg-danger">{{
-                    >
+            trans(CONFIDENTIAL)
-                    <span
+          }}</span>
-                        v-if="c.confidential"
-                        class="badge rounded-pill bg-danger"
-                        >{{ $t("confidential") }}</span
-                    >
         </td>
         <td>
           <a class="btn btn-sm btn-show" :href="getUrl(c)">
-                        {{ $t("show_entity", { entity: $t("the_course") }) }}
+            {{ trans(SHOW_ENTITY, { entity: trans(THE_COURSE) }) }}
           </a>
         </td>
       </tr>
@@ -73,36 +62,47 @@
   </tab-table>
 </template>
 
-<script>
+<script lang="ts" setup>
-import { mapState, mapGetters } from "vuex";
+import { computed, ComputedRef } from "vue";
-import TabTable from "./TabTable";
+import { useStore } from "vuex";
-import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly";
+import TabTable from "./TabTable.vue";
+import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+import { AccompanyingCourse } from "ChillPersonAssets/types";
+import { PaginationResponse } from "ChillMainAssets/lib/api/apiMethods";
+import {
+  MY_ACCOMPANYING_COURSES_DESCRIPTION,
+  OPENING_DATE,
+  SOCIAL_ISSUES,
+  CONCERNED_PERSONS,
+  SHOW_ENTITY,
+  THE_COURSE,
+  NO_DATA,
+  EMERGENCY,
+  CONFIDENTIAL,
+  trans,
+} from "translator";
+import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
-export default {
+const store = useStore();
-    name: "MyAccompanyingCourses",
+
-    components: {
+const accompanyingCourses: ComputedRef<PaginationResponse<AccompanyingCourse>> =
-        TabTable,
+  computed(() => store.state.homepage.accompanyingCourses);
-        OnTheFly,
+const isAccompanyingCoursesLoaded = computed(
-    },
+  () => store.getters.isAccompanyingCoursesLoaded,
-    computed: {
+);
-        ...mapState(["accompanyingCourses"]),
+
-        ...mapGetters(["isAccompanyingCoursesLoaded"]),
+const noResults = computed(() => {
-        noResults() {
+  if (!isAccompanyingCoursesLoaded.value) {
-            if (!this.isAccompanyingCoursesLoaded) {
     return false;
   } else {
-                return this.accompanyingCourses.count === 0;
+    return accompanyingCourses.value.count === 0;
   }
-        },
+});
-    },
+
-    methods: {
+function getUrl(c: { id: number }): string {
-        localizeString,
-        getUrl(c) {
   return `/fr/parcours/${c.id}`;
-        },
+}
-    },
-};
 </script>
 
 <style scoped>