Merge branch '369-duplicate-evaluation-document' into testing202509

Refactor accompanying period work fetching logic to include a new filter for ignoring specific IDs, and update related components with new prop bindings.

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

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

.changes/unreleased/Feature-20250403-100311.yaml

@@ -0,0 +1,6 @@
+kind: Feature
+body: Duplication of a document to another accompanying period work evaluation
+time: 2025-04-03T10:03:11.796736107+02:00
+custom:
+    Issue: "369"
+    SchemaChange: No schema change

.changes/unreleased/Feature-20250403-100857.yaml

@@ -0,0 +1,6 @@
+kind: Feature
+body: Fusion of two accompanying period works
+time: 2025-04-03T10:08:57.25079018+02:00
+custom:
+    Issue: "359"
+    SchemaChange: No schema change

.changes/v4.2.1.md

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

.changes/v4.3.0.md

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

.changes/v4.4.0.md

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

.changes/v4.4.1.md

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

.changes/v4.4.2.md

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

.junie/guidelines.md

@@ -27,11 +27,11 @@ Chill is a comprehensive web application built as a set of Symfony bundles. It i
 
 ## Project Structure
 
-Note: This is a project that's existed for a long time, and throughout the years we've used multiple structures inside each bundle. When having the choice, the developers should choose the new structure.
+Note: This is a project which exists from a long time ago, and we found multiple structure inside each bundle. When having the choice, the developers should choose the new structure.
 
 The project follows a standard Symfony bundle structure:
 - `/src/Bundle/`: Contains all the Chill bundles. The code is either at the root of the bundle directory, or within a `src/` directory (preferred). See psr4 mapping at the root's `composer.json`.
-- each bundle comes with its own tests, either in the `Tests` directory (when the code is directly within the bundle directory (for instance `src/Bundle/ChillMainBundle/Tests`, `src/Bundle/ChillPersonBundle/Tests`)), or inside the `tests` directory, alongside the `src/` sub-directory (example: `src/Bundle/ChillWopiBundle/tests`) (this is the preferred way).
+- each bundle come with his own tests, either in the `Tests` directory (when the code is directly within the bundle directory (for instance `src/Bundle/ChillMainBundle/Tests`, `src/Bundle/ChillPersonBundle/Tests`)), or inside the `tests` directory, alongside to the `src/` sub-directory (example: `src/Bundle/ChillWopiBundle/tests`) (this is the preferred way).
 - `/docs/`: Contains project documentation
 
 Each bundle typically has the following structure:
@@ -46,13 +46,13 @@ Each bundle typically has the following structure:
 
 ### A special word about TicketBundle
 
-The ticket bundle is developed using a kind of "Command" pattern. The controller fills a "Command," and a "CommandHandler" handles this command. They are saved in the `src/Bundle/ChillTicketBundle/src/Action` directory.
+The ticket bundle is developed using a kind of "Command" pattern. The controller fill a "Command", and a "CommandHandler" handle this command. They are savec in the `src/Bundle/ChillTicketBundle/src/Action` directory.
 
 ## Development Guidelines
 
 ### Building and Configuration Instructions
 
-All the commands should be run through the `symfony` command, which will configure the required variables.
+All the command should be run through the `symfony` command, which will configure the required variables.
 
 For assets, we must ensure that we use node at version `^20.0.0`. This is done using `nvm use 20`.
 
@@ -87,7 +87,7 @@ For assets, we must ensure that we use node at version `^20.0.0`. This is done u
    docker compose up -d
    ```
 
-6. **Set Up the Database**:
+5. **Set Up the Database**:
    ```bash
    # Create the database
    symfony console doctrine:database:create
@@ -99,20 +99,20 @@ For assets, we must ensure that we use node at version `^20.0.0`. This is done u
    symfony console doctrine:fixtures:load
    ```
 
-7. **Build Assets**:
+6. **Build Assets**:
    ```bash
    nvm use 20
    yarn run encore dev
    ```
 
-8. **Start the Development Server**:
+7. **Start the Development Server**:
    ```bash
    symfony server:start -d
    ```
 
 #### Docker Setup
 
-The project includes a Docker configuration for easier development:
+The project includes Docker configuration for easier development:
 
 1. **Start Docker Services**:
    ```bash
@@ -153,9 +153,9 @@ Key configuration files:
 
 Each time a doctrine entity is created, we generate migration to adapt the database.
 
-The migration is created using the command `symfony console doctrine:migrations:diff --no-interaction --namespace <namespace>`, where the namespace is the relevant namespace for migration. As this is a bash script, remember to quote the `\` (`\` must become `\\` in your command).
+The migration are created using the command `symfony console doctrine:migrations:diff --no-interaction --namespace <namespace>`, where the namespace is the relevant namespace for migration. As this is a bash script, do not forget to quote the `\` (`\` must become `\\` in your command).
 
-Each bundle has his own namespace for migration (always ask me to confirm that command with a list of updated / created entities so that I can confirm to you that it is ok):
+Each bundle has his own namespace for migration (always ask me to confirm that command, with a list of updated / created entities so that I can confirm you that it is ok):
 
 - `Chill\Bundle\ActivityBundle` writes migrations to `Chill\Migrations\Activity`;
 - `Chill\Bundle\BudgetBundle` writes migrations to `Chill\Migrations\Budget`;
@@ -183,7 +183,7 @@ Once created the, comment's classes should be removed and a description of the c
 
 When we need to use a DateTime or DateTimeImmutable that need to express "now", we prefer the usage of
 `Symfony\Component\Clock\ClockInterface`, where possible. This is usually not possible in doctrine entities,
-where injection does not work when restoring an entity from a database, but usually possible in services.
+where injection does not work when restoring an entity from database, but usually possible in services.
 
 In test, we use `\Symfony\Component\Clock\MockClock` which is an implementation of `Symfony\Component\Clock\ClockInterface`
 where we have full and easy control of the date.
@@ -198,9 +198,9 @@ The project uses PHPUnit for testing. Each bundle has its own test suite, and th
 
 For creating mock, we prefer using prophecy (library phpspec/prophecy).
 
-##### Useful helpers and tips that avoid creating a mock
+##### Useful helpers and tips that avoid create a mock
 
-Some notable implementations that are test helpers and avoid creating a mock:
+Some notable implementations that are tests helper, and avoid to create a mock:
 
 - `\Psr\Log\NullLogger`, an implementation of `\Psr\Log\LoggerInterface`;
 - `\Symfony\Component\Clock\MockClock`, an implementation of `Symfony\Component\Clock\ClockInterface` (already mentioned above);
@@ -297,7 +297,7 @@ class TicketTest extends TestCase
 
 #### Test Database
 
-For tests that require a database, the project uses a postgresql database filled with fixtures (usage of doctrine-fixtures). You can configure a different database for testing in the `.env.test` file.
+For tests that require a database, the project uses postgresql database filled by fixtures (usage of doctrine-fixtures). You can configure a different database for testing in the `.env.test` file.
 
 ### Code Quality Tools
 

CHANGELOG.md

@@ -6,41 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
-## v4.4.2 - 2025-09-12
-### Fixed
-* Fix document generation and workflow generation do not work on accompanying period work documents   
-
-## v4.4.1 - 2025-09-11
-### Fixed
-* fix translations in duplicate evaluation document modal and realign close modal button   
-
-## v4.4.0 - 2025-09-11
-### Feature
-* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works   
-* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation   
-* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works   
-### Fixed
-* Fix display of 'duplicate' and 'merge' buttons in CRUD templates   
-* Fix saving notification preferences in user's profile   
-
-## v4.3.0 - 2025-09-08
-### Feature
-* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges   
-* Add a command to generate a list of permissions   
-* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date   
-
-  **Schema Change**: Add columns or tables
-### Fixed
-* fix date formatting in calendar range display   
-* Change route URL to avoid clash with person duplicate controller method   
-
-## v4.2.1 - 2025-09-03
-### Fixed
-* Fix exports to work with DirectExportInterface   
-### DX
-* Improve error message when a stored object cannot be written on local disk
-   
-
 ## v4.2.0 - 2025-09-02
 ### Feature
 * ([#64](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/64)) Add external identifier for a Person

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

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

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

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

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

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

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

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

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

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

src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig

@@ -118,7 +118,7 @@
 
         {{ entity.notes|chill_print_or_message("Aucune note", 'blockquote') }}
     {% endblock crud_content_view_details %}
-    {% block content_view_actions_duplicate_link %}{% endblock %}
+
     {% block content_view_actions_back %}
         <li class="cancel">
             <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', { 'person': entity.person.id }) }}">

src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig

@@ -46,7 +46,6 @@
             </dd>
         </dl>
     {% endblock crud_content_view_details %}
-    {% block content_view_actions_duplicate_link %}{% endblock %}
 
     {% block content_view_actions_back %}
         <li class="cancel">

src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig

@@ -206,8 +206,6 @@
             </a>
         </li>
     {% endblock %}
-    {% block content_view_actions_duplicate_link %}{% endblock %}
-
     {% block content_view_actions_after %}
         <li>
             <a class="btn btn-misc" href="{{ chill_return_path_or('chill_crud_immersion_bilan', { 'id': entity.id, 'person_id': entity.person.id }) }}">

src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig

@@ -94,7 +94,6 @@
 
 
     {% endblock crud_content_view_details %}
-    {% block content_view_actions_duplicate_link %}{% endblock %}
 
     {% block content_view_actions_back %}
         <li class="cancel">

src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php

@@ -1,64 +0,0 @@
-<?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\Action\User\UpdateProfile;
-
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Notification\NotificationFlagManager;
-use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
-use libphonenumber\PhoneNumber;
-
-final class UpdateProfileCommand
-{
-    public array $notificationFlags = [];
-
-    public function __construct(
-        #[PhonenumberConstraint]
-        public ?PhoneNumber $phonenumber,
-    ) {}
-
-    public static function create(User $user, NotificationFlagManager $flagManager): self
-    {
-        $updateProfileCommand = new self($user->getPhonenumber());
-
-        foreach ($flagManager->getAllNotificationFlagProviders() as $provider) {
-            $updateProfileCommand->setNotificationFlag(
-                $provider->getFlag(),
-                User::NOTIF_FLAG_IMMEDIATE_EMAIL,
-                $user->isNotificationSendImmediately($provider->getFlag())
-            );
-            $updateProfileCommand->setNotificationFlag(
-                $provider->getFlag(),
-                User::NOTIF_FLAG_DAILY_DIGEST,
-                $user->isNotificationDailyDigest($provider->getFlag())
-            );
-        }
-
-        return $updateProfileCommand;
-    }
-
-    /**
-     * @param User::NOTIF_FLAG_IMMEDIATE_EMAIL|User::NOTIF_FLAG_DAILY_DIGEST $kind
-     */
-    private function setNotificationFlag(string $type, string $kind, bool $value): void
-    {
-        if (!array_key_exists($type, $this->notificationFlags)) {
-            $this->notificationFlags[$type] = ['immediate_email' => true, 'daily_digest' => false];
-        }
-
-        $k = match ($kind) {
-            User::NOTIF_FLAG_IMMEDIATE_EMAIL => 'immediate_email',
-            User::NOTIF_FLAG_DAILY_DIGEST => 'daily_digest',
-        };
-
-        $this->notificationFlags[$type][$k] = $value;
-    }
-}

src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommandHandler.php

@@ -1,27 +0,0 @@
-<?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\Action\User\UpdateProfile;
-
-use Chill\MainBundle\Entity\User;
-
-final readonly class UpdateProfileCommandHandler
-{
-    public function updateProfile(User $user, UpdateProfileCommand $command): void
-    {
-        $user->setPhonenumber($command->phonenumber);
-
-        foreach ($command->notificationFlags as $flag => $values) {
-            $user->setNotificationImmediately($flag, $values['immediate_email']);
-            $user->setNotificationDailyDigest($flag, $values['daily_digest']);
-        }
-    }
-}

src/Bundle/ChillMainBundle/Command/DumpListPermissionsCommand.php

@@ -1,35 +0,0 @@
-<?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 Chill\MainBundle\Security\RoleDumper;
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-#[AsCommand(name: 'chill:main:dump-list-permissions', description: 'Print a markdown reference of permissions (roles) grouped by title with dependencies).')]
-final class DumpListPermissionsCommand extends Command
-{
-    public function __construct(private readonly RoleDumper $roleDumper)
-    {
-        parent::__construct();
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $markdown = $this->roleDumper->dumpAsMarkdown();
-        $output->writeln($markdown);
-
-        return Command::SUCCESS;
-    }
-}

src/Bundle/ChillMainBundle/Controller/AbsenceController.php

@@ -48,7 +48,6 @@ class AbsenceController extends AbstractController
         $user = $this->security->getUser();
 
         $user->setAbsenceStart(null);
-        $user->setAbsenceEnd(null);
         $em = $this->managerRegistry->getManager();
         $em->flush();
 

src/Bundle/ChillMainBundle/Controller/ExportController.php

@@ -345,7 +345,7 @@ class ExportController extends AbstractController
      * @param array  $dataExport    Raw data from export step
      * @param array  $dataFormatter Raw data from formatter step
      */
-    private function buildExportDataForNormalization(string $alias, ?array $dataCenters, array $dataExport, ?array $dataFormatter, ?SavedExport $savedExport): array
+    private function buildExportDataForNormalization(string $alias, ?array $dataCenters, array $dataExport, array $dataFormatter, ?SavedExport $savedExport): array
     {
         if ($this->filterStatsByCenters) {
             $formCenters = $this->createCreateFormExport($alias, 'generate_centers', [], null);
@@ -365,7 +365,7 @@ class ExportController extends AbstractController
         $formExport->submit($dataExport);
         $dataExport = $formExport->getData();
 
-        if (is_array($dataFormatter) && \count($dataFormatter) > 0) {
+        if (\count($dataFormatter) > 0) {
             $formFormatter = $this->createCreateFormExport(
                 $alias,
                 'generate_formatter',
@@ -381,7 +381,7 @@ class ExportController extends AbstractController
             'export' => $dataExport['export']['export'] ?? [],
             'filters' => $dataExport['export']['filters'] ?? [],
             'aggregators' => $dataExport['export']['aggregators'] ?? [],
-            'pick_formatter' => ($dataExport['export']['pick_formatter'] ?? [])['alias'] ?? '',
+            'pick_formatter' => $dataExport['export']['pick_formatter']['alias'],
             'formatter' => $dataFormatter['formatter'] ?? [],
         ];
     }

src/Bundle/ChillMainBundle/Controller/UserProfileController.php

@@ -0,0 +1,63 @@
+<?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\Controller;
+
+use Chill\MainBundle\Form\UserProfileType;
+use Chill\MainBundle\Security\ChillSecurity;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Routing\Annotation\Route;
+
+final class UserProfileController extends AbstractController
+{
+    public function __construct(
+        private readonly TranslatorInterface $translator,
+        private readonly ChillSecurity $security,
+        private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
+    ) {}
+
+    /**
+     * User profile that allows editing of phonenumber and visualization of certain data.
+     */
+    #[Route(path: '/{_locale}/main/user/my-profile', name: 'chill_main_user_profile')]
+    public function __invoke(Request $request)
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException();
+        }
+
+        $user = $this->security->getUser();
+        $editForm = $this->createForm(UserProfileType::class, $user);
+
+        $editForm->get('notificationFlags')->setData($user->getNotificationFlags());
+
+        $editForm->handleRequest($request);
+
+        if ($editForm->isSubmitted() && $editForm->isValid()) {
+            $notificationFlagsData = $editForm->get('notificationFlags')->getData();
+            $user->setNotificationFlags($notificationFlagsData);
+
+            $em = $this->managerRegistry->getManager();
+            $em->flush();
+            $this->addFlash('success', $this->translator->trans('user.profile.Profile successfully updated!'));
+
+            return $this->redirectToRoute('chill_main_user_profile');
+        }
+
+        return $this->render('@ChillMain/User/profile.html.twig', [
+            'user' => $user,
+            'form' => $editForm->createView(),
+        ]);
+    }
+}

src/Bundle/ChillMainBundle/Controller/UserUpdateProfileController.php

@@ -1,75 +0,0 @@
-<?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\Controller;
-
-use Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommand;
-use Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommandHandler;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Form\UpdateProfileType;
-use Chill\MainBundle\Notification\NotificationFlagManager;
-use Chill\MainBundle\Security\ChillSecurity;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-use Symfony\Component\Routing\Annotation\Route;
-use Twig\Environment;
-
-final readonly class UserUpdateProfileController
-{
-    public function __construct(
-        private TranslatorInterface $translator,
-        private ChillSecurity $security,
-        private EntityManagerInterface $entityManager,
-        private NotificationFlagManager $notificationFlagManager,
-        private FormFactoryInterface $formFactory,
-        private UrlGeneratorInterface $urlGenerator,
-        private Environment $twig,
-        private UpdateProfileCommandHandler $updateProfileCommandHandler,
-    ) {}
-
-    /**
-     * User profile that allows editing of phonenumber and visualization of certain data.
-     */
-    #[Route(path: '/{_locale}/main/user/my-profile', name: 'chill_main_user_profile')]
-    public function __invoke(Request $request, Session $session)
-    {
-        if (!$this->security->isGranted('ROLE_USER')) {
-            throw new AccessDeniedHttpException();
-        }
-
-        $user = $this->security->getUser();
-
-        $command = UpdateProfileCommand::create($user, $this->notificationFlagManager);
-        $editForm = $this->formFactory->create(UpdateProfileType::class, $command);
-
-        $editForm->handleRequest($request);
-
-        if ($editForm->isSubmitted() && $editForm->isValid()) {
-            $this->updateProfileCommandHandler->updateProfile($user, $command);
-            $this->entityManager->flush();
-            $session->getFlashBag()->add('success', $this->translator->trans('user.profile.Profile successfully updated!'));
-
-            return new RedirectResponse($this->urlGenerator->generate('chill_main_user_profile'));
-        }
-
-        return new Response($this->twig->render('@ChillMain/User/profile.html.twig', [
-            'user' => $user,
-            'form' => $editForm->createView(),
-        ]));
-    }
-}

src/Bundle/ChillMainBundle/Entity/User.php

@@ -24,7 +24,6 @@ use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * User.
@@ -46,8 +45,6 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true)]
     private ?\DateTimeImmutable $absenceStart = null;
 
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true)]
-    private ?\DateTimeImmutable $absenceEnd = null;
     /**
      * Array where SAML attributes's data are stored.
      */
@@ -160,11 +157,6 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
         return $this->absenceStart;
     }
 
-    public function getAbsenceEnd(): ?\DateTimeImmutable
-    {
-        return $this->absenceEnd;
-    }
-
     /**
      * Get attributes.
      *
@@ -344,13 +336,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
 
     public function isAbsent(): bool
     {
-        $now = new \DateTimeImmutable('now');
-        $absenceStart = $this->getAbsenceStart();
-        $absenceEnd = $this->getAbsenceEnd();
-
-        return null !== $absenceStart
-            && $absenceStart <= $now
-            && (null === $absenceEnd || $now <= $absenceEnd);
+        return null !== $this->getAbsenceStart() && $this->getAbsenceStart() <= new \DateTimeImmutable('now');
     }
 
     /**
@@ -424,11 +410,6 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
         $this->absenceStart = $absenceStart;
     }
 
-    public function setAbsenceEnd(?\DateTimeImmutable $absenceEnd): void
-    {
-        $this->absenceEnd = $absenceEnd;
-    }
-
     public function setAttributeByDomain(string $domain, string $key, $value): self
     {
         $this->attributes[$domain][$key] = $value;
@@ -652,82 +633,46 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
         return true;
     }
 
-    private function getNotificationFlagData(string $flag): array
+    public function getNotificationFlags(): array
     {
-        return $this->notificationFlags[$flag] ?? [self::NOTIF_FLAG_IMMEDIATE_EMAIL];
+        return $this->notificationFlags;
+    }
+
+    public function setNotificationFlags(array $notificationFlags)
+    {
+        $this->notificationFlags = $notificationFlags;
+    }
+
+    public function getNotificationFlagData(string $flag): array
+    {
+        return $this->notificationFlags[$flag] ?? [];
+    }
+
+    public function setNotificationFlagData(string $flag, array $data): void
+    {
+        $this->notificationFlags[$flag] = $data;
     }
 
     public function isNotificationSendImmediately(string $type): bool
     {
-        return $this->isNotificationForElement($type, self::NOTIF_FLAG_IMMEDIATE_EMAIL);
-    }
-
-    public function setNotificationImmediately(string $type, bool $active): void
-    {
-        $this->setNotificationFlagElement($type, $active, self::NOTIF_FLAG_IMMEDIATE_EMAIL);
-    }
-
-    public function setNotificationDailyDigest(string $type, bool $active): void
-    {
-        $this->setNotificationFlagElement($type, $active, self::NOTIF_FLAG_DAILY_DIGEST);
-    }
-
-    /**
-     * @param self::NOTIF_FLAG_IMMEDIATE_EMAIL|self::NOTIF_FLAG_DAILY_DIGEST $kind
-     */
-    private function setNotificationFlagElement(string $type, bool $active, string $kind): void
-    {
-        $notificationFlags = [...$this->notificationFlags];
-        $changed = false;
-
-        if (!isset($notificationFlags[$type])) {
-            $notificationFlags[$type] = [self::NOTIF_FLAG_IMMEDIATE_EMAIL];
-            $changed = true;
+        if ([] === $this->getNotificationFlagData($type) || in_array(User::NOTIF_FLAG_IMMEDIATE_EMAIL, $this->getNotificationFlagData($type), true)) {
+            return true;
         }
 
-        if ($active) {
-            if (!in_array($kind, $notificationFlags[$type], true)) {
-                $notificationFlags[$type] = [...$notificationFlags[$type], $kind];
-                $changed = true;
-            }
-        } else {
-            if (in_array($kind, $notificationFlags[$type], true)) {
-                $notificationFlags[$type] = array_values(
-                    array_filter($notificationFlags[$type], static fn ($k) => $k !== $kind)
-                );
-                $changed = true;
-            }
-        }
-
-        if ($changed) {
-            $this->notificationFlags = [...$notificationFlags];
-        }
-    }
-
-    private function isNotificationForElement(string $type, string $kind): bool
-    {
-        return in_array($kind, $this->getNotificationFlagData($type), true);
+        return false;
     }
 
     public function isNotificationDailyDigest(string $type): bool
     {
-        return $this->isNotificationForElement($type, self::NOTIF_FLAG_DAILY_DIGEST);
+        if (in_array(User::NOTIF_FLAG_DAILY_DIGEST, $this->getNotificationFlagData($type), true)) {
+            return true;
+        }
+
+        return false;
     }
 
     public function getLocale(): string
     {
         return 'fr';
     }
-
-    #[Assert\Callback]
-    public function validateAbsenceDates(ExecutionContextInterface $context): void
-    {
-        if (null !== $this->getAbsenceEnd() && null === $this->getAbsenceStart()) {
-            $context->buildViolation(
-                'user.absence_end_requires_start'
-            )
-                ->atPath('absenceEnd')
-                ->addViolation();
-        }
-    }
 }

src/Bundle/ChillMainBundle/Export/ExportConfigNormalizer.php

@@ -20,7 +20,7 @@ use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\RegroupmentRepositoryInterface;
 
 /**
- * @phpstan-type NormalizedData array{centers: array{centers: list<int>, regroupments: list<int>}, export: array{form: array<string, mixed>, version: int}, filters: array<string, array{enabled: boolean, form: array<string, mixed>, version: int}>, aggregators: array<string, array{enabled: boolean, form: array<string, mixed>, version: int}>, pick_formatter?: string, formatter: array{form: array<string, mixed>, version: int}}
+ * @phpstan-type NormalizedData array{centers: array{centers: list<int>, regroupments: list<int>}, export: array{form: array<string, mixed>, version: int}, filters: array<string, array{enabled: boolean, form: array<string, mixed>, version: int}>, aggregators: array<string, array{enabled: boolean, form: array<string, mixed>, version: int}>, pick_formatter: string, formatter: array{form: array<string, mixed>, version: int}}
  */
 class ExportConfigNormalizer
 {
@@ -72,14 +72,10 @@ class ExportConfigNormalizer
         }
         $serialized['aggregators'] = $aggregatorsSerialized;
 
-        if ($export instanceof ExportInterface) {
-            $serialized['pick_formatter'] = $formData['pick_formatter'];
-            $formatter = $this->exportManager->getFormatter($formData['pick_formatter']);
-            $serialized['formatter']['form'] = $formatter->normalizeFormData($formData['formatter']);
-            $serialized['formatter']['version'] = $formatter->getNormalizationVersion();
-        } elseif ($export instanceof DirectExportInterface) {
-            $serialized['formatter'] = ['form' => [], 'version' => 0];
-        }
+        $serialized['pick_formatter'] = $formData['pick_formatter'];
+        $formatter = $this->exportManager->getFormatter($formData['pick_formatter']);
+        $serialized['formatter']['form'] = $formatter->normalizeFormData($formData['formatter']);
+        $serialized['formatter']['version'] = $formatter->getNormalizationVersion();
 
         return $serialized;
     }
@@ -91,12 +87,7 @@ class ExportConfigNormalizer
     public function denormalizeConfig(string $exportAlias, array $serializedData, bool $replaceDisabledByDefaultData = false): array
     {
         $export = $this->exportManager->getExport($exportAlias);
-
-        if ($export instanceof ExportInterface) {
-            $formatter = $this->exportManager->getFormatter($serializedData['pick_formatter']);
-        } else {
-            $formatter = null;
-        }
+        $formater = $this->exportManager->getFormatter($serializedData['pick_formatter']);
 
         $filtersConfig = [];
         foreach ($serializedData['filters'] as $alias => $filterData) {
@@ -126,8 +117,8 @@ class ExportConfigNormalizer
             'export' => $export->denormalizeFormData($serializedData['export']['form'], $serializedData['export']['version']),
             'filters' => $filtersConfig,
             'aggregators' => $aggregatorsConfig,
-            'pick_formatter' => $serializedData['pick_formatter'] ?? '',
-            'formatter' => $formatter?->denormalizeFormData($serializedData['formatter']['form'], $serializedData['formatter']['version']),
+            'pick_formatter' => $serializedData['pick_formatter'],
+            'formatter' => $formater->denormalizeFormData($serializedData['formatter']['form'], $serializedData['formatter']['version']),
             'centers' => [
                 'centers' => array_values(array_filter(array_map(fn (int $id) => $this->centerRepository->find($id), $serializedData['centers']['centers']), fn ($item) => null !== $item)),
                 'regroupments' => array_values(array_filter(array_map(fn (int $id) => $this->regroupmentRepository->find($id), $serializedData['centers']['regroupments']), fn ($item) => null !== $item)),

src/Bundle/ChillMainBundle/Form/AbsenceType.php

@@ -23,14 +23,9 @@ class AbsenceType extends AbstractType
     {
         $builder
             ->add('absenceStart', ChillDateType::class, [
-                'required' => false,
+                'required' => true,
                 'input' => 'datetime_immutable',
                 'label' => 'absence.Absence start',
-            ])
-            ->add('absenceEnd', ChillDateType::class, [
-                'required' => false,
-                'input' => 'datetime_immutable',
-                'label' => 'absence.Absence end',
             ]);
     }
 

src/Bundle/ChillMainBundle/Form/DataMapper/NotificationFlagDataMapper.php

@@ -0,0 +1,75 @@
+<?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\Form\DataMapper;
+
+use Chill\MainBundle\Entity\User;
+use Symfony\Component\Form\DataMapperInterface;
+
+final readonly class NotificationFlagDataMapper implements DataMapperInterface
+{
+    public function __construct(private array $notificationFlagProviders) {}
+
+    public function mapDataToForms($viewData, $forms): void
+    {
+        if (null === $viewData) {
+            $viewData = [];
+        }
+
+        $formsArray = iterator_to_array($forms);
+
+        foreach ($this->notificationFlagProviders as $flagProvider) {
+            $flag = $flagProvider->getFlag();
+
+            if (isset($formsArray[$flag])) {
+                $flagForm = $formsArray[$flag];
+
+                $immediateEmailChecked = in_array(User::NOTIF_FLAG_IMMEDIATE_EMAIL, $viewData[$flag] ?? [], true)
+                    || !array_key_exists($flag, $viewData);
+                $dailyEmailChecked = in_array(User::NOTIF_FLAG_DAILY_DIGEST, $viewData[$flag] ?? [], true);
+
+                if ($flagForm->has('immediate_email')) {
+                    $flagForm->get('immediate_email')->setData($immediateEmailChecked);
+                }
+                if ($flagForm->has('daily_email')) {
+                    $flagForm->get('daily_email')->setData($dailyEmailChecked);
+                }
+            }
+        }
+    }
+
+    public function mapFormsToData($forms, &$viewData): void
+    {
+        $formsArray = iterator_to_array($forms);
+        $viewData = [];
+
+        foreach ($this->notificationFlagProviders as $flagProvider) {
+            $flag = $flagProvider->getFlag();
+
+            if (isset($formsArray[$flag])) {
+                $flagForm = $formsArray[$flag];
+                $viewData[$flag] = [];
+
+                if (true === $flagForm['immediate_email']->getData()) {
+                    $viewData[$flag][] = User::NOTIF_FLAG_IMMEDIATE_EMAIL;
+                }
+
+                if (true === $flagForm['daily_email']->getData()) {
+                    $viewData[$flag][] = User::NOTIF_FLAG_DAILY_DIGEST;
+                }
+
+                if ([] === $viewData[$flag]) {
+                    $viewData[$flag][] = User::NOTIF_FLAG_IMMEDIATE_EMAIL;
+                }
+            }
+        }
+    }
+}

src/Bundle/ChillMainBundle/Form/Type/NotificationFlagsType.php

@@ -11,9 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form\Type;
 
+use Chill\MainBundle\Form\DataMapper\NotificationFlagDataMapper;
 use Chill\MainBundle\Notification\NotificationFlagManager;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -28,24 +30,27 @@ class NotificationFlagsType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
+        $builder->setDataMapper(new NotificationFlagDataMapper($this->notificationFlagProviders));
+
         foreach ($this->notificationFlagProviders as $flagProvider) {
             $flag = $flagProvider->getFlag();
-            $flagBuilder = $builder->create($flag, options: [
+            $builder->add($flag, FormType::class, [
                 'label' => $flagProvider->getLabel(),
-                'compound' => true,
+                'required' => false,
             ]);
 
-            $flagBuilder
+            $builder->get($flag)
                 ->add('immediate_email', CheckboxType::class, [
                     'label' => false,
                     'required' => false,
+                    'mapped' => false,
                 ])
-                ->add('daily_digest', CheckboxType::class, [
+                ->add('daily_email', CheckboxType::class, [
                     'label' => false,
                     'required' => false,
+                    'mapped' => false,
                 ])
             ;
-            $builder->add($flagBuilder);
         }
     }
 
@@ -53,7 +58,6 @@ class NotificationFlagsType extends AbstractType
     {
         $resolver->setDefaults([
             'data_class' => null,
-            'compound' => true,
         ]);
     }
 }

src/Bundle/ChillMainBundle/Form/UserProfileType.php

@@ -11,29 +11,31 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form;
 
-use Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommand;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Form\Type\NotificationFlagsType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class UpdateProfileType extends AbstractType
+class UserProfileType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options): void
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('phonenumber', ChillPhoneNumberType::class, [
                 'required' => false,
             ])
-            ->add('notificationFlags', NotificationFlagsType::class)
+            ->add('notificationFlags', NotificationFlagsType::class, [
+                'label' => false,
+                'mapped' => false,
+            ])
         ;
     }
 
-    public function configureOptions(OptionsResolver $resolver): void
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => UpdateProfileCommand::class,
+            'data_class' => \Chill\MainBundle\Entity\User::class,
         ]);
     }
 }

src/Bundle/ChillMainBundle/Form/UserType.php

@@ -105,11 +105,6 @@ class UserType extends AbstractType
                 'required' => false,
                 'input' => 'datetime_immutable',
                 'label' => 'absence.Absence start',
-            ])
-            ->add('absenceEnd', ChillDateType::class, [
-                'required' => false,
-                'input' => 'datetime_immutable',
-                'label' => 'absence.Absence end',
             ]);
 
         // @phpstan-ignore-next-line

src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts

@@ -37,13 +37,8 @@ export const ISOToDate = (str: string | null): Date | null => {
         return null;
     }
 
-    // If the string already contains time info, use it directly
-    if (str.includes("T") || str.includes(" ")) {
-        return new Date(str);
-    }
-
-    // Otherwise, parse date only
     const [year, month, day] = str.split("-").map((p) => parseInt(p));
+
     return new Date(year, month - 1, day, 0, 0, 0, 0);
 };
 
@@ -74,19 +69,20 @@ export const ISOToDatetime = (str: string | null): Date | null => {
  *
  */
 export const datetimeToISO = (date: Date): string => {
-    const cal = [
+    let cal, time, offset;
+    cal = [
         date.getFullYear(),
         (date.getMonth() + 1).toString().padStart(2, "0"),
         date.getDate().toString().padStart(2, "0"),
     ].join("-");
 
-    const time = [
+    time = [
         date.getHours().toString().padStart(2, "0"),
         date.getMinutes().toString().padStart(2, "0"),
         date.getSeconds().toString().padStart(2, "0"),
     ].join(":");
 
-    const offset = [
+    offset = [
         date.getTimezoneOffset() <= 0 ? "+" : "-",
         Math.abs(Math.floor(date.getTimezoneOffset() / 60))
             .toString()

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue

@@ -84,8 +84,6 @@ const emits = defineEmits<{
 }
 .modal-header .close {
     border-top-right-radius: 0.3rem;
-    margin-right: 0;
-    margin-left: auto;
 }
 /*
    * The following styles are auto-applied to elements with

src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig

@@ -44,7 +44,17 @@
                 {% endif %}
                 {% endif %}
             {% endblock content_view_actions_duplicate_link %}
-            {% block content_view_actions_merge %}{% endblock %}
+            {% block content_view_actions_merge %}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_thirdparty_find_duplicate',
+                        { 'thirdparty_id': entity.id }) }}"
+                       title="{{ 'Merge'|trans }}"
+                       class="btn btn-misc">
+                        <i class="bi bi-chevron-contract"></i>
+                        {{ 'Merge'|trans }}
+                    </a>
+                </li>
+            {% endblock %}
             {% block content_view_actions_edit_link %}
                 {% if chill_crud_action_exists(crud_name, 'edit') %}
                 {% if is_granted(chill_crud_config('role', crud_name, 'edit'), entity) %}

src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig

@@ -8,36 +8,36 @@
 
     <div class="col-md-10">
         <h2>{{ 'absence.My absence'|trans }}</h2>
-        <div>
-            {% if user.absenceStart is not null %}
-                <div class="alert alert-success flash_message">{{ 'absence.You are listed as absent, as of {date, date, short}'|trans({
-                        date: user.absenceStart
-                    }) }}
-                    {% if user.absenceEnd is not null %}
-                   {{ 'until %date%'|trans({'%date%': user.absenceEnd|format_date('short') }) }}
-                {% endif %}
-                </div>
-            {% else %}
-                <div class="alert alert-warning flash_message">{{ 'absence.No absence listed'|trans }}</div>
-            {% endif %}
-        </div>
-        <div>
-            {{ form_start(form) }}
-            {{ form_row(form.absenceStart) }}
-            {{ form_row(form.absenceEnd) }}
 
-            <ul class="record_actions sticky-form-buttons">
-                <li>
-                    <a class="btn btn-delete" title="Modifier" href="{{ path('chill_main_user_absence_unset') }}">{{ 'absence.Unset absence'|trans }}</a>
-                </li>
-                <li>
-                    <button class="btn btn-save" type="submit">
-                        {{ 'Save'|trans }}
-                    </button>
-                </li>
-            </ul>
-            {{ form_end(form) }}
-        </div>
+        {% if user.absenceStart is not null %}
+            <div>
+                <p>{{ 'absence.You are listed as absent, as of'|trans }} {{ user.absenceStart|format_date('long') }}</p>
+                <ul class="record_actions sticky-form-buttons">
+                    <li>
+                        <a href="{{ path('chill_main_user_absence_unset') }}"
+                           class="btn btn-delete">{{ 'absence.Unset absence'|trans }}</a>
+                    </li>
+                </ul>
+            </div>
+        {% else %}
+            <div>
+                <p class="chill-no-data-statement">{{ 'absence.No absence listed'|trans }}</p>
+            </div>
+            <div>
+                {{ form_start(form) }}
+                {{ form_row(form.absenceStart) }}
+
+                <ul class="record_actions sticky-form-buttons">
+                    <li>
+                        <button class="btn btn-save" type="submit">
+                            {{ 'Save'|trans }}
+                        </button>
+                    </li>
+                </ul>
+
+                {{ form_end(form) }}
+            </div>
+        {% endif %}
     </div>
 
 {% endblock %}

src/Bundle/ChillMainBundle/Resources/views/Menu/quick_menu.html.twig

@@ -5,7 +5,7 @@
         role="button"
         data-bs-toggle="dropdown"
         aria-expanded="false">
-        <i class="bi bi-lightning-fill"></i>
+        <i class="fa fa-flash"></i>
     </a>
     <div class="dropdown-menu">
         {% for menu in menus %}

src/Bundle/ChillMainBundle/Resources/views/User/profile.html.twig

@@ -64,7 +64,7 @@
                             {{ form_widget(flag.immediate_email, {'label_attr': { 'class': 'checkbox-inline checkbox-switch'}}) }}
                         </td>
                         <td class="text-center">
-                            {{ form_widget(flag.daily_digest, {'label_attr': { 'class': 'checkbox-inline checkbox-switch'}}) }}
+                            {{ form_widget(flag.daily_email, {'label_attr': { 'class': 'checkbox-inline checkbox-switch'}}) }}
                         </td>
                     </tr>
                 {% endfor %}

src/Bundle/ChillMainBundle/Resources/views/layout.html.twig

@@ -79,7 +79,7 @@
                             <div class="d-flex flex-row mb-5 alert alert-warning" role="alert">
                                 <p class="m-2">{{'absence.You are marked as being absent'|trans }}</p>
                                 <span class="ms-auto">
-                                    <a class="btn btn-delete" title="Modifier" href="{{ path('chill_main_user_absence_unset') }}">{{ 'absence.Unset absence'|trans }}</a>
+                                    <a class="btn btn-remove" title="Modifier" href="{{ path('chill_main_user_absence_index') }}">{{ 'absence.Unset absence'|trans }}</a>
                                 </span>
                             </div>
                         {% endif %}

src/Bundle/ChillMainBundle/Security/RoleDumper.php

@@ -1,86 +0,0 @@
-<?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\Security;
-
-use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-final readonly class RoleDumper
-{
-    public function __construct(
-        private RoleProvider $roleProvider,
-        private RoleHierarchyInterface $roleHierarchy,
-        private TranslatorInterface $translator,
-    ) {}
-
-    public function dumpAsMarkdown(): string
-    {
-        $roles = $this->roleProvider->getRoles();
-        $rolesWithoutScopes = $this->roleProvider->getRolesWithoutScopes();
-
-        // Group roles by title
-        $groups = [];
-        foreach ($roles as $role) {
-            $title = $this->roleProvider->getRoleTitle($role);
-            $title ??= 'Other';
-            $groups[$title][] = $role;
-        }
-
-        // Sort groups by title
-        ksort($groups, SORT_NATURAL | SORT_FLAG_CASE);
-
-        $lines = [];
-        foreach ($groups as $title => $roleList) {
-            // Sort roles by translated label for deterministic output
-            usort($roleList, function (string $a, string $b): int {
-                $ta = $this->translator->trans($a);
-                $tb = $this->translator->trans($b);
-
-                return strcasecmp($ta, $tb);
-            });
-
-            $translatedTitle = $this->translator->trans($title);
-            $lines[] = '## '.$translatedTitle;
-
-            foreach ($roleList as $role) {
-                // Translate primary role
-                $translatedRole = $this->translator->trans($role);
-
-                // Scope marker: (S) if needs scope, (~~S~~) if no scope required
-                $needsScope = !in_array($role, $rolesWithoutScopes, true);
-                $scopeMarker = $needsScope ? '(S)' : '(~~S~~)';
-
-                // Compute dependent roles from hierarchy (exclude itself)
-                $reachable = $this->roleHierarchy->getReachableRoleNames([$role]);
-                $dependents = array_values(array_filter($reachable, static fn (string $r): bool => $r !== $role));
-
-                // Translate dependents and sort deterministically
-                $translatedDependents = array_map(fn (string $r) => $this->translator->trans($r), $dependents);
-                sort($translatedDependents, SORT_NATURAL | SORT_FLAG_CASE);
-
-                if (count($translatedDependents) > 0) {
-                    $lines[] = sprintf('- **%s** %s: %s', $translatedRole, $scopeMarker, implode(', ', $translatedDependents));
-                } else {
-                    $lines[] = sprintf('- **%s** %s', $translatedRole, $scopeMarker);
-                }
-            }
-
-            // Add a blank line between groups
-            $lines[] = '';
-        }
-
-        // Trim possible trailing blank line
-        $markdown = rtrim(implode("\n", $lines));
-
-        return $markdown."\n"; // End with newline for POSIX friendliness
-    }
-}

src/Bundle/ChillMainBundle/Security/RoleProvider.php

@@ -52,8 +52,12 @@ class RoleProvider
 
     /**
      * Get the title for each role.
+     *
+     * @param string $role
+     *
+     * @return string the title of the role
      */
-    public function getRoleTitle(string $role): ?string
+    public function getRoleTitle($role)
     {
         $this->initializeRolesTitlesCache();
 
@@ -69,7 +73,7 @@ class RoleProvider
     /**
      * initialize the array for caching role and titles.
      */
-    private function initializeRolesTitlesCache(): void
+    private function initializeRolesTitlesCache()
     {
         // break if already initialized
         if (null !== $this->rolesTitlesCache) {

src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php

@@ -39,8 +39,6 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
         'label' => '',
         'email' => '',
         'isAbsent' => false,
-        'absenceStart' => null,
-        'absenceEnd' => null,
     ];
 
     public function __construct(private readonly UserRender $userRender, private readonly ClockInterface $clock) {}
@@ -79,11 +77,6 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
             ['docgen:expects' => PhoneNumber::class, 'groups' => 'docgen:read']
         );
 
-        $absenceDatesContext = array_merge(
-            $context,
-            ['docgen:expects' => \DateTimeImmutable::class, 'groups' => 'docgen:read']
-        );
-
         if (null === $object && 'docgen' === $format) {
             return [...self::NULL_USER, 'phonenumber' => $this->normalizer->normalize(null, $format, $phonenumberContext), 'civility' => $this->normalizer->normalize(null, $format, $civilityContext), 'user_job' => $this->normalizer->normalize(null, $format, $userJobContext), 'main_center' => $this->normalizer->normalize(null, $format, $centerContext), 'main_scope' => $this->normalizer->normalize(null, $format, $scopeContext), 'current_location' => $this->normalizer->normalize(null, $format, $locationContext), 'main_location' => $this->normalizer->normalize(null, $format, $locationContext)];
         }
@@ -106,8 +99,6 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
             'main_center' => $this->normalizer->normalize($object->getMainCenter(), $format, $centerContext),
             'main_scope' => $this->normalizer->normalize($object->getMainScope($at), $format, $scopeContext),
             'isAbsent' => $object->isAbsent(),
-            'absenceStart' => $this->normalizer->normalize($object->getAbsenceStart(), $format, $absenceDatesContext),
-            'absenceEnd' => $this->normalizer->normalize($object->getAbsenceEnd(), $format, $absenceDatesContext),
         ];
 
         if ('docgen' === $format) {

src/Bundle/ChillMainBundle/Tests/Action/User/UpdateProfile/UpdateProfileCommandHandlerTest.php

@@ -1,85 +0,0 @@
-<?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 Action\User\UpdateProfile;
-
-use Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommand;
-use Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommandHandler;
-use Chill\MainBundle\Entity\User;
-use libphonenumber\PhoneNumber;
-use PHPUnit\Framework\TestCase;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-final class UpdateProfileCommandHandlerTest extends TestCase
-{
-    public function testUpdateProfileWithNullPhoneAndFlags(): void
-    {
-        $user = new User();
-
-        // Pre-set some flags to opposite values to check they are updated
-        $flag = 'tickets';
-        $user->setNotificationImmediately($flag, true);
-        $user->setNotificationDailyDigest($flag, true);
-
-        $command = new UpdateProfileCommand(null);
-        $command->notificationFlags = [
-            $flag => [
-                'immediate_email' => false,
-                'daily_digest' => false,
-            ],
-        ];
-
-        (new UpdateProfileCommandHandler())->updateProfile($user, $command);
-
-        self::assertNull($user->getPhonenumber(), 'Phone should be set to null');
-        self::assertFalse($user->isNotificationSendImmediately($flag));
-        self::assertFalse($user->isNotificationDailyDigest($flag));
-    }
-
-    public function testUpdateProfileWithPhoneAndMultipleFlags(): void
-    {
-        $user = new User();
-
-        $phone = new PhoneNumber();
-        $phone->setCountryCode(33); // France
-        $phone->setNationalNumber(612345678);
-
-        $command = new UpdateProfileCommand($phone);
-        $command->notificationFlags = [
-            'reports' => [
-                'immediate_email' => true,
-                'daily_digest' => false,
-            ],
-            'activities' => [
-                'immediate_email' => false,
-                'daily_digest' => true,
-            ],
-        ];
-
-        (new UpdateProfileCommandHandler())->updateProfile($user, $command);
-
-        // Phone assigned
-        self::assertInstanceOf(PhoneNumber::class, $user->getPhonenumber());
-        self::assertSame(33, $user->getPhonenumber()->getCountryCode());
-        self::assertSame('612345678', (string) $user->getPhonenumber()->getNationalNumber());
-
-        // Flags applied
-        self::assertTrue($user->isNotificationSendImmediately('reports'));
-        self::assertFalse($user->isNotificationDailyDigest('reports'));
-
-        self::assertFalse($user->isNotificationSendImmediately('activities'));
-        self::assertTrue($user->isNotificationDailyDigest('activities'));
-    }
-}

src/Bundle/ChillMainBundle/Tests/Action/User/UpdateProfile/UpdateProfileCommandTest.php

@@ -1,103 +0,0 @@
-<?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 Action\User\UpdateProfile;
-
-use Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommand;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Notification\FlagProviders\NotificationFlagProviderInterface;
-use Chill\MainBundle\Notification\NotificationFlagManager;
-use libphonenumber\PhoneNumber;
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\TranslatableMessage;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-final class UpdateProfileCommandTest extends TestCase
-{
-    public function testCreateTransfersPhonenumberAndNotificationFlags(): void
-    {
-        $user = new User();
-
-        // set a phone number
-        $phone = new PhoneNumber();
-        $phone->setCountryCode(32); // Belgium
-        $phone->setNationalNumber(471234567);
-        $user->setPhonenumber($phone);
-
-        // configure notification flags on the user via helpers
-        $flagA = 'foo';
-        $flagB = 'bar';
-
-        // For tickets: immediate true, daily false
-        $user->setNotificationImmediately($flagA, true);
-        $user->setNotificationDailyDigest($flagA, false);
-
-        // For reports: immediate false, daily true
-        $user->setNotificationImmediately($flagB, false);
-        $user->setNotificationDailyDigest($flagB, true);
-
-        // a third flag not explicitly set to validate default behavior from User
-        $flagC = 'foobar'; // by default immediate-email is true, daily-digest is false per User::getNotificationFlagData
-
-        $manager = $this->createNotificationFlagManager([$flagA, $flagB, $flagC]);
-
-        $command = UpdateProfileCommand::create($user, $manager);
-
-        // phone number transferred
-        self::assertInstanceOf(PhoneNumber::class, $command->phonenumber);
-        self::assertSame($phone->getCountryCode(), $command->phonenumber->getCountryCode());
-        self::assertSame($phone->getNationalNumber(), $command->phonenumber->getNationalNumber());
-
-        // flags transferred consistently
-        self::assertArrayHasKey($flagA, $command->notificationFlags);
-        self::assertArrayHasKey($flagB, $command->notificationFlags);
-        self::assertArrayHasKey($flagC, $command->notificationFlags);
-
-        self::assertSame([
-            'immediate_email' => true,
-            'daily_digest' => false,
-        ], $command->notificationFlags[$flagA]);
-
-        self::assertSame([
-            'immediate_email' => false,
-            'daily_digest' => true,
-        ], $command->notificationFlags[$flagB]);
-
-        // default from User::getNotificationFlagData -> immediate true, daily false
-        self::assertSame([
-            'immediate_email' => true,
-            'daily_digest' => false,
-        ], $command->notificationFlags[$flagC]);
-    }
-
-    private function createNotificationFlagManager(array $flags): NotificationFlagManager
-    {
-        $providers = array_map(fn (string $flag) => new class ($flag) implements NotificationFlagProviderInterface {
-            public function __construct(private readonly string $flag) {}
-
-            public function getFlag(): string
-            {
-                return $this->flag;
-            }
-
-            public function getLabel(): TranslatableMessage
-            {
-                return new TranslatableMessage($this->flag);
-            }
-        }, $flags);
-
-        return new NotificationFlagManager($providers);
-    }
-}

src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php

@@ -96,13 +96,11 @@ final class NotificationTest extends KernelTestCase
         $this->assertTrue($user->isNotificationSendImmediately($notification->getType()), 'Should return true when no notification flags are set, by default immediate email');
 
         // immediate-email preference
-        $user->setNotificationImmediately('test_notification_type', true);
-        $user->setNotificationDailyDigest('test_notification_type', true);
+        $user->setNotificationFlags(['test_notification_type' => [User::NOTIF_FLAG_IMMEDIATE_EMAIL, User::NOTIF_FLAG_DAILY_DIGEST]]);
         $this->assertTrue($user->isNotificationSendImmediately($notification->getType()), 'Should return true when preferences contain immediate-email');
 
         // daily-email preference
-        $user->setNotificationDailyDigest('test_notification_type', true);
-        $user->setNotificationImmediately('test_notification_type', false);
+        $user->setNotificationFlags(['test_notification_type' => [User::NOTIF_FLAG_DAILY_DIGEST]]);
         $this->assertFalse($user->isNotificationSendImmediately($notification->getType()), 'Should return false when preference is daily-email only');
         $this->assertTrue($user->isNotificationDailyDigest($notification->getType()), 'Should return true when preference is daily-email');
 

src/Bundle/ChillMainBundle/Tests/Entity/UserNotificationFlagsPersistenceTest.php

@@ -1,82 +0,0 @@
-<?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\Tests\Entity;
-
-use Chill\MainBundle\Entity\User;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class UserNotificationFlagsPersistenceTest extends KernelTestCase
-{
-    public function testFlushPersistsNotificationFlagsChanges(): void
-    {
-        self::bootKernel();
-        $em = self::getContainer()->get('doctrine')->getManager();
-
-        $user = new User();
-        $user->setUsername('user_'.bin2hex(random_bytes(4)));
-        $user->setLabel('Test User');
-        $user->setPassword('secret');
-
-        // Étape 1: créer et persister l’utilisateur
-        $em->persist($user);
-        $em->flush();
-        $id = $user->getId();
-        self::assertNotNull($id, 'User should have an ID after flush');
-
-        try {
-            // Sanity check: par défaut, pas de daily digest pour "alerts"
-            self::assertFalse($user->isNotificationDailyDigest('alerts'));
-
-            // Étape 2: activer le daily digest -> setNotificationFlagElement réassigne la propriété
-            $user->setNotificationDailyDigest('alerts', true);
-            $em->flush(); // persist le changement
-            $em->clear(); // simule un nouveau cycle de requête
-
-            // Étape 3: recharger depuis la base et vérifier la persistance
-            /** @var User $reloaded */
-            $reloaded = $em->find(User::class, $id);
-            self::assertNotNull($reloaded);
-            self::assertTrue(
-                $reloaded->isNotificationDailyDigest('alerts'),
-                'Daily digest flag should be persisted'
-            );
-
-            // Étape 4: modifier via setNotificationFlagData (remplacement du tableau)
-            // Cette méthode doit réassigner la propriété (copie -> réassignation)
-            $reloaded->setNotificationImmediately('alerts', true);
-            $reloaded->setNotificationDailyDigest('alerts', false);
-            $em->flush();
-            $em->clear();
-
-            /** @var User $reloaded2 */
-            $reloaded2 = $em->find(User::class, $id);
-            self::assertNotNull($reloaded2);
-
-            // Le daily digest n’est plus actif, seul immediate-email est présent
-            self::assertFalse($reloaded2->isNotificationDailyDigest('alerts'));
-            self::assertTrue($reloaded2->isNotificationSendImmediately('alerts'));
-        } finally {
-            // Nettoyage
-            $managed = $em->find(User::class, $id);
-            if (null !== $managed) {
-                $em->remove($managed);
-                $em->flush();
-            }
-            $em->clear();
-        }
-    }
-}

src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php

@@ -67,54 +67,4 @@ class UserTest extends TestCase
                 ->first()->getEndDate()
         );
     }
-
-    public function testIsAbsent()
-    {
-        $user = new User();
-
-        // Absent: today is within absence period
-        $absenceStart = new \DateTimeImmutable('-1 day');
-        $absenceEnd = new \DateTimeImmutable('+1 day');
-        $user->setAbsenceStart($absenceStart);
-        $user->setAbsenceEnd($absenceEnd);
-        self::assertTrue($user->isAbsent(), 'Should be absent when now is between start and end');
-
-        // Absent: end is null
-        $user->setAbsenceStart(new \DateTimeImmutable('-2 days'));
-        $user->setAbsenceEnd(null);
-        self::assertTrue($user->isAbsent(), 'Should be absent when started and no end');
-
-        // Not absent: absenceStart is in the future
-        $user->setAbsenceStart(new \DateTimeImmutable('+2 days'));
-        $user->setAbsenceEnd(null);
-        self::assertFalse($user->isAbsent(), 'Should not be absent if start is in the future');
-
-        // Not absent: absenceEnd is in the past
-        $user->setAbsenceStart(new \DateTimeImmutable('-5 days'));
-        $user->setAbsenceEnd(new \DateTimeImmutable('-1 day'));
-        self::assertFalse($user->isAbsent(), 'Should not be absent if end is in the past');
-
-        // Not absent: both are null
-        $user->setAbsenceStart(null);
-        $user->setAbsenceEnd(null);
-        self::assertFalse($user->isAbsent(), 'Should not be absent if start is null');
-    }
-
-    public function testSetNotification(): void
-    {
-        $user = new User();
-
-        self::assertTrue($user->isNotificationSendImmediately('dummy'));
-        self::assertFalse($user->isNotificationDailyDigest('dummy'));
-
-        $user->setNotificationImmediately('dummy', false);
-        self::assertFalse($user->isNotificationSendImmediately('dummy'));
-
-        $user->setNotificationDailyDigest('dummy', true);
-        self::assertTrue($user->isNotificationDailyDigest('dummy'));
-
-        $user->setNotificationImmediately('dummy', true);
-        self::assertTrue($user->isNotificationSendImmediately('dummy'));
-        self::assertTrue($user->isNotificationDailyDigest('dummy'));
-    }
 }

src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationMailerTest.php

@@ -144,7 +144,7 @@ class NotificationMailerTest extends TestCase
         $idProperty->setValue($user, 456);
 
         // Set notification flags for the user
-        $user->setNotificationImmediately('test_notification_type', true);
+        $user->setNotificationFlags(['test_notification_type' => [User::NOTIF_FLAG_IMMEDIATE_EMAIL]]);
 
         $messageBus = $this->createMock(MessageBusInterface::class);
         $messageBus->expects($this->once())

src/Bundle/ChillMainBundle/Tests/Security/RoleDumperTest.php

@@ -1,98 +0,0 @@
-<?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\Tests\Security;
-
-use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-use Chill\MainBundle\Security\RoleDumper;
-use Chill\MainBundle\Security\RoleProvider;
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class RoleDumperTest extends TestCase
-{
-    public function testDumpAsMarkdownGroupsByTitleTranslatesAndListsDependencies(): void
-    {
-        // Fake provider with two groups
-        $provider = new class () implements ProvideRoleHierarchyInterface {
-            public const R_PERSON_SEE = 'CHILL_PERSON_SEE';
-            public const R_PERSON_UPDATE = 'CHILL_PERSON_UPDATE';
-            public const R_REPORT_SEE = 'CHILL_REPORT_SEE';
-
-            public function getRoles(): array
-            {
-                return [self::R_PERSON_SEE, self::R_PERSON_UPDATE, self::R_REPORT_SEE];
-            }
-
-            public function getRolesWithoutScope(): array
-            {
-                // In this test, assume REPORT_SEE does not need scope, others do
-                return [self::R_REPORT_SEE];
-            }
-
-            public function getRolesWithHierarchy(): array
-            {
-                return [
-                    'Person' => [self::R_PERSON_SEE, self::R_PERSON_UPDATE],
-                    'Report' => [self::R_REPORT_SEE],
-                ];
-            }
-        };
-
-        $roleProvider = new RoleProvider([$provider]);
-
-        // Fake role hierarchy: UPDATE implies SEE; others none
-        $roleHierarchy = new class () implements RoleHierarchyInterface {
-            public function getReachableRoleNames(array $roles): array
-            {
-                $output = [];
-                foreach ($roles as $r) {
-                    $output[] = $r;
-                    if ('CHILL_PERSON_UPDATE' === $r) {
-                        $output[] = 'CHILL_PERSON_SEE';
-                    }
-                }
-
-                return array_values(array_unique($output));
-            }
-        };
-
-        // Fake translator that clearly shows translation applied
-        $translator = new class () implements TranslatorInterface {
-            public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string
-            {
-                return 'T('.$id.')';
-            }
-
-            public function getLocale(): string
-            {
-                return 'en';
-            }
-        };
-
-        $dumper = new RoleDumper($roleProvider, $roleHierarchy, $translator);
-        $md = $dumper->dumpAsMarkdown();
-
-        $expected = "## T(Person)\n"
-            ."- **T(CHILL_PERSON_SEE)** (S)\n"
-            ."- **T(CHILL_PERSON_UPDATE)** (S): T(CHILL_PERSON_SEE)\n\n"
-            ."## T(Report)\n"
-            ."- **T(CHILL_REPORT_SEE)** (~~S~~)\n";
-
-        self::assertSame($expected, $md);
-    }
-}

src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/UserNormalizerTest.php

@@ -101,8 +101,6 @@ final class UserNormalizerTest extends TestCase
                 'text_without_absent' => 'SomeUser',
                 'isAbsent' => false,
                 'main_center' => ['context' => Center::class],
-                'absenceStart' => ['context' => \DateTimeImmutable::class],
-                'absenceEnd' => ['context' => \DateTimeImmutable::class],
             ]];
 
         yield [$userNoPhone, 'docgen', ['docgen:expects' => User::class],
@@ -122,8 +120,6 @@ final class UserNormalizerTest extends TestCase
                 'text_without_absent' => 'AnotherUser',
                 'isAbsent' => false,
                 'main_center' => ['context' => Center::class],
-                'absenceStart' => ['context' => \DateTimeImmutable::class],
-                'absenceEnd' => ['context' => \DateTimeImmutable::class],
             ]];
 
         yield [null, 'docgen', ['docgen:expects' => User::class], [
@@ -142,8 +138,6 @@ final class UserNormalizerTest extends TestCase
             'text_without_absent' => '',
             'isAbsent' => false,
             'main_center' => ['context' => Center::class],
-            'absenceStart' => null,
-            'absenceEnd' => null,
         ]];
     }
 }

src/Bundle/ChillMainBundle/config/services.yaml

@@ -113,5 +113,3 @@ services:
     Chill\MainBundle\Service\EntityInfo\ViewEntityInfoManager:
         arguments:
             $vienEntityInfoProviders: !tagged_iterator chill_main.entity_info_provider
-
-    Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommandHandler: ~

src/Bundle/ChillMainBundle/config/services/command.yaml

@@ -80,7 +80,3 @@ services:
     Chill\MainBundle\Command\SynchronizeEntityInfoViewsCommand:
         tags:
             - {name: console.command}
-
-    Chill\MainBundle\Command\DumpListPermissionsCommand:
-        autoconfigure: true
-        autowire: true

src/Bundle/ChillMainBundle/migrations/Version20250722140048.php

@@ -1,34 +0,0 @@
-<?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\Migrations\Main;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20250722140048 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add an absence end date for the user absence';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE users ADD absenceEnd TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
-        $this->addSql('COMMENT ON COLUMN users.absenceEnd IS \'(DC2Type:datetime_immutable)\'');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE users DROP absenceEnd');
-    }
-}

src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml

@@ -136,7 +136,3 @@ filter_order:
     Search: Chercher dans la liste
     By date: Filtrer par date
     search_box: Filtrer par contenu
-
-absence:
-    You are listed as absent, as of {date, date, short}: Votre absence est indiquée à partir du {date, date, short}
-

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

@@ -841,12 +841,12 @@ absence:
     # single letter for absence
     A: A
     My absence: Mon absence
-    Unset absence: Supprimer mes dates d'absence
+    Unset absence: Supprimer la date d'absence
     Set absence date: Indiquer une date d'absence
     Absence start: Absent à partir du
-    Absence end: Jusqu'au
     Absent: Absent
     You are marked as being absent: Vous êtes indiqué absent.
+    You are listed as absent, as of: Votre absence est indiquée à partir du
     No absence listed: Aucune absence indiquée.
     Is absent: Absent?
 

src/Bundle/ChillMainBundle/translations/validators.fr.yml

@@ -40,7 +40,3 @@ workflow:
 
 rolling_date:
     When fixed date is selected, you must provide a date: Indiquez la date fixe choisie
-
-user:
-    absence_end_requires_start: "Vous ne pouvez pas renseigner une date de fin d'absence sans date de début."
-

src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php

@@ -79,7 +79,7 @@ class AccompanyingPeriodWorkDuplicateController extends AbstractController
      * @ParamConverter("acpw1", options={"id": "acpw1_id"})
      * @ParamConverter("acpw2", options={"id": "acpw2_id"})
      */
-    #[Route(path: '/{_locale}/person/{acpw1_id}/acpw-duplicate/{acpw2_id}/confirm', name: 'chill_person_acpw_duplicate_confirm')]
+    #[Route(path: '/{_locale}/person/{acpw1_id}/duplicate/{acpw2_id}/confirm', name: 'chill_person_acpw_duplicate_confirm')]
     public function confirmAction(AccompanyingPeriodWork $acpw1, AccompanyingPeriodWork $acpw2, Request $request): Response
     {
         $accompanyingPeriod = $acpw1->getAccompanyingPeriod();

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentActions.vue

@@ -6,7 +6,7 @@
             :id="evaluation.id"
             :templates="templates"
             :preventDefaultMoveToGenerate="true"
-            @go-to-generate-document="submitBeforeGenerate"
+            @go-to-generate-document="$emit('submitBeforeGenerate', $event)"
         >
             <template v-slot:title>
                 <label class="col-form-label">{{
@@ -22,7 +22,7 @@
                 <li>
                     <drop-file-modal
                         :allow-remove="false"
-                        @add-document="emit('addDocument', $event)"
+                        @add-document="$emit('addDocument', $event)"
                     ></drop-file-modal>
                 </li>
             </ul>
@@ -39,34 +39,9 @@ import {
     EVALUATION_GENERATE_A_DOCUMENT,
     trans,
 } from "translator";
-import { buildLink } from "ChillDocGeneratorAssets/lib/document-generator";
-import { useStore } from "vuex";
 
-const store = useStore();
-
-const props = defineProps(["evaluation", "templates"]);
-const emit = defineEmits(["addDocument"]);
-
-async function submitBeforeGenerate({ template }) {
-    const callback = (data) => {
-        let evaluationId = data.accompanyingPeriodWorkEvaluations.find(
-            (e) => e.key === props.evaluation.key,
-        ).id;
-
-        window.location.assign(
-            buildLink(
-                template,
-                evaluationId,
-                "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation",
-            ),
-        );
-    };
-
-    return store.dispatch("submit", callback).catch((e) => {
-        console.log(e);
-        throw e;
-    });
-}
+defineProps(["evaluation", "templates"]);
+defineEmits(["addDocument", "submitBeforeGenerate"]);
 </script>
 
 <style scoped>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue

@@ -58,7 +58,7 @@
                                     :preventDefaultMoveToGenerate="true"
                                     :goToGenerateWorkflowPayload="{ doc: d }"
                                     @go-to-generate-workflow="
-                                        goToGenerateWorkflowEvaluationDocument
+                                        $emit('goToGenerateWorkflow', $event)
                                     "
                                 ></list-workflow-modal>
                             </li>
@@ -95,9 +95,10 @@
                                             <a
                                                 class="dropdown-item"
                                                 @click="
-                                                    goToGenerateDocumentNotification(
+                                                    $emit(
+                                                        'goToGenerateNotification',
                                                         d,
-                                                        false,
+                                                        true,
                                                     )
                                                 "
                                             >
@@ -112,7 +113,8 @@
                                             <a
                                                 class="dropdown-item"
                                                 @click="
-                                                    goToGenerateDocumentNotification(
+                                                    $emit(
+                                                        'goToGenerateNotification',
                                                         d,
                                                         false,
                                                     )
@@ -148,35 +150,15 @@
                                     "
                                 ></document-action-buttons-group>
                             </li>
-                            <!--replace document-->
-                            <li
-                                v-if="
-                                    Number.isInteger(d.id) &&
-                                    d.storedObject._permissions.canEdit
-                                "
-                            >
-                                <drop-file-modal
-                                    :existing-doc="d.storedObject"
-                                    :allow-remove="false"
-                                    @add-document="
-                                        (arg) =>
-                                            replaceDocument(
-                                                d,
-                                                arg.stored_object,
-                                                arg.stored_object_version,
-                                            )
-                                    "
-                                ></drop-file-modal>
-                            </li>
                             <li v-if="Number.isInteger(d.id)">
                                 <div class="duplicate-dropdown">
                                     <button
-                                        class="btn btn-outline-primary dropdown-toggle"
+                                        class="btn btn-edit dropdown-toggle"
                                         type="button"
                                         data-bs-toggle="dropdown"
                                         aria-expanded="false"
                                     >
-                                        <i class="bi bi-lightning-fill"></i>
+                                        {{ trans(EVALUATION_DOCUMENT_EDIT) }}
                                     </button>
                                     <ul class="dropdown-menu">
                                         <!--delete-->
@@ -198,6 +180,27 @@
                                                 }}
                                             </a>
                                         </li>
+                                        <!--replace document-->
+                                        <li
+                                            v-if="
+                                                d.storedObject._permissions
+                                                    .canEdit
+                                            "
+                                        >
+                                            <drop-file-modal
+                                                :existing-doc="d.storedObject"
+                                                :allow-remove="false"
+                                                @add-document="
+                                                    (arg) =>
+                                                        $emit(
+                                                            'replaceDocument',
+                                                            d,
+                                                            arg.stored_object,
+                                                            arg.stored_object_version,
+                                                        )
+                                                "
+                                            ></drop-file-modal>
+                                        </li>
                                         <!--duplicate document-->
                                         <li>
                                             <a
@@ -297,45 +300,35 @@ import {
     EVALUATION_DOCUMENTS,
     EVALUATION_DOCUMENT_MOVE,
     EVALUATION_DOCUMENT_DELETE,
+    EVALUATION_DOCUMENT_EDIT,
     EVALUATION_DOCUMENT_DUPLICATE_HERE,
     EVALUATION_DOCUMENT_DUPLICATE_TO_OTHER_EVALUATION,
     trans,
 } from "translator";
-import { computed, ref, watch } from "vue";
+import { ref, watch } from "vue";
 import AccompanyingPeriodWorkSelectorModal from "ChillPersonAssets/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue";
-import { buildLinkCreate } from "ChillMainAssets/lib/entity-workflow/api";
-import { buildLinkCreate as buildLinkCreateNotification } from "ChillMainAssets/lib/entity-notification/api";
-import { useStore } from "vuex";
 
-const props = defineProps([
+defineProps([
     "documents",
     "docAnchorId",
     "accompanyingPeriodId",
-    "evaluation",
+    "accompanyingPeriodWorkId",
 ]);
 const emit = defineEmits([
     "inputDocumentTitle",
     "removeDocument",
     "duplicateDocument",
     "statusDocumentChanged",
+    "goToGenerateWorkflow",
+    "goToGenerateNotification",
     "duplicateDocumentToWork",
 ]);
 
-const store = useStore();
-
 const showAccompanyingPeriodSelector = ref(false);
 const selectedEvaluation = ref(null);
 const selectedDocumentToDuplicate = ref(null);
 const selectedDocumentToMove = ref(null);
 
-const AmIRefferer = computed(() => {
-    return !(
-        store.state.work.accompanyingPeriod.user &&
-        store.state.me &&
-        store.state.work.accompanyingPeriod.user.id !== store.state.me.id
-    );
-});
-
 const prepareDocumentDuplicationToWork = (d) => {
     selectedDocumentToDuplicate.value = d;
     /** ensure selectedDocumentToMove is null */
@@ -365,91 +358,4 @@ watch(selectedEvaluation, (val) => {
         });
     }
 });
-
-async function goToGenerateWorkflowEvaluationDocument({
-    workflowName,
-    payload,
-}) {
-    const callback = (data) => {
-        let evaluation = data.accompanyingPeriodWorkEvaluations.find(
-            (e) => e.key === props.evaluation.key,
-        );
-        let updatedDocument = evaluation.documents.find(
-            (d) => d.key === payload.doc.key,
-        );
-        window.location.assign(
-            buildLinkCreate(
-                workflowName,
-                "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
-                updatedDocument.id,
-            ),
-        );
-    };
-
-    return store.dispatch("submit", callback).catch((e) => {
-        console.log(e);
-        throw e;
-    });
-}
-
-/**
- * Replaces a document in the store with a new document.
- *
- * @param {Object} oldDocument - The document to be replaced.
- * @param {StoredObject} storedObject - The stored object of the new document.
- * @param {StoredObjectVersion} storedObjectVersion - The new version of the document
- * @return {void}
- */
-async function replaceDocument(oldDocument, storedObject, storedObjectVersion) {
-    let document = {
-        type: "accompanying_period_work_evaluation_document",
-        storedObject: storedObject,
-        title: oldDocument.title,
-    };
-
-    return store.commit("replaceDocument", {
-        key: props.evaluation.key,
-        document,
-        oldDocument: oldDocument,
-        stored_object_version: storedObjectVersion,
-    });
-}
-
-async function goToGenerateDocumentNotification(document, tos) {
-    const callback = (data) => {
-        let evaluation = data.accompanyingPeriodWorkEvaluations.find(
-            (e) => e.key === props.evaluation.key,
-        );
-        let updatedDocument = evaluation.documents.find(
-            (d) => d.key === document.key,
-        );
-        window.location.assign(
-            buildLinkCreateNotification(
-                "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
-                updatedDocument.id,
-                tos === true
-                    ? store.state.work.accompanyingPeriod.user?.id
-                    : null,
-                window.location.pathname +
-                    window.location.search +
-                    window.location.hash,
-            ),
-        );
-    };
-
-    return store.dispatch("submit", callback).catch((e) => {
-        console.log(e);
-        throw e;
-    });
-}
-
-async function submitBeforeLeaveToEditor() {
-    console.log("submit beore edit 2");
-    // empty callback
-    const callback = () => null;
-    return store.dispatch("submit", callback).catch((e) => {
-        console.log(e);
-        throw e;
-    });
-}
 </script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue

@@ -24,8 +24,8 @@
                 v-if="evaluation.documents.length > 0"
                 :documents="evaluation.documents"
                 :docAnchorId="docAnchorId"
-                :evaluation="evaluation"
                 :accompanyingPeriodId="store.state.work.accompanyingPeriod.id"
+                :accompanying-period-work-id="store.state.work.id"
                 @inputDocumentTitle="onInputDocumentTitle"
                 @removeDocument="removeDocument"
                 @duplicateDocument="duplicateDocument"
@@ -34,6 +34,7 @@
                 "
                 @move-document-to-evaluation="moveDocumentToEvaluation"
                 @statusDocumentChanged="onStatusDocumentChanged"
+                @goToGenerateWorkflow="goToGenerateWorkflowEvaluationDocument"
                 @goToGenerateNotification="goToGenerateDocumentNotification"
             />
 
@@ -41,6 +42,7 @@
                 :evaluation="evaluation"
                 :templates="getTemplatesAvailables"
                 @addDocument="addDocument"
+                @submitBeforeGenerate="submitBeforeGenerate"
             />
         </div>
     </div>
@@ -288,6 +290,29 @@ function onStatusDocumentChanged(newStatus) {
     });
 }
 
+function goToGenerateWorkflowEvaluationDocument({ workflowName, payload }) {
+    const callback = (data) => {
+        let evaluation = data.accompanyingPeriodWorkEvaluations.find(
+            (e) => e.key === props.evaluation.key,
+        );
+        let updatedDocument = evaluation.documents.find(
+            (d) => d.key === payload.doc.key,
+        );
+        window.location.assign(
+            buildLinkCreate(
+                workflowName,
+                "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
+                updatedDocument.id,
+            ),
+        );
+    };
+
+    store.dispatch("submit", callback).catch((e) => {
+        console.log(e);
+        throw e;
+    });
+}
+
 function goToGenerateDocumentNotification(document, tos) {
     const callback = (data) => {
         let evaluation = data.accompanyingPeriodWorkEvaluations.find(

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue

@@ -30,7 +30,11 @@
             >
                 <template #header>
                     <h3>
-                        {{ getModalTitle() }}
+                        {{
+                            trans(
+                                ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK,
+                            )
+                        }}
                     </h3>
                 </template>
 
@@ -69,7 +73,6 @@ import { AccompanyingPeriodWork } from "../../../types";
 import {
     trans,
     ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK,
-    ACPW_DUPLICATE_SELECT_AN_EVALUATION,
     CONFIRM,
 } from "translator";
 import { fetchResults } from "ChillMainAssets/lib/api/apiMethods";
@@ -94,11 +97,6 @@ const emit = defineEmits<{
     "update:selectedEvaluation": [evaluation: AccompanyingPeriodWorkEvaluation];
 }>();
 
-const getModalTitle = () =>
-    evaluations.value.length > 0
-        ? trans(ACPW_DUPLICATE_SELECT_AN_EVALUATION)
-        : trans(ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK);
-
 onMounted(() => {
     if (props.accompanyingPeriodId) {
         getAccompanyingPeriodWorks(parseInt(props.accompanyingPeriodId));
@@ -108,7 +106,6 @@ onMounted(() => {
 
     showModal.value = true;
 });
-
 const getAccompanyingPeriodWorks = async (periodId: number) => {
     const url = `/api/1.0/person/accompanying-course/${periodId}/works.json`;
 

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

@@ -786,8 +786,8 @@ evaluation:
       duplicate: Dupliquer
       duplicate_here: Dupliquer ici
       duplicate_to_other_evaluation: Dupliquer vers une autre évaluation
-      duplicate_success: Le document d'évaluation a été dupliqué
-      move_success: Le document d'évaluation a été déplacé
+      duplicate_success: Le document d'évaluation a été dupliquer
+      move_success: Le document d'évaluation a été déplacer
 
 
 goal:
@@ -1543,8 +1543,7 @@ entity_display_title:
 acpw_duplicate:
     title: Fusionner les actions d'accompagnement
     description: Cette fusion conservera la date de début la plus ancienne, la date de fin la plus récente, toutes les évaluations, documents et workflows. Les agents traitants seront additionnés ainsi que les tiers intervenants. Les commentaires seront mis l'un à la suite de l'autre.
-    Select accompanying period work: Sélectionner une action d'accompagnement
-    Select an evaluation: Sélectionner une évaluation
+    Select accompanying period work: Selectionner un action d'accompagnement
     Assign duplicate: Désigner un action d'accompagnement doublon
     Accompanying period work to delete: Action d'accompagnement à supprimer
     Accompanying period work to delete explanation: Cet action d'accompagnement sera supprimé.

src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig

@@ -152,17 +152,6 @@
                     {% endif %}
                 </dl>
             {% endblock %}
-            {% block content_view_actions_merge %}
-                <li>
-                    <a href="{{ chill_path_add_return_path('chill_thirdparty_find_duplicate',
-                        { 'thirdparty_id': entity.id }) }}"
-                       title="{{ 'Merge'|trans }}"
-                       class="btn btn-misc">
-                        <i class="bi bi-chevron-contract"></i>
-                        {{ 'Merge'|trans }}
-                    </a>
-                </li>
-            {% endblock %}
             {% block content_form_actions_delete %}{% endblock %}
             {% block content_view_actions_duplicate_link %}{% endblock %}
         {% endembed %}