feat: add invitation list

- Introduced `MyInvitationsController` for managing user invitations
- Added `InviteACLAwareRepository` and its interface for handling invite data operations
- Created views for listing and displaying user-specific invitations
- Updated user menu to include "My invitations list" option

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

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

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

@@ -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

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

@@ -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

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

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

.changes/v4.2.1.md

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

.junie/guidelines.md

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

CHANGELOG.md

@@ -6,6 +6,13 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.2.1 - 2025-09-03
+### Fixed
+* Fix exports to work with DirectExportInterface   
+### DX
+* Improve error message when a stored object cannot be written on local disk
+   
+
 ## v4.2.0 - 2025-09-02
 ### Feature
 * ([#64](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/64)) Add external identifier for a Person

src/Bundle/ChillCalendarBundle/Controller/CalendarController.php

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

src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Controller;
+
+use Chill\CalendarBundle\Repository\InviteACLAwareRepository;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+
+class MyInvitationsController extends AbstractController
+{
+    public function __construct(private readonly InviteACLAwareRepository $inviteACLAwareRepository, private readonly PaginatorFactory $paginator) {}
+
+    /**
+     * @throws NonUniqueResultException
+     * @throws NoResultException
+     */
+    #[Route(path: '/{_locale}/calendar/invitations/my', name: 'chill_calendar_invitations_list_my')]
+    public function myInvitations(Request $request): Response
+    {
+        $this->denyAccessUnlessGranted('ROLE_USER');
+
+        $user = $this->getUser();
+
+        if (!$user instanceof User) {
+            throw new UnauthorizedHttpException('you are not a user');
+        }
+
+        $total = $this->inviteACLAwareRepository->countByUser($user);
+        $paginator = $this->paginator->create($total);
+        $invitations = $this->inviteACLAwareRepository->findByUser(
+            $user,
+            ['createdAt' => 'DESC'],
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage()
+        );
+
+        dump($invitations);
+
+        $view = '@ChillCalendar/Invitations/listByUser.html.twig';
+
+        return $this->render($view, [
+            'invitations' => $invitations,
+            'paginator' => $paginator,
+        ]);
+    }
+}

src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php

@@ -30,6 +30,13 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                     'order' => 9,
                     'icon' => 'tasks',
                 ]);
+            $menu->addChild('My invitations list', [
+                'route' => 'chill_calendar_invitations_list_my',
+            ])
+                ->setExtras([
+                    'order' => 9,
+                    'icon' => 'tasks',
+                ]);
         }
     }
 

src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepository.php

@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Repository;
+
+use Chill\CalendarBundle\Entity\Invite;
+use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
+use Doctrine\ORM\QueryBuilder;
+
+readonly class InviteACLAwareRepository implements InviteACLAwareRepositoryInterface
+{
+    public function __construct(private EntityManagerInterface $em) {}
+
+    /**
+     * @throws NonUniqueResultException
+     * @throws NoResultException
+     */
+    public function countByUser(User $user): int
+    {
+        return $this->buildQueryByUser($user)
+            ->select('COUNT(i)')
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
+    public function findByUser(User $user, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array
+    {
+        $qb = $this->buildQueryByUser($user)
+            ->select('i');
+
+        foreach ($orderBy as $sort => $order) {
+            $qb->addOrderBy('i.'.$sort, $order);
+        }
+
+        if (null !== $offset) {
+            $qb->setFirstResult($offset);
+        }
+
+        if (null !== $limit) {
+            $qb->setMaxResults($limit);
+        }
+
+        return $qb->getQuery()->getResult();
+    }
+
+    public function buildQueryByUser(User $user): QueryBuilder
+    {
+        $qb = $this->em->createQueryBuilder()
+            ->from(Invite::class, 'i');
+
+        $qb->where('i.user = :user');
+
+        $qb->setParameter('user', $user);
+
+        return $qb;
+    }
+}

src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepositoryInterface.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Repository;
+
+use Chill\MainBundle\Entity\User;
+
+interface InviteACLAwareRepositoryInterface
+{
+    public function countByUser(User $user): int;
+
+    public function findByUser(User $user, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array;
+}

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

@@ -0,0 +1,172 @@
+{% if invitations|length > 0 %}
+    <div class="flex-table list-records">
+
+        {% for invitation in invitations %}
+        {% set calendar = invitation.getCalendar %}
+
+            {% if calendar is not null %}
+            <div class="item-bloc">
+                <div class="item-row main">
+                    <div class="item-col">
+                        <div class="wrap-header">
+                            <div class="wl-row">
+                                <div class="wl-col title">
+                                    <p class="date-label">
+                                        {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
+                                            {{ calendar.startDate|format_datetime('short', 'short') }}
+                                            - {{ calendar.endDate|format_datetime('short', 'short') }}
+                                        {% else %}
+                                            {{ calendar.startDate|format_datetime('short', 'short') }}
+                                            - {{ calendar.endDate|format_datetime('none', 'short') }}
+                                        {% endif %}
+                                    </p>
+
+                                    <div class="duration short-message">
+                                        <i class="fa fa-fw fa-hourglass-end"></i>
+                                        {{ calendar.duration|date('%H:%I') }}
+                                        {% if false == calendar.sendSMS or null == calendar.sendSMS %}
+                                            <!-- no sms will be send -->
+                                        {% else %}
+                                            {% if calendar.smsStatus == 'sms_sent' %}
+                                                <span title="{{ 'SMS already sent'|trans }}" class="badge bg-info">
+                                                    <i class="fa fa-check "></i>
+                                                    <i class="fa fa-envelope "></i>
+                                                </span>
+                                            {% else %}
+                                                <span title="{{ 'Will send SMS'|trans }}" class="badge bg-info">
+                                                    <i class="fa fa-envelope "></i>
+                                                    <i class="fa fa-hourglass-end "></i>
+                                                </span>
+                                            {% endif %}
+                                        {% endif %}
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="item-col">
+                            <ul class="list-content">
+                                {% if calendar.mainUser is not empty %}
+                                    <span class="badge-user">{{ calendar.mainUser|chill_entity_render_box({'at_date': calendar.startDate}) }}</span>
+                                {% endif %}
+                            </ul>
+                        </div>
+
+                    </div>
+                </div>
+
+                {% if calendar.comment.comment is not empty
+                    or calendar.users|length > 0
+                    or calendar.thirdParties|length > 0
+                    or calendar.users|length > 0 %}
+                    <div class="item-row details separator">
+                        <div class="item-col">
+                            {% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
+                                'context': calendar.context == 'person' ?  'calendar_person' : 'calendar_accompanyingCourse',
+                                'render': 'wrap-list',
+                                'entity': calendar
+                            } %}
+                        </div>
+
+                    </div>
+                {% endif %}
+
+                {% if calendar.comment.comment is not empty %}
+                    <div class="item-row details separator">
+                        <div class="item-col comment">
+                            {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
+                        </div>
+                    </div>
+                {% endif %}
+
+                {% if calendar.location is not empty %}
+                    <div class="item-row separator">
+                        <div>
+                            {% if calendar.location.address is not same as(null) and calendar.location.name is not empty %}
+                                <i class="fa fa-map-marker"></i>{% endif %}
+                            {% if calendar.location.name is not empty %}{{ calendar.location.name }}{% endif %}
+                            {% if calendar.location.address is not same as(null) %}{{ calendar.location.address|chill_entity_render_box({'multiline': false, 'with_picto': (calendar.location.name is empty)}) }}{% else %}
+                                <i class="fa fa-map-marker"></i>{% endif %}
+                            {% if calendar.location.phonenumber1 is not empty %}<i
+                                class="fa fa-phone"></i> {{ calendar.location.phonenumber1|chill_format_phonenumber }}{% endif %}
+                            {% if calendar.location.phonenumber2 is not empty %}<i
+                                class="fa fa-phone"></i> {{ calendar.location.phonenumber2|chill_format_phonenumber }}{% endif %}
+                        </div>
+                    </div>
+                {% endif %}
+
+                <div class="item-row separator column">
+                    <div>
+
+                        {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
+                    </div>
+                </div>
+
+                {% if calendar.activity is not null %}
+                    <div class="item-row separator">
+                        <div class="item-col">
+                            <div class="wrap-list">
+                                <div class="wl-row">
+                                    <div class="wl-col title"><h3>{{ 'Activity'|trans }}</h3></div>
+                                    <div class="wl-col list activity-linked">
+                                        <h2 class="badge-title">
+                                            <span class="title_label"></span>
+                                            <span class="title_action">
+                                            {{ calendar.activity.type.name | localize_translatable_string }}
+
+                                                {% if calendar.activity.emergency %}
+                                                    <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
+                                                {% endif %}
+                                        </span>
+                                        </h2>
+
+                                        <ul class="record_actions">
+                                            <li class="cancel">
+                                                <span class="createdBy">
+                                                     {{ 'Created by'|trans }}
+                                                    <b>{{ calendar.activity.createdBy|chill_entity_render_string({'at_date': calendar.activity.createdAt}) }}</b>, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }}
+                                                </span>
+                                            </li>
+                                            {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %}
+                                                <li>
+                                                    <a href="{{ chill_path_add_return_path('chill_activity_activity_show', {'id': calendar.activity.id}) }}" class="btn btn-sm btn-show" ></a>
+                                                </li>
+                                            {% endif %}
+                                        </ul>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                {% endif %}
+
+                <div class="item-row separator">
+                    <ul class="record_actions">
+
+                        {% if (calendar.isInvited(app.user)) %}
+                            {% set invite = calendar.inviteForUser(app.user) %}
+                            <li>
+                                <div invite-answer data-status="{{ invite.status|e('html_attr') }}"
+                                     data-calendar-id="{{ calendar.id|e('html_attr') }}"></div>
+                            </li>
+                        {% endif %}
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_show', { 'id': calendar.id}) }}"
+                               class="btn btn-show "></a>
+                        </li>
+                    </ul>
+
+                </div>
+
+            </div>
+        {% endif %}
+        {% endfor %}
+
+        {% if invitations|length < paginator.getTotalItems %}
+            {{ chill_pagination(paginator) }}
+        {% endif %}
+
+    </div>
+{% endif %}

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

@@ -0,0 +1,27 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_invitations_list' %}
+
+{% block title %}{{ 'My invitations list' |trans }}{% endblock title %}
+
+{% block content %}
+
+    <h1>{{ 'Invitation list' |trans }}</h1>
+
+    {% if invitations|length == 0 %}
+        <p class="chill-no-data-statement">
+            {{ "There is no invitation items."|trans }}
+        </p>
+    {% else %}
+        {{ include ('@ChillCalendar/Invitations/_list_item.html.twig') }}
+    {% endif %}
+
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+{% endblock %}

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

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

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

@@ -4,7 +4,6 @@ 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;
@@ -76,10 +75,10 @@ function closeModal(): void {
         @click="openModal"
         class="btn btn-create"
     >
-        {{ trans(DOCUMENT_ADD) }}
+        Ajouter un document
     </button>
-    <button v-else @click="openModal" class="dropdown-item">
-        {{ trans(DOCUMENT_REPLACE) }}
+    <button v-else @click="openModal" class="btn btn-edit">
+        Remplacer le document
     </button>
     <modal
         v-if="state.showModal"

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

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

src/Bundle/ChillMainBundle/Controller/ExportController.php

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

src/Bundle/ChillMainBundle/Export/ExportConfigNormalizer.php

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

src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig

@@ -280,17 +280,11 @@
     </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'] }}"
-         data-suggested="{{ form.vars['suggested']|json_encode|escape('html_attr') }}"
+    <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>
+
 {% endblock %}
 
 {% block pick_postal_code_widget %}

src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php

@@ -18,7 +18,6 @@ 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;
@@ -33,7 +32,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): Response
+    public function assignDuplicate(AccompanyingPeriodWork $acpw, Request $request)
     {
         $accompanyingPeriod = $acpw->getAccompanyingPeriod();
 
@@ -80,7 +79,7 @@ class AccompanyingPeriodWorkDuplicateController extends AbstractController
      * @ParamConverter("acpw2", options={"id": "acpw2_id"})
      */
     #[Route(path: '/{_locale}/person/{acpw1_id}/duplicate/{acpw2_id}/confirm', name: 'chill_person_acpw_duplicate_confirm')]
-    public function confirmAction(AccompanyingPeriodWork $acpw1, AccompanyingPeriodWork $acpw2, Request $request): Response
+    public function confirmAction(AccompanyingPeriodWork $acpw1, AccompanyingPeriodWork $acpw2, Request $request)
     {
         $accompanyingPeriod = $acpw1->getAccompanyingPeriod();
 
@@ -99,7 +98,6 @@ 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()]);
             }
 

src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentDuplicateController.php

@@ -12,7 +12,6 @@ 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;
@@ -25,16 +24,15 @@ 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 AccompanyingPeriodWorkEvaluationDocumentDuplicateController
+class AccompanyingPeriodWorkEvaluationDocumentDuplicateController
 {
     public function __construct(
-        private AccompanyingPeriodWorkEvaluationDocumentDuplicator $duplicator,
-        private Security $security,
-        private SerializerInterface $serializer,
-        private EntityManagerInterface $entityManager,
-        private ChillUrlGeneratorInterface $urlGenerator,
+        private readonly AccompanyingPeriodWorkEvaluationDocumentDuplicator $duplicator,
+        private readonly Security $security,
+        private readonly SerializerInterface $serializer,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly ChillUrlGeneratorInterface $urlGenerator,
     ) {}
 
     #[Route('/api/1.0/person/accompanying-course-work-evaluation-document/{id}/duplicate', methods: ['POST'])]
@@ -58,32 +56,6 @@ readonly 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
     {

src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentMoveController.php

@@ -1,58 +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\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
-        );
-    }
-}

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php

@@ -98,6 +98,16 @@ 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;

src/Bundle/ChillPersonBundle/Form/FindAccompanyingPeriodWorkType.php

@@ -24,7 +24,7 @@ class FindAccompanyingPeriodWorkType extends AbstractType
     {
         $builder
             ->add('acpw', PickLinkedAccompanyingPeriodWorkType::class, [
-                'label' => 'Accompanying period work',
+                'label' => 'Social action',
                 'multiple' => false,
                 'accompanyingPeriod' => $options['accompanyingPeriod'],
             ])

src/Bundle/ChillPersonBundle/Form/Type/PickLinkedAccompanyingPeriodWorkType.php

@@ -16,26 +16,18 @@ 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)
@@ -46,7 +38,6 @@ 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)

src/Bundle/ChillPersonBundle/Resources/public/mod/DuplicateSelector/AccompanyingPeriodWorkSelector.ts

@@ -41,8 +41,7 @@ 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();
                 },
             },
         });

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;

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;
 

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

@@ -1,31 +0,0 @@
-<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>

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

@@ -1,71 +0,0 @@
-<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>

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

@@ -1,51 +0,0 @@
-<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>

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

@@ -1,361 +0,0 @@
-<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>

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

@@ -1,74 +1,394 @@
 <template>
     <div>
+        <!--h2>
+      {{ $t('evaluation_title') }}
+   </h2-->
+
         <div class="m-md-3">
-            <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-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-->
+
+            <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
+                <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
                                         "
-                @move-document-to-evaluation="moveDocumentToEvaluation"
-                @statusDocumentChanged="onStatusDocumentChanged"
-                @goToGenerateWorkflow="goToGenerateWorkflowEvaluationDocument"
-                @goToGenerateNotification="goToGenerateDocumentNotification"
-            />
+                                    >
+                                        <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>
 
-            <DocumentActions
-                :evaluation="evaluation"
+            <div class="row mb-3">
+                <h6>{{ $t("document_add") }} :</h6>
+                <pick-template
+                    entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
+                    :id="evaluation.id"
                     :templates="getTemplatesAvailables"
-                @addDocument="addDocument"
-                @submitBeforeGenerate="submitBeforeGenerate"
-            />
+                    :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>
         </div>
     </div>
 </template>
 
-<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";
+<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";
 
-const props = defineProps(["evaluation", "docAnchorId"]);
-const store = useStore();
+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 $toast = useToast();
-
-const timeSpentChoices = [
+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 },
@@ -97,137 +417,207 @@ const timeSpentChoices = [
                 { text: "7 hours", value: 25200 },
                 { text: "7 hours 30 minutes", value: 27000 },
                 { text: "8 hours", value: 28800 },
-];
-
-const startDate = computed({
+            ],
+        };
+    },
+    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() {
-        return props.evaluation.startDate;
+                console.log("evaluation", this.evaluation);
+                return this.evaluation.startDate;
             },
             set(v) {
-        store.commit("setEvaluationStartDate", {
-            key: props.evaluation.key,
+                this.$store.commit("setEvaluationStartDate", {
+                    key: this.evaluation.key,
                     date: v,
                 });
             },
-});
-
-const endDate = computed({
+        },
+        endDate: {
             get() {
-        return props.evaluation.endDate;
+                return this.evaluation.endDate;
             },
             set(v) {
-        store.commit("setEvaluationEndDate", {
-            key: props.evaluation.key,
+                this.$store.commit("setEvaluationEndDate", {
+                    key: this.evaluation.key,
                     date: v,
                 });
             },
-});
-
-const maxDate = computed({
+        },
+        maxDate: {
             get() {
-        return props.evaluation.maxDate;
+                return this.evaluation.maxDate;
             },
             set(v) {
-        store.commit("setEvaluationMaxDate", {
-            key: props.evaluation.key,
+                this.$store.commit("setEvaluationMaxDate", {
+                    key: this.evaluation.key,
                     date: v,
                 });
             },
-});
-
-const warningInterval = computed({
+        },
+        warningInterval: {
             get() {
-        return props.evaluation.warningInterval;
+                return this.evaluation.warningInterval;
             },
             set(v) {
-        store.commit("setEvaluationWarningInterval", {
-            key: props.evaluation.key,
+                this.$store.commit("setEvaluationWarningInterval", {
+                    key: this.evaluation.key,
                     days: v,
                 });
             },
-});
-
-const timeSpent = computed({
+        },
+        timeSpent: {
             get() {
-        return props.evaluation.timeSpent;
+                return this.evaluation.timeSpent;
             },
             set(v) {
-        store.commit("setEvaluationTimeSpent", {
-            key: props.evaluation.key,
+                this.$store.commit("setEvaluationTimeSpent", {
+                    key: this.evaluation.key,
                     time: v,
                 });
             },
-});
-
-const comment = computed({
+        },
+        comment: {
             get() {
-        return props.evaluation.comment;
+                return this.evaluation.comment;
             },
             set(v) {
-        store.commit("setEvaluationComment", {
-            key: props.evaluation.key,
+                this.$store.commit("setEvaluationComment", {
+                    key: this.evaluation.key,
                     comment: v,
                 });
             },
-});
-
-const getTemplatesAvailables = computed(() => {
-    return store.getters.getTemplatesAvailablesForEvaluation(
-        props.evaluation.evaluation,
+        },
+    },
+    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 getAccompanyingPeriod = computed(() => store.work)
-function updateStartDate(value) {
-    startDate.value = value;
-}
+                window.location.assign(
+                    buildLink(
+                        template,
+                        evaluationId,
+                        "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation",
+                    ),
+                );
+            };
 
-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) {
+            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;
-    store.commit("updateDocumentTitle", {
+            this.$store.commit("updateDocumentTitle", {
                 id: id,
                 key: key,
-        evaluationKey: props.evaluation.key,
+                evaluationKey: this.evaluation.key,
                 title: title,
             });
-}
-
-function addDocument({ stored_object, stored_object_version }) {
+        },
+        addDocument({ stored_object, stored_object_version, file_name }) {
             let document = {
                 type: "accompanying_period_work_evaluation_document",
                 storedObject: stored_object,
-        title: "Nouveau document",
+                title: file_name,
             };
-    store.commit("addDocument", {
-        key: props.evaluation.key,
+            this.$store.commit("addDocument", {
+                key: this.evaluation.key,
                 document,
                 stored_object_version,
             });
-}
-
-function removeDocument(document) {
+        },
+        /**
+         * 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 "' +
@@ -235,65 +625,29 @@ function removeDocument(document) {
                         '" ?',
                 )
             ) {
-        store.commit("removeDocument", {
-            key: props.evaluation.key,
+                this.$store.commit("removeDocument", {
+                    key: this.evaluation.key,
                     document: document,
                 });
             }
-}
-
-function duplicateDocument(document) {
-    store.dispatch("duplicateDocument", {
-        evaluation_key: props.evaluation.key,
+        },
+        duplicateDocument(document) {
+            this.$store.dispatch("duplicateDocument", {
+                evaluation_key: this.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,
+        },
+        onStatusDocumentChanged(newStatus) {
+            console.log("onStatusDocumentChanged", newStatus);
+            this.$store.commit("statusDocumentChanged", {
+                key: this.evaluation.key,
                 newStatus: newStatus,
             });
-}
-
-function goToGenerateWorkflowEvaluationDocument({ workflowName, payload }) {
+        },
+        goToGenerateWorkflowEvaluationDocument({ workflowName, payload }) {
             const callback = (data) => {
                 let evaluation = data.accompanyingPeriodWorkEvaluations.find(
-            (e) => e.key === props.evaluation.key,
+                    (e) => e.key === this.evaluation.key,
                 );
                 let updatedDocument = evaluation.documents.find(
                     (d) => d.key === payload.doc.key,
@@ -307,16 +661,15 @@ function goToGenerateWorkflowEvaluationDocument({ workflowName, payload }) {
                 );
             };
 
-    store.dispatch("submit", callback).catch((e) => {
+            return this.$store.dispatch("submit", callback).catch((e) => {
                 console.log(e);
                 throw e;
             });
-}
-
-function goToGenerateDocumentNotification(document, tos) {
+        },
+        goToGenerateDocumentNotification(document, tos) {
             const callback = (data) => {
                 let evaluation = data.accompanyingPeriodWorkEvaluations.find(
-            (e) => e.key === props.evaluation.key,
+                    (e) => e.key === this.evaluation.key,
                 );
                 let updatedDocument = evaluation.documents.find(
                     (d) => d.key === document.key,
@@ -326,7 +679,7 @@ function goToGenerateDocumentNotification(document, tos) {
                         "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
                         updatedDocument.id,
                         tos === true
-                    ? store.state.work.accompanyingPeriod.user.id
+                            ? this.$store.state.work.accompanyingPeriod.user.id
                             : null,
                         window.location.pathname +
                             window.location.search +
@@ -334,11 +687,13 @@ function goToGenerateDocumentNotification(document, tos) {
                     ),
                 );
             };
-    store.dispatch("submit", callback).catch((e) => {
+            return this.$store.dispatch("submit", callback).catch((e) => {
                 console.log(e);
                 throw e;
             });
-}
+        },
+    },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -346,6 +701,9 @@ input.document-title {
     font-weight: bold;
     font-size: 1rem;
 }
+ul.document-upload {
+    justify-content: flex-start;
+}
 
 .bg-blink {
     color: #050000;

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

@@ -1,32 +0,0 @@
-<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>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js

@@ -11,13 +11,12 @@ 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,
-  duplicateDocumentToEvaluation,
-  moveDocumentToEvaluation,
-} from "../_api/accompanyingCourseWorkEvaluationDocument";
+import { duplicate } from "../_api/accompanyingCourseWorkEvaluationDocument";
 
 const debug = process.env.NODE_ENV !== "production";
+const evalFQDN = encodeURIComponent(
+  "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation",
+);
 
 const store = createStore({
   strict: debug,
@@ -299,47 +298,15 @@ 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.
      *
@@ -636,44 +603,6 @@ 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);
     },

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts

@@ -9,23 +9,3 @@ 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`,
-    );
-};

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

@@ -1,70 +0,0 @@
-<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>

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

@@ -1,47 +0,0 @@
-<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>

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

@@ -26,24 +26,14 @@ 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>(
-    props.selectedAcpw ?? null,
-);
+const selectedAcpw = ref<AccompanyingPeriodWork | null>(null);
 
-const emit = defineEmits<{
-    "update:selectedAcpw": [value: AccompanyingPeriodWork | null];
-}>();
-
-watch(
-    () => props.selectedAcpw,
-    (val) => {
-        selectedAcpw.value = val ?? null;
-    },
-);
+// eslint-disable-next-line vue/valid-define-emits
+const emit = defineEmits();
 
 watch(selectedAcpw, (newValue) => {
     emit("update:selectedAcpw", newValue);

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="row justify-content-end" v-if="!isEvaluationSelector">
+        <div class="row justify-content-end">
             <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 v-if="!showModal" class="record_actions">
+        <ul class="record_actions">
             <li>
                 <a class="btn btn-sm btn-create mt-3" @click="openModal">
                     {{ trans(ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK) }}
@@ -40,15 +40,9 @@
 
                 <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>
@@ -66,109 +60,58 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch, onMounted } from "vue";
+import { onMounted, ref } 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";
-import AccompanyingPeriodWorkEvaluationList from "ChillPersonAssets/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationList.vue";
-import { AccompanyingPeriodWorkEvaluation } from "../../../types";
+
+interface AccompanyingPeriodWorkSelectorModalProps {
+    accompanyingPeriodId: number;
+}
 
 const selectedAcpw = ref<AccompanyingPeriodWork | null>(null);
-const selectedEvaluation = ref<AccompanyingPeriodWorkEvaluation | null>(null);
 const showModal = ref(false);
 const accompanyingPeriodWorks = ref<AccompanyingPeriodWork[]>([]);
-const evaluations = ref<AccompanyingPeriodWorkEvaluation[]>([]);
-
-const props = defineProps<{
-    accompanyingPeriodId: string;
-    isEvaluationSelector: boolean;
-    ignoreAccompanyingPeriodWorkIds: number[];
-}>();
+const props = defineProps<AccompanyingPeriodWorkSelectorModalProps>();
 
 const emit = defineEmits<{
     pickWork: [payload: { work: AccompanyingPeriodWork | null }];
-    closeModal: [];
-    "update:selectedEvaluation": [evaluation: AccompanyingPeriodWorkEvaluation];
 }>();
 
 onMounted(() => {
     if (props.accompanyingPeriodId) {
-        getAccompanyingPeriodWorks(parseInt(props.accompanyingPeriodId));
+        getAccompanyingPeriodWorks(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`;
 
-    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;
+    try {
+        accompanyingPeriodWorks.value = await fetchResults(url);
+    } catch (error) {
+        console.log(error);
     }
+    /*  makeFetch<number, AccompanyingPeriodWork[]>("GET", url)
+    .then((response) => {
+      accompanyingPeriodWorks.value = response;
+    })
+    .catch((error) => {
+      console.log(error);
+    });*/
 };
 
-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 openModal = () => (showModal.value = true);
+const closeModal = () => (showModal.value = false);
 const confirmSelection = () => {
-    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>

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': true,
+        'displayAction': false,
         'displayContent': 'short',
         'displayFontSmall': true,
         'itemBlocClass': '',
-        'displayNotification': true
+        'displayNotification': false
     } %}
 {% endmacro %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriodWorkDuplicate/assign_acpw_duplicate.html.twig

@@ -2,10 +2,10 @@
 
 {% set activeRouteKey = 'chill_person_accompanying_period_work_assign_duplicate' %}
 
-{% import '@ChillPerson/AccompanyingPeriodWorkDuplicate/_details.html.twig' as details %}
-
 {% block title %}{{ 'Assign an accompanying period work duplicate' }}{% endblock %}
 
+{% import '@ChillPerson/AccompanyingPeriodWorkDuplicate/_details.html.twig' as details %}
+
 {% block content %}
     <div class="person-duplicate">
 
@@ -18,7 +18,7 @@
             </div>
         </div>
 
-        <h1>{{ 'acpw_duplicate.Assign duplicate'|trans }}</h1>
+        <h3>{{ 'acpw_duplicate.Assign duplicate'|trans }}</h3>
         {{ form_start(form) }}
         {%- if form.acpw is defined -%}
             {{ form_row(form.acpw) }}

src/Bundle/ChillPersonBundle/Service/AccompanyingPeriodWorkEvaluationDocument/AccompanyingPeriodWorkEvaluationDocumentDuplicator.php

@@ -12,7 +12,6 @@ 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;
@@ -37,17 +36,4 @@ 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;
-    }
 }

src/Bundle/ChillPersonBundle/chill.api.specs.yaml

@@ -1993,33 +1993,3 @@ 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

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

@@ -753,42 +753,6 @@ 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
@@ -813,6 +777,7 @@ relation:
     reverseTitle: Deuxième membre
 
 days: jours
+months: mois
 years: années
 
 # specific to closing motive
@@ -1560,6 +1525,3 @@ 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"