From 1195b54a68036df7cca74d347fb80697f5d89d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 10 Sep 2025 16:28:45 +0000
Subject: [PATCH 01/15] Resolve "user notification preferences are not
 displayed correctly"

---
 .../unreleased/Fixed-20250910-180935.yaml     |   6 +
 .../UpdateProfile/UpdateProfileCommand.php    |  64 +++++++++++
 .../UpdateProfileCommandHandler.php           |  27 +++++
 .../Controller/UserProfileController.php      |  63 -----------
 .../UserUpdateProfileController.php           |  75 +++++++++++++
 src/Bundle/ChillMainBundle/Entity/User.php    |  74 ++++++++-----
 .../DataMapper/NotificationFlagDataMapper.php |  75 -------------
 .../Form/Type/NotificationFlagsType.php       |  16 +--
 ...rProfileType.php => UpdateProfileType.php} |  14 +--
 .../Resources/views/User/profile.html.twig    |   2 +-
 .../UpdateProfileCommandHandlerTest.php       |  85 +++++++++++++++
 .../UpdateProfileCommandTest.php              | 103 ++++++++++++++++++
 .../Tests/Entity/NotificationTest.php         |   6 +-
 .../UserNotificationFlagsPersistenceTest.php  |  82 ++++++++++++++
 .../ChillMainBundle/Tests/Entity/UserTest.php |  18 +++
 .../Email/NotificationMailerTest.php          |   2 +-
 .../ChillMainBundle/config/services.yaml      |   2 +
 17 files changed, 529 insertions(+), 185 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20250910-180935.yaml
 create mode 100644 src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php
 create mode 100644 src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommandHandler.php
 delete mode 100644 src/Bundle/ChillMainBundle/Controller/UserProfileController.php
 create mode 100644 src/Bundle/ChillMainBundle/Controller/UserUpdateProfileController.php
 delete mode 100644 src/Bundle/ChillMainBundle/Form/DataMapper/NotificationFlagDataMapper.php
 rename src/Bundle/ChillMainBundle/Form/{UserProfileType.php => UpdateProfileType.php} (75%)
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Action/User/UpdateProfile/UpdateProfileCommandHandlerTest.php
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Action/User/UpdateProfile/UpdateProfileCommandTest.php
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Entity/UserNotificationFlagsPersistenceTest.php

diff --git a/.changes/unreleased/Fixed-20250910-180935.yaml b/.changes/unreleased/Fixed-20250910-180935.yaml
new file mode 100644
index 000000000..9e0a90cc8
--- /dev/null
+++ b/.changes/unreleased/Fixed-20250910-180935.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix saving notification preferences in user's profile
+time: 2025-09-10T18:09:35.525979715+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php b/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php
new file mode 100644
index 000000000..f0751cb58
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php
@@ -0,0 +1,64 @@
+<?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;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommandHandler.php b/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommandHandler.php
new file mode 100644
index 000000000..4c46e686e
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommandHandler.php
@@ -0,0 +1,27 @@
+<?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']);
+        }
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Controller/UserProfileController.php b/src/Bundle/ChillMainBundle/Controller/UserProfileController.php
deleted file mode 100644
index b022a2b60..000000000
--- a/src/Bundle/ChillMainBundle/Controller/UserProfileController.php
+++ /dev/null
@@ -1,63 +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\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(),
-        ]);
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/Controller/UserUpdateProfileController.php b/src/Bundle/ChillMainBundle/Controller/UserUpdateProfileController.php
new file mode 100644
index 000000000..b23c201f0
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/UserUpdateProfileController.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\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(),
+        ]));
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 791391659..70b032238 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -652,42 +652,66 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
         return true;
     }
 
-    public function getNotificationFlags(): array
+    private function getNotificationFlagData(string $flag): array
     {
-        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;
+        return $this->notificationFlags[$flag] ?? [self::NOTIF_FLAG_IMMEDIATE_EMAIL];
     }
 
     public function isNotificationSendImmediately(string $type): bool
     {
-        if ([] === $this->getNotificationFlagData($type) || in_array(User::NOTIF_FLAG_IMMEDIATE_EMAIL, $this->getNotificationFlagData($type), true)) {
-            return true;
+        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;
         }
 
-        return false;
+        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);
     }
 
     public function isNotificationDailyDigest(string $type): bool
     {
-        if (in_array(User::NOTIF_FLAG_DAILY_DIGEST, $this->getNotificationFlagData($type), true)) {
-            return true;
-        }
-
-        return false;
+        return $this->isNotificationForElement($type, self::NOTIF_FLAG_DAILY_DIGEST);
     }
 
     public function getLocale(): string
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/NotificationFlagDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/NotificationFlagDataMapper.php
deleted file mode 100644
index d904ed5b5..000000000
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/NotificationFlagDataMapper.php
+++ /dev/null
@@ -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\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;
-                }
-            }
-        }
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/NotificationFlagsType.php b/src/Bundle/ChillMainBundle/Form/Type/NotificationFlagsType.php
index 4535a4815..b9e15f5d9 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/NotificationFlagsType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/NotificationFlagsType.php
@@ -11,11 +11,9 @@ 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;
 
@@ -30,27 +28,24 @@ 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();
-            $builder->add($flag, FormType::class, [
+            $flagBuilder = $builder->create($flag, options: [
                 'label' => $flagProvider->getLabel(),
-                'required' => false,
+                'compound' => true,
             ]);
 
-            $builder->get($flag)
+            $flagBuilder
                 ->add('immediate_email', CheckboxType::class, [
                     'label' => false,
                     'required' => false,
-                    'mapped' => false,
                 ])
-                ->add('daily_email', CheckboxType::class, [
+                ->add('daily_digest', CheckboxType::class, [
                     'label' => false,
                     'required' => false,
-                    'mapped' => false,
                 ])
             ;
+            $builder->add($flagBuilder);
         }
     }
 
@@ -58,6 +53,7 @@ class NotificationFlagsType extends AbstractType
     {
         $resolver->setDefaults([
             'data_class' => null,
+            'compound' => true,
         ]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/UserProfileType.php b/src/Bundle/ChillMainBundle/Form/UpdateProfileType.php
similarity index 75%
rename from src/Bundle/ChillMainBundle/Form/UserProfileType.php
rename to src/Bundle/ChillMainBundle/Form/UpdateProfileType.php
index f9fa65991..6aa8f0943 100644
--- a/src/Bundle/ChillMainBundle/Form/UserProfileType.php
+++ b/src/Bundle/ChillMainBundle/Form/UpdateProfileType.php
@@ -11,31 +11,29 @@ 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 UserProfileType extends AbstractType
+class UpdateProfileType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('phonenumber', ChillPhoneNumberType::class, [
                 'required' => false,
             ])
-            ->add('notificationFlags', NotificationFlagsType::class, [
-                'label' => false,
-                'mapped' => false,
-            ])
+            ->add('notificationFlags', NotificationFlagsType::class)
         ;
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'data_class' => \Chill\MainBundle\Entity\User::class,
+            'data_class' => UpdateProfileCommand::class,
         ]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/profile.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/profile.html.twig
index d25f6645f..0b268af03 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/profile.html.twig
+++ b/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_email, {'label_attr': { 'class': 'checkbox-inline checkbox-switch'}}) }}
+                            {{ form_widget(flag.daily_digest, {'label_attr': { 'class': 'checkbox-inline checkbox-switch'}}) }}
                         </td>
                     </tr>
                 {% endfor %}
diff --git a/src/Bundle/ChillMainBundle/Tests/Action/User/UpdateProfile/UpdateProfileCommandHandlerTest.php b/src/Bundle/ChillMainBundle/Tests/Action/User/UpdateProfile/UpdateProfileCommandHandlerTest.php
new file mode 100644
index 000000000..e21ebbdb2
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Action/User/UpdateProfile/UpdateProfileCommandHandlerTest.php
@@ -0,0 +1,85 @@
+<?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'));
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Action/User/UpdateProfile/UpdateProfileCommandTest.php b/src/Bundle/ChillMainBundle/Tests/Action/User/UpdateProfile/UpdateProfileCommandTest.php
new file mode 100644
index 000000000..570c5bb05
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Action/User/UpdateProfile/UpdateProfileCommandTest.php
@@ -0,0 +1,103 @@
+<?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);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
index e9e7ff760..20dd3d97c 100644
--- a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
@@ -96,11 +96,13 @@ 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->setNotificationFlags(['test_notification_type' => [User::NOTIF_FLAG_IMMEDIATE_EMAIL, User::NOTIF_FLAG_DAILY_DIGEST]]);
+        $user->setNotificationImmediately('test_notification_type', true);
+        $user->setNotificationDailyDigest('test_notification_type', true);
         $this->assertTrue($user->isNotificationSendImmediately($notification->getType()), 'Should return true when preferences contain immediate-email');
 
         // daily-email preference
-        $user->setNotificationFlags(['test_notification_type' => [User::NOTIF_FLAG_DAILY_DIGEST]]);
+        $user->setNotificationDailyDigest('test_notification_type', true);
+        $user->setNotificationImmediately('test_notification_type', false);
         $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');
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/UserNotificationFlagsPersistenceTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/UserNotificationFlagsPersistenceTest.php
new file mode 100644
index 000000000..eefcd22c3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Entity/UserNotificationFlagsPersistenceTest.php
@@ -0,0 +1,82 @@
+<?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();
+        }
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php
index 254ced51b..76654e3ef 100644
--- a/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php
@@ -99,4 +99,22 @@ class UserTest extends TestCase
         $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'));
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationMailerTest.php b/src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationMailerTest.php
index 03be565a2..173cb8a0e 100644
--- a/src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationMailerTest.php
+++ b/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->setNotificationFlags(['test_notification_type' => [User::NOTIF_FLAG_IMMEDIATE_EMAIL]]);
+        $user->setNotificationImmediately('test_notification_type', true);
 
         $messageBus = $this->createMock(MessageBusInterface::class);
         $messageBus->expects($this->once())
diff --git a/src/Bundle/ChillMainBundle/config/services.yaml b/src/Bundle/ChillMainBundle/config/services.yaml
index 14f0f851a..d8d4a475d 100644
--- a/src/Bundle/ChillMainBundle/config/services.yaml
+++ b/src/Bundle/ChillMainBundle/config/services.yaml
@@ -113,3 +113,5 @@ services:
     Chill\MainBundle\Service\EntityInfo\ViewEntityInfoManager:
         arguments:
             $vienEntityInfoProviders: !tagged_iterator chill_main.entity_info_provider
+
+    Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommandHandler: ~

From 5b90d23367be270349721e0e4ecc131dab9a591e Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Thu, 11 Sep 2025 11:01:16 +0000
Subject: [PATCH 02/15] =?UTF-8?q?Resolve=20"Dupliquer=20une=20document=20d?=
 =?UTF-8?q?'une=20=C3=A9valuation=20vers=20une=20autre"=20+=20"D=C3=A9plac?=
 =?UTF-8?q?er=20un=20document=20vers=20une=20autre=20=C3=A9valuation"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unreleased/Feature-20250211-142243.yaml   |    6 +
 .../unreleased/Feature-20250403-100311.yaml   |    6 +
 .../unreleased/Feature-20250403-100857.yaml   |    6 +
 .../vuejs/DropFileWidget/DropFileModal.vue    |    7 +-
 .../translations/messages.fr.yml              |    2 +
 .../Resources/views/Form/fields.html.twig     |   14 +-
 ...ompanyingPeriodWorkDuplicateController.php |    6 +-
 ...kEvaluationDocumentDuplicateController.php |   40 +-
 ...odWorkEvaluationDocumentMoveController.php |   58 +
 ...companyingPeriodWorkEvaluationDocument.php |   10 -
 .../Form/FindAccompanyingPeriodWorkType.php   |    2 +-
 .../PickLinkedAccompanyingPeriodWorkType.php  |    9 +
 .../AccompanyingPeriodWorkSelector.ts         |    3 +-
 .../Resources/public/types.ts                 |    2 +-
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  |    2 +-
 .../components/CommentInput.vue               |   31 +
 .../components/DateInputs.vue                 |   71 ++
 .../components/DocumentActions.vue            |   51 +
 .../components/DocumentsList.vue              |  361 ++++++
 .../components/FormEvaluation.vue             | 1008 ++++++-----------
 .../components/TimeSpentInput.vue             |   32 +
 .../vuejs/AccompanyingCourseWorkEdit/store.js |   85 +-
 ...ccompanyingCourseWorkEvaluationDocument.ts |   20 +
 .../AccompanyingPeriodWorkEvaluationItem.vue  |   70 ++
 .../AccompanyingPeriodWorkEvaluationList.vue  |   47 +
 .../AccompanyingPeriodWorkList.vue            |   18 +-
 .../AccompanyingPeriodWorkSelectorModal.vue   |  107 +-
 .../_details.html.twig                        |    4 +-
 .../assign_acpw_duplicate.html.twig           |    6 +-
 ...PeriodWorkEvaluationDocumentDuplicator.php |   14 +
 .../ChillPersonBundle/chill.api.specs.yaml    |   30 +
 .../translations/messages.fr.yml              |   40 +-
 32 files changed, 1414 insertions(+), 754 deletions(-)
 create mode 100644 .changes/unreleased/Feature-20250211-142243.yaml
 create mode 100644 .changes/unreleased/Feature-20250403-100311.yaml
 create mode 100644 .changes/unreleased/Feature-20250403-100857.yaml
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentMoveController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/CommentInput.vue
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DateInputs.vue
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentActions.vue
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/TimeSpentInput.vue
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationItem.vue
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationList.vue

diff --git a/.changes/unreleased/Feature-20250211-142243.yaml b/.changes/unreleased/Feature-20250211-142243.yaml
new file mode 100644
index 000000000..4f0b25e88
--- /dev/null
+++ b/.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
diff --git a/.changes/unreleased/Feature-20250403-100311.yaml b/.changes/unreleased/Feature-20250403-100311.yaml
new file mode 100644
index 000000000..1076efc1a
--- /dev/null
+++ b/.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
diff --git a/.changes/unreleased/Feature-20250403-100857.yaml b/.changes/unreleased/Feature-20250403-100857.yaml
new file mode 100644
index 000000000..113ae8a2a
--- /dev/null
+++ b/.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
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
index 956b3e859..4ca2d49a1 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
@@ -4,6 +4,7 @@ import { StoredObject, StoredObjectVersion } from "../../types";
 import DropFileWidget from "ChillDocStoreAssets/vuejs/DropFileWidget/DropFileWidget.vue";
 import { computed, reactive } from "vue";
 import { useToast } from "vue-toast-notification";
+import { DOCUMENT_REPLACE, DOCUMENT_ADD, trans } from "translator";
 
 interface DropFileConfig {
     allowRemove: boolean;
@@ -75,10 +76,10 @@ function closeModal(): void {
         @click="openModal"
         class="btn btn-create"
     >
-        Ajouter un document
+        {{ trans(DOCUMENT_ADD) }}
     </button>
-    <button v-else @click="openModal" class="btn btn-edit">
-        Remplacer le document
+    <button v-else @click="openModal" class="dropdown-item">
+        {{ trans(DOCUMENT_REPLACE) }}
     </button>
     <modal
         v-if="state.showModal"
diff --git a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
index 1aea94892..94db395df 100644
--- a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
@@ -23,6 +23,8 @@ See the document: Voir le document
 
 document:
     Any title: Aucun titre
+    replace: Remplacer
+    Add: Ajouter un document
 
 generic_doc:
     filter:
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 033fdb342..5e3edca10 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -280,11 +280,17 @@
     </div>
 {% endblock %}
 
-{% block pick_linked_entities_widget %}
-    <input type="hidden" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value|escape('html_attr') }}" {% endif %} data-input-uniqid="{{ form.vars['uniqid'] }}" />
-    <div data-input-uniqid="{{ form.vars['uniqid'] }}" data-module="pick-linked-entities" data-pick-entities-type="{{ form.vars['pick-entities-type'] }}"
-    ></div>
 
+{% block pick_linked_entities_widget %}
+    <input type="hidden" {{ block('widget_attributes') }}
+        {% if value is not empty %}value="{{ value|escape('html_attr') }}" {% endif %}
+       data-input-uniqid="{{ form.vars['uniqid'] }}"/>
+    <div
+        data-input-uniqid="{{ form.vars['uniqid'] }}"
+        data-module="pick-linked-entities"
+        data-pick-entities-type="{{ form.vars['pick-entities-type'] }}"
+         data-suggested="{{ form.vars['suggested']|json_encode|escape('html_attr') }}"
+    ></div>
 {% endblock %}
 
 {% block pick_postal_code_widget %}
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php
index db890cd4d..43daa9343 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php
@@ -18,6 +18,7 @@ use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepos
 use Chill\PersonBundle\Service\AccompanyingPeriodWork\AccompanyingPeriodWorkMergeService;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Translation\TranslatableMessage;
@@ -32,7 +33,7 @@ class AccompanyingPeriodWorkDuplicateController extends AbstractController
      * @ParamConverter("accompanyingPeriodWork", options={"id": "acpw_id"})
      */
     #[Route(path: '{_locale}/person/accompanying-period/work/{id}/assign-duplicate', name: 'chill_person_accompanying_period_work_assign_duplicate')]
-    public function assignDuplicate(AccompanyingPeriodWork $acpw, Request $request)
+    public function assignDuplicate(AccompanyingPeriodWork $acpw, Request $request): Response
     {
         $accompanyingPeriod = $acpw->getAccompanyingPeriod();
 
@@ -79,7 +80,7 @@ class AccompanyingPeriodWorkDuplicateController extends AbstractController
      * @ParamConverter("acpw2", options={"id": "acpw2_id"})
      */
     #[Route(path: '/{_locale}/person/{acpw1_id}/acpw-duplicate/{acpw2_id}/confirm', name: 'chill_person_acpw_duplicate_confirm')]
-    public function confirmAction(AccompanyingPeriodWork $acpw1, AccompanyingPeriodWork $acpw2, Request $request)
+    public function confirmAction(AccompanyingPeriodWork $acpw1, AccompanyingPeriodWork $acpw2, Request $request): Response
     {
         $accompanyingPeriod = $acpw1->getAccompanyingPeriod();
 
@@ -98,6 +99,7 @@ class AccompanyingPeriodWorkDuplicateController extends AbstractController
                     $session->getFlashBag()->add('success', new TranslatableMessage('acpw_duplicate.Successfully merged'));
                 }
 
+
                 return $this->redirectToRoute('chill_person_accompanying_period_work_show', ['id' => $acpw1->getId()]);
             }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentDuplicateController.php
index 033533b05..db3045602 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentDuplicateController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentDuplicateController.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\Routing\ChillUrlGeneratorInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
 use Chill\PersonBundle\Service\AccompanyingPeriodWorkEvaluationDocument\AccompanyingPeriodWorkEvaluationDocumentDuplicator;
@@ -24,15 +25,16 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 
-class AccompanyingPeriodWorkEvaluationDocumentDuplicateController
+readonly class AccompanyingPeriodWorkEvaluationDocumentDuplicateController
 {
     public function __construct(
-        private readonly AccompanyingPeriodWorkEvaluationDocumentDuplicator $duplicator,
-        private readonly Security $security,
-        private readonly SerializerInterface $serializer,
-        private readonly EntityManagerInterface $entityManager,
-        private readonly ChillUrlGeneratorInterface $urlGenerator,
+        private AccompanyingPeriodWorkEvaluationDocumentDuplicator $duplicator,
+        private Security $security,
+        private SerializerInterface $serializer,
+        private EntityManagerInterface $entityManager,
+        private ChillUrlGeneratorInterface $urlGenerator,
     ) {}
 
     #[Route('/api/1.0/person/accompanying-course-work-evaluation-document/{id}/duplicate', methods: ['POST'])]
@@ -56,6 +58,32 @@ class AccompanyingPeriodWorkEvaluationDocumentDuplicateController
         );
     }
 
+    /**
+     * @ParamConverter("document", options={"id": "document_id"})
+     * @ParamConverter("evaluation", options={"id": "evaluation_id"})
+     */
+    #[Route('/api/1.0/person/accompanying-course-work-evaluation-document/{document_id}/evaluation/{evaluation_id}/duplicate', methods: ['POST'])]
+    public function duplicateToEvaluationApi(AccompanyingPeriodWorkEvaluationDocument $document, AccompanyingPeriodWorkEvaluation $evaluation): Response
+    {
+        $work = $evaluation->getAccompanyingPeriodWork();
+
+        if (!$this->security->isGranted(AccompanyingPeriodWorkVoter::UPDATE, $work)) {
+            throw new AccessDeniedHttpException('not allowed to edit this accompanying period work');
+        }
+
+        $duplicatedDocument = $this->duplicator->duplicateToEvaluation($document, $evaluation);
+
+        $this->entityManager->persist($duplicatedDocument);
+        $this->entityManager->persist($duplicatedDocument->getStoredObject());
+        $this->entityManager->persist($evaluation);
+        $this->entityManager->flush();
+
+        return new JsonResponse(
+            $this->serializer->serialize($duplicatedDocument, 'json', [AbstractNormalizer::GROUPS => ['read']]),
+            json: true
+        );
+    }
+
     #[Route('/{_locale}/person/accompanying-course-work-evaluation-document/{id}/duplicate', name: 'chill_person_accompanying_period_work_evaluation_document_duplicate', methods: ['POST'])]
     public function duplicate(AccompanyingPeriodWorkEvaluationDocument $document): Response
     {
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentMoveController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentMoveController.php
new file mode 100644
index 000000000..5e777f3e0
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentMoveController.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\SerializerInterface;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+
+readonly class AccompanyingPeriodWorkEvaluationDocumentMoveController
+{
+    public function __construct(
+        private Security $security,
+        private SerializerInterface $serializer,
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    /**
+     * @ParamConverter("document", options={"id": "document_id"})
+     * @ParamConverter("evaluation", options={"id": "evaluation_id"})
+     */
+    #[Route('/api/1.0/person/accompanying-course-work-evaluation-document/{document_id}/evaluation/{evaluation_id}/move', methods: ['POST'])]
+    public function moveToEvaluationApi(AccompanyingPeriodWorkEvaluationDocument $document, AccompanyingPeriodWorkEvaluation $evaluation): Response
+    {
+        $work = $evaluation->getAccompanyingPeriodWork();
+
+        if (!$this->security->isGranted(AccompanyingPeriodWorkVoter::UPDATE, $work)) {
+            throw new AccessDeniedHttpException('not allowed to edit this accompanying period work');
+        }
+
+        $document->setAccompanyingPeriodWorkEvaluation($evaluation);
+
+        $this->entityManager->persist($document);
+        $this->entityManager->flush();
+
+        return new JsonResponse(
+            $this->serializer->serialize($document, 'json', [AbstractNormalizer::GROUPS => ['read']]),
+            json: true
+        );
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
index 01c3ed69d..10329c400 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
@@ -98,16 +98,6 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
 
     public function setAccompanyingPeriodWorkEvaluation(?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation): AccompanyingPeriodWorkEvaluationDocument
     {
-        // if an evaluation is already associated, we cannot change the association (removing the association,
-        // by setting a null value, is allowed.
-        if (
-            $this->accompanyingPeriodWorkEvaluation instanceof AccompanyingPeriodWorkEvaluation
-            && $accompanyingPeriodWorkEvaluation instanceof AccompanyingPeriodWorkEvaluation
-        ) {
-            if ($this->accompanyingPeriodWorkEvaluation !== $accompanyingPeriodWorkEvaluation) {
-                throw new \RuntimeException('It is not allowed to change the evaluation for a document');
-            }
-        }
         $this->accompanyingPeriodWorkEvaluation = $accompanyingPeriodWorkEvaluation;
 
         return $this;
diff --git a/src/Bundle/ChillPersonBundle/Form/FindAccompanyingPeriodWorkType.php b/src/Bundle/ChillPersonBundle/Form/FindAccompanyingPeriodWorkType.php
index ab78cb541..9b3acf156 100644
--- a/src/Bundle/ChillPersonBundle/Form/FindAccompanyingPeriodWorkType.php
+++ b/src/Bundle/ChillPersonBundle/Form/FindAccompanyingPeriodWorkType.php
@@ -24,7 +24,7 @@ class FindAccompanyingPeriodWorkType extends AbstractType
     {
         $builder
             ->add('acpw', PickLinkedAccompanyingPeriodWorkType::class, [
-                'label' => 'Social action',
+                'label' => 'Accompanying period work',
                 'multiple' => false,
                 'accompanyingPeriod' => $options['accompanyingPeriod'],
             ])
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickLinkedAccompanyingPeriodWorkType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickLinkedAccompanyingPeriodWorkType.php
index 55eda49e6..6f8fc7665 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickLinkedAccompanyingPeriodWorkType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickLinkedAccompanyingPeriodWorkType.php
@@ -16,18 +16,26 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class PickLinkedAccompanyingPeriodWorkType extends AbstractType
 {
+    public function __construct(private readonly NormalizerInterface $normalizer) {}
+
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['acpw'];
         $view->vars['uniqid'] = uniqid('pick_acpw_dyn');
+        $view->vars['suggested'] = [];
         $view->vars['as_id'] = true === $options['as_id'] ? '1' : '0';
         $view->vars['submit_on_adding_new_entity'] = false;
         $view->vars['pick-entities-type'] = 'acpw';
         $view->vars['attr']['data-accompanying-period-id'] = $options['accompanyingPeriod']->getId();
+
+        foreach ($options['suggested'] as $suggestion) {
+            $view->vars['suggested'][] = $this->normalizer->normalize($suggestion, 'json', ['groups' => 'read']);
+        }
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -38,6 +46,7 @@ class PickLinkedAccompanyingPeriodWorkType extends AbstractType
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
             ->setDefault('compound', false)
+            ->setDefault('suggested', [])
             ->setDefault('as_id', false)
             ->setAllowedTypes('as_id', ['bool'])
             ->setDefault('submit_on_adding_new_entity', false)
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/mod/DuplicateSelector/AccompanyingPeriodWorkSelector.ts b/src/Bundle/ChillPersonBundle/Resources/public/mod/DuplicateSelector/AccompanyingPeriodWorkSelector.ts
index 8f117d6ef..8e955070a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/mod/DuplicateSelector/AccompanyingPeriodWorkSelector.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/mod/DuplicateSelector/AccompanyingPeriodWorkSelector.ts
@@ -41,7 +41,8 @@ document.addEventListener("DOMContentLoaded", () => {
             methods: {
                 pickWork: function (payload: { work: AccompanyingPeriodWork }) {
                     console.log("payload", payload);
-                    input.value = payload.work.id.toString();
+
+                    input.value = payload.work.id?.toString() ?? "";
                 },
             },
         });
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/types.ts b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
index 7d641c859..13a9fe5c9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
@@ -84,7 +84,7 @@ export interface AccompanyingPeriodWorkEvaluationDocument {
 }
 
 export interface AccompanyingPeriodWork {
-    id: number;
+    id?: number;
     accompanyingPeriod?: AccompanyingPeriod;
     accompanyingPeriodWorkEvaluations: AccompanyingPeriodWorkEvaluation[];
     createdAt?: string;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index f3404e2de..bf403291e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -972,7 +972,7 @@ div#workEditor {
                 font-size: 85%;
             }
 
-            i.fa {
+            & > i.fa {
                 padding: 0.25rem;
                 color: $white;
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/CommentInput.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/CommentInput.vue
new file mode 100644
index 000000000..84a27a5ed
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/CommentInput.vue
@@ -0,0 +1,31 @@
+<template>
+    <div class="row mb-3">
+        <label class="col-sm-4 col-form-label visually-hidden">{{
+            trans(EVALUATION_PUBLIC_COMMENT)
+        }}</label>
+        <div class="col-sm-12">
+            <ckeditor
+                :editor="ClassicEditor"
+                :config="classicEditorConfig"
+                :placeholder="trans(EVALUATION_COMMENT_PLACEHOLDER)"
+                :value="comment"
+                @input="$emit('update:comment', $event)"
+                tag-name="textarea"
+            ></ckeditor>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { Ckeditor } from "@ckeditor/ckeditor5-vue";
+import { ClassicEditor } from "ckeditor5";
+import classicEditorConfig from "ChillMainAssets/module/ckeditor5/editor_config";
+import {
+    EVALUATION_PUBLIC_COMMENT,
+    EVALUATION_COMMENT_PLACEHOLDER,
+    trans,
+} from "translator";
+
+defineProps(["comment"]);
+defineEmits(["update:comment"]);
+</script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DateInputs.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DateInputs.vue
new file mode 100644
index 000000000..ac16b467f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DateInputs.vue
@@ -0,0 +1,71 @@
+<template>
+    <div class="row mb-3">
+        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+            {{ trans(EVALUATION_STARTDATE) }}
+        </label>
+        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+            <input
+                class="form-control form-control-sm"
+                type="date"
+                :value="startDate"
+                @input="$emit('update:startDate', $event.target.value)"
+            />
+        </div>
+
+        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+            {{ trans(EVALUATION_ENDDATE) }}
+        </label>
+        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+            <input
+                class="form-control form-control-sm"
+                type="date"
+                :value="endDate"
+                @input="$emit('update:endDate', $event.target.value)"
+            />
+        </div>
+    </div>
+
+    <div class="row mb-3">
+        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+            {{ trans(EVALUATION_MAXDATE) }}
+        </label>
+        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+            <input
+                class="form-control form-control-sm"
+                type="date"
+                :value="maxDate"
+                @input="$emit('update:maxDate', $event.target.value)"
+            />
+        </div>
+
+        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+            {{ trans(EVALUATION_WARNING_INTERVAL) }}
+        </label>
+        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+            <input
+                class="form-control form-control-sm"
+                type="number"
+                :value="warningInterval"
+                @input="$emit('update:warningInterval', $event.target.value)"
+            />
+        </div>
+    </div>
+</template>
+
+<script setup>
+import {
+    EVALUATION_STARTDATE,
+    EVALUATION_ENDDATE,
+    EVALUATION_MAXDATE,
+    EVALUATION_WARNING_INTERVAL,
+    trans,
+} from "translator";
+
+defineProps(["startDate", "endDate", "maxDate", "warningInterval"]);
+defineEmits([
+    "update:startDate",
+    "update:endDate",
+    "update:maxDate",
+    "update:warningInterval",
+]);
+</script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentActions.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentActions.vue
new file mode 100644
index 000000000..592e9a7fd
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentActions.vue
@@ -0,0 +1,51 @@
+<template>
+    <div class="row mb-3">
+        <h6>{{ trans(EVALUATION_DOCUMENT_ADD) }} :</h6>
+        <pick-template
+            entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
+            :id="evaluation.id"
+            :templates="templates"
+            :preventDefaultMoveToGenerate="true"
+            @go-to-generate-document="$emit('submitBeforeGenerate', $event)"
+        >
+            <template v-slot:title>
+                <label class="col-form-label">{{
+                    trans(EVALUATION_GENERATE_A_DOCUMENT)
+                }}</label>
+            </template>
+        </pick-template>
+        <div>
+            <label class="col-form-label">{{
+                trans(EVALUATION_DOCUMENT_UPLOAD)
+            }}</label>
+            <ul class="record_actions document-upload">
+                <li>
+                    <drop-file-modal
+                        :allow-remove="false"
+                        @add-document="$emit('addDocument', $event)"
+                    ></drop-file-modal>
+                </li>
+            </ul>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import PickTemplate from "ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue";
+import DropFileModal from "ChillDocStoreAssets/vuejs/DropFileWidget/DropFileModal.vue";
+import {
+    EVALUATION_DOCUMENT_ADD,
+    EVALUATION_DOCUMENT_UPLOAD,
+    EVALUATION_GENERATE_A_DOCUMENT,
+    trans,
+} from "translator";
+
+defineProps(["evaluation", "templates"]);
+defineEmits(["addDocument", "submitBeforeGenerate"]);
+</script>
+
+<style scoped>
+ul.document-upload {
+    justify-content: flex-start;
+}
+</style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
new file mode 100644
index 000000000..4132b388e
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
@@ -0,0 +1,361 @@
+<template>
+    <div class="row mb-3">
+        <h5>{{ trans(EVALUATION_DOCUMENTS) }} :</h5>
+        <div class="flex-table">
+            <div
+                class="item-bloc"
+                v-for="(d, i) in documents"
+                :key="d.id"
+                :class="[
+                    parseInt(docAnchorId) === d.id ? 'bg-blink' : 'nothing',
+                ]"
+            >
+                <div :id="'document_' + d.id" class="item-row">
+                    <div class="input-group input-group-lg mb-3 row">
+                        <label class="col-sm-3 col-form-label"
+                            >Titre du document:</label
+                        >
+                        <div class="col-sm-9">
+                            <input
+                                class="form-control document-title"
+                                type="text"
+                                :value="d.title"
+                                :id="d.id"
+                                :data-key="i"
+                                @input="$emit('inputDocumentTitle', $event)"
+                            />
+                        </div>
+                    </div>
+                </div>
+                <div class="item-row">
+                    <div class="item-col item-meta">
+                        <p v-if="d.createdBy" class="createdBy">
+                            Créé par {{ d.createdBy.text }}<br />
+                            Le
+                            {{
+                                $d(ISOToDatetime(d.createdAt.datetime), "long")
+                            }}
+                        </p>
+                    </div>
+                </div>
+                <div class="item-row">
+                    <div class="item-col">
+                        <ul class="record_actions">
+                            <li
+                                v-if="
+                                    d.workflows_availables.length > 0 ||
+                                    d.workflows.length > 0
+                                "
+                            >
+                                <list-workflow-modal
+                                    :workflows="d.workflows"
+                                    :allowCreate="true"
+                                    relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument"
+                                    :relatedEntityId="d.id"
+                                    :workflowsAvailables="
+                                        d.workflows_availables
+                                    "
+                                    :preventDefaultMoveToGenerate="true"
+                                    :goToGenerateWorkflowPayload="{ doc: d }"
+                                    @go-to-generate-workflow="
+                                        $emit('goToGenerateWorkflow', $event)
+                                    "
+                                ></list-workflow-modal>
+                            </li>
+                            <li>
+                                <button
+                                    v-if="AmIRefferer"
+                                    class="btn btn-notify"
+                                    @click="
+                                        $emit(
+                                            'goToGenerateNotification',
+                                            d,
+                                            false,
+                                        )
+                                    "
+                                ></button>
+                                <template v-else>
+                                    <button
+                                        id="btnGroupNotifyButtons"
+                                        type="button"
+                                        class="btn btn-notify dropdown-toggle"
+                                        :title="
+                                            trans(EVALUATION_NOTIFICATION_SEND)
+                                        "
+                                        data-bs-toggle="dropdown"
+                                        aria-expanded="false"
+                                    >
+                                        &nbsp;
+                                    </button>
+                                    <ul
+                                        class="dropdown-menu"
+                                        aria-labelledby="btnGroupNotifyButtons"
+                                    >
+                                        <li>
+                                            <a
+                                                class="dropdown-item"
+                                                @click="
+                                                    $emit(
+                                                        'goToGenerateNotification',
+                                                        d,
+                                                        true,
+                                                    )
+                                                "
+                                            >
+                                                {{
+                                                    trans(
+                                                        EVALUATION_NOTIFICATION_NOTIFY_REFERRER,
+                                                    )
+                                                }}
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a
+                                                class="dropdown-item"
+                                                @click="
+                                                    $emit(
+                                                        'goToGenerateNotification',
+                                                        d,
+                                                        false,
+                                                    )
+                                                "
+                                            >
+                                                {{
+                                                    trans(
+                                                        EVALUATION_NOTIFICATION_NOTIFY_ANY,
+                                                    )
+                                                }}
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </template>
+                            </li>
+                            <li>
+                                <document-action-buttons-group
+                                    :stored-object="d.storedObject"
+                                    :filename="d.title"
+                                    :can-edit="true"
+                                    :execute-before-leave="
+                                        submitBeforeLeaveToEditor
+                                    "
+                                    :davLink="
+                                        d.storedObject._links?.dav_link.href
+                                    "
+                                    :davLinkExpiration="
+                                        d.storedObject._links?.dav_link
+                                            .expiration
+                                    "
+                                    @on-stored-object-status-change="
+                                        $emit('statusDocumentChanged', $event)
+                                    "
+                                ></document-action-buttons-group>
+                            </li>
+                            <li v-if="Number.isInteger(d.id)">
+                                <div class="duplicate-dropdown">
+                                    <button
+                                        class="btn btn-edit dropdown-toggle"
+                                        type="button"
+                                        data-bs-toggle="dropdown"
+                                        aria-expanded="false"
+                                    >
+                                        {{ trans(EVALUATION_DOCUMENT_EDIT) }}
+                                    </button>
+                                    <ul class="dropdown-menu">
+                                        <!--delete-->
+                                        <li v-if="d.workflows.length === 0">
+                                            <a
+                                                class="dropdown-item"
+                                                @click="
+                                                    $emit('removeDocument', d)
+                                                "
+                                            >
+                                                <i
+                                                    class="fa fa-trash-o"
+                                                    aria-hidden="true"
+                                                ></i>
+                                                {{
+                                                    trans(
+                                                        EVALUATION_DOCUMENT_DELETE,
+                                                    )
+                                                }}
+                                            </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
+                                                class="dropdown-item"
+                                                @click="
+                                                    $emit(
+                                                        'duplicateDocument',
+                                                        d,
+                                                    )
+                                                "
+                                            >
+                                                <i
+                                                    class="fa fa-copy"
+                                                    aria-hidden="true"
+                                                ></i>
+                                                {{
+                                                    trans(
+                                                        EVALUATION_DOCUMENT_DUPLICATE_HERE,
+                                                    )
+                                                }}
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a
+                                                class="dropdown-item"
+                                                @click="
+                                                    prepareDocumentDuplicationToWork(
+                                                        d,
+                                                    )
+                                                "
+                                            >
+                                                <i
+                                                    class="fa fa-copy"
+                                                    aria-hidden="true"
+                                                ></i>
+                                                {{
+                                                    trans(
+                                                        EVALUATION_DOCUMENT_DUPLICATE_TO_OTHER_EVALUATION,
+                                                    )
+                                                }}</a
+                                            >
+                                        </li>
+                                        <!--move document-->
+                                        <li
+                                            v-if="
+                                                d.storedObject._permissions
+                                                    .canEdit
+                                            "
+                                        >
+                                            <a
+                                                class="dropdown-item"
+                                                @click="
+                                                    prepareDocumentMoveToWork(d)
+                                                "
+                                            >
+                                                <i
+                                                    class="fa fa-arrows"
+                                                    aria-hidden="true"
+                                                ></i>
+                                                {{
+                                                    trans(
+                                                        EVALUATION_DOCUMENT_MOVE,
+                                                    )
+                                                }}</a
+                                            >
+                                        </li>
+                                    </ul>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <AccompanyingPeriodWorkSelectorModal
+        v-if="showAccompanyingPeriodSelector"
+        v-model:selectedAcpw="selectedAcpw"
+        :accompanying-period-id="accompanyingPeriodId"
+        :is-evaluation-selector="true"
+        :ignore-accompanying-period-work-ids="[]"
+        @close-modal="showAccompanyingPeriodSelector = false"
+        @update:selectedEvaluation="selectedEvaluation = $event"
+    />
+</template>
+
+<script setup>
+import { ISOToDatetime } from "ChillMainAssets/chill/js/date";
+import ListWorkflowModal from "ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue";
+import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
+import DropFileModal from "ChillDocStoreAssets/vuejs/DropFileWidget/DropFileModal.vue";
+import {
+    EVALUATION_NOTIFICATION_NOTIFY_REFERRER,
+    EVALUATION_NOTIFICATION_NOTIFY_ANY,
+    EVALUATION_NOTIFICATION_SEND,
+    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 { ref, watch } from "vue";
+import AccompanyingPeriodWorkSelectorModal from "ChillPersonAssets/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue";
+
+defineProps([
+    "documents",
+    "docAnchorId",
+    "accompanyingPeriodId",
+    "accompanyingPeriodWorkId",
+]);
+const emit = defineEmits([
+    "inputDocumentTitle",
+    "removeDocument",
+    "duplicateDocument",
+    "statusDocumentChanged",
+    "goToGenerateWorkflow",
+    "goToGenerateNotification",
+    "duplicateDocumentToWork",
+]);
+
+const showAccompanyingPeriodSelector = ref(false);
+const selectedEvaluation = ref(null);
+const selectedDocumentToDuplicate = ref(null);
+const selectedDocumentToMove = ref(null);
+
+const prepareDocumentDuplicationToWork = (d) => {
+    selectedDocumentToDuplicate.value = d;
+    /** ensure selectedDocumentToMove is null */
+    selectedDocumentToMove.value = null;
+
+    showAccompanyingPeriodSelector.value = true;
+};
+
+const prepareDocumentMoveToWork = (d) => {
+    selectedDocumentToMove.value = d;
+    /** ensure selectedDocumentToDuplicate is null */
+    selectedDocumentToDuplicate.value = null;
+
+    showAccompanyingPeriodSelector.value = true;
+};
+
+watch(selectedEvaluation, (val) => {
+    if (selectedDocumentToDuplicate.value) {
+        emit("duplicateDocumentToEvaluation", {
+            evaluation: val,
+            document: selectedDocumentToDuplicate.value,
+        });
+    } else {
+        emit("moveDocumentToEvaluation", {
+            evaluationDest: val,
+            document: selectedDocumentToMove.value,
+        });
+    }
+});
+</script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index b54baf09a..0a39150bf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -1,699 +1,344 @@
 <template>
     <div>
-        <!--h2>
-      {{ $t('evaluation_title') }}
-   </h2-->
-
         <div class="m-md-3">
-            <!--div class="row mb-3">
-         <label class="col-sm-4 col-form-label">{{ $t('evaluation_status') }}</label>
-         <div class="col-sm-8">
-            <select class="form-select form-select-sm" v-model="status">
-               <option disabled value="">{{ $t('evaluation_choose_a_status') }}</option>
-               <option v-for="s in listAllStatus" :value="s.id">
-                  {{ s.id }}
-               </option>
-            </select>
-         </div>
-      </div-->
+            <DateInputs
+                :startDate="startDate"
+                :endDate="endDate"
+                :maxDate="maxDate"
+                :warningInterval="warningInterval"
+                @update:startDate="updateStartDate"
+                @update:endDate="updateEndDate"
+                @update:maxDate="updateMaxDate"
+                @update:warningInterval="updateWarningInterval"
+            />
 
-            <div class="row mb-3">
-                <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-                    {{ $t("evaluation_startdate") }}
-                </label>
-                <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-                    <input
-                        class="form-control form-control-sm"
-                        type="date"
-                        v-model="startDate"
-                    />
-                </div>
+            <TimeSpentInput
+                :timeSpent="timeSpent"
+                :timeSpentChoices="timeSpentChoices"
+                @update:timeSpent="updateTimeSpent"
+            />
 
-                <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-                    {{ $t("evaluation_enddate") }}
-                </label>
-                <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-                    <input
-                        class="form-control form-control-sm"
-                        type="date"
-                        v-model="endDate"
-                    />
-                </div>
-            </div>
+            <CommentInput :comment="comment" @update:comment="updateComment" />
 
-            <div class="row mb-3">
-                <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-                    {{ $t("evaluation_maxdate") }}
-                </label>
-                <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-                    <input
-                        class="form-control form-control-sm"
-                        type="date"
-                        v-model="maxDate"
-                    />
-                </div>
+            <DocumentsList
+                v-if="evaluation.documents.length > 0"
+                :documents="evaluation.documents"
+                :docAnchorId="docAnchorId"
+                :accompanyingPeriodId="store.state.work.accompanyingPeriod.id"
+                :accompanying-period-work-id="store.state.work.id"
+                @inputDocumentTitle="onInputDocumentTitle"
+                @removeDocument="removeDocument"
+                @duplicateDocument="duplicateDocument"
+                @duplicate-document-to-evaluation="
+                    duplicateDocumentToEvaluation
+                "
+                @move-document-to-evaluation="moveDocumentToEvaluation"
+                @statusDocumentChanged="onStatusDocumentChanged"
+                @goToGenerateWorkflow="goToGenerateWorkflowEvaluationDocument"
+                @goToGenerateNotification="goToGenerateDocumentNotification"
+            />
 
-                <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-                    {{ $t("evaluation_warning_interval") }}
-                </label>
-                <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-                    <input
-                        class="form-control form-control-sm"
-                        type="number"
-                        v-model.number="warningInterval"
-                    />
-                </div>
-            </div>
-
-            <div class="row mb-3">
-                <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-                    {{ $t("evaluation_time_spent") }}
-                </label>
-                <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-                    <select
-                        class="form-control form-control-sm"
-                        type="time"
-                        v-model="timeSpent"
-                    >
-                        <option disabled value="">
-                            {{ $t("select_time_spent") }}
-                        </option>
-                        <option
-                            v-for="(time, i) in timeSpentChoices"
-                            :value="time.value"
-                            :key="i"
-                        >
-                            {{ time.text }}
-                        </option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="row mb-3">
-                <label class="col-sm-4 col-form-label visually-hidden">{{
-                    $t("evaluation_public_comment")
-                }}</label>
-                <div class="col-sm-12">
-                    <comment-editor v-model:value="comment"></comment-editor>
-                </div>
-            </div>
-
-            <div v-if="evaluation.documents.length > 0" class="row mb-3">
-                <h5>{{ $t("Documents") }} :</h5>
-
-                <div class="flex-table">
-                    <div
-                        class="item-bloc"
-                        v-for="(d, i) in evaluation.documents"
-                        :key="d.id"
-                        :class="[
-                            parseInt(this.docAnchorId) === d.id
-                                ? 'bg-blink'
-                                : 'nothing',
-                        ]"
-                    >
-                        <div :id="`document_${d.id}`" class="item-row">
-                            <div class="input-group input-group-lg mb-3 row">
-                                <label class="col-sm-3 col-form-label"
-                                    >Titre du document:</label
-                                >
-                                <div class="col-sm-9">
-                                    <input
-                                        class="form-control document-title"
-                                        type="text"
-                                        :value="d.title"
-                                        :id="d.id"
-                                        :data-key="i"
-                                        @input="onInputDocumentTitle"
-                                    />
-                                </div>
-                            </div>
-                        </div>
-                        <div class="item-row">
-                            <div class="item-col item-meta">
-                                <p v-if="d.createdBy" class="createdBy">
-                                    Créé par {{ d.createdBy.text }}<br />
-                                    Le
-                                    {{
-                                        $d(
-                                            ISOToDatetime(d.createdAt.datetime),
-                                            "long",
-                                        )
-                                    }}
-                                </p>
-                            </div>
-                        </div>
-                        <div class="item-row">
-                            <div class="item-col">
-                                <ul class="record_actions">
-                                    <li
-                                        v-if="
-                                            d.workflows_availables.length > 0 ||
-                                            d.workflows.length > 0
-                                        "
-                                    >
-                                        <list-workflow-modal
-                                            :workflows="d.workflows"
-                                            :allowCreate="true"
-                                            relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument"
-                                            :relatedEntityId="d.id"
-                                            :workflowsAvailables="
-                                                d.workflows_availables
-                                            "
-                                            :preventDefaultMoveToGenerate="true"
-                                            :goToGenerateWorkflowPayload="{
-                                                doc: d,
-                                            }"
-                                            @go-to-generate-workflow="
-                                                goToGenerateWorkflowEvaluationDocument
-                                            "
-                                        ></list-workflow-modal>
-                                    </li>
-                                    <li>
-                                        <button
-                                            v-if="AmIRefferer"
-                                            class="btn btn-notify"
-                                            @click="
-                                                goToGenerateDocumentNotification(
-                                                    d,
-                                                    false,
-                                                )
-                                            "
-                                        ></button>
-                                        <template v-else>
-                                            <button
-                                                id="btnGroupNotifyButtons"
-                                                type="button"
-                                                class="btn btn-notify dropdown-toggle"
-                                                :title="$t('notification_send')"
-                                                data-bs-toggle="dropdown"
-                                                aria-expanded="false"
-                                            >
-                                                &nbsp;
-                                            </button>
-                                            <ul
-                                                class="dropdown-menu"
-                                                aria-labelledby="btnGroupNotifyButtons"
-                                            >
-                                                <li>
-                                                    <a
-                                                        class="dropdown-item"
-                                                        @click="
-                                                            goToGenerateDocumentNotification(
-                                                                d,
-                                                                true,
-                                                            )
-                                                        "
-                                                        >{{
-                                                            $t(
-                                                                "notification_notify_referrer",
-                                                            )
-                                                        }}</a
-                                                    >
-                                                </li>
-                                                <li>
-                                                    <a
-                                                        class="dropdown-item"
-                                                        @click="
-                                                            goToGenerateDocumentNotification(
-                                                                d,
-                                                                false,
-                                                            )
-                                                        "
-                                                        >{{
-                                                            $t(
-                                                                "notification_notify_any",
-                                                            )
-                                                        }}</a
-                                                    >
-                                                </li>
-                                            </ul>
-                                        </template>
-                                    </li>
-                                    <li>
-                                        <document-action-buttons-group
-                                            :stored-object="d.storedObject"
-                                            :filename="d.title"
-                                            :can-edit="true"
-                                            :execute-before-leave="
-                                                submitBeforeLeaveToEditor
-                                            "
-                                            :davLink="
-                                                d.storedObject._links?.dav_link
-                                                    .href
-                                            "
-                                            :davLinkExpiration="
-                                                d.storedObject._links?.dav_link
-                                                    .expiration
-                                            "
-                                            @on-stored-object-status-change="
-                                                onStatusDocumentChanged
-                                            "
-                                        ></document-action-buttons-group>
-                                    </li>
-                                    <li
-                                        v-if="
-                                            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="d.workflows.length === 0">
-                                        <a
-                                            class="btn btn-delete"
-                                            @click="removeDocument(d)"
-                                        >
-                                        </a>
-                                    </li>
-                                    <li v-if="Number.isInteger(d.id)">
-                                        <button
-                                            type="button"
-                                            @click="duplicateDocument(d)"
-                                            class="btn btn-duplicate"
-                                            title="Dupliquer"
-                                        ></button>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row mb-3">
-                <h6>{{ $t("document_add") }} :</h6>
-                <pick-template
-                    entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
-                    :id="evaluation.id"
-                    :templates="getTemplatesAvailables"
-                    :preventDefaultMoveToGenerate="true"
-                    @go-to-generate-document="submitBeforeGenerate"
-                >
-                    <template v-slot:title>
-                        <label class="col-form-label">{{
-                            $t("evaluation_generate_a_document")
-                        }}</label>
-                    </template>
-                </pick-template>
-                <div>
-                    <label class="col-form-label">{{
-                        $t("document_upload")
-                    }}</label>
-                    <ul class="record_actions document-upload">
-                        <li>
-                            <drop-file-modal
-                                :allow-remove="false"
-                                @add-document="addDocument"
-                            ></drop-file-modal>
-                        </li>
-                    </ul>
-                </div>
-            </div>
+            <DocumentActions
+                :evaluation="evaluation"
+                :templates="getTemplatesAvailables"
+                @addDocument="addDocument"
+                @submitBeforeGenerate="submitBeforeGenerate"
+            />
         </div>
     </div>
 </template>
 
-<script>
-import { ISOToDatetime } from "ChillMainAssets/chill/js/date";
-import { mapState } from "vuex";
-import PickTemplate from "ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue";
-import { buildLink } from "ChillDocGeneratorAssets/lib/document-generator";
-import ListWorkflowModal from "ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue";
-import { buildLinkCreate } from "ChillMainAssets/lib/entity-workflow/api";
-import { buildLinkCreate as buildLinkCreateNotification } from "ChillMainAssets/lib/entity-notification/api";
-import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
-import DropFileModal from "ChillDocStoreAssets/vuejs/DropFileWidget/DropFileModal.vue";
-import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
+<script setup>
+import { computed } from "vue";
+import { useStore } from "vuex";
+import DateInputs from "./DateInputs.vue";
+import TimeSpentInput from "./TimeSpentInput.vue";
+import CommentInput from "./CommentInput.vue";
+import DocumentsList from "./DocumentsList.vue";
+import DocumentActions from "./DocumentActions.vue";
+import {
+    trans,
+    EVALUATION_DOCUMENT_DUPLICATE_SUCCESS,
+    EVALUATION_DOCUMENT_MOVE_SUCCESS,
+} from "translator";
+import { useToast } from "vue-toast-notification";
 
-const i18n = {
-    messages: {
-        fr: {
-            evaluation_title: "Ecrire une évaluation",
-            evaluation_status: "Statut",
-            evaluation_choose_a_status: "Choisir un statut",
-            evaluation_startdate: "Date d'ouverture",
-            evaluation_enddate: "Date de fin",
-            evaluation_maxdate: "Date d'échéance",
-            evaluation_warning_interval: "Rappel (jours)",
-            evaluation_public_comment: "Note publique",
-            evaluation_comment_placeholder: "Commencez à écrire ...",
-            evaluation_generate_a_document: "Générer un document",
-            evaluation_choose_a_template: "Choisir un modèle",
-            evaluation_add_a_document: "Ajouter un document",
-            evaluation_add: "Ajouter une évaluation",
-            evaluation_time_spent: "Temps de rédaction",
-            select_time_spent: "Indiquez le temps de rédaction",
-            Documents: "Documents",
-            document_add: "Générer ou téléverser un document",
-            document_upload: "Téléverser un document",
-            document_title: "Titre du document",
-            template_title: "Nom du template",
-            browse: "Ajouter un document",
-            replace: "Remplacer",
-            download: "Télécharger le fichier existant",
-            notification_notify_referrer: "Notifier le référent",
-            notification_notify_any: "Notifier d'autres utilisateurs",
-            notification_send: "Envoyer une notification",
-        },
-    },
-};
+const props = defineProps(["evaluation", "docAnchorId"]);
+const store = useStore();
 
-export default {
-    name: "FormEvaluation",
-    props: ["evaluation", "docAnchorId"],
-    components: {
-        CommentEditor,
-        DropFileModal,
-        PickTemplate,
-        ListWorkflowModal,
-        DocumentActionButtonsGroup,
-    },
-    i18n,
-    data() {
-        return {
-            template: null,
-            asyncUploadOptions: {
-                maxFiles: 1,
-                maxPostSize: 15000000,
-                required: false,
-            },
-            timeSpentChoices: [
-                { text: "1 minute", value: 60 },
-                { text: "2 minutes", value: 120 },
-                { text: "3 minutes", value: 180 },
-                { text: "4 minutes", value: 240 },
-                { text: "5 minutes", value: 300 },
-                { text: "10 minutes", value: 600 },
-                { text: "15 minutes", value: 900 },
-                { text: "20 minutes", value: 1200 },
-                { text: "25 minutes", value: 1500 },
-                { text: "30 minutes", value: 1800 },
-                { text: "45 minutes", value: 2700 },
-                { text: "1 hour", value: 3600 },
-                { text: "1 hour 15 minutes", value: 4500 },
-                { text: "1 hour 30 minutes", value: 5400 },
-                { text: "1 hour 45 minutes", value: 6300 },
-                { text: "2 hours", value: 7200 },
-                { text: "2 hours 30 minutes", value: 9000 },
-                { text: "3 hours", value: 10800 },
-                { text: "3 hours 30 minutes", value: 12600 },
-                { text: "4 hours", value: 14400 },
-                { text: "4 hours 30 minutes", value: 16200 },
-                { text: "5 hours", value: 18000 },
-                { text: "5 hours 30 minutes", value: 19800 },
-                { text: "6 hours", value: 21600 },
-                { text: "6 hours 30 minutes", value: 23400 },
-                { text: "7 hours", value: 25200 },
-                { text: "7 hours 30 minutes", value: 27000 },
-                { text: "8 hours", value: 28800 },
-            ],
-        };
-    },
-    computed: {
-        ...mapState(["isPosting", "work", "me"]),
-        AmIRefferer() {
-            return !(
-                this.$store.state.work.accompanyingPeriod.user &&
-                this.$store.state.me &&
-                this.$store.state.work.accompanyingPeriod.user.id !==
-                    this.$store.state.me.id
-            );
-        },
-        getTemplatesAvailables() {
-            return this.$store.getters.getTemplatesAvailablesForEvaluation(
-                this.evaluation.evaluation,
-            );
-        },
-        canGenerate() {
-            return !this.$store.state.isPosting && this.template !== null;
-        },
-        startDate: {
-            get() {
-                console.log("evaluation", this.evaluation);
-                return this.evaluation.startDate;
-            },
-            set(v) {
-                this.$store.commit("setEvaluationStartDate", {
-                    key: this.evaluation.key,
-                    date: v,
-                });
-            },
-        },
-        endDate: {
-            get() {
-                return this.evaluation.endDate;
-            },
-            set(v) {
-                this.$store.commit("setEvaluationEndDate", {
-                    key: this.evaluation.key,
-                    date: v,
-                });
-            },
-        },
-        maxDate: {
-            get() {
-                return this.evaluation.maxDate;
-            },
-            set(v) {
-                this.$store.commit("setEvaluationMaxDate", {
-                    key: this.evaluation.key,
-                    date: v,
-                });
-            },
-        },
-        warningInterval: {
-            get() {
-                return this.evaluation.warningInterval;
-            },
-            set(v) {
-                this.$store.commit("setEvaluationWarningInterval", {
-                    key: this.evaluation.key,
-                    days: v,
-                });
-            },
-        },
-        timeSpent: {
-            get() {
-                return this.evaluation.timeSpent;
-            },
-            set(v) {
-                this.$store.commit("setEvaluationTimeSpent", {
-                    key: this.evaluation.key,
-                    time: v,
-                });
-            },
-        },
-        comment: {
-            get() {
-                return this.evaluation.comment;
-            },
-            set(v) {
-                this.$store.commit("setEvaluationComment", {
-                    key: this.evaluation.key,
-                    comment: v,
-                });
-            },
-        },
-    },
-    methods: {
-        ISOToDatetime,
-        listAllStatus() {
-            console.log("load all status");
-            let url = `/api/`;
-            fetch(url).then((response) => {
-                if (response.ok) {
-                    return response.json();
-                }
-                throw { m: "yeeah", s: response.status, b: response.body };
-            });
-        },
-        buildEditLink(document) {
-            return (
-                `/chill/wopi/edit/${document.storedObject.uuid}?returnPath=` +
-                encodeURIComponent(
-                    window.location.pathname +
-                        window.location.search +
-                        window.location.hash,
-                )
-            );
-        },
-        submitBeforeLeaveToEditor() {
-            console.log("submit beore edit 2");
-            // empty callback
-            const callback = () => null;
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
-        submitBeforeEdit(storedObject) {
-            const callback = (data) => {
-                let evaluation = data.accompanyingPeriodWorkEvaluations.find(
-                    (e) => e.key === this.evaluation.key,
-                );
-                let document = evaluation.documents.find(
-                    (d) => d.storedObject.id === storedObject.id,
-                );
-                //console.log('=> document', document);
-                window.location.assign(this.buildEditLink(document));
-            };
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
-        submitBeforeGenerate({ template }) {
-            const callback = (data) => {
-                let evaluationId = data.accompanyingPeriodWorkEvaluations.find(
-                    (e) => e.key === this.evaluation.key,
-                ).id;
+const $toast = useToast();
 
-                window.location.assign(
-                    buildLink(
-                        template,
-                        evaluationId,
-                        "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation",
-                    ),
-                );
-            };
+const timeSpentChoices = [
+    { text: "1 minute", value: 60 },
+    { text: "2 minutes", value: 120 },
+    { text: "3 minutes", value: 180 },
+    { text: "4 minutes", value: 240 },
+    { text: "5 minutes", value: 300 },
+    { text: "10 minutes", value: 600 },
+    { text: "15 minutes", value: 900 },
+    { text: "20 minutes", value: 1200 },
+    { text: "25 minutes", value: 1500 },
+    { text: "30 minutes", value: 1800 },
+    { text: "45 minutes", value: 2700 },
+    { text: "1 hour", value: 3600 },
+    { text: "1 hour 15 minutes", value: 4500 },
+    { text: "1 hour 30 minutes", value: 5400 },
+    { text: "1 hour 45 minutes", value: 6300 },
+    { text: "2 hours", value: 7200 },
+    { text: "2 hours 30 minutes", value: 9000 },
+    { text: "3 hours", value: 10800 },
+    { text: "3 hours 30 minutes", value: 12600 },
+    { text: "4 hours", value: 14400 },
+    { text: "4 hours 30 minutes", value: 16200 },
+    { text: "5 hours", value: 18000 },
+    { text: "5 hours 30 minutes", value: 19800 },
+    { text: "6 hours", value: 21600 },
+    { text: "6 hours 30 minutes", value: 23400 },
+    { text: "7 hours", value: 25200 },
+    { text: "7 hours 30 minutes", value: 27000 },
+    { text: "8 hours", value: 28800 },
+];
 
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
-        onInputDocumentTitle(event) {
-            const id = Number(event.target.id);
-            const key = Number(event.target.dataset.key) + 1;
-            const title = event.target.value;
-            this.$store.commit("updateDocumentTitle", {
-                id: id,
-                key: key,
-                evaluationKey: this.evaluation.key,
-                title: title,
-            });
-        },
-        addDocument({ stored_object, stored_object_version, file_name }) {
-            let document = {
-                type: "accompanying_period_work_evaluation_document",
-                storedObject: stored_object,
-                title: file_name,
-            };
-            this.$store.commit("addDocument", {
-                key: this.evaluation.key,
-                document,
-                stored_object_version,
-            });
-        },
-        /**
-         * 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}
-         */
-        replaceDocument(oldDocument, storedObject, storedObjectVersion) {
-            let document = {
-                type: "accompanying_period_work_evaluation_document",
-                storedObject: storedObject,
-                title: oldDocument.title,
-            };
-            this.$store.commit("replaceDocument", {
-                key: this.evaluation.key,
-                document,
-                oldDocument: oldDocument,
-                stored_object_version: storedObjectVersion,
-            });
-        },
-        removeDocument(document) {
-            if (
-                window.confirm(
-                    'Êtes-vous sûr·e de vouloir supprimer le document qui a pour titre "' +
-                        document.title +
-                        '" ?',
-                )
-            ) {
-                this.$store.commit("removeDocument", {
-                    key: this.evaluation.key,
-                    document: document,
-                });
-            }
-        },
-        duplicateDocument(document) {
-            this.$store.dispatch("duplicateDocument", {
-                evaluation_key: this.evaluation.key,
-                document: document,
-            });
-        },
-        onStatusDocumentChanged(newStatus) {
-            console.log("onStatusDocumentChanged", newStatus);
-            this.$store.commit("statusDocumentChanged", {
-                key: this.evaluation.key,
-                newStatus: newStatus,
-            });
-        },
-        goToGenerateWorkflowEvaluationDocument({ workflowName, payload }) {
-            const callback = (data) => {
-                let evaluation = data.accompanyingPeriodWorkEvaluations.find(
-                    (e) => e.key === this.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 this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
-        goToGenerateDocumentNotification(document, tos) {
-            const callback = (data) => {
-                let evaluation = data.accompanyingPeriodWorkEvaluations.find(
-                    (e) => e.key === this.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
-                            ? this.$store.state.work.accompanyingPeriod.user.id
-                            : null,
-                        window.location.pathname +
-                            window.location.search +
-                            window.location.hash,
-                    ),
-                );
-            };
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
+const startDate = computed({
+    get() {
+        return props.evaluation.startDate;
     },
-};
+    set(v) {
+        store.commit("setEvaluationStartDate", {
+            key: props.evaluation.key,
+            date: v,
+        });
+    },
+});
+
+const endDate = computed({
+    get() {
+        return props.evaluation.endDate;
+    },
+    set(v) {
+        store.commit("setEvaluationEndDate", {
+            key: props.evaluation.key,
+            date: v,
+        });
+    },
+});
+
+const maxDate = computed({
+    get() {
+        return props.evaluation.maxDate;
+    },
+    set(v) {
+        store.commit("setEvaluationMaxDate", {
+            key: props.evaluation.key,
+            date: v,
+        });
+    },
+});
+
+const warningInterval = computed({
+    get() {
+        return props.evaluation.warningInterval;
+    },
+    set(v) {
+        store.commit("setEvaluationWarningInterval", {
+            key: props.evaluation.key,
+            days: v,
+        });
+    },
+});
+
+const timeSpent = computed({
+    get() {
+        return props.evaluation.timeSpent;
+    },
+    set(v) {
+        store.commit("setEvaluationTimeSpent", {
+            key: props.evaluation.key,
+            time: v,
+        });
+    },
+});
+
+const comment = computed({
+    get() {
+        return props.evaluation.comment;
+    },
+    set(v) {
+        store.commit("setEvaluationComment", {
+            key: props.evaluation.key,
+            comment: v,
+        });
+    },
+});
+
+const getTemplatesAvailables = computed(() => {
+    return store.getters.getTemplatesAvailablesForEvaluation(
+        props.evaluation.evaluation,
+    );
+});
+
+// const getAccompanyingPeriod = computed(() => store.work)
+function updateStartDate(value) {
+    startDate.value = value;
+}
+
+function updateEndDate(value) {
+    endDate.value = value;
+}
+
+function updateMaxDate(value) {
+    maxDate.value = value;
+}
+
+function updateWarningInterval(value) {
+    warningInterval.value = value;
+}
+
+function updateTimeSpent(value) {
+    timeSpent.value = value;
+}
+
+function updateComment(value) {
+    comment.value = value;
+}
+
+function onInputDocumentTitle(event) {
+    const id = Number(event.target.id);
+    const key = Number(event.target.dataset.key) + 1;
+    const title = event.target.value;
+    store.commit("updateDocumentTitle", {
+        id: id,
+        key: key,
+        evaluationKey: props.evaluation.key,
+        title: title,
+    });
+}
+
+function addDocument({ stored_object, stored_object_version }) {
+    let document = {
+        type: "accompanying_period_work_evaluation_document",
+        storedObject: stored_object,
+        title: "Nouveau document",
+    };
+    store.commit("addDocument", {
+        key: props.evaluation.key,
+        document,
+        stored_object_version,
+    });
+}
+
+function removeDocument(document) {
+    if (
+        window.confirm(
+            'Êtes-vous sûr·e de vouloir supprimer le document qui a pour titre "' +
+                document.title +
+                '" ?',
+        )
+    ) {
+        store.commit("removeDocument", {
+            key: props.evaluation.key,
+            document: document,
+        });
+    }
+}
+
+function duplicateDocument(document) {
+    store.dispatch("duplicateDocument", {
+        evaluation_key: props.evaluation.key,
+        document: document,
+    });
+}
+
+function duplicateDocumentToEvaluation({ evaluation, document }) {
+    store
+        .dispatch("duplicateDocumentToEvaluation", {
+            evaluation: evaluation,
+            document: document,
+        })
+        .then(() => {
+            $toast.open({
+                message: trans(EVALUATION_DOCUMENT_DUPLICATE_SUCCESS),
+            });
+        })
+        .catch((e) => {
+            console.log(e);
+        });
+}
+
+function moveDocumentToEvaluation({ evaluationDest, document }) {
+    console.log("dest eval in formEvaluation", evaluationDest);
+    store
+        .dispatch("moveDocumentToEvaluation", {
+            evaluationInitial: props.evaluation,
+            evaluationDest: evaluationDest,
+            document: document,
+        })
+        .then(() => {
+            $toast.open({
+                message: trans(EVALUATION_DOCUMENT_MOVE_SUCCESS),
+            });
+        })
+        .catch((e) => {
+            console.log(e);
+        });
+}
+
+function onStatusDocumentChanged(newStatus) {
+    store.commit("statusDocumentChanged", {
+        key: props.evaluation.key,
+        newStatus: 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(
+            (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,
+            ),
+        );
+    };
+    store.dispatch("submit", callback).catch((e) => {
+        console.log(e);
+        throw e;
+    });
+}
 </script>
 
 <style lang="scss" scoped>
@@ -701,9 +346,6 @@ input.document-title {
     font-weight: bold;
     font-size: 1rem;
 }
-ul.document-upload {
-    justify-content: flex-start;
-}
 
 .bg-blink {
     color: #050000;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/TimeSpentInput.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/TimeSpentInput.vue
new file mode 100644
index 000000000..e03ec0ed5
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/TimeSpentInput.vue
@@ -0,0 +1,32 @@
+<template>
+    <div class="row mb-3">
+        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+            {{ trans(EVALUATION_TIME_SPENT) }}
+        </label>
+        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+            <select
+                class="form-control form-control-sm"
+                :value="timeSpent"
+                @input="$emit('update:timeSpent', $event.target.value)"
+            >
+                <option disabled value="">
+                    {{ trans(EVALUATION_TIME_SPENT) }}
+                </option>
+                <option
+                    v-for="time in timeSpentChoices"
+                    :value="time.value"
+                    :key="time.value"
+                >
+                    {{ time.text }}
+                </option>
+            </select>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { EVALUATION_TIME_SPENT, trans } from "translator";
+
+defineProps(["timeSpent", "timeSpentChoices"]);
+defineEmits(["update:timeSpent"]);
+</script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index a820d0816..741c87ddf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -11,12 +11,13 @@ import { findSocialActionsBySocialIssue } from "ChillPersonAssets/vuejs/_api/Soc
 import { create } from "ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js";
 import { fetchResults, makeFetch } from "ChillMainAssets/lib/api/apiMethods.ts";
 import { fetchTemplates } from "ChillDocGeneratorAssets/api/pickTemplate.js";
-import { duplicate } from "../_api/accompanyingCourseWorkEvaluationDocument";
+import {
+  duplicate,
+  duplicateDocumentToEvaluation,
+  moveDocumentToEvaluation,
+} from "../_api/accompanyingCourseWorkEvaluationDocument";
 
 const debug = process.env.NODE_ENV !== "production";
-const evalFQDN = encodeURIComponent(
-  "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation",
-);
 
 const store = createStore({
   strict: debug,
@@ -298,15 +299,47 @@ const store = createStore({
       );
     },
     addDuplicatedDocument(state, { document, evaluation_key }) {
-      console.log("add duplicated document", document);
-      console.log("add duplicated dcuemnt - evaluation key", evaluation_key);
-
       let evaluation = state.evaluationsPicked.find(
         (e) => e.key === evaluation_key,
       );
       document.key = evaluation.documents.length + 1;
       evaluation.documents.splice(0, 0, document);
     },
+    addDuplicatedDocumentToEvaluation(state, { document, evaluation }) {
+      let evaluationDest = state.evaluationsPicked.find(
+        (e) => e.id === evaluation.id,
+      );
+      if (evaluationDest) {
+        console.log("add duplicated document to evaluation", evaluationDest);
+        document.key = evaluationDest.documents.length + 1;
+        evaluationDest.documents.splice(0, 0, document);
+      }
+    },
+    moveDocumentToEvaluation(
+      state,
+      { evaluationInitial, evaluationDest, document },
+    ) {
+      let evaluationA = state.evaluationsPicked.find(
+        (e) => e.id === evaluationInitial.id,
+      );
+      let evaluationB = state.evaluationsPicked.find(
+        (e) => e.id === evaluationDest.id,
+      );
+
+      if (evaluationB) {
+        // add document to chosen evaluation if evaluation is part of the same social work
+        document.key = evaluationB.documents.length + 1;
+        evaluationB.documents.splice(0, 0, document);
+      }
+
+      // remove document from original evaluation
+      const indexToRemove = evaluationA.documents.findIndex(
+        (doc) => doc.id === document.id,
+      );
+      if (indexToRemove !== -1) {
+        evaluationA.documents.splice(indexToRemove, 1);
+      }
+    },
     /**
      * Replaces a document in the state with a new document.
      *
@@ -603,6 +636,44 @@ const store = createStore({
       const newDoc = await duplicate(document.id);
       commit("addDuplicatedDocument", { document: newDoc, evaluation_key });
     },
+    async duplicateDocumentToEvaluation({ commit }, { document, evaluation }) {
+      try {
+        const newDoc = await duplicateDocumentToEvaluation(
+          document.id,
+          evaluation.id,
+        );
+        commit("addDuplicatedDocumentToEvaluation", {
+          document: newDoc,
+          evaluation,
+        });
+
+        return newDoc;
+      } catch (error) {
+        console.error("Failed to move document:", error);
+        throw error;
+      }
+    },
+    async moveDocumentToEvaluation(
+      { commit },
+      { evaluationInitial, evaluationDest, document },
+    ) {
+      try {
+        const response = await moveDocumentToEvaluation(
+          document.id,
+          evaluationDest.id,
+        );
+        commit("moveDocumentToEvaluation", {
+          evaluationInitial,
+          evaluationDest,
+          document,
+        });
+
+        return response;
+      } catch (error) {
+        console.error("Failed to move document:", error);
+        throw error;
+      }
+    },
     removeDocument({ commit }, payload) {
       commit("removeDocument", payload);
     },
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts
index ddb37fab1..a5dcd4f2c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts
@@ -9,3 +9,23 @@ export const duplicate = async (
         `/api/1.0/person/accompanying-course-work-evaluation-document/${id}/duplicate`,
     );
 };
+
+export const duplicateDocumentToEvaluation = async (
+    document_id: number,
+    evaluation_id: number,
+): Promise<AccompanyingPeriodWorkEvaluationDocument> => {
+    return makeFetch<null, AccompanyingPeriodWorkEvaluationDocument>(
+        "POST",
+        `/api/1.0/person/accompanying-course-work-evaluation-document/${document_id}/evaluation/${evaluation_id}/duplicate`,
+    );
+};
+
+export const moveDocumentToEvaluation = async (
+    document_id: number,
+    evaluation_id: number,
+): Promise<AccompanyingPeriodWorkEvaluationDocument> => {
+    return makeFetch<null, AccompanyingPeriodWorkEvaluationDocument>(
+        "POST",
+        `/api/1.0/person/accompanying-course-work-evaluation-document/${document_id}/evaluation/${evaluation_id}/move`,
+    );
+};
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationItem.vue
new file mode 100644
index 000000000..fc641a0a2
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationItem.vue
@@ -0,0 +1,70 @@
+<template>
+    <div class="container">
+        <div class="item-bloc">
+            <div class="item-row">
+                <h2 class="badge-title">
+                    <span class="title_label"></span>
+                    <span class="title_action">
+                        <span>
+                            {{ trans(EVALUATION) }}:
+                            <span class="badge bg-light text-dark">
+                                {{ eval?.evaluation?.title.fr }}
+                            </span>
+                        </span>
+
+                        <ul class="small_in_title columns mt-1">
+                            <li>
+                                <span class="item-key">
+                                    {{
+                                        trans(
+                                            ACCOMPANYING_COURSE_WORK_START_DATE,
+                                        )
+                                    }}
+                                    :
+                                </span>
+                                <b>{{ formatDate(eval.startDate) }}</b>
+                            </li>
+
+                            <li v-if="eval.endDate">
+                                <span class="item-key">
+                                    {{
+                                        trans(ACCOMPANYING_COURSE_WORK_END_DATE)
+                                    }}
+                                    :
+                                </span>
+                                <b>{{ formatDate(eval.endDate) }}</b>
+                            </li>
+                        </ul>
+                    </span>
+                </h2>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import {
+    ACCOMPANYING_COURSE_WORK_END_DATE,
+    ACCOMPANYING_COURSE_WORK_START_DATE,
+    EVALUATION,
+    trans,
+} from "translator";
+import { ISOToDate } from "ChillMainAssets/chill/js/date";
+import { DateTime } from "ChillMainAssets/types";
+import { AccompanyingPeriodWorkEvaluation } from "../../../types";
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const props = defineProps<{ eval: AccompanyingPeriodWorkEvaluation }>();
+const formatDate = (dateObject: DateTime) => {
+    if (dateObject) {
+        const parsedDate = ISOToDate(dateObject.datetime);
+        if (parsedDate) {
+            return new Intl.DateTimeFormat("default", {
+                dateStyle: "short",
+            }).format(parsedDate);
+        } else {
+            return "";
+        }
+    }
+};
+</script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationList.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationList.vue
new file mode 100644
index 000000000..8581546f1
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationList.vue
@@ -0,0 +1,47 @@
+<template>
+    <div class="results">
+        <div
+            v-for="evaluation in evaluations"
+            :key="evaluation.id"
+            class="list-item"
+        >
+            <label class="acpw-item">
+                <div>
+                    <input
+                        type="radio"
+                        :value="evaluation"
+                        v-model="selectedEvaluation"
+                        name="item"
+                    />
+                </div>
+
+                <accompanying-period-work-evaluation-item :eval="evaluation" />
+            </label>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { AccompanyingPeriodWorkEvaluation } from "../../../types";
+import { defineProps, ref, watch } from "vue";
+import AccompanyingPeriodWorkEvaluationItem from "ChillPersonAssets/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationItem.vue";
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const props = defineProps<{
+    evaluations: AccompanyingPeriodWorkEvaluation[];
+}>();
+const selectedEvaluation = ref<AccompanyingPeriodWorkEvaluation | null>(null);
+
+// eslint-disable-next-line vue/valid-define-emits
+const emit = defineEmits();
+
+watch(selectedEvaluation, (newValue) => {
+    emit("update:selectedEvaluation", newValue);
+});
+</script>
+
+<style>
+.acpw-item {
+    display: flex;
+}
+</style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue
index b2ebc5f1c..02f26656e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue
@@ -26,14 +26,24 @@ import AccompanyingPeriodWorkItem from "./AccompanyingPeriodWorkItem.vue";
 import { AccompanyingPeriodWork } from "../../../types";
 import { defineProps, ref, watch } from "vue";
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const props = defineProps<{
     accompanyingPeriodWorks: AccompanyingPeriodWork[];
+    selectedAcpw?: AccompanyingPeriodWork | null;
 }>();
-const selectedAcpw = ref<AccompanyingPeriodWork | null>(null);
+const selectedAcpw = ref<AccompanyingPeriodWork | null>(
+    props.selectedAcpw ?? null,
+);
 
-// eslint-disable-next-line vue/valid-define-emits
-const emit = defineEmits();
+const emit = defineEmits<{
+    "update:selectedAcpw": [value: AccompanyingPeriodWork | null];
+}>();
+
+watch(
+    () => props.selectedAcpw,
+    (val) => {
+        selectedAcpw.value = val ?? null;
+    },
+);
 
 watch(selectedAcpw, (newValue) => {
     emit("update:selectedAcpw", newValue);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
index 4b4f3ddba..254595cb3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="row justify-content-end">
+        <div class="row justify-content-end" v-if="!isEvaluationSelector">
             <div class="col-md-6 col-sm-10" v-if="selectedAcpw">
                 <ul class="list-suggest remove-items">
                     <li>
@@ -14,7 +14,7 @@
             </div>
         </div>
 
-        <ul class="record_actions">
+        <ul v-if="!showModal" class="record_actions">
             <li>
                 <a class="btn btn-sm btn-create mt-3" @click="openModal">
                     {{ trans(ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK) }}
@@ -40,9 +40,15 @@
 
                 <template #body>
                     <accompanying-period-work-list
+                        v-if="evaluations.length === 0"
                         :accompanying-period-works="accompanyingPeriodWorks"
                         v-model:selectedAcpw="selectedAcpw"
                     />
+                    <accompanying-period-work-evaluation-list
+                        v-if="evaluations.length > 0"
+                        :evaluations="evaluations"
+                        v-model:selectedEvaluation="selectedEvaluation"
+                    />
                 </template>
 
                 <template #footer>
@@ -60,58 +66,109 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
+import { ref, watch, onMounted } from "vue";
 import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import AccompanyingPeriodWorkList from "./AccompanyingPeriodWorkList.vue";
 import { AccompanyingPeriodWork } from "../../../types";
 import {
+    trans,
     ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK,
     CONFIRM,
-    trans,
 } from "translator";
 import { fetchResults } from "ChillMainAssets/lib/api/apiMethods";
-
-interface AccompanyingPeriodWorkSelectorModalProps {
-    accompanyingPeriodId: number;
-}
+import AccompanyingPeriodWorkEvaluationList from "ChillPersonAssets/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationList.vue";
+import { AccompanyingPeriodWorkEvaluation } from "../../../types";
 
 const selectedAcpw = ref<AccompanyingPeriodWork | null>(null);
+const selectedEvaluation = ref<AccompanyingPeriodWorkEvaluation | null>(null);
 const showModal = ref(false);
 const accompanyingPeriodWorks = ref<AccompanyingPeriodWork[]>([]);
-const props = defineProps<AccompanyingPeriodWorkSelectorModalProps>();
+const evaluations = ref<AccompanyingPeriodWorkEvaluation[]>([]);
+
+const props = defineProps<{
+    accompanyingPeriodId: string;
+    isEvaluationSelector: boolean;
+    ignoreAccompanyingPeriodWorkIds: number[];
+}>();
 
 const emit = defineEmits<{
     pickWork: [payload: { work: AccompanyingPeriodWork | null }];
+    closeModal: [];
+    "update:selectedEvaluation": [evaluation: AccompanyingPeriodWorkEvaluation];
 }>();
 
 onMounted(() => {
     if (props.accompanyingPeriodId) {
-        getAccompanyingPeriodWorks(props.accompanyingPeriodId);
+        getAccompanyingPeriodWorks(parseInt(props.accompanyingPeriodId));
     } else {
         console.error("No accompanyingperiod id was given");
     }
+
+    showModal.value = true;
 });
 const getAccompanyingPeriodWorks = async (periodId: number) => {
     const url = `/api/1.0/person/accompanying-course/${periodId}/works.json`;
 
-    try {
-        accompanyingPeriodWorks.value = await fetchResults(url);
-    } catch (error) {
-        console.log(error);
+    const accompanyingPeriodWorksFetched =
+        await fetchResults<AccompanyingPeriodWork>(url);
+    if (props.isEvaluationSelector) {
+        accompanyingPeriodWorks.value = accompanyingPeriodWorksFetched.filter(
+            (acpw: AccompanyingPeriodWork) =>
+                acpw.accompanyingPeriodWorkEvaluations.length > 0 &&
+                typeof acpw.id !== "undefined" &&
+                !props.ignoreAccompanyingPeriodWorkIds.includes(acpw.id),
+        );
+    } else {
+        accompanyingPeriodWorks.value = accompanyingPeriodWorksFetched;
     }
-    /*  makeFetch<number, AccompanyingPeriodWork[]>("GET", url)
-    .then((response) => {
-      accompanyingPeriodWorks.value = response;
-    })
-    .catch((error) => {
-      console.log(error);
-    });*/
 };
 
-const openModal = () => (showModal.value = true);
-const closeModal = () => (showModal.value = false);
+watch(selectedAcpw, (newValue) => {
+    const inputField = document.getElementById(
+        "find_accompanying_period_work_acpw",
+    ) as HTMLInputElement;
+    if (inputField) {
+        inputField.value = String(newValue?.id || "");
+    }
+
+    /*  if (!props.isEvaluationSelector) {
+    console.log("Emitting from watch:", { work: newValue });
+    emit("pickWork", { work: newValue });
+  }*/
+});
+
+const openModal = () => {
+    showModal.value = true;
+};
+const closeModal = () => {
+    showModal.value = false;
+    selectedEvaluation.value = null;
+    // selectedAcpw.value = null;
+    emit("closeModal");
+};
 const confirmSelection = () => {
-    emit("pickWork", { work: selectedAcpw.value });
-    closeModal();
+    selectedAcpw.value = selectedAcpw.value;
+    console.log("selectedAcpw", selectedAcpw.value);
+
+    if (!props.isEvaluationSelector) {
+        if (selectedAcpw.value) {
+            // only emit if something is actually selected!
+            emit("pickWork", { work: selectedAcpw.value });
+            closeModal();
+        }
+        // optionally show some error or warning if not selected
+        return;
+    }
+
+    if (selectedAcpw.value && props.isEvaluationSelector) {
+        evaluations.value =
+            selectedAcpw.value.accompanyingPeriodWorkEvaluations;
+    }
+
+    if (selectedEvaluation.value && props.isEvaluationSelector) {
+        // console.log('evaluation log in modal', selectedEvaluation.value)
+        emit("update:selectedEvaluation", selectedEvaluation.value);
+        closeModal();
+    }
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriodWorkDuplicate/_details.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriodWorkDuplicate/_details.html.twig
index 94007ca9c..ed1a27cad 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriodWorkDuplicate/_details.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriodWorkDuplicate/_details.html.twig
@@ -1,9 +1,9 @@
 {%- macro details(w, accompanyingCourse, options) -%}
     {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with {
-        'displayAction': false,
+        'displayAction': true,
         'displayContent': 'short',
         'displayFontSmall': true,
         'itemBlocClass': '',
-        'displayNotification': false
+        'displayNotification': true
     } %}
 {% endmacro %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriodWorkDuplicate/assign_acpw_duplicate.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriodWorkDuplicate/assign_acpw_duplicate.html.twig
index a8d2f7f07..67e7ea736 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriodWorkDuplicate/assign_acpw_duplicate.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriodWorkDuplicate/assign_acpw_duplicate.html.twig
@@ -2,10 +2,10 @@
 
 {% set activeRouteKey = 'chill_person_accompanying_period_work_assign_duplicate' %}
 
-{% block title %}{{ 'Assign an accompanying period work duplicate' }}{% endblock %}
-
 {% import '@ChillPerson/AccompanyingPeriodWorkDuplicate/_details.html.twig' as details %}
 
+{% block title %}{{ 'Assign an accompanying period work duplicate' }}{% endblock %}
+
 {% block content %}
     <div class="person-duplicate">
 
@@ -18,7 +18,7 @@
             </div>
         </div>
 
-        <h3>{{ 'acpw_duplicate.Assign duplicate'|trans }}</h3>
+        <h1>{{ 'acpw_duplicate.Assign duplicate'|trans }}</h1>
         {{ form_start(form) }}
         {%- if form.acpw is defined -%}
             {{ form_row(form.acpw) }}
diff --git a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriodWorkEvaluationDocument/AccompanyingPeriodWorkEvaluationDocumentDuplicator.php b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriodWorkEvaluationDocument/AccompanyingPeriodWorkEvaluationDocumentDuplicator.php
index 5ca37aa71..3da33cc79 100644
--- a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriodWorkEvaluationDocument/AccompanyingPeriodWorkEvaluationDocumentDuplicator.php
+++ b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriodWorkEvaluationDocument/AccompanyingPeriodWorkEvaluationDocumentDuplicator.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Service\AccompanyingPeriodWorkEvaluationDocument;
 
 use Chill\DocStoreBundle\Service\StoredObjectDuplicate;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
 use Symfony\Component\Clock\ClockInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -36,4 +37,17 @@ class AccompanyingPeriodWorkEvaluationDocumentDuplicator
 
         return $newDocument;
     }
+
+    public function duplicateToEvaluation(AccompanyingPeriodWorkEvaluationDocument $document, AccompanyingPeriodWorkEvaluation $evaluation): AccompanyingPeriodWorkEvaluationDocument
+    {
+        $newDocument = new AccompanyingPeriodWorkEvaluationDocument();
+        $newDocument
+            ->setTitle($document->getTitle().' ('.$this->translator->trans('accompanying_course_evaluation_document.duplicated_at', ['at' => $this->clock->now()]).')')
+            ->setStoredObject($this->storedObjectDuplicate->duplicate($document->getStoredObject()))
+        ;
+
+        $evaluation->addDocument($newDocument);
+
+        return $newDocument;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
index 637ab399d..c5f244525 100644
--- a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
@@ -1993,3 +1993,33 @@ paths:
             application/json:
               schema:
                 type: object
+
+  /1.0/person/accompanying-course-work-evaluation-document/{document_id}/evaluation/{evaluation_id}/duplicate:
+    post:
+      tags:
+        - accompanying-course-work-evaluation-document
+      summary: Dupliate an an accompanying period work evaluation document to another evaluation
+      parameters:
+        - in: path
+          name: document_id
+          required: true
+          description: The document's id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+        - in: path
+          name: evaluation_id
+          required: true
+          description: The evaluation's id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      responses:
+        200:
+          description: "OK"
+          content:
+            application/json:
+              schema:
+                type: object
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 8e938af13..0b00ad7df 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -753,6 +753,42 @@ evaluation:
     delay: Délai
     notificationDelay: Délai de notification
     url: Lien internet
+    title: Ecrire une évaluation
+    status: Statut
+    choose_a_status: Choisir un statut
+    startdate: Date d'ouverture
+    enddate: Date de fin
+    maxdate: Date d'échéance
+    warning_interval: Rappel (jours)
+    public_comment: Note publique
+    comment_placeholder: Commencez à écrire ...
+    generate_a_document: Générer un document
+    choose_a_template: Choisir un modèle
+    add_a_document: Ajouter un document
+    add: Ajouter une évaluation
+    time_spent: Temps de rédaction
+    select_time_spent: Indiquez le temps de rédaction
+    Documents: Documents
+    document_add: Générer ou téléverser un document
+    document_upload: Téléverser un document
+    document_title: Titre du document
+    template_title: Nom du template
+    browse: Ajouter un document
+    replace: Remplacer
+    download: Télécharger le fichier existant
+    notification_notify_referrer: Notifier le référent
+    notification_notify_any: Notifier d'autres utilisateurs
+    notification_send: Envoyer une notification
+    document:
+      edit: Modifier
+      delete: Supprimer
+      move: Déplacer
+      duplicate: Dupliquer
+      duplicate_here: Dupliquer ici
+      duplicate_to_other_evaluation: Dupliquer vers une autre évaluation
+      duplicate_success: Le document d'évaluation a été dupliquer
+      move_success: Le document d'évaluation a été déplacer
+
 
 goal:
    desactivationDate: Date de désactivation
@@ -777,7 +813,6 @@ relation:
     reverseTitle: Deuxième membre
 
 days: jours
-months: mois
 years: années
 
 # specific to closing motive
@@ -1525,3 +1560,6 @@ my_parcours_filters:
   parcours_intervening: Intervenant
   is_open: Parcours ouverts
   is_closed: Parcours clôturés
+
+document_duplicate:
+    to_evaluation_success: "Le document a été dupliquer"

From c39637180a8e81d972c004ef5e169ce28c72381c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 11 Sep 2025 13:04:50 +0200
Subject: [PATCH 03/15] Release v4.4.0

---
 .changes/unreleased/Feature-20250211-142243.yaml | 6 ------
 .changes/unreleased/Feature-20250403-100311.yaml | 6 ------
 .changes/unreleased/Feature-20250403-100857.yaml | 6 ------
 .changes/unreleased/Fixed-20250909-173639.yaml   | 6 ------
 .changes/unreleased/Fixed-20250910-180935.yaml   | 6 ------
 .changes/v4.4.0.md                               | 8 ++++++++
 CHANGELOG.md                                     | 9 +++++++++
 7 files changed, 17 insertions(+), 30 deletions(-)
 delete mode 100644 .changes/unreleased/Feature-20250211-142243.yaml
 delete mode 100644 .changes/unreleased/Feature-20250403-100311.yaml
 delete mode 100644 .changes/unreleased/Feature-20250403-100857.yaml
 delete mode 100644 .changes/unreleased/Fixed-20250909-173639.yaml
 delete mode 100644 .changes/unreleased/Fixed-20250910-180935.yaml
 create mode 100644 .changes/v4.4.0.md

diff --git a/.changes/unreleased/Feature-20250211-142243.yaml b/.changes/unreleased/Feature-20250211-142243.yaml
deleted file mode 100644
index 4f0b25e88..000000000
--- a/.changes/unreleased/Feature-20250211-142243.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Allow the merge of two accompanying period works
-time: 2025-02-11T14:22:43.134106669+01:00
-custom:
-    Issue: "359"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20250403-100311.yaml b/.changes/unreleased/Feature-20250403-100311.yaml
deleted file mode 100644
index 1076efc1a..000000000
--- a/.changes/unreleased/Feature-20250403-100311.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-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
diff --git a/.changes/unreleased/Feature-20250403-100857.yaml b/.changes/unreleased/Feature-20250403-100857.yaml
deleted file mode 100644
index 113ae8a2a..000000000
--- a/.changes/unreleased/Feature-20250403-100857.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-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
diff --git a/.changes/unreleased/Fixed-20250909-173639.yaml b/.changes/unreleased/Fixed-20250909-173639.yaml
deleted file mode 100644
index 57dc42e20..000000000
--- a/.changes/unreleased/Fixed-20250909-173639.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix display of 'duplicate' and 'merge' buttons in CRUD templates
-time: 2025-09-09T17:36:39.960419639+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20250910-180935.yaml b/.changes/unreleased/Fixed-20250910-180935.yaml
deleted file mode 100644
index 9e0a90cc8..000000000
--- a/.changes/unreleased/Fixed-20250910-180935.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix saving notification preferences in user's profile
-time: 2025-09-10T18:09:35.525979715+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/v4.4.0.md b/.changes/v4.4.0.md
new file mode 100644
index 000000000..bc8d2e98f
--- /dev/null
+++ b/.changes/v4.4.0.md
@@ -0,0 +1,8 @@
+## v4.4.0 - 2025-09-11
+### Feature
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works   
+* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation   
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works   
+### Fixed
+* Fix display of 'duplicate' and 'merge' buttons in CRUD templates   
+* Fix saving notification preferences in user's profile   
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd6e978ac..d132554df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,15 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## 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   

From db98519e6538d8d16d4e73b00af7d1898f760e45 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Thu, 11 Sep 2025 14:21:05 +0000
Subject: [PATCH 04/15] Fix translations and close button modal for duplicate
 evaluation document

---
 .changes/unreleased/Fixed-20250911-151223.yaml      |  6 ++++++
 .../Resources/public/vuejs/_components/Modal.vue    |  2 ++
 .../AccompanyingPeriodWorkSelectorModal.vue         | 13 ++++++++-----
 .../ChillPersonBundle/translations/messages.fr.yml  |  7 ++++---
 4 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20250911-151223.yaml

diff --git a/.changes/unreleased/Fixed-20250911-151223.yaml b/.changes/unreleased/Fixed-20250911-151223.yaml
new file mode 100644
index 000000000..ef26fe298
--- /dev/null
+++ b/.changes/unreleased/Fixed-20250911-151223.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: fix translations in duplicate evaluation document modal and realign close modal button
+time: 2025-09-11T15:12:23.994553843+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index 06e1bfa1a..7ec7f47e2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -84,6 +84,8 @@ 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
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
index 254595cb3..007486bc2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
@@ -30,11 +30,7 @@
             >
                 <template #header>
                     <h3>
-                        {{
-                            trans(
-                                ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK,
-                            )
-                        }}
+                        {{ getModalTitle() }}
                     </h3>
                 </template>
 
@@ -73,6 +69,7 @@ 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";
@@ -97,6 +94,11 @@ 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));
@@ -106,6 +108,7 @@ onMounted(() => {
 
     showModal.value = true;
 });
+
 const getAccompanyingPeriodWorks = async (periodId: number) => {
     const url = `/api/1.0/person/accompanying-course/${periodId}/works.json`;
 
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 0b00ad7df..cde9a6add 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/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é dupliquer
-      move_success: Le document d'évaluation a été déplacer
+      duplicate_success: Le document d'évaluation a été dupliqué
+      move_success: Le document d'évaluation a été déplacé
 
 
 goal:
@@ -1543,7 +1543,8 @@ 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: Selectionner un action d'accompagnement
+    Select accompanying period work: Sélectionner une action d'accompagnement
+    Select an evaluation: Sélectionner une évaluation
     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é.

From d984dec7db3678e1c4f911988b3405fd15bbd016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 11 Sep 2025 16:26:51 +0200
Subject: [PATCH 05/15] Release v4.4.1

---
 .changes/unreleased/Fixed-20250911-151223.yaml | 6 ------
 .changes/v4.4.1.md                             | 3 +++
 CHANGELOG.md                                   | 4 ++++
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .changes/unreleased/Fixed-20250911-151223.yaml
 create mode 100644 .changes/v4.4.1.md

diff --git a/.changes/unreleased/Fixed-20250911-151223.yaml b/.changes/unreleased/Fixed-20250911-151223.yaml
deleted file mode 100644
index ef26fe298..000000000
--- a/.changes/unreleased/Fixed-20250911-151223.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: fix translations in duplicate evaluation document modal and realign close modal button
-time: 2025-09-11T15:12:23.994553843+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/v4.4.1.md b/.changes/v4.4.1.md
new file mode 100644
index 000000000..dd4c339ab
--- /dev/null
+++ b/.changes/v4.4.1.md
@@ -0,0 +1,3 @@
+## v4.4.1 - 2025-09-11
+### Fixed
+* fix translations in duplicate evaluation document modal and realign close modal button   
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d132554df..2734c716f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## 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   

From 7b60b7a8af2347d6ac2a43befd3595f6052bcfaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 12 Sep 2025 10:42:34 +0000
Subject: [PATCH 06/15] Fix document generation and workflow generation do not
 work on accompanying period work documents

---
 .../unreleased/Fixed-20250912-123656.yaml     |   6 +
 .../vuejs/DropFileWidget/DropFileModal.vue    |   6 +-
 .../Resources/views/Menu/quick_menu.html.twig |   2 +-
 .../components/DocumentActions.vue            |  33 +++-
 .../components/DocumentsList.vue              | 164 ++++++++++++++----
 .../components/FormEvaluation.vue             |  27 +--
 6 files changed, 168 insertions(+), 70 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20250912-123656.yaml

diff --git a/.changes/unreleased/Fixed-20250912-123656.yaml b/.changes/unreleased/Fixed-20250912-123656.yaml
new file mode 100644
index 000000000..9d1a638a4
--- /dev/null
+++ b/.changes/unreleased/Fixed-20250912-123656.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix document generation and workflow generation do not work on accompanying period work documents
+time: 2025-09-12T12:36:56.444183161+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
index 4ca2d49a1..ef6846828 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
+++ b/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_REPLACE, DOCUMENT_ADD, trans } from "translator";
+import { DOCUMENT_ADD, trans } from "translator";
 
 interface DropFileConfig {
     allowRemove: boolean;
@@ -78,9 +78,7 @@ function closeModal(): void {
     >
         {{ trans(DOCUMENT_ADD) }}
     </button>
-    <button v-else @click="openModal" class="dropdown-item">
-        {{ trans(DOCUMENT_REPLACE) }}
-    </button>
+    <button v-else @click="openModal" class="btn btn-edit"></button>
     <modal
         v-if="state.showModal"
         :modal-dialog-class="modalClasses"
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/quick_menu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/quick_menu.html.twig
index 9e048d706..66fce55fb 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/quick_menu.html.twig
+++ b/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="fa fa-flash"></i>
+        <i class="bi bi-lightning-fill"></i>
     </a>
     <div class="dropdown-menu">
         {% for menu in menus %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentActions.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentActions.vue
index 592e9a7fd..126fbffe6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentActions.vue
+++ b/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="$emit('submitBeforeGenerate', $event)"
+            @go-to-generate-document="submitBeforeGenerate"
         >
             <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,9 +39,34 @@ import {
     EVALUATION_GENERATE_A_DOCUMENT,
     trans,
 } from "translator";
+import { buildLink } from "ChillDocGeneratorAssets/lib/document-generator";
+import { useStore } from "vuex";
 
-defineProps(["evaluation", "templates"]);
-defineEmits(["addDocument", "submitBeforeGenerate"]);
+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;
+    });
+}
 </script>
 
 <style scoped>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
index 4132b388e..77fa443d4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
@@ -58,7 +58,7 @@
                                     :preventDefaultMoveToGenerate="true"
                                     :goToGenerateWorkflowPayload="{ doc: d }"
                                     @go-to-generate-workflow="
-                                        $emit('goToGenerateWorkflow', $event)
+                                        goToGenerateWorkflowEvaluationDocument
                                     "
                                 ></list-workflow-modal>
                             </li>
@@ -95,10 +95,9 @@
                                             <a
                                                 class="dropdown-item"
                                                 @click="
-                                                    $emit(
-                                                        'goToGenerateNotification',
+                                                    goToGenerateDocumentNotification(
                                                         d,
-                                                        true,
+                                                        false,
                                                     )
                                                 "
                                             >
@@ -113,8 +112,7 @@
                                             <a
                                                 class="dropdown-item"
                                                 @click="
-                                                    $emit(
-                                                        'goToGenerateNotification',
+                                                    goToGenerateDocumentNotification(
                                                         d,
                                                         false,
                                                     )
@@ -150,15 +148,35 @@
                                     "
                                 ></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-edit dropdown-toggle"
+                                        class="btn btn-outline-primary dropdown-toggle"
                                         type="button"
                                         data-bs-toggle="dropdown"
                                         aria-expanded="false"
                                     >
-                                        {{ trans(EVALUATION_DOCUMENT_EDIT) }}
+                                        <i class="bi bi-lightning-fill"></i>
                                     </button>
                                     <ul class="dropdown-menu">
                                         <!--delete-->
@@ -180,27 +198,6 @@
                                                 }}
                                             </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
@@ -300,35 +297,45 @@ 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 { ref, watch } from "vue";
+import { computed, 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";
 
-defineProps([
+const props = defineProps([
     "documents",
     "docAnchorId",
     "accompanyingPeriodId",
-    "accompanyingPeriodWorkId",
+    "evaluation",
 ]);
 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 */
@@ -358,4 +365,91 @@ 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>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 0a39150bf..76eaf2e9e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/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,7 +34,6 @@
                 "
                 @move-document-to-evaluation="moveDocumentToEvaluation"
                 @statusDocumentChanged="onStatusDocumentChanged"
-                @goToGenerateWorkflow="goToGenerateWorkflowEvaluationDocument"
                 @goToGenerateNotification="goToGenerateDocumentNotification"
             />
 
@@ -42,7 +41,6 @@
                 :evaluation="evaluation"
                 :templates="getTemplatesAvailables"
                 @addDocument="addDocument"
-                @submitBeforeGenerate="submitBeforeGenerate"
             />
         </div>
     </div>
@@ -290,29 +288,6 @@ 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(

From ab98f3a1020625855d48c65e639c5a0c5c47f39c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 12 Sep 2025 12:47:06 +0200
Subject: [PATCH 07/15] Release v4.4.2

---
 .changes/unreleased/Fixed-20250912-123656.yaml | 6 ------
 .changes/v4.4.2.md                             | 3 +++
 CHANGELOG.md                                   | 4 ++++
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .changes/unreleased/Fixed-20250912-123656.yaml
 create mode 100644 .changes/v4.4.2.md

diff --git a/.changes/unreleased/Fixed-20250912-123656.yaml b/.changes/unreleased/Fixed-20250912-123656.yaml
deleted file mode 100644
index 9d1a638a4..000000000
--- a/.changes/unreleased/Fixed-20250912-123656.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix document generation and workflow generation do not work on accompanying period work documents
-time: 2025-09-12T12:36:56.444183161+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/v4.4.2.md b/.changes/v4.4.2.md
new file mode 100644
index 000000000..c04db028f
--- /dev/null
+++ b/.changes/v4.4.2.md
@@ -0,0 +1,3 @@
+## v4.4.2 - 2025-09-12
+### Fixed
+* Fix document generation and workflow generation do not work on accompanying period work documents   
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2734c716f..f0c695e2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ 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   

From 80a3734171f4c019498117791c10c2816822a0cf Mon Sep 17 00:00:00 2001
From: juminet <juminet@gmail.com>
Date: Fri, 19 Sep 2025 07:03:51 +0000
Subject: [PATCH 08/15] #426 Increased the number of required characters when
 setting a new password in Chill

---
 .changes/unreleased/Fixed-20250918-114044.yaml              | 6 ++++++
 src/Bundle/ChillMainBundle/Form/UserPasswordType.php        | 2 +-
 .../ChillMainBundle/Tests/Controller/UserControllerTest.php | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20250918-114044.yaml

diff --git a/.changes/unreleased/Fixed-20250918-114044.yaml b/.changes/unreleased/Fixed-20250918-114044.yaml
new file mode 100644
index 000000000..fe50576fe
--- /dev/null
+++ b/.changes/unreleased/Fixed-20250918-114044.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance
+time: 2025-09-18T11:40:44.858533536+02:00
+custom:
+    Issue: "426"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillMainBundle/Form/UserPasswordType.php b/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
index 256e68731..d3afb9250 100644
--- a/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
@@ -59,7 +59,7 @@ class UserPasswordType extends AbstractType
                 'invalid_message' => 'The password fields must match',
                 'constraints' => [
                     new Length([
-                        'min' => 9,
+                        'min' => 14,
                         'minMessage' => 'The password must be greater than {{ limit }} characters',
                     ]),
                     new NotBlank(),
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
index ba76df8ca..e135d3447 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
@@ -45,7 +45,7 @@ final class UserControllerTest extends WebTestCase
         self::assertResponseIsSuccessful();
 
         $username = 'Test_user'.uniqid();
-        $password = 'Password1234!';
+        $password = 'Password_1234!';
 
         // Fill in the form and submit it
 
@@ -99,7 +99,7 @@ final class UserControllerTest extends WebTestCase
     {
         $client = $this->getClientAuthenticatedAsAdmin();
         $crawler = $client->request('GET', "/fr/admin/user/{$userId}/edit_password");
-        $newPassword = '1234Password!';
+        $newPassword = '1234_Password!';
 
         $form = $crawler->selectButton('Changer le mot de passe')->form([
             'chill_mainbundle_user_password[new_password][first]' => $newPassword,

From be39fa16e72ae566d29b467c2468375a51939e29 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 3 Oct 2025 09:49:33 +0000
Subject: [PATCH 09/15] Signature fixes

---
 .changes/unreleased/DX-20251003-114344.yaml   |   6 +
 .../unreleased/Feature-20250724-161556.yaml   |   6 +
 .../unreleased/Feature-20250724-161628.yaml   |   6 +
 .../unreleased/Feature-20250724-172013.yaml   |   6 +
 .../unreleased/Feature-20251003-113838.yaml   |   6 +
 .../unreleased/Feature-20251003-113937.yaml   |   6 +
 .../unreleased/Feature-20251003-114233.yaml   |   6 +
 .../unreleased/Fixed-20251003-114144.yaml     |   6 +
 .../Resources/public/types/generic_doc.ts     |   2 +-
 .../AbstractStoredObjectVoter.php             |  12 +-
 .../StoredObjectVoterInterface.php            |   6 +
 .../AbstractStoredObjectVoterTest.php         | 166 +++++++++++-
 .../Controller/WorkflowApiController.php      |   3 +-
 ...WorkflowSignatureStateChangeController.php |  20 +-
 .../WorkflowWaitStepChangeController.php      |  41 +++
 .../ChillMainExtension.php                    |  18 ++
 .../lib/return_path/returnPathHelper.ts       |  13 +
 .../Resources/public/lib/workflow/api.ts      |  16 ++
 .../ChillMainBundle/Resources/public/types.ts |  58 +++++
 .../public/vuejs/DownloadExport/App.vue       |  97 +++----
 .../vuejs/WaitPostProcessWorkflow/App.vue     |  75 ++++++
 .../vuejs/WaitPostProcessWorkflow/index.ts    |  51 ++++
 .../public/vuejs/WorkflowAttachment/App.vue   |  24 +-
 .../Component/AttachmentList.vue              |  10 +-
 .../Component/PickGenericDoc.vue              |  16 +-
 .../Component/PickGenericDocModal.vue         |   3 +
 .../vuejs/_components/WaitingScreen.vue       |  62 +++++
 .../Resources/views/Workflow/index.html.twig  |   8 +-
 .../views/Workflow/waiting.html.twig          |  18 ++
 .../EntityWorkflowAttachmentVoter.php         |  53 ++++
 .../Normalizer/EntityWorkflowNormalizer.php   |  14 +-
 .../EntityWorkflowAttachmentVoterTest.php     | 173 +++++++++++++
 ...kflowRelatedEntityPermissionHelperTest.php | 237 +++++++++++++++++-
 .../PostSendExternalMessageHandlerTest.php    |  36 ++-
 .../WorkflowRelatedEntityPermissionHelper.php |  87 +++++--
 .../PostSendExternalMessageHandler.php        |  29 +++
 .../Workflow/SignatureStepStateChanger.php    |  83 ++++--
 .../ChillMainBundle/chill.api.specs.yaml      |  25 ++
 .../ChillMainBundle/chill.webpack.config.js   |   5 +-
 .../translations/messages.fr.yml              |   7 +
 40 files changed, 1393 insertions(+), 123 deletions(-)
 create mode 100644 .changes/unreleased/DX-20251003-114344.yaml
 create mode 100644 .changes/unreleased/Feature-20250724-161556.yaml
 create mode 100644 .changes/unreleased/Feature-20250724-161628.yaml
 create mode 100644 .changes/unreleased/Feature-20250724-172013.yaml
 create mode 100644 .changes/unreleased/Feature-20251003-113838.yaml
 create mode 100644 .changes/unreleased/Feature-20251003-113937.yaml
 create mode 100644 .changes/unreleased/Feature-20251003-114233.yaml
 create mode 100644 .changes/unreleased/Fixed-20251003-114144.yaml
 create mode 100644 src/Bundle/ChillMainBundle/Controller/WorkflowWaitStepChangeController.php
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/lib/return_path/returnPathHelper.ts
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/lib/workflow/api.ts
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/App.vue
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/index.ts
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/WaitingScreen.vue
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Workflow/waiting.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowAttachmentVoter.php
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Security/Authorization/EntityWorkflowAttachmentVoterTest.php

diff --git a/.changes/unreleased/DX-20251003-114344.yaml b/.changes/unreleased/DX-20251003-114344.yaml
new file mode 100644
index 000000000..c7b36e93a
--- /dev/null
+++ b/.changes/unreleased/DX-20251003-114344.yaml
@@ -0,0 +1,6 @@
+kind: DX
+body: Introduce a WaitingScreen component to display a waiting screen
+time: 2025-10-03T11:43:44.688572711+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20250724-161556.yaml b/.changes/unreleased/Feature-20250724-161556.yaml
new file mode 100644
index 000000000..e661f72e1
--- /dev/null
+++ b/.changes/unreleased/Feature-20250724-161556.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Only allow delete of attachment on workflows that are not final
+time: 2025-07-24T16:15:56.042884578+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20250724-161628.yaml b/.changes/unreleased/Feature-20250724-161628.yaml
new file mode 100644
index 000000000..db2013b66
--- /dev/null
+++ b/.changes/unreleased/Feature-20250724-161628.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Move up signature buttons on index workflow page for easier access
+time: 2025-07-24T16:16:28.609598883+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20250724-172013.yaml b/.changes/unreleased/Feature-20250724-172013.yaml
new file mode 100644
index 000000000..ab12bd88b
--- /dev/null
+++ b/.changes/unreleased/Feature-20250724-172013.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Filter out document from attachment list if it is the same as the workflow document
+time: 2025-07-24T17:20:13.118537573+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20251003-113838.yaml b/.changes/unreleased/Feature-20251003-113838.yaml
new file mode 100644
index 000000000..22257a5e1
--- /dev/null
+++ b/.changes/unreleased/Feature-20251003-113838.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Block edition on attached document on workflow, if the workflow is finalized or sent external
+time: 2025-10-03T11:38:38.879030263+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20251003-113937.yaml b/.changes/unreleased/Feature-20251003-113937.yaml
new file mode 100644
index 000000000..85f4118bb
--- /dev/null
+++ b/.changes/unreleased/Feature-20251003-113937.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Convert workflow's attached document to pdf while sending them external
+time: 2025-10-03T11:39:37.382834874+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20251003-114233.yaml b/.changes/unreleased/Feature-20251003-114233.yaml
new file mode 100644
index 000000000..42296ca94
--- /dev/null
+++ b/.changes/unreleased/Feature-20251003-114233.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition
+time: 2025-10-03T11:42:33.859561072+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251003-114144.yaml b/.changes/unreleased/Fixed-20251003-114144.yaml
new file mode 100644
index 000000000..92be727be
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251003-114144.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix permissions on storedObject which are subject by a workflow
+time: 2025-10-03T11:41:44.17608896+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
index facc55e58..497cfee5a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
@@ -25,7 +25,7 @@ export interface GenericDoc {
     type: "doc_store_generic_doc";
     uniqueKey: string;
     key: string;
-    identifiers: object;
+    identifiers: { id: number };
     context: "person" | "accompanying-period";
     doc_date: DateTime;
     metadata: GenericDocMetadata;
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoter/AbstractStoredObjectVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoter/AbstractStoredObjectVoter.php
index 161360c52..15e8d7aac 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoter/AbstractStoredObjectVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoter/AbstractStoredObjectVoter.php
@@ -46,6 +46,16 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
 
     public function voteOnAttribute(StoredObjectRoleEnum $attribute, StoredObject $subject, TokenInterface $token): bool
     {
+        // we first try to get the permission from the workflow, as attachement (this is the less intensive query)
+        $workflowPermissionAsAttachment = match ($attribute) {
+            StoredObjectRoleEnum::SEE => $this->workflowDocumentService->isAllowedByWorkflowForReadOperation($subject),
+            StoredObjectRoleEnum::EDIT => $this->workflowDocumentService->isAllowedByWorkflowForWriteOperation($subject),
+        };
+
+        if (WorkflowRelatedEntityPermissionHelper::FORCE_DENIED === $workflowPermissionAsAttachment) {
+            return false;
+        }
+
         // Retrieve the related entity
         $entity = $this->getRepository()->findAssociatedEntityToStoredObject($subject);
 
@@ -66,7 +76,7 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
         return match ($workflowPermission) {
             WorkflowRelatedEntityPermissionHelper::FORCE_GRANT => true,
             WorkflowRelatedEntityPermissionHelper::FORCE_DENIED => false,
-            WorkflowRelatedEntityPermissionHelper::ABSTAIN => $regularPermission,
+            WorkflowRelatedEntityPermissionHelper::ABSTAIN => WorkflowRelatedEntityPermissionHelper::FORCE_GRANT === $workflowPermissionAsAttachment || $regularPermission,
         };
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoterInterface.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoterInterface.php
index 97d45eec3..11dea0652 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoterInterface.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoterInterface.php
@@ -14,6 +14,12 @@ namespace Chill\DocStoreBundle\Security\Authorization;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
+/**
+ * Interface for voting on stored object permissions.
+ *
+ * Each time a stored object is attached to a document, the voter is responsible for determining
+ * whether the user has the necessary permissions to access or modify the stored object.
+ */
 interface StoredObjectVoterInterface
 {
     public function supports(StoredObjectRoleEnum $attribute, StoredObject $subject): bool;
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/Security/Authorization/AbstractStoredObjectVoterTest.php b/src/Bundle/ChillDocStoreBundle/Tests/Security/Authorization/AbstractStoredObjectVoterTest.php
index fc6099557..d1a96a5bb 100644
--- a/src/Bundle/ChillDocStoreBundle/Tests/Security/Authorization/AbstractStoredObjectVoterTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/Security/Authorization/AbstractStoredObjectVoterTest.php
@@ -86,9 +86,165 @@ class AbstractStoredObjectVoterTest extends TestCase
     }
 
     /**
-     * @dataProvider dataProviderVoteOnAttribute
+     * @dataProvider dataProviderVoteOnAttributeWithStoredObjectPermission
      */
-    public function testVoteOnAttribute(
+    public function testVoteOnAttributeWithStoredObjectPermission(
+        StoredObjectRoleEnum $attribute,
+        bool $expected,
+        bool $isGrantedRegularPermission,
+        string $isGrantedWorkflowPermission,
+        string $isGrantedStoredObjectAttachment,
+    ): void {
+        $storedObject = new StoredObject();
+        $repository = new DummyRepository($related = new \stdClass());
+        $token = new UsernamePasswordToken(new User(), 'dummy');
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
+
+        $workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelper::class);
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
+
+        if (StoredObjectRoleEnum::SEE === $attribute) {
+            $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($storedObject)
+                ->shouldBeCalled()
+                ->willReturn($isGrantedStoredObjectAttachment);
+            $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($related)
+                ->willReturn($isGrantedWorkflowPermission);
+        } elseif (StoredObjectRoleEnum::EDIT === $attribute) {
+            $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($storedObject)
+                ->shouldBeCalled()
+                ->willReturn($isGrantedStoredObjectAttachment);
+            $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($related)
+                ->willReturn($isGrantedWorkflowPermission);
+        } else {
+            throw new \LogicException('Invalid attribute for StoredObjectVoter');
+        }
+
+        $storedObjectVoter = new class ($repository, $workflowRelatedEntityPermissionHelper->reveal(), $security->reveal()) extends AbstractStoredObjectVoter {
+            public function __construct(private $repository, $helper, $security)
+            {
+                parent::__construct($security, $helper);
+            }
+
+            protected function getRepository(): AssociatedEntityToStoredObjectInterface
+            {
+                return $this->repository;
+            }
+
+            protected function getClass(): string
+            {
+                return \stdClass::class;
+            }
+
+            protected function attributeToRole(StoredObjectRoleEnum $attribute): string
+            {
+                return 'SOME_ROLE';
+            }
+
+            protected function canBeAssociatedWithWorkflow(): bool
+            {
+                return true;
+            }
+        };
+
+        $actual = $storedObjectVoter->voteOnAttribute($attribute, $storedObject, $token);
+
+        self::assertEquals($expected, $actual);
+    }
+
+    public static function dataProviderVoteOnAttributeWithStoredObjectPermission(): iterable
+    {
+        foreach (['read' => StoredObjectRoleEnum::SEE, 'write' => StoredObjectRoleEnum::EDIT] as $action => $attribute) {
+            yield 'Not related to any workflow nor attachment ('.$action.')' => [
+                $attribute,
+                true,
+                true,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+            ];
+
+            yield 'Not related to any workflow nor attachment (refuse) ('.$action.')' => [
+                $attribute,
+                false,
+                false,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+            ];
+
+            yield 'Is granted by a workflow takes precedence (workflow) ('.$action.')' => [
+                $attribute,
+                false,
+                true,
+                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+            ];
+
+            yield 'Is granted by a workflow takes precedence (stored object) ('.$action.')' => [
+                $attribute,
+                false,
+                true,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
+            ];
+
+            yield 'Is granted by a workflow takes precedence (workflow) although grant ('.$action.')' => [
+                $attribute,
+                false,
+                true,
+                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
+                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
+            ];
+
+            yield 'Is granted by a workflow takes precedence (stored object) although grant ('.$action.')' => [
+                $attribute,
+                false,
+                true,
+                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
+                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
+            ];
+
+            yield 'Is granted by a workflow takes precedence (initially refused) (workflow) although grant ('.$action.')' => [
+                $attribute,
+                false,
+                false,
+                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
+                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
+            ];
+
+            yield 'Is granted by a workflow takes precedence (initially refused) (stored object) although grant ('.$action.')' => [
+                $attribute,
+                false,
+                false,
+                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
+                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
+            ];
+
+            yield 'Force grant inverse the regular permission (workflow) ('.$action.')' => [
+                $attribute,
+                true,
+                false,
+                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+            ];
+
+            yield 'Force grant inverse the regular permission (so) ('.$action.')' => [
+                $attribute,
+                true,
+                false,
+                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
+            ];
+
+        }
+    }
+
+    /**
+     * @dataProvider dataProviderVoteOnAttributeWithoutStoredObjectPermission
+     */
+    public function testVoteOnAttributeWithoutStoredObjectPermission(
         StoredObjectRoleEnum $attribute,
         bool $expected,
         bool $canBeAssociatedWithWorkflow,
@@ -105,6 +261,10 @@ class AbstractStoredObjectVoterTest extends TestCase
         $security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
 
         $workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelper::class);
+
+        $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($storedObject)->willReturn(WorkflowRelatedEntityPermissionHelper::ABSTAIN);
+        $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($storedObject)->willReturn(WorkflowRelatedEntityPermissionHelper::ABSTAIN);
+
         if (null !== $isGrantedWorkflowPermissionRead) {
             $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($related)
                 ->willReturn($isGrantedWorkflowPermissionRead)->shouldBeCalled();
@@ -123,7 +283,7 @@ class AbstractStoredObjectVoterTest extends TestCase
         self::assertEquals($expected, $voter->voteOnAttribute($attribute, $storedObject, $token), $message);
     }
 
-    public static function dataProviderVoteOnAttribute(): iterable
+    public static function dataProviderVoteOnAttributeWithoutStoredObjectPermission(): iterable
     {
         // not associated on a workflow
         yield [StoredObjectRoleEnum::SEE, true, false, true, null, null, 'not associated on a workflow, granted by regular access, must not rely on helper'];
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
index 28dca8016..eee731d98 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Controller;
 
+use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Pagination\PaginatorFactory;
@@ -27,7 +28,7 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\SerializerInterface;
 
-class WorkflowApiController
+class WorkflowApiController extends ApiController
 {
     public function __construct(private readonly EntityManagerInterface $entityManager, private readonly EntityWorkflowRepository $entityWorkflowRepository, private readonly PaginatorFactory $paginatorFactory, private readonly Security $security, private readonly SerializerInterface $serializer) {}
 
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowSignatureStateChangeController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowSignatureStateChangeController.php
index 24de6f1a0..aacee5c13 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowSignatureStateChangeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowSignatureStateChangeController.php
@@ -44,7 +44,7 @@ final readonly class WorkflowSignatureStateChangeController
             $signature,
             $request,
             EntityWorkflowStepSignatureVoter::CANCEL,
-            function (EntityWorkflowStepSignature $signature) {$this->signatureStepStateChanger->markSignatureAsCanceled($signature); },
+            fn (EntityWorkflowStepSignature $signature): string => $this->signatureStepStateChanger->markSignatureAsCanceled($signature),
             '@ChillMain/WorkflowSignature/cancel.html.twig',
         );
     }
@@ -56,11 +56,18 @@ final readonly class WorkflowSignatureStateChangeController
             $signature,
             $request,
             EntityWorkflowStepSignatureVoter::REJECT,
-            function (EntityWorkflowStepSignature $signature) {$this->signatureStepStateChanger->markSignatureAsRejected($signature); },
+            fn (EntityWorkflowStepSignature $signature): string => $this->signatureStepStateChanger->markSignatureAsRejected($signature),
             '@ChillMain/WorkflowSignature/reject.html.twig',
         );
     }
 
+    /**
+     * @param callable(EntityWorkflowStepSignature): string $markSignature
+     *
+     * @throws \Twig\Error\LoaderError
+     * @throws \Twig\Error\RuntimeError
+     * @throws \Twig\Error\SyntaxError
+     */
     private function markSignatureAction(
         EntityWorkflowStepSignature $signature,
         Request $request,
@@ -79,12 +86,13 @@ final readonly class WorkflowSignatureStateChangeController
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $this->entityManager->wrapInTransaction(function () use ($signature, $markSignature) {
-                $markSignature($signature);
-            });
+            $expectedStep = $this->entityManager->wrapInTransaction(fn () => $markSignature($signature));
 
             return new RedirectResponse(
-                $this->chillUrlGenerator->returnPathOr('chill_main_workflow_show', ['id' => $signature->getStep()->getEntityWorkflow()->getId()])
+                $this->chillUrlGenerator->forwardReturnPath(
+                    'chill_main_workflow_wait',
+                    ['id' => $signature->getStep()->getEntityWorkflow()->getId(), 'expectedStep' => $expectedStep]
+                )
             );
         }
 
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowWaitStepChangeController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowWaitStepChangeController.php
new file mode 100644
index 000000000..53e966495
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowWaitStepChangeController.php
@@ -0,0 +1,41 @@
+<?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\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Routing\ChillUrlGeneratorInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Twig\Environment;
+
+final readonly class WorkflowWaitStepChangeController
+{
+    public function __construct(
+        private ChillUrlGeneratorInterface $chillUrlGenerator,
+        private Environment $twig,
+    ) {}
+
+    #[Route('/{_locale}/main/workflow/{id}/wait/{expectedStep}', name: 'chill_main_workflow_wait', methods: ['GET'])]
+    public function waitForSignatureChange(EntityWorkflow $entityWorkflow, string $expectedStep): Response
+    {
+        if ($entityWorkflow->getStep() === $expectedStep) {
+            return new RedirectResponse(
+                $this->chillUrlGenerator->returnPathOr('chill_main_workflow_show', ['id' => $entityWorkflow->getId()])
+            );
+        }
+
+        return new Response(
+            $this->twig->render('@ChillMain/Workflow/waiting.html.twig', ['workflow' => $entityWorkflow, 'expectedStep' => $expectedStep])
+        );
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 6b33b998d..70f0df071 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -30,6 +30,7 @@ use Chill\MainBundle\Controller\UserGroupAdminController;
 use Chill\MainBundle\Controller\UserGroupApiController;
 use Chill\MainBundle\Controller\UserJobApiController;
 use Chill\MainBundle\Controller\UserJobController;
+use Chill\MainBundle\Controller\WorkflowApiController;
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
 use Chill\MainBundle\Doctrine\DQL\Age;
 use Chill\MainBundle\Doctrine\DQL\Extract;
@@ -66,6 +67,7 @@ use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserGroup;
 use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Form\CenterType;
 use Chill\MainBundle\Form\CivilityType;
 use Chill\MainBundle\Form\CountryType;
@@ -79,6 +81,7 @@ use Chill\MainBundle\Form\UserGroupType;
 use Chill\MainBundle\Form\UserJobType;
 use Chill\MainBundle\Form\UserType;
 use Chill\MainBundle\Security\Authorization\ChillExportVoter;
+use Chill\MainBundle\Security\Authorization\EntityWorkflowVoter;
 use Misd\PhoneNumberBundle\Doctrine\DBAL\Types\PhoneNumberType;
 use Ramsey\Uuid\Doctrine\UuidType;
 use Symfony\Component\Config\FileLocator;
@@ -940,6 +943,21 @@ class ChillMainExtension extends Extension implements
                         ],
                     ],
                 ],
+                [
+                    'class' => EntityWorkflow::class,
+                    'name' => 'workflow',
+                    'base_path' => '/api/1.0/main/workflow',
+                    'base_role' => EntityWorkflowVoter::SEE,
+                    'controller' => WorkflowApiController::class,
+                    'actions' => [
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                        ],
+                    ],
+                ],
             ],
         ]);
     }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/return_path/returnPathHelper.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/return_path/returnPathHelper.ts
new file mode 100644
index 000000000..e4316329d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/return_path/returnPathHelper.ts
@@ -0,0 +1,13 @@
+/**
+ * Extracts the "returnPath" parameter from the current URL's query string and returns it.
+ * If the parameter is not present, returns the provided fallback path.
+ *
+ * @param {string} fallbackPath - The fallback path to use if "returnPath" is not found in the query string.
+ * @return {string} The "returnPath" from the query string, or the fallback path if "returnPath" is not present.
+ */
+export function returnPathOr(fallbackPath: string): string {
+    const urlParams = new URLSearchParams(window.location.search);
+    const returnPath = urlParams.get("returnPath");
+
+    return returnPath ?? fallbackPath;
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/workflow/api.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/workflow/api.ts
new file mode 100644
index 000000000..773abbfaf
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/workflow/api.ts
@@ -0,0 +1,16 @@
+import { EntityWorkflow } from "ChillMainAssets/types";
+import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
+
+export const fetchWorkflow = async (
+    workflowId: number,
+): Promise<EntityWorkflow> => {
+    try {
+        return await makeFetch<null, EntityWorkflow>(
+            "GET",
+            `/api/1.0/main/workflow/${workflowId}.json`,
+        );
+    } catch (error) {
+        console.error(`Failed to fetch workflow ${workflowId}:`, error);
+        throw error;
+    }
+};
diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index 2cd83bc64..b96462ceb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -1,5 +1,6 @@
 import { GenericDoc } from "ChillDocStoreAssets/types/generic_doc";
 import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
+import { Person } from "../../../ChillPersonBundle/Resources/public/types";
 
 export interface DateTime {
     datetime: string;
@@ -202,6 +203,58 @@ export interface WorkflowAttachment {
     genericDoc: null | GenericDoc;
 }
 
+export interface Workflow {
+    name: string;
+    text: string;
+}
+
+export interface EntityWorkflowStep {
+    type: "entity_workflow_step";
+    id: number;
+    comment: string;
+    currentStep: StepDefinition;
+    isFinal: boolean;
+    isFreezed: boolean;
+    isFinalized: boolean;
+    transitionPrevious: Transition | null;
+    transitionAfter: Transition | null;
+    previousId: number | null;
+    nextId: number | null;
+    transitionPreviousBy: User | null;
+    transitionPreviousAt: DateTime | null;
+}
+
+export interface Transition {
+    name: string;
+    text: string;
+    isForward: boolean;
+}
+
+export interface StepDefinition {
+    name: string;
+    text: string;
+}
+
+export interface EntityWorkflow {
+    type: "entity_workflow";
+    id: number;
+    relatedEntityClass: string;
+    relatedEntityId: number;
+    workflow: Workflow;
+    currentStep: EntityWorkflowStep;
+    steps: EntityWorkflowStep[];
+    datas: WorkflowData;
+    title: string;
+    isOnHoldAtCurrentStep: boolean;
+    _permissions: {
+        CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT: boolean;
+    };
+}
+
+export interface WorkflowData {
+    persons: Person[];
+}
+
 export interface ExportGeneration {
     id: string;
     type: "export_generation";
@@ -215,3 +268,8 @@ export interface ExportGeneration {
 export interface PrivateCommentEmbeddable {
     comments: Record<number, string>;
 }
+
+/**
+ * Possible states for the WaitingScreen Component.
+ */
+export type WaitingScreenState = "pending" | "failure" | "stopped" | "ready";
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue
index 033eb6cac..b9ffeff34 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue
@@ -10,7 +10,8 @@ import { computed, onMounted, ref } from "vue";
 import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
 import { fetchExportGenerationStatus } from "ChillMainAssets/lib/api/export";
 import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
-import { ExportGeneration } from "ChillMainAssets/types";
+import WaitingScreen from "../_components/WaitingScreen.vue";
+import { ExportGeneration, WaitingScreenState } from "ChillMainAssets/types";
 
 interface AppProps {
     exportGenerationId: string;
@@ -34,13 +35,16 @@ const storedObject = computed<null | StoredObject>(() => {
 });
 
 const isPending = computed<boolean>(() => status.value === "pending");
-const isFetching = computed<boolean>(
-    () => tryiesForReady.value < maxTryiesForReady,
-);
-const isReady = computed<boolean>(() => status.value === "ready");
-const isFailure = computed<boolean>(() => status.value === "failure");
 const filename = computed<string>(() => `${props.title}-${props.createdDate}`);
 
+const state = computed<WaitingScreenState>((): WaitingScreenState => {
+    if (status.value === "empty") {
+        return "pending";
+    }
+
+    return status.value;
+});
+
 /**
  * counter for the number of times that we check for a new status
  */
@@ -85,57 +89,36 @@ onMounted(() => {
 </script>
 
 <template>
-    <div id="waiting-screen">
-        <div
-            v-if="isPending && isFetching"
-            class="alert alert-danger text-center"
-        >
-            <div>
-                <p>
-                    {{ trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING) }}
-                </p>
-            </div>
+    <WaitingScreen :state="state">
+        <template v-slot:pending>
+            <p>
+                {{ trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING) }}
+            </p>
+        </template>
 
-            <div>
-                <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
-                <span class="sr-only">Loading...</span>
-            </div>
-        </div>
-        <div v-if="isPending && !isFetching" class="alert alert-info">
-            <div>
-                <p>
-                    {{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}
-                </p>
-            </div>
-        </div>
-        <div v-if="isFailure" class="alert alert-danger text-center">
-            <div>
-                <p>
-                    {{ trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT) }}
-                </p>
-            </div>
-        </div>
-        <div v-if="isReady" class="alert alert-success text-center">
-            <div>
-                <p>
-                    {{ trans(EXPORT_GENERATION_EXPORT_READY) }}
-                </p>
+        <template v-slot:stopped>
+            <p>
+                {{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}
+            </p>
+        </template>
 
-                <p v-if="storedObject !== null">
-                    <document-action-buttons-group
-                        :stored-object="storedObject"
-                        :filename="filename"
-                    ></document-action-buttons-group>
-                </p>
-            </div>
-        </div>
-    </div>
+        <template v-slot:failure>
+            <p>
+                {{ trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT) }}
+            </p>
+        </template>
+
+        <template v-slot:ready>
+            <p>
+                {{ trans(EXPORT_GENERATION_EXPORT_READY) }}
+            </p>
+
+            <p v-if="storedObject !== null">
+                <document-action-buttons-group
+                    :stored-object="storedObject"
+                    :filename="filename"
+                ></document-action-buttons-group>
+            </p>
+        </template>
+    </WaitingScreen>
 </template>
-
-<style scoped lang="scss">
-#waiting-screen {
-    > .alert {
-        min-height: 350px;
-    }
-}
-</style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/App.vue
new file mode 100644
index 000000000..578cb6558
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/App.vue
@@ -0,0 +1,75 @@
+<script setup lang="ts">
+import { useIntervalFn } from "@vueuse/core";
+import { fetchWorkflow } from "ChillMainAssets/lib/workflow/api";
+import { returnPathOr } from "ChillMainAssets/lib/return_path/returnPathHelper";
+import { ref } from "vue";
+import WaitingScreen from "ChillMainAssets/vuejs/_components/WaitingScreen.vue";
+import { WaitingScreenState } from "ChillMainAssets/types";
+import {
+    trans,
+    WORKFLOW_WAIT_TITLE,
+    WORKFLOW_WAIT_ERROR_WHILE_WAITING,
+    WORKFLOW_WAIT_SUCCESS,
+} from "translator";
+
+interface WaitPostProcessWorkflowComponentProps {
+    workflowId: number;
+    expectedStep: string;
+}
+
+const props = defineProps<WaitPostProcessWorkflowComponentProps>();
+const counter = ref<number>(0);
+const MAX_TRYIES = 50;
+
+const state = ref<WaitingScreenState>("pending");
+
+const { pause, resume } = useIntervalFn(
+    async () => {
+        try {
+            const workflow = await fetchWorkflow(props.workflowId);
+            counter.value++;
+            if (workflow.currentStep.currentStep.name === props.expectedStep) {
+                window.location.assign(
+                    returnPathOr("/fr/main/workflow" + workflow.id + "/show"),
+                );
+                resume();
+                state.value = "ready";
+            }
+
+            if (counter.value > MAX_TRYIES) {
+                pause();
+                state.value = "failure";
+            }
+        } catch (error) {
+            console.error(error);
+            pause();
+        }
+    },
+    2000,
+    { immediate: true },
+);
+</script>
+
+<template>
+    <div class="container">
+        <WaitingScreen :state="state">
+            <template v-slot:pending>
+                <p>
+                    {{ trans(WORKFLOW_WAIT_TITLE) }}
+                </p>
+            </template>
+            <template v-slot:failure>
+                <p>
+                    {{ trans(WORKFLOW_WAIT_ERROR_WHILE_WAITING) }}
+                </p>
+            </template>
+            <template v-slot:ready>
+                <p>
+                    {{ trans(WORKFLOW_WAIT_SUCCESS) }}
+                </p>
+            </template>
+        </WaitingScreen>
+    </div>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/index.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/index.ts
new file mode 100644
index 000000000..ac52a90cd
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/index.ts
@@ -0,0 +1,51 @@
+import { createApp } from "vue";
+import App from "./App.vue";
+
+function mountApp(): void {
+    const el = document.querySelector<HTMLDivElement>(".screen-wait");
+    if (!el) {
+        console.error(
+            "WaitPostProcessWorkflow: mount element .screen-wait not found",
+        );
+        return;
+    }
+
+    const workflowIdAttr = el.getAttribute("data-workflow-id");
+    const expectedStep = el.getAttribute("data-expected-step") || "";
+
+    if (!workflowIdAttr) {
+        console.error(
+            "WaitPostProcessWorkflow: data-workflow-id attribute missing on mount element",
+        );
+        return;
+    }
+
+    if (!expectedStep) {
+        console.error(
+            "WaitPostProcessWorkflow: data-expected-step attribute missing on mount element",
+        );
+        return;
+    }
+
+    const workflowId = Number(workflowIdAttr);
+    if (Number.isNaN(workflowId)) {
+        console.error(
+            "WaitPostProcessWorkflow: data-workflow-id is not a valid number:",
+            workflowIdAttr,
+        );
+        return;
+    }
+
+    const app = createApp(App, {
+        workflowId,
+        expectedStep,
+    });
+
+    app.mount(el);
+}
+
+if (document.readyState === "loading") {
+    document.addEventListener("DOMContentLoaded", mountApp);
+} else {
+    mountApp();
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
index 9164e134b..289b49788 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import { computed, useTemplateRef } from "vue";
-import type { WorkflowAttachment } from "ChillMainAssets/types";
+import { computed, onMounted, ref, useTemplateRef } from "vue";
+import type { EntityWorkflow, WorkflowAttachment } from "ChillMainAssets/types";
 import PickGenericDocModal from "ChillMainAssets/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue";
 import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
 import AttachmentList from "ChillMainAssets/vuejs/WorkflowAttachment/Component/AttachmentList.vue";
 import { GenericDoc } from "ChillDocStoreAssets/types";
+import { fetchWorkflow } from "ChillMainAssets/lib/workflow/api";
 
 interface AppConfig {
     workflowId: number;
@@ -34,6 +35,13 @@ const attachedGenericDoc = computed<GenericDocForAccompanyingPeriod[]>(
             ) as GenericDocForAccompanyingPeriod[],
 );
 
+const workflow = ref<EntityWorkflow | null>(null);
+
+onMounted(async () => {
+    workflow.value = await fetchWorkflow(Number(props.workflowId));
+    console.log("workflow", workflow.value);
+});
+
 const openModal = function () {
     pickDocModal.value?.openModal();
 };
@@ -49,20 +57,30 @@ const onPickGenericDoc = ({
 const onRemoveAttachment = (payload: { attachment: WorkflowAttachment }) => {
     emit("removeAttachment", payload);
 };
+
+const canEditAttachement = computed<boolean>(() => {
+    if (null === workflow.value) {
+        return false;
+    }
+
+    return workflow.value._permissions.CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT;
+});
 </script>
 
 <template>
     <pick-generic-doc-modal
+        :workflow="workflow"
         :accompanying-period-id="props.accompanyingPeriodId"
         :to-remove="attachedGenericDoc"
         ref="pickDocModal"
         @pickGenericDoc="onPickGenericDoc"
     ></pick-generic-doc-modal>
     <attachment-list
+        :workflow="workflow"
         :attachments="props.attachments"
         @removeAttachment="onRemoveAttachment"
     ></attachment-list>
-    <ul class="record_actions">
+    <ul v-if="canEditAttachement" class="record_actions">
         <li>
             <button type="button" class="btn btn-create" @click="openModal">
                 Ajouter une pièce jointe
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
index 06e6ca6f4..c0d3a8eb4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import { WorkflowAttachment } from "ChillMainAssets/types";
+import { EntityWorkflow, WorkflowAttachment } from "ChillMainAssets/types";
 import GenericDocItemBox from "ChillMainAssets/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue";
 import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
 
 interface AttachmentListProps {
     attachments: WorkflowAttachment[];
+    workflow: EntityWorkflow | null;
 }
 
 const emit = defineEmits<{
@@ -36,7 +37,12 @@ const props = defineProps<AttachmentListProps>();
                             :stored-object="a.genericDoc.storedObject"
                         ></document-action-buttons-group>
                     </li>
-                    <li>
+                    <li
+                        v-if="
+                            !workflow?._permissions
+                                .CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT
+                        "
+                    >
                         <button
                             type="button"
                             class="btn btn-delete"
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
index 01e9c3a0e..717b8a62b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
@@ -6,8 +6,10 @@ import {
 import PickGenericDocItem from "ChillMainAssets/vuejs/WorkflowAttachment/Component/PickGenericDocItem.vue";
 import { fetch_generic_docs_by_accompanying_period } from "ChillDocStoreAssets/js/generic-doc-api";
 import { computed, onMounted, ref } from "vue";
+import { EntityWorkflow } from "ChillMainAssets/types";
 
 interface PickGenericDocProps {
+    workflow: EntityWorkflow | null;
     accompanyingPeriodId: number;
     pickedList: GenericDocForAccompanyingPeriod[];
     toRemove: GenericDocForAccompanyingPeriod[];
@@ -36,9 +38,21 @@ const isPicked = (genericDoc: GenericDocForAccompanyingPeriod): boolean =>
     ) !== -1;
 
 onMounted(async () => {
-    genericDocs.value = await fetch_generic_docs_by_accompanying_period(
+    const fetchedGenericDocs = await fetch_generic_docs_by_accompanying_period(
         props.accompanyingPeriodId,
     );
+    const documentClasses = [
+        "Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument",
+        "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
+        "Chill\\DocStoreBundle\\Entity\\PersonDocument",
+    ];
+
+    genericDocs.value = fetchedGenericDocs.filter(
+        (doc) =>
+            !documentClasses.includes(
+                props.workflow?.relatedEntityClass || "",
+            ) || props.workflow?.relatedEntityId !== doc.identifiers.id,
+    );
     loaded.value = true;
 });
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
index cd3e9253d..adaa4c825 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
@@ -3,8 +3,10 @@ import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import { computed, ref, useTemplateRef } from "vue";
 import PickGenericDoc from "ChillMainAssets/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue";
 import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
+import { EntityWorkflow } from "ChillMainAssets/types";
 
 interface PickGenericDocModalProps {
+    workflow: EntityWorkflow | null;
     accompanyingPeriodId: number;
     toRemove: GenericDocForAccompanyingPeriod[];
 }
@@ -80,6 +82,7 @@ defineExpose({ openModal, closeModal });
         </template>
         <template v-slot:body>
             <pick-generic-doc
+                :workflow="props.workflow"
                 :accompanying-period-id="props.accompanyingPeriodId"
                 :to-remove="props.toRemove"
                 :picked-list="pickeds"
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/WaitingScreen.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/WaitingScreen.vue
new file mode 100644
index 000000000..963db5e81
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/WaitingScreen.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import { WaitingScreenState } from "ChillMainAssets/types";
+
+interface Props {
+    state: WaitingScreenState;
+}
+
+const props = defineProps<Props>();
+</script>
+
+<template>
+    <div id="waiting-screen">
+        <div
+            v-if="props.state === 'pending' && !!$slots.pending"
+            class="alert alert-danger text-center"
+        >
+            <div>
+                <slot name="pending"></slot>
+            </div>
+
+            <div>
+                <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
+                <span class="sr-only">Loading...</span>
+            </div>
+        </div>
+
+        <div
+            v-if="props.state === 'stopped' && !!$slots.stopped"
+            class="alert alert-info"
+        >
+            <div>
+                <slot name="stopped"></slot>
+            </div>
+        </div>
+
+        <div
+            v-if="props.state === 'failure' && !!$slots.failure"
+            class="alert alert-danger text-center"
+        >
+            <div>
+                <slot name="failure"></slot>
+            </div>
+        </div>
+
+        <div
+            v-if="props.state === 'ready' && !!$slots.ready"
+            class="alert alert-success text-center"
+        >
+            <div>
+                <slot name="ready"></slot>
+            </div>
+        </div>
+    </div>
+</template>
+
+<style scoped lang="scss">
+#waiting-screen {
+    > .alert {
+        min-height: 350px;
+    }
+}
+</style>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig
index 27af88296..8805bc545 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig
@@ -58,12 +58,14 @@
         {% endif %}
     </section>
 
+    {% if signatures|length > 0 %}
+    <section class="step my-4">{% include '@ChillMain/Workflow/_signature.html.twig' %}</section>
+    {% endif %}
+
     <section class="step my-4">{% include '@ChillMain/Workflow/_attachment.html.twig' %}</section>
 
     <section class="step my-4">{% include '@ChillMain/Workflow/_follow.html.twig' %}</section>
-    {% if signatures|length > 0 %}
-        <section class="step my-4">{% include '@ChillMain/Workflow/_signature.html.twig' %}</section>
-    {% elseif entity_workflow.currentStep.sends|length > 0 %}
+    {% if entity_workflow.currentStep.sends|length > 0 %}
         <section class="step my-4">
             <h2>{{ 'workflow.external_views.title'|trans({'numberOfSends': entity_workflow.currentStep.sends|length }) }}</h2>
             {% include '@ChillMain/Workflow/_send_views_list.html.twig' with {'sends': entity_workflow.currentStep.sends} %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/waiting.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/waiting.html.twig
new file mode 100644
index 000000000..e137df304
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/waiting.html.twig
@@ -0,0 +1,18 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block title %}{{ 'workflow.signature.waiting_for'|trans }}{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('page_workflow_waiting_post_process') }}
+{% endblock %}
+
+{% block js %}
+    {{ encore_entry_script_tags('page_workflow_waiting_post_process') }}
+{% endblock %}
+
+{% block content %}
+    <h1>{{ block('title') }}</h1>
+
+    <div class="screen-wait" data-workflow-id="{{ workflow.id|e('html_attr') }}" data-expected-step="{{ expectedStep|e('html_attr') }}"></div>
+
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowAttachmentVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowAttachmentVoter.php
new file mode 100644
index 000000000..dfdb92a65
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowAttachmentVoter.php
@@ -0,0 +1,53 @@
+<?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\Authorization;
+
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\Voter\Voter;
+use Symfony\Component\Workflow\Registry;
+
+final class EntityWorkflowAttachmentVoter extends Voter
+{
+    public function __construct(
+        private readonly Registry $registry,
+    ) {}
+    public const EDIT = 'CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT';
+
+    protected function supports(string $attribute, $subject): bool
+    {
+        return $subject instanceof EntityWorkflow && self::EDIT === $attribute;
+    }
+
+    protected function voteOnAttribute(string $attribute, $subject, TokenInterface $token): bool
+    {
+        if (!$subject instanceof EntityWorkflow) {
+            throw new \UnexpectedValueException('Subject must be an instance of EntityWorkflow');
+        }
+
+        if ($subject->isFinal()) {
+            return false;
+        }
+
+        $workflow = $this->registry->get($subject, $subject->getWorkflowName());
+
+        $marking = $workflow->getMarking($subject);
+        foreach ($marking->getPlaces() as $place => $int) {
+            $placeMetadata = $workflow->getMetadataStore()->getPlaceMetadata($place);
+            if ($placeMetadata['isSentExternal'] ?? false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
index a84220099..f21ceea38 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
@@ -12,18 +12,25 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Security\Authorization\EntityWorkflowAttachmentVoter;
 use Chill\MainBundle\Workflow\EntityWorkflowManager;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Workflow\Registry;
 
-class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareInterface
+final class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareInterface
 {
     use NormalizerAwareTrait;
 
-    public function __construct(private readonly EntityWorkflowManager $entityWorkflowManager, private readonly MetadataExtractor $metadataExtractor, private readonly Registry $registry) {}
+    public function __construct(
+        private readonly EntityWorkflowManager $entityWorkflowManager,
+        private readonly MetadataExtractor $metadataExtractor,
+        private readonly Registry $registry,
+        private readonly Security $security,
+    ) {}
 
     /**
      * @param EntityWorkflow $object
@@ -46,6 +53,9 @@ class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareIn
             'datas' => $this->normalizer->normalize($handler->getEntityData($object), $format, $context),
             'title' => $handler->getEntityTitle($object),
             'isOnHoldAtCurrentStep' => $object->isOnHoldAtCurrentStep(),
+            '_permissions' => [
+                EntityWorkflowAttachmentVoter::EDIT => $this->security->isGranted(EntityWorkflowAttachmentVoter::EDIT, $object),
+            ],
         ];
     }
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/EntityWorkflowAttachmentVoterTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/EntityWorkflowAttachmentVoterTest.php
new file mode 100644
index 000000000..5af65176c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/EntityWorkflowAttachmentVoterTest.php
@@ -0,0 +1,173 @@
+<?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\Authorization;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Security\Authorization\EntityWorkflowAttachmentVoter;
+use Chill\MainBundle\Workflow\EntityWorkflowMarkingStore;
+use Chill\MainBundle\Workflow\WorkflowTransitionContextDTO;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
+use Symfony\Component\Workflow\DefinitionBuilder;
+use Symfony\Component\Workflow\Metadata\InMemoryMetadataStore;
+use Symfony\Component\Workflow\Registry;
+use Symfony\Component\Workflow\SupportStrategy\WorkflowSupportStrategyInterface;
+use Symfony\Component\Workflow\Transition;
+use Symfony\Component\Workflow\Workflow;
+use Symfony\Component\Workflow\WorkflowInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class EntityWorkflowAttachmentVoterTest extends TestCase
+{
+    use ProphecyTrait;
+
+    /**
+     * @dataProvider dataVoteOnAttribute
+     */
+    public function testVoteOnAttribute(EntityWorkflow $entityWorkflow, int $expected): void
+    {
+        $voter = new EntityWorkflowAttachmentVoter($this->buildRegistry());
+        $actual = $voter->vote(
+            new UsernamePasswordToken(new User(), 'default'),
+            $entityWorkflow,
+            ['CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT'],
+        );
+        $this->assertEquals($expected, $actual);
+    }
+
+    public static function dataVoteOnAttribute(): iterable
+    {
+        $entity = new EntityWorkflow();
+        $entity->setWorkflowName('dummy');
+
+        $workflow = static::buildRegistry()->get($entity, 'dummy');
+
+        $dto = new WorkflowTransitionContextDTO($entity);
+        $dto->futureDestUsers[] = new User();
+        $workflow->apply(
+            $entity,
+            'to_final_positive',
+            ['context' => $dto,
+                'byUser' => new User(),
+                'transition' => 'to_final_positive',
+                'transitionAt' => new \DateTimeImmutable()],
+        );
+        // we need to mark manually as final, as the listener is not registered
+        $entity->getCurrentStep()->setIsFinal(true);
+
+        yield 'on final positive' => [
+            $entity,
+            VoterInterface::ACCESS_DENIED,
+        ];
+
+        $entity = new EntityWorkflow();
+        $entity->setWorkflowName('dummy');
+
+        $workflow = static::buildRegistry()->get($entity, 'dummy');
+
+        $dto = new WorkflowTransitionContextDTO($entity);
+        $dto->futureDestUsers[] = new User();
+        $workflow->apply(
+            $entity,
+            'to_final_negative',
+            ['context' => $dto,
+                'byUser' => new User(),
+                'transition' => 'to_final_negative',
+                'transitionAt' => new \DateTimeImmutable()],
+        );
+        // we need to mark manually as final, as the listener is not registered
+        $entity->getCurrentStep()->setIsFinal(true);
+
+        yield 'on final negative' => [
+            $entity,
+            VoterInterface::ACCESS_DENIED,
+        ];
+
+        $entity = new EntityWorkflow();
+        $entity->setWorkflowName('dummy');
+
+        $workflow = static::buildRegistry()->get($entity, 'dummy');
+
+        $dto = new WorkflowTransitionContextDTO($entity);
+        $dto->futureDestUsers[] = new User();
+        $workflow->apply(
+            $entity,
+            'to_sent_external',
+            ['context' => $dto,
+                'byUser' => new User(),
+                'transition' => 'to_sent_external',
+                'transitionAt' => new \DateTimeImmutable()],
+        );
+
+        yield 'on sent_external' => [
+            $entity,
+            VoterInterface::ACCESS_DENIED,
+        ];
+
+        $entity = new EntityWorkflow();
+        $entity->setWorkflowName('dummy');
+
+        yield 'on initial' => [
+            $entity,
+            VoterInterface::ACCESS_GRANTED,
+        ];
+    }
+
+    private static function buildRegistry(): Registry
+    {
+        $builder = new DefinitionBuilder();
+        $builder
+            ->setInitialPlaces(['initial'])
+            ->addPlaces(['initial', 'sent_external', 'final_positive', 'final_negative'])
+            ->addTransitions([
+                new Transition('to_final_positive', ['initial'], 'final_positive'),
+                new Transition('to_sent_external', ['initial'], 'sent_external'),
+                new Transition('to_final_negative', ['initial'], 'final_negative'),
+
+            ])
+            ->setMetadataStore(
+                new InMemoryMetadataStore(
+                    placesMetadata: [
+                        'sent_external' => [
+                            'isSentExternal' => true,
+                        ],
+                        'final_positive' => [
+                            'isFinal' => true,
+                            'isFinalPositive' => true,
+                        ],
+                        'final_negative' => [
+                            'isFinal' => true,
+                            'isFinalPositive' => false,
+                        ],
+                    ]
+                )
+            );
+
+        $workflow = new Workflow($builder->build(), new EntityWorkflowMarkingStore(), name: 'dummy');
+        $registry = new Registry();
+        $registry->addWorkflow($workflow, new class () implements WorkflowSupportStrategyInterface {
+            public function supports(WorkflowInterface $workflow, object $subject): bool
+            {
+                return true;
+            }
+        });
+
+        return $registry;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Workflow/Helper/WorkflowRelatedEntityPermissionHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Workflow/Helper/WorkflowRelatedEntityPermissionHelperTest.php
index 06e4304f3..d28645182 100644
--- a/src/Bundle/ChillMainBundle/Tests/Workflow/Helper/WorkflowRelatedEntityPermissionHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Workflow/Helper/WorkflowRelatedEntityPermissionHelperTest.php
@@ -11,6 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Tests\Workflow\Helper;
 
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowAttachment;
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
 use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
@@ -148,8 +151,11 @@ class WorkflowRelatedEntityPermissionHelperTest extends TestCase
         $dto = new WorkflowTransitionContextDTO($entityWorkflow);
         $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
 
-        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
-            'abstain because the user is not present as a dest user'];
+        yield [[], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain because there is no workflow'];
+
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, new \DateTimeImmutable(),
+            'force deny because the user is not present as a dest user'];
 
         $entityWorkflow = new EntityWorkflow();
         $dto = new WorkflowTransitionContextDTO($entityWorkflow);
@@ -171,6 +177,9 @@ class WorkflowRelatedEntityPermissionHelperTest extends TestCase
         yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
             'force grant because the user was a previous user'];
 
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, new \DateTimeImmutable(),
+            'force denied because the user was not a previous user'];
+
         $entityWorkflow = new EntityWorkflow();
         $dto = new WorkflowTransitionContextDTO($entityWorkflow);
         $dto->futureDestUsers[] = $user = new User();
@@ -232,6 +241,13 @@ class WorkflowRelatedEntityPermissionHelperTest extends TestCase
 
         yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
             'abstain: there is a signature on a canceled workflow'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('sent_external', $dto, 'to_sent_external', new \DateTimeImmutable(), $user);
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, new \DateTimeImmutable(), 'force denied: the workflow is sent to an external user'];
     }
 
     public function testNoWorkflow(): void
@@ -253,7 +269,217 @@ class WorkflowRelatedEntityPermissionHelperTest extends TestCase
         $entityWorkflowManager = $this->prophesize(EntityWorkflowManager::class);
         $entityWorkflowManager->findByRelatedEntity(Argument::type('object'))->willReturn($entityWorkflows);
 
-        return new WorkflowRelatedEntityPermissionHelper($security->reveal(), $entityWorkflowManager->reveal(), $this->buildRegistry(), new MockClock($atDateTime ?? new \DateTimeImmutable()));
+        $repository = $this->prophesize(EntityWorkflowAttachmentRepository::class);
+        $repository->findByStoredObject(Argument::type(StoredObject::class))->willReturn([]);
+
+        return new WorkflowRelatedEntityPermissionHelper($security->reveal(), $entityWorkflowManager->reveal(), $repository->reveal(), $this->buildRegistry(), new MockClock($atDateTime ?? new \DateTimeImmutable()));
+    }
+
+    /**
+     * @dataProvider provideDataAllowedByWorkflowReadOperationByAttachment
+     *
+     * @param list<EntityWorkflow> $entityWorkflows
+     */
+    public function testAllowedByWorkflowReadByAttachment(
+        array $entityWorkflows,
+        User $user,
+        string $expected,
+        ?\DateTimeImmutable $atDate,
+        string $message,
+    ): void {
+        // all entities must have this workflow name, so we are ok to set it here
+        foreach ($entityWorkflows as $entityWorkflow) {
+            $entityWorkflow->setWorkflowName('dummy');
+        }
+        $helper = $this->buildHelperForAttachment($entityWorkflows, $user, $atDate);
+
+        self::assertEquals($expected, $helper->isAllowedByWorkflowForReadOperation(new StoredObject()), $message);
+    }
+
+    public static function provideDataAllowedByWorkflowReadOperationByAttachment(): iterable
+    {
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain because the user is not present as a dest user'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
+            'force grant because the user is a current user'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
+            'force grant because the user was a previous user'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futurePersonSignatures[] = new Person();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'Abstain: there is a signature for person, but the attachment is not concerned'];
+    }
+
+    /**
+     * @dataProvider provideDataAllowedByWorkflowWriteOperationByAttachment
+     *
+     * @param list<EntityWorkflow> $entityWorkflows
+     */
+    public function testAllowedByWorkflowWriteByAttachment(
+        array $entityWorkflows,
+        User $user,
+        string $expected,
+        ?\DateTimeImmutable $atDate,
+        string $message,
+    ): void {
+        // all entities must have this workflow name, so we are ok to set it here
+        foreach ($entityWorkflows as $entityWorkflow) {
+            $entityWorkflow->setWorkflowName('dummy');
+        }
+        $helper = $this->buildHelperForAttachment($entityWorkflows, $user, $atDate);
+
+        self::assertEquals($expected, $helper->isAllowedByWorkflowForWriteOperation(new StoredObject()), $message);
+    }
+
+    public static function provideDataAllowedByWorkflowWriteOperationByAttachment(): iterable
+    {
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain because there is no workflow'];
+
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain because the user is not present as a dest user (and attachment)'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
+            'force grant because the user is a current user'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
+            'force grant because the user was a previous user'];
+
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain because the user was not a previous user'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $entityWorkflow->setStep('final_positive', $dto, 'to_final_positive', new \DateTimeImmutable(), new User());
+        $entityWorkflow->getCurrentStep()->setIsFinal(true);
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, new \DateTimeImmutable(),
+            'force denied: user was a previous user, but it is finalized positive'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable());
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $entityWorkflow->setStep('final_negative', $dto, 'to_final_negative', new \DateTimeImmutable());
+        $entityWorkflow->getCurrentStep()->setIsFinal(true);
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain: user was a previous user, it is finalized, but finalized negative'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futurePersonSignatures[] = new Person();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+        $signature = $entityWorkflow->getCurrentStep()->getSignatures()->first();
+        $signature->setState(EntityWorkflowSignatureStateEnum::SIGNED)->setStateDate(new \DateTimeImmutable());
+
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain: there is a signature, but not on the attachment'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futurePersonSignatures[] = new Person();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+
+        yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain: there is a signature, but the signature is not on the attachment'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futurePersonSignatures[] = new Person();
+        $entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
+        $signature = $entityWorkflow->getCurrentStep()->getSignatures()->first();
+        $signature->setState(EntityWorkflowSignatureStateEnum::SIGNED)->setStateDate(new \DateTimeImmutable());
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $entityWorkflow->setStep('final_negative', $dto, 'to_final_negative', new \DateTimeImmutable(), new User());
+        $entityWorkflow->getCurrentStep()->setIsFinal(true);
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
+            'abstain: there is a signature on a canceled workflow'];
+
+        $entityWorkflow = new EntityWorkflow();
+        $dto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $dto->futureDestUsers[] = $user = new User();
+        $entityWorkflow->setStep('sent_external', $dto, 'to_sent_external', new \DateTimeImmutable(), $user);
+
+        yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, new \DateTimeImmutable(),
+            'force denied: the workflow is sent to an external user'];
+    }
+
+    /**
+     * @param list<EntityWorkflow> $entityWorkflows
+     */
+    private function buildHelperForAttachment(array $entityWorkflows, User $user, ?\DateTimeImmutable $atDateTime): WorkflowRelatedEntityPermissionHelper
+    {
+        $security = $this->prophesize(Security::class);
+        $security->getUser()->willReturn($user);
+
+        $entityWorkflowManager = $this->prophesize(EntityWorkflowManager::class);
+        $entityWorkflowManager->findByRelatedEntity(Argument::type('object'))->shouldNotBeCalled();
+
+        $repository = $this->prophesize(EntityWorkflowAttachmentRepository::class);
+        $attachments = [];
+        foreach ($entityWorkflows as $entityWorkflow) {
+            $attachments[] = new EntityWorkflowAttachment('dummy', ['id' => 1], $entityWorkflow, new StoredObject());
+        }
+        $repository->findByStoredObject(Argument::type(StoredObject::class))->willReturn($attachments);
+
+        return new WorkflowRelatedEntityPermissionHelper($security->reveal(), $entityWorkflowManager->reveal(), $repository->reveal(), $this->buildRegistry(), new MockClock($atDateTime ?? new \DateTimeImmutable()));
     }
 
     private static function buildRegistry(): Registry
@@ -261,10 +487,13 @@ class WorkflowRelatedEntityPermissionHelperTest extends TestCase
         $builder = new DefinitionBuilder();
         $builder
             ->setInitialPlaces(['initial'])
-            ->addPlaces(['initial', 'test', 'final_positive', 'final_negative'])
+            ->addPlaces(['initial', 'test', 'sent_external', 'final_positive', 'final_negative'])
             ->setMetadataStore(
                 new InMemoryMetadataStore(
                     placesMetadata: [
+                        'sent_external' => [
+                            'isSentExternal' => true,
+                        ],
                         'final_positive' => [
                             'isFinal' => true,
                             'isFinalPositive' => true,
diff --git a/src/Bundle/ChillMainBundle/Tests/Workflow/Messenger/PostSendExternalMessageHandlerTest.php b/src/Bundle/ChillMainBundle/Tests/Workflow/Messenger/PostSendExternalMessageHandlerTest.php
index a22547937..6daeb1f0a 100644
--- a/src/Bundle/ChillMainBundle/Tests/Workflow/Messenger/PostSendExternalMessageHandlerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Workflow/Messenger/PostSendExternalMessageHandlerTest.php
@@ -11,8 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Tests\Workflow\Messenger;
 
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Service\StoredObjectToPdfConverter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowAttachment;
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
 use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Chill\MainBundle\Workflow\EntityWorkflowManager;
@@ -23,6 +26,7 @@ use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Log\LoggerInterface;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Mime\Address;
@@ -39,24 +43,54 @@ class PostSendExternalMessageHandlerTest extends TestCase
     public function testSendMessageHappyScenario(): void
     {
         $entityWorkflow = $this->buildEntityWorkflow();
+
+        // Prepare attachments (2 attachments)
+        $attachmentStoredObject1 = new StoredObject();
+        $attachmentStoredObject2 = new StoredObject();
+        new EntityWorkflowAttachment('generic_doc', ['id' => 1], $entityWorkflow, $attachmentStoredObject1);
+        new EntityWorkflowAttachment('generic_doc', ['id' => 2], $entityWorkflow, $attachmentStoredObject2);
+
+        // Prepare transition DTO and sends
         $dto = new WorkflowTransitionContextDTO($entityWorkflow);
         $dto->futureDestineeEmails = ['external@example.com'];
         $dto->futureDestineeThirdParties = [(new ThirdParty())->setEmail('3party@example.com')];
         $entityWorkflow->setStep('send_external', $dto, 'to_send_external', new \DateTimeImmutable(), new User());
 
+        // Repository returns our workflow
         $repository = $this->prophesize(EntityWorkflowRepository::class);
         $repository->find(1)->willReturn($entityWorkflow);
 
+        // Mailer must send to both recipients
         $mailer = $this->prophesize(MailerInterface::class);
         $mailer->send(Argument::that($this->buildCheckAddressCallback('3party@example.com')))->shouldBeCalledOnce();
         $mailer->send(Argument::that($this->buildCheckAddressCallback('external@example.com')))->shouldBeCalledOnce();
 
+        // Workflow manager and handler
         $workflowHandler = $this->prophesize(EntityWorkflowHandlerInterface::class);
         $workflowHandler->getEntityTitle($entityWorkflow, Argument::any())->willReturn('title');
         $workflowManager = $this->prophesize(EntityWorkflowManager::class);
         $workflowManager->getHandler($entityWorkflow)->willReturn($workflowHandler->reveal());
 
-        $handler = new PostSendExternalMessageHandler($repository->reveal(), $mailer->reveal(), $workflowManager->reveal());
+        // Associated stored object for the workflow
+        $associatedStoredObject = new StoredObject();
+        $workflowManager->getAssociatedStoredObject($entityWorkflow)->willReturn($associatedStoredObject);
+
+        // Converter should be called for each attachment and the associated stored object
+        $converter = $this->prophesize(StoredObjectToPdfConverter::class);
+        $converter->addConvertedVersion($attachmentStoredObject1, 'fr')->shouldBeCalledOnce();
+        $converter->addConvertedVersion($attachmentStoredObject2, 'fr')->shouldBeCalledOnce();
+        $converter->addConvertedVersion($associatedStoredObject, 'fr')->shouldBeCalledOnce();
+
+        // Logger (not used in happy path, but required by handler)
+        $logger = $this->prophesize(LoggerInterface::class);
+
+        $handler = new PostSendExternalMessageHandler(
+            $repository->reveal(),
+            $mailer->reveal(),
+            $workflowManager->reveal(),
+            $converter->reveal(),
+            $logger->reveal(),
+        );
 
         $handler(new PostSendExternalMessage(1, 'fr'));
 
diff --git a/src/Bundle/ChillMainBundle/Workflow/Helper/WorkflowRelatedEntityPermissionHelper.php b/src/Bundle/ChillMainBundle/Workflow/Helper/WorkflowRelatedEntityPermissionHelper.php
index b0694549d..6d393b318 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Helper/WorkflowRelatedEntityPermissionHelper.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Helper/WorkflowRelatedEntityPermissionHelper.php
@@ -11,9 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Workflow\Helper;
 
+use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowAttachment;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowSignatureStateEnum;
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
 use Chill\MainBundle\Workflow\EntityWorkflowManager;
 use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\Security\Core\Security;
@@ -58,21 +61,39 @@ class WorkflowRelatedEntityPermissionHelper
     public function __construct(
         private readonly Security $security,
         private readonly EntityWorkflowManager $entityWorkflowManager,
+        private readonly EntityWorkflowAttachmentRepository $entityWorkflowAttachmentRepository,
         private readonly Registry $registry,
         private readonly ClockInterface $clock,
     ) {}
 
     /**
+     * @param object $entity The entity may be an
+     *
      * @return 'FORCE_GRANT'|'FORCE_DENIED'|'ABSTAIN'
      */
     public function isAllowedByWorkflowForReadOperation(object $entity): string
     {
-        $entityWorkflows = $this->entityWorkflowManager->findByRelatedEntity($entity);
+        if ($entity instanceof StoredObject) {
+            $attachments = $this->entityWorkflowAttachmentRepository->findByStoredObject($entity);
+            $entityWorkflows = array_map(static fn (EntityWorkflowAttachment $attachment) => $attachment->getEntityWorkflow(), $attachments);
+            $isAttached = true;
+        } else {
+            $entityWorkflows = $this->entityWorkflowManager->findByRelatedEntity($entity);
+            $isAttached = false;
+        }
+
+        if ([] === $entityWorkflows) {
+            return self::ABSTAIN;
+        }
 
         if ($this->isUserInvolvedInAWorkflow($entityWorkflows)) {
             return self::FORCE_GRANT;
         }
 
+        if ($isAttached) {
+            return self::ABSTAIN;
+        }
+
         // give a view permission if there is a Person signature pending, or in the 12 hours following
         // the signature last state
         foreach ($entityWorkflows as $workflow) {
@@ -100,33 +121,51 @@ class WorkflowRelatedEntityPermissionHelper
      */
     public function isAllowedByWorkflowForWriteOperation(object $entity): string
     {
-        $entityWorkflows = $this->entityWorkflowManager->findByRelatedEntity($entity);
-        $runningWorkflows = [];
+        if ($entity instanceof StoredObject) {
+            $attachments = $this->entityWorkflowAttachmentRepository->findByStoredObject($entity);
+            $entityWorkflows = array_map(static fn (EntityWorkflowAttachment $attachment) => $attachment->getEntityWorkflow(), $attachments);
+            $isAttached = true;
+        } else {
+            $entityWorkflows = $this->entityWorkflowManager->findByRelatedEntity($entity);
+            $isAttached = false;
+        }
 
-        // if a workflow is finalized positive, we are not allowed to edit to document any more
+        if ([] === $entityWorkflows) {
+            return self::ABSTAIN;
+        }
 
+        // if a workflow is finalized positive, anyone is allowed to edit the document anymore
         foreach ($entityWorkflows as $entityWorkflow) {
-            if ($entityWorkflow->isFinal()) {
-                $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
-                $marking = $workflow->getMarkingStore()->getMarking($entityWorkflow);
-                foreach ($marking->getPlaces() as $place => $int) {
-                    $placeMetadata = $workflow->getMetadataStore()->getPlaceMetadata($place);
-                    if (true === ($placeMetadata['isFinalPositive'] ?? false)) {
-                        // the workflow is final, and final positive, so we stop here.
-                        return self::FORCE_DENIED;
-                    }
+            $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
+            $marking = $workflow->getMarkingStore()->getMarking($entityWorkflow);
+            foreach ($marking->getPlaces() as $place => $int) {
+                $placeMetadata = $workflow->getMetadataStore()->getPlaceMetadata($place);
+                if (
+                    ($entityWorkflow->isFinal() && ($placeMetadata['isFinalPositive'] ?? false))
+                    || ($placeMetadata['isSentExternal'] ?? false)
+                ) {
+                    // the workflow is final, and final positive, or is sentExternal, so we stop here.
+                    return self::FORCE_DENIED;
+                }
+                if (
+                    // if not finalized positive
+                    $entityWorkflow->isFinal() && !($placeMetadata['isFinalPositive'] ?? false)
+                ) {
+                    return self::ABSTAIN;
                 }
-            } else {
-                $runningWorkflows[] = $entityWorkflow;
             }
         }
 
-        // if there is a signature on a **running workflow**, no one can edit the workflow any more
-        foreach ($runningWorkflows as $entityWorkflow) {
-            foreach ($entityWorkflow->getSteps() as $step) {
-                foreach ($step->getSignatures() as $signature) {
-                    if (EntityWorkflowSignatureStateEnum::SIGNED === $signature->getState()) {
-                        return self::FORCE_DENIED;
+        $runningWorkflows = array_filter($entityWorkflows, fn (EntityWorkflow $ew) => !$ew->isFinal());
+
+        // if there is a signature on a **running workflow**, no one is allowed edit the workflow anymore
+        if (!$isAttached) {
+            foreach ($runningWorkflows as $entityWorkflow) {
+                foreach ($entityWorkflow->getSteps() as $step) {
+                    foreach ($step->getSignatures() as $signature) {
+                        if (EntityWorkflowSignatureStateEnum::SIGNED === $signature->getState()) {
+                            return self::FORCE_DENIED;
+                        }
                     }
                 }
             }
@@ -137,7 +176,11 @@ class WorkflowRelatedEntityPermissionHelper
             return self::FORCE_GRANT;
         }
 
-        return self::ABSTAIN;
+        if ($isAttached) {
+            return self::ABSTAIN;
+        }
+
+        return self::FORCE_DENIED;
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSendExternalMessageHandler.php b/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSendExternalMessageHandler.php
index 04576015b..66888cce6 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSendExternalMessageHandler.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSendExternalMessageHandler.php
@@ -11,9 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Workflow\Messenger;
 
+use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
+use Chill\DocStoreBundle\Service\StoredObjectToPdfConverter;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowSend;
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
 use Chill\MainBundle\Workflow\EntityWorkflowManager;
+use Psr\Log\LoggerInterface;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
@@ -25,6 +29,8 @@ final readonly class PostSendExternalMessageHandler implements MessageHandlerInt
         private EntityWorkflowRepository $entityWorkflowRepository,
         private MailerInterface $mailer,
         private EntityWorkflowManager $workflowManager,
+        private StoredObjectToPdfConverter $storedObjectToPdfConverter,
+        private LoggerInterface $logger,
     ) {}
 
     public function __invoke(PostSendExternalMessage $message): void
@@ -35,11 +41,34 @@ final readonly class PostSendExternalMessageHandler implements MessageHandlerInt
             throw new UnrecoverableMessageHandlingException(sprintf('Entity workflow with id %d not found', $message->entityWorkflowId));
         }
 
+        $this->convertToPdf($entityWorkflow, $message->lang);
+
         foreach ($entityWorkflow->getCurrentStep()->getSends() as $send) {
             $this->sendEmailToDestinee($send, $message);
         }
     }
 
+    private function convertToPdf(EntityWorkflow $entityWorkflow, string $locale): void
+    {
+        foreach ($entityWorkflow->getAttachments() as $attachment) {
+            try {
+                $this->storedObjectToPdfConverter->addConvertedVersion($attachment->getProxyStoredObject(), $locale);
+            } catch (StoredObjectManagerException $e) {
+                $this->logger->error('Error converting attachment to PDF', ['backtrace' => $e->getTraceAsString(), 'attachment_id' => $attachment->getId()]);
+            }
+        }
+
+        $storedObject = $this->workflowManager->getAssociatedStoredObject($entityWorkflow);
+
+        if (null !== $storedObject) {
+            try {
+                $this->storedObjectToPdfConverter->addConvertedVersion($storedObject, $locale);
+            } catch (StoredObjectManagerException $e) {
+                $this->logger->error('Error converting stored object to PDF', ['backtrace' => $e->getTraceAsString(), 'stored_object_id' => $storedObject->getId(), 'workflow_id' => $entityWorkflow->getId()]);
+            }
+        }
+    }
+
     private function sendEmailToDestinee(EntityWorkflowSend $send, PostSendExternalMessage $message): void
     {
         $entityWorkflow = $send->getEntityWorkflowStep()->getEntityWorkflow();
diff --git a/src/Bundle/ChillMainBundle/Workflow/SignatureStepStateChanger.php b/src/Bundle/ChillMainBundle/Workflow/SignatureStepStateChanger.php
index 7315093d7..d9045bfc2 100644
--- a/src/Bundle/ChillMainBundle/Workflow/SignatureStepStateChanger.php
+++ b/src/Bundle/ChillMainBundle/Workflow/SignatureStepStateChanger.php
@@ -22,6 +22,7 @@ use Psr\Log\LoggerInterface;
 use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Workflow\Registry;
+use Symfony\Component\Workflow\Transition;
 
 /**
  * Handles state changes for signature steps within a workflow.
@@ -50,8 +51,10 @@ class SignatureStepStateChanger
      *
      * @param EntityWorkflowStepSignature $signature the signature entity to be marked as signed
      * @param int|null                    $atIndex   optional index position for the signature within the zone
+     *
+     * @return string The expected new workflow's step, after transition is applyied
      */
-    public function markSignatureAsSigned(EntityWorkflowStepSignature $signature, ?int $atIndex): void
+    public function markSignatureAsSigned(EntityWorkflowStepSignature $signature, ?int $atIndex): string
     {
         $this->entityManager->refresh($signature, LockMode::PESSIMISTIC_WRITE);
 
@@ -60,7 +63,14 @@ class SignatureStepStateChanger
             ->setZoneSignatureIndex($atIndex)
             ->setStateDate($this->clock->now());
         $this->logger->info(self::LOG_PREFIX.'Mark signature entity as signed', ['signatureId' => $signature->getId(), 'index' => (string) $atIndex]);
+        ['transition' => $transition, 'futureUser' => $futureUser] = $this->decideTransition($signature);
+
         $this->messageBus->dispatch(new PostSignatureStateChangeMessage((int) $signature->getId()));
+        if (null === $transition) {
+            return $signature->getStep()->getEntityWorkflow()->getStep();
+        }
+
+        return $transition->getTos()[0];
     }
 
     /**
@@ -71,8 +81,10 @@ class SignatureStepStateChanger
      *
      * This method updates the signature state to 'canceled' and logs the action.
      * It also dispatches a message to notify about the state change.
+     *
+     * @return string The expected new workflow's step, after transition is applyied
      */
-    public function markSignatureAsCanceled(EntityWorkflowStepSignature $signature): void
+    public function markSignatureAsCanceled(EntityWorkflowStepSignature $signature): string
     {
         $this->entityManager->refresh($signature, LockMode::PESSIMISTIC_WRITE);
 
@@ -80,7 +92,15 @@ class SignatureStepStateChanger
             ->setState(EntityWorkflowSignatureStateEnum::CANCELED)
             ->setStateDate($this->clock->now());
         $this->logger->info(self::LOG_PREFIX.'Mark signature entity as canceled', ['signatureId' => $signature->getId()]);
+
+        ['transition' => $transition, 'futureUser' => $futureUser] = $this->decideTransition($signature);
+
         $this->messageBus->dispatch(new PostSignatureStateChangeMessage((int) $signature->getId()));
+        if (null === $transition) {
+            return $signature->getStep()->getEntityWorkflow()->getStep();
+        }
+
+        return $transition->getTos()[0];
     }
 
     /**
@@ -93,8 +113,10 @@ class SignatureStepStateChanger
      * a state change has occurred.
      *
      * @param EntityWorkflowStepSignature $signature the signature entity to be marked as rejected
+     *
+     * @return string The expected new workflow's step, after transition is applyied
      */
-    public function markSignatureAsRejected(EntityWorkflowStepSignature $signature): void
+    public function markSignatureAsRejected(EntityWorkflowStepSignature $signature): string
     {
         $this->entityManager->refresh($signature, LockMode::PESSIMISTIC_WRITE);
 
@@ -102,7 +124,16 @@ class SignatureStepStateChanger
             ->setState(EntityWorkflowSignatureStateEnum::REJECTED)
             ->setStateDate($this->clock->now());
         $this->logger->info(self::LOG_PREFIX.'Mark signature entity as rejected', ['signatureId' => $signature->getId()]);
+
+        ['transition' => $transition, 'futureUser' => $futureUser] = $this->decideTransition($signature);
+
         $this->messageBus->dispatch(new PostSignatureStateChangeMessage((int) $signature->getId()));
+
+        if (null === $transition) {
+            return $signature->getStep()->getEntityWorkflow()->getStep();
+        }
+
+        return $transition->getTos()[0];
     }
 
     /**
@@ -117,10 +148,35 @@ class SignatureStepStateChanger
     {
         $this->entityManager->refresh($signature, LockMode::PESSIMISTIC_READ);
 
+        ['transition' => $transition, 'futureUser' => $futureUser] = $this->decideTransition($signature);
+
+        if (null === $transition) {
+            return;
+        }
+
+        $entityWorkflow = $signature->getStep()->getEntityWorkflow();
+        $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
+        $transitionDto = new WorkflowTransitionContextDTO($entityWorkflow);
+        $transitionDto->futureDestUsers[] = $futureUser;
+
+        $workflow->apply($entityWorkflow, $transition->getName(), [
+            'context' => $transitionDto,
+            'transitionAt' => $this->clock->now(),
+            'transition' => $transition->getName(),
+        ]);
+
+        $this->logger->info(self::LOG_PREFIX.'Transition automatically applied', ['signatureId' => $signature->getId()]);
+    }
+
+    /**
+     * @return array{transition: Transition|null, futureUser: User|null}
+     */
+    private function decideTransition(EntityWorkflowStepSignature $signature): array
+    {
         if (!EntityWorkflowStepSignature::isAllSignatureNotPendingForStep($signature->getStep())) {
             $this->logger->info(self::LOG_PREFIX.'This is not the last signature, skipping transition to another place', ['signatureId' => $signature->getId()]);
 
-            return;
+            return ['transition' => null, 'futureUser' => null];
         }
 
         $this->logger->debug(self::LOG_PREFIX.'Continuing the process to find a transition', ['signatureId' => $signature->getId()]);
@@ -144,7 +200,7 @@ class SignatureStepStateChanger
         if (null === $transition) {
             $this->logger->info(self::LOG_PREFIX.'The transition is not configured, will not apply a transition', ['signatureId' => $signature->getId()]);
 
-            return;
+            return ['transition' => null, 'futureUser' => null];
         }
 
         if ('person' === $signature->getSignerKind()) {
@@ -156,19 +212,16 @@ class SignatureStepStateChanger
         if (null === $futureUser) {
             $this->logger->info(self::LOG_PREFIX.'No previous user, will not apply a transition', ['signatureId' => $signature->getId()]);
 
-            return;
+            return ['transition' => null, 'futureUser' => null];
         }
 
-        $transitionDto = new WorkflowTransitionContextDTO($entityWorkflow);
-        $transitionDto->futureDestUsers[] = $futureUser;
+        foreach ($workflow->getDefinition()->getTransitions() as $transitionObj) {
+            if ($transitionObj->getName() === $transition) {
+                return ['transition' => $transitionObj, 'futureUser' => $futureUser];
+            }
+        }
 
-        $workflow->apply($entityWorkflow, $transition, [
-            'context' => $transitionDto,
-            'transitionAt' => $this->clock->now(),
-            'transition' => $transition,
-        ]);
-
-        $this->logger->info(self::LOG_PREFIX.'Transition automatically applied', ['signatureId' => $signature->getId()]);
+        throw new \RuntimeException('Transition not found');
     }
 
     private function getPreviousSender(EntityWorkflowStep $entityWorkflowStep): ?User
diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index d87a0eb71..62df1a44c 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
@@ -965,6 +965,31 @@ paths:
                         application/json:
                             schema:
                                 $ref: "#/components/schemas/UserJob"
+    /1.0/main/workflow/{id}.json:
+        get:
+            tags:
+                - workflow
+            summary: Return a workflow
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The workflow id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: "#/components/schemas/Workflow"
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
     /1.0/main/workflow/my:
         get:
             tags:
diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js
index 011fc9559..596fab77f 100644
--- a/src/Bundle/ChillMainBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js
@@ -120,5 +120,8 @@ module.exports = function (encore, entries) {
     "vue_onthefly",
     __dirname + "/Resources/public/vuejs/OnTheFly/index.js",
   );
-
+  encore.addEntry(
+    "page_workflow_waiting_post_process",
+    __dirname + "/Resources/public/vuejs/WaitPostProcessWorkflow/index.ts"
+  );
 };
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 5f5b71650..0430b72c6 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -666,10 +666,17 @@ workflow:
         cancel_are_you_sure: Êtes-vous sûr de vouloir annuler la signature de %signer%
         reject_signature_of: Rejet de la signature de %signer%
         reject_are_you_sure: Êtes-vous sûr de vouloir rejeter la signature de %signer%
+        waiting_for: En attente de modification de l'état de la signature
 
     attachments:
         title: Pièces jointes
 
+    wait:
+        title: En attente de traitement
+        error_while_waiting: Le traitement a échoué
+        success: Traitement terminé. Redirection en cours...
+
+
 Subscribe final: Recevoir une notification à l'étape finale
 Subscribe all steps: Recevoir une notification à chaque étape
 CHILL_MAIN_WORKFLOW_APPLY_ALL_TRANSITION: Appliquer les transitions sur tous les workflows

From 955cb817c4b55b2afaba44fb75f0a1c0d9002a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 3 Oct 2025 12:09:17 +0200
Subject: [PATCH 10/15] Release v4.5.0

---
 .changes/unreleased/DX-20251003-114344.yaml      |  6 ------
 .changes/unreleased/Feature-20250724-161556.yaml |  6 ------
 .changes/unreleased/Feature-20250724-161628.yaml |  6 ------
 .changes/unreleased/Feature-20250724-172013.yaml |  6 ------
 .changes/unreleased/Feature-20251003-113838.yaml |  6 ------
 .changes/unreleased/Feature-20251003-113937.yaml |  6 ------
 .changes/unreleased/Feature-20251003-114233.yaml |  6 ------
 .changes/unreleased/Fixed-20250918-114044.yaml   |  6 ------
 .changes/unreleased/Fixed-20251003-114144.yaml   |  6 ------
 .changes/v4.5.0.md                               | 13 +++++++++++++
 CHANGELOG.md                                     | 14 ++++++++++++++
 11 files changed, 27 insertions(+), 54 deletions(-)
 delete mode 100644 .changes/unreleased/DX-20251003-114344.yaml
 delete mode 100644 .changes/unreleased/Feature-20250724-161556.yaml
 delete mode 100644 .changes/unreleased/Feature-20250724-161628.yaml
 delete mode 100644 .changes/unreleased/Feature-20250724-172013.yaml
 delete mode 100644 .changes/unreleased/Feature-20251003-113838.yaml
 delete mode 100644 .changes/unreleased/Feature-20251003-113937.yaml
 delete mode 100644 .changes/unreleased/Feature-20251003-114233.yaml
 delete mode 100644 .changes/unreleased/Fixed-20250918-114044.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251003-114144.yaml
 create mode 100644 .changes/v4.5.0.md

diff --git a/.changes/unreleased/DX-20251003-114344.yaml b/.changes/unreleased/DX-20251003-114344.yaml
deleted file mode 100644
index c7b36e93a..000000000
--- a/.changes/unreleased/DX-20251003-114344.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: DX
-body: Introduce a WaitingScreen component to display a waiting screen
-time: 2025-10-03T11:43:44.688572711+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20250724-161556.yaml b/.changes/unreleased/Feature-20250724-161556.yaml
deleted file mode 100644
index e661f72e1..000000000
--- a/.changes/unreleased/Feature-20250724-161556.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Only allow delete of attachment on workflows that are not final
-time: 2025-07-24T16:15:56.042884578+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20250724-161628.yaml b/.changes/unreleased/Feature-20250724-161628.yaml
deleted file mode 100644
index db2013b66..000000000
--- a/.changes/unreleased/Feature-20250724-161628.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Move up signature buttons on index workflow page for easier access
-time: 2025-07-24T16:16:28.609598883+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20250724-172013.yaml b/.changes/unreleased/Feature-20250724-172013.yaml
deleted file mode 100644
index ab12bd88b..000000000
--- a/.changes/unreleased/Feature-20250724-172013.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Filter out document from attachment list if it is the same as the workflow document
-time: 2025-07-24T17:20:13.118537573+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20251003-113838.yaml b/.changes/unreleased/Feature-20251003-113838.yaml
deleted file mode 100644
index 22257a5e1..000000000
--- a/.changes/unreleased/Feature-20251003-113838.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Block edition on attached document on workflow, if the workflow is finalized or sent external
-time: 2025-10-03T11:38:38.879030263+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20251003-113937.yaml b/.changes/unreleased/Feature-20251003-113937.yaml
deleted file mode 100644
index 85f4118bb..000000000
--- a/.changes/unreleased/Feature-20251003-113937.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Convert workflow's attached document to pdf while sending them external
-time: 2025-10-03T11:39:37.382834874+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20251003-114233.yaml b/.changes/unreleased/Feature-20251003-114233.yaml
deleted file mode 100644
index 42296ca94..000000000
--- a/.changes/unreleased/Feature-20251003-114233.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition
-time: 2025-10-03T11:42:33.859561072+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20250918-114044.yaml b/.changes/unreleased/Fixed-20250918-114044.yaml
deleted file mode 100644
index fe50576fe..000000000
--- a/.changes/unreleased/Fixed-20250918-114044.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance
-time: 2025-09-18T11:40:44.858533536+02:00
-custom:
-    Issue: "426"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251003-114144.yaml b/.changes/unreleased/Fixed-20251003-114144.yaml
deleted file mode 100644
index 92be727be..000000000
--- a/.changes/unreleased/Fixed-20251003-114144.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix permissions on storedObject which are subject by a workflow
-time: 2025-10-03T11:41:44.17608896+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/v4.5.0.md b/.changes/v4.5.0.md
new file mode 100644
index 000000000..1744eca0c
--- /dev/null
+++ b/.changes/v4.5.0.md
@@ -0,0 +1,13 @@
+## v4.5.0 - 2025-10-03
+### Feature
+* Only allow delete of attachment on workflows that are not final   
+* Move up signature buttons on index workflow page for easier access   
+* Filter out document from attachment list if it is the same as the workflow document   
+* Block edition on attached document on workflow, if the workflow is finalized or sent external   
+* Convert workflow's attached document to pdf while sending them external   
+* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition   
+### Fixed
+* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance   
+* Fix permissions on storedObject which are subject by a workflow   
+### DX
+* Introduce a WaitingScreen component to display a waiting screen   
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0c695e2f..2cc145cc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,20 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.5.0 - 2025-10-03
+### Feature
+* Only allow delete of attachment on workflows that are not final   
+* Move up signature buttons on index workflow page for easier access   
+* Filter out document from attachment list if it is the same as the workflow document   
+* Block edition on attached document on workflow, if the workflow is finalized or sent external   
+* Convert workflow's attached document to pdf while sending them external   
+* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition   
+### Fixed
+* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance   
+* Fix permissions on storedObject which are subject by a workflow   
+### DX
+* Introduce a WaitingScreen component to display a waiting screen   
+
 ## v4.4.2 - 2025-09-12
 ### Fixed
 * Fix document generation and workflow generation do not work on accompanying period work documents   

From fcc9529a208349d568a8f17f6979e9045f8b6a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 3 Oct 2025 12:57:52 +0200
Subject: [PATCH 11/15] Add missing javascript dependency in package.json

---
 .changes/unreleased/Fixed-20251003-125745.yaml | 6 ++++++
 package.json                                   | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 .changes/unreleased/Fixed-20251003-125745.yaml

diff --git a/.changes/unreleased/Fixed-20251003-125745.yaml b/.changes/unreleased/Fixed-20251003-125745.yaml
new file mode 100644
index 000000000..ef6ec9882
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251003-125745.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Add missing javascript dependency
+time: 2025-10-03T12:57:45.693475353+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/package.json b/package.json
index fc50ba29c..a013df3da 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",
     "@types/leaflet": "^1.9.3",
+    "@vueuse/core": "^13.9.0",
     "bootstrap-icons": "^1.11.3",
     "dropzone": "^5.7.6",
     "es6-promise": "^4.2.8",

From f9ad96c78bd057c32f42f0beae03565369f9a3f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 3 Oct 2025 13:01:39 +0200
Subject: [PATCH 12/15] Introduce `ConversionWithSameMimeTypeException` for
 improved error handling in document conversion.

- Added the `ConversionWithSameMimeTypeException` to handle cases where document conversion is requested for the same MIME type.
- Updated `StoredObjectToPdfConverter` to throw the new exception when encountering such cases.
- Enhanced error logging in `PostSendExternalMessageHandler` to capture these specific conversion errors.
---
 .../unreleased/Fixed-20251003-130249.yaml     |  6 ++++++
 .../ConversionWithSameMimeTypeException.php   | 20 +++++++++++++++++++
 .../Service/StoredObjectToPdfConverter.php    |  8 +++++---
 .../PostSendExternalMessageHandler.php        |  5 +++++
 4 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251003-130249.yaml
 create mode 100644 src/Bundle/ChillDocStoreBundle/Exception/ConversionWithSameMimeTypeException.php

diff --git a/.changes/unreleased/Fixed-20251003-130249.yaml b/.changes/unreleased/Fixed-20251003-130249.yaml
new file mode 100644
index 000000000..b6db3cafc
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251003-130249.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Add exception handling for conversion of attachment on sending external, when documens are already in pdf
+time: 2025-10-03T13:02:49.524835257+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillDocStoreBundle/Exception/ConversionWithSameMimeTypeException.php b/src/Bundle/ChillDocStoreBundle/Exception/ConversionWithSameMimeTypeException.php
new file mode 100644
index 000000000..06fb4a9ed
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Exception/ConversionWithSameMimeTypeException.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Exception;
+
+class ConversionWithSameMimeTypeException extends \RuntimeException
+{
+    public function __construct(string $mimeType, ?\Throwable $previous = null)
+    {
+        parent::__construct("Conversion to same MIME type '{$mimeType}' is not allowed: already at the same MIME type", 0, $previous);
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectToPdfConverter.php b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectToPdfConverter.php
index ac570c513..8a5ea6e8c 100644
--- a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectToPdfConverter.php
+++ b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectToPdfConverter.php
@@ -15,6 +15,7 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Entity\StoredObjectPointInTime;
 use Chill\DocStoreBundle\Entity\StoredObjectPointInTimeReasonEnum;
 use Chill\DocStoreBundle\Entity\StoredObjectVersion;
+use Chill\DocStoreBundle\Exception\ConversionWithSameMimeTypeException;
 use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
 use Chill\WopiBundle\Service\WopiConverter;
 use Symfony\Component\Mime\MimeTypesInterface;
@@ -41,9 +42,10 @@ class StoredObjectToPdfConverter
      *
      * @return array{0: StoredObjectPointInTime, 1: StoredObjectVersion, 2?: string} contains the point in time before conversion and the new version of the stored object. The converted content is included in the response if $includeConvertedContent is true
      *
-     * @throws \UnexpectedValueException    if the preferred mime type for the conversion is not found
-     * @throws \RuntimeException            if the conversion or storage of the new version fails
+     * @throws \UnexpectedValueException           if the preferred mime type for the conversion is not found
+     * @throws \RuntimeException                   if the conversion or storage of the new version fails
      * @throws StoredObjectManagerException
+     * @throws ConversionWithSameMimeTypeException if the document has already the same mime type79*
      */
     public function addConvertedVersion(StoredObject $storedObject, string $lang, $convertTo = 'pdf', bool $includeConvertedContent = false): array
     {
@@ -56,7 +58,7 @@ class StoredObjectToPdfConverter
         $currentVersion = $storedObject->getCurrentVersion();
 
         if ($currentVersion->getType() === $newMimeType) {
-            throw new \UnexpectedValueException('Already at the same mime type');
+            throw new ConversionWithSameMimeTypeException($newMimeType);
         }
 
         $content = $this->storedObjectManager->read($currentVersion);
diff --git a/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSendExternalMessageHandler.php b/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSendExternalMessageHandler.php
index 66888cce6..2e5f74808 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSendExternalMessageHandler.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSendExternalMessageHandler.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Workflow\Messenger;
 
+use Chill\DocStoreBundle\Exception\ConversionWithSameMimeTypeException;
 use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
 use Chill\DocStoreBundle\Service\StoredObjectToPdfConverter;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
@@ -55,6 +56,8 @@ final readonly class PostSendExternalMessageHandler implements MessageHandlerInt
                 $this->storedObjectToPdfConverter->addConvertedVersion($attachment->getProxyStoredObject(), $locale);
             } catch (StoredObjectManagerException $e) {
                 $this->logger->error('Error converting attachment to PDF', ['backtrace' => $e->getTraceAsString(), 'attachment_id' => $attachment->getId()]);
+            } catch (ConversionWithSameMimeTypeException $e) {
+                $this->logger->error('Error converting attachment to PDF: already at the same MIME type', ['backtrace' => $e->getTraceAsString(), 'attachment_id' => $attachment->getId()]);
             }
         }
 
@@ -65,6 +68,8 @@ final readonly class PostSendExternalMessageHandler implements MessageHandlerInt
                 $this->storedObjectToPdfConverter->addConvertedVersion($storedObject, $locale);
             } catch (StoredObjectManagerException $e) {
                 $this->logger->error('Error converting stored object to PDF', ['backtrace' => $e->getTraceAsString(), 'stored_object_id' => $storedObject->getId(), 'workflow_id' => $entityWorkflow->getId()]);
+            } catch (ConversionWithSameMimeTypeException $e) {
+                $this->logger->error('Error converting stored object to PDF: already at the same MIME type', ['backtrace' => $e->getTraceAsString(), 'stored_object_id' => $storedObject->getId(), 'workflow_id' => $entityWorkflow->getId()]);
             }
         }
     }

From c2d9c73fd4dfc2d72e09824434a5b2a06aec9f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 3 Oct 2025 14:11:41 +0200
Subject: [PATCH 13/15] Release v4.5.1

---
 .changes/unreleased/Fixed-20251003-125745.yaml | 6 ------
 .changes/unreleased/Fixed-20251003-130249.yaml | 6 ------
 .changes/v4.5.1.md                             | 4 ++++
 CHANGELOG.md                                   | 5 +++++
 4 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 .changes/unreleased/Fixed-20251003-125745.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251003-130249.yaml
 create mode 100644 .changes/v4.5.1.md

diff --git a/.changes/unreleased/Fixed-20251003-125745.yaml b/.changes/unreleased/Fixed-20251003-125745.yaml
deleted file mode 100644
index ef6ec9882..000000000
--- a/.changes/unreleased/Fixed-20251003-125745.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Add missing javascript dependency
-time: 2025-10-03T12:57:45.693475353+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251003-130249.yaml b/.changes/unreleased/Fixed-20251003-130249.yaml
deleted file mode 100644
index b6db3cafc..000000000
--- a/.changes/unreleased/Fixed-20251003-130249.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Add exception handling for conversion of attachment on sending external, when documens are already in pdf
-time: 2025-10-03T13:02:49.524835257+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/v4.5.1.md b/.changes/v4.5.1.md
new file mode 100644
index 000000000..d2bca7be9
--- /dev/null
+++ b/.changes/v4.5.1.md
@@ -0,0 +1,4 @@
+## v4.5.1 - 2025-10-03
+### Fixed
+* Add missing javascript dependency   
+* Add exception handling for conversion of attachment on sending external, when documens are already in pdf   
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cc145cc8..359b777c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.5.1 - 2025-10-03
+### Fixed
+* Add missing javascript dependency   
+* Add exception handling for conversion of attachment on sending external, when documens are already in pdf   
+
 ## v4.5.0 - 2025-10-03
 ### Feature
 * Only allow delete of attachment on workflows that are not final   

From d159a82f88f38dde664c34494d6ba80a649b65a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 3 Oct 2025 22:20:51 +0200
Subject: [PATCH 14/15] Update import paths in `HistoryButtonListItem.vue` to
 use aliases

- Changed types import to use `ChillDocStoreAssets/types`.
- Updated `ISOToDatetime` import to use `ChillMainAssets/chill/js/date`.
---
 .../HistoryButton/HistoryButtonListItem.vue                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
index bf5e3fffb..bd8502e96 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
@@ -3,9 +3,9 @@ import {
     StoredObject,
     StoredObjectPointInTime,
     StoredObjectVersionWithPointInTime,
-} from "./../../../types";
+} from "ChillDocStoreAssets/types";
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
-import { ISOToDatetime } from "./../../../../../../ChillMainBundle/Resources/public/chill/js/date";
+import { ISOToDatetime } from "ChillMainAssets/chill/js/date";
 import FileIcon from "ChillDocStoreAssets/vuejs/FileIcon.vue";
 import RestoreVersionButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/HistoryButton/RestoreVersionButton.vue";
 import DownloadButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/DownloadButton.vue";

From d3a31be412a1d795b95260d0f173f96b2c259302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 3 Oct 2025 22:31:07 +0200
Subject: [PATCH 15/15] Fix re-ordering of StoredObjectVersion in the list of
 versions

As some intermediate versions are remove, this may lead to situation where the indexes are not continous. In that case, the array is not a list, and is rendered as an array with numeric indexes, instead of a list of elements. The HistoryListItem component fails to render.

- Ensured proper handling of removed versions by using `array_values` to reindex items.
- Added test case to validate the result after removing a version.
- Asserted the results are a proper list in the API response.
---
 .changes/unreleased/Fixed-20251003-224044.yaml              | 6 ++++++
 .../Controller/StoredObjectVersionApiController.php         | 2 +-
 .../Controller/StoredObjectVersionApiControllerTest.php     | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/Fixed-20251003-224044.yaml

diff --git a/.changes/unreleased/Fixed-20251003-224044.yaml b/.changes/unreleased/Fixed-20251003-224044.yaml
new file mode 100644
index 000000000..c5b3e7304
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251003-224044.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted
+time: 2025-10-03T22:40:44.685474863+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectVersionApiController.php b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectVersionApiController.php
index 819eb9f84..1dbcb6159 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectVersionApiController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectVersionApiController.php
@@ -59,7 +59,7 @@ final readonly class StoredObjectVersionApiController
 
         return new JsonResponse(
             $this->serializer->serialize(
-                new Collection($items, $paginator),
+                new Collection(array_values($items->toArray()), $paginator),
                 'json',
                 [AbstractNormalizer::GROUPS => ['read', StoredObjectVersionNormalizer::WITH_POINT_IN_TIMES_CONTEXT, StoredObjectVersionNormalizer::WITH_RESTORED_CONTEXT]]
             ),
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/Controller/StoredObjectVersionApiControllerTest.php b/src/Bundle/ChillDocStoreBundle/Tests/Controller/StoredObjectVersionApiControllerTest.php
index 27154831d..36d225ddf 100644
--- a/src/Bundle/ChillDocStoreBundle/Tests/Controller/StoredObjectVersionApiControllerTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/Controller/StoredObjectVersionApiControllerTest.php
@@ -40,6 +40,10 @@ class StoredObjectVersionApiControllerTest extends \PHPUnit\Framework\TestCase
             $storedObject->registerVersion();
         }
 
+        // remove one version in the history
+        $v5 = $storedObject->getVersions()->get(5);
+        $storedObject->removeVersion($v5);
+
         $security = $this->prophesize(Security::class);
         $security->isGranted(StoredObjectRoleEnum::SEE->value, $storedObject)
             ->willReturn(true)
@@ -53,6 +57,7 @@ class StoredObjectVersionApiControllerTest extends \PHPUnit\Framework\TestCase
         self::assertEquals($response->getStatusCode(), 200);
         self::assertIsArray($body);
         self::assertArrayHasKey('results', $body);
+        self::assertIsList($body['results']);
         self::assertCount(10, $body['results']);
     }