From fb51e44e45a8bf5395e58b49419416dee3308665 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 11 Jan 2023 17:16:37 +0100
Subject: [PATCH 001/106] FEATURE [absence][in_progress] add absence property
 to user, create form, controller, template, migration and menu entry

---
 .../Controller/AbsenceController.php          | 42 +++++++++++++++++++
 src/Bundle/ChillMainBundle/Entity/User.php    | 23 +++++++++-
 .../ChillMainBundle/Form/AbsenceType.php      | 36 ++++++++++++++++
 .../Resources/views/Menu/absence.html.twig    | 10 +++++
 .../Routing/MenuBuilder/UserMenuBuilder.php   |  9 ++++
 src/Bundle/ChillMainBundle/config/routes.yaml |  4 ++
 .../migrations/Version20230111160610.php      | 36 ++++++++++++++++
 7 files changed, 159 insertions(+), 1 deletion(-)
 create mode 100644 src/Bundle/ChillMainBundle/Controller/AbsenceController.php
 create mode 100644 src/Bundle/ChillMainBundle/Form/AbsenceType.php
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20230111160610.php

diff --git a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
new file mode 100644
index 000000000..97ca2979c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\Form\AbsenceType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;
+
+class AbsenceController extends AbstractController
+{
+    public function setAbsence(Request $request)
+    {
+        $user = $this->getUser();
+        $form = $this->createForm(AbsenceType::class, $user);
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
+            $em->persist($user);
+            $em->flush();
+
+            return $this->redirect($this->generateUrl('chill_main_homepage'));
+        }
+
+        return $this->render('@ChillMain/Menu/absence.html.twig', [
+            'user' => $user,
+            'form' => $form->createView(),
+        ]);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 80a0b5b2a..10620dc0f 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -11,14 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Entity;
 
+use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use RuntimeException;
 use Symfony\Component\Security\Core\User\AdvancedUserInterface;
 use Symfony\Component\Serializer\Annotation as Serializer;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use function in_array;
 
 /**
@@ -40,6 +41,11 @@ class User implements AdvancedUserInterface
      */
     protected ?int $id = null;
 
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    private ?DateTimeImmutable $absenceStart = null;
+
     /**
      * Array where SAML attributes's data are stored.
      *
@@ -175,6 +181,11 @@ class User implements AdvancedUserInterface
     {
     }
 
+    public function getAbsenceStart(): ?DateTimeImmutable
+    {
+        return $this->absenceStart;
+    }
+
     /**
      * Get attributes.
      *
@@ -295,6 +306,11 @@ class User implements AdvancedUserInterface
         return $this->usernameCanonical;
     }
 
+    public function isAbsent(): bool
+    {
+        return null !== $this->getAbsenceStart() ? true : false;
+    }
+
     /**
      * @return bool
      */
@@ -359,6 +375,11 @@ class User implements AdvancedUserInterface
         }
     }
 
+    public function setAbsenceStart(?DateTimeImmutable $absenceStart): void
+    {
+        $this->absenceStart = $absenceStart;
+    }
+
     public function setAttributeByDomain(string $domain, string $key, $value): self
     {
         $this->attributes[$domain][$key] = $value;
diff --git a/src/Bundle/ChillMainBundle/Form/AbsenceType.php b/src/Bundle/ChillMainBundle/Form/AbsenceType.php
new file mode 100644
index 000000000..1f43093e5
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/AbsenceType.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\Type\ChillDateTimeType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class AbsenceType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('absenceStart', ChillDateTimeType::class, [
+                'required' => true,
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => User::class,
+        ]);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
new file mode 100644
index 000000000..37b4bdd2f
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
@@ -0,0 +1,10 @@
+{% if user.absenceStart is not null %}
+
+<p>Votre absence est indiqué à partier de {{ user.absenceStart|format_datetime() }}</p>
+
+{% endif %}
+
+{{ form_start(form) }}
+{{ form_row(form.absenceStart) }}
+{{ form_row(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
+{{ form_end(form) }}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
index e0e8a782f..e91aa040b 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
@@ -78,6 +78,15 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
 
             $nbNotifications = $this->notificationByUserCounter->countUnreadByUser($user);
 
+            //TODO add an icon? How exactly? For example a clock icon...
+            $menu
+                ->addChild($this->translator->trans('absence.Set absence date'), [
+                    'route' => 'chill_absence_user',
+                ])
+                ->setExtras([
+                    'order' => -8888888,
+                ]);
+
             $menu
                 ->addChild(
                     $this->translator->trans('notification.My notifications with counter', ['nb' => $nbNotifications]),
diff --git a/src/Bundle/ChillMainBundle/config/routes.yaml b/src/Bundle/ChillMainBundle/config/routes.yaml
index d25f2aaff..d1fde6f5c 100644
--- a/src/Bundle/ChillMainBundle/config/routes.yaml
+++ b/src/Bundle/ChillMainBundle/config/routes.yaml
@@ -94,3 +94,7 @@ login_check:
 
 logout:
     path:    /logout
+
+chill_absence_user:
+    path:  /{_locale}/absence
+    controller: Chill\MainBundle\Controller\AbsenceController::setAbsence
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20230111160610.php b/src/Bundle/ChillMainBundle/migrations/Version20230111160610.php
new file mode 100644
index 000000000..1c5f74897
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20230111160610.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20230111160610 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users DROP absenceStart');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add absence property to user';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users ADD absenceStart TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+    }
+}

From b2924ede704863778e7d79543999c666b7c6114c Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 12 Jan 2023 11:10:41 +0100
Subject: [PATCH 002/106] FEAUTURE [routing][absence] use routing annotation
 instead of config file

---
 .../ChillMainBundle/Controller/AbsenceController.php   | 10 ++++++++--
 src/Bundle/ChillMainBundle/config/routes.yaml          |  4 ----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
index 97ca2979c..7241e15be 100644
--- a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
@@ -13,16 +13,22 @@ namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\Form\AbsenceType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 
 class AbsenceController extends AbstractController
 {
+    /**
+     * @Route(
+     *     "/{_locale}/absence",
+     *     name="chill_absence_user",
+     *     methods={"GET", "POST"}
+     * )
+     */
     public function setAbsence(Request $request)
     {
         $user = $this->getUser();
         $form = $this->createForm(AbsenceType::class, $user);
-        $form->add('submit', SubmitType::class, ['label' => 'Create']);
 
         $form->handleRequest($request);
 
diff --git a/src/Bundle/ChillMainBundle/config/routes.yaml b/src/Bundle/ChillMainBundle/config/routes.yaml
index d1fde6f5c..d25f2aaff 100644
--- a/src/Bundle/ChillMainBundle/config/routes.yaml
+++ b/src/Bundle/ChillMainBundle/config/routes.yaml
@@ -94,7 +94,3 @@ login_check:
 
 logout:
     path:    /logout
-
-chill_absence_user:
-    path:  /{_locale}/absence
-    controller: Chill\MainBundle\Controller\AbsenceController::setAbsence

From b93b78615bd4866439a33a9bce7e79931eee9ee9 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 12 Jan 2023 11:11:43 +0100
Subject: [PATCH 003/106] FIX [migration][absence] fix the typing in db for
 absence datetime immuatable

---
 src/Bundle/ChillMainBundle/Entity/User.php                      | 2 +-
 src/Bundle/ChillMainBundle/Form/AbsenceType.php                 | 1 +
 src/Bundle/ChillMainBundle/migrations/Version20230111160610.php | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 10620dc0f..c38dd97c6 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -42,7 +42,7 @@ class User implements AdvancedUserInterface
     protected ?int $id = null;
 
     /**
-     * @ORM\Column(type="datetime", nullable=true)
+     * @ORM\Column(type="datetime_immutable", nullable=true)
      */
     private ?DateTimeImmutable $absenceStart = null;
 
diff --git a/src/Bundle/ChillMainBundle/Form/AbsenceType.php b/src/Bundle/ChillMainBundle/Form/AbsenceType.php
index 1f43093e5..8600fd019 100644
--- a/src/Bundle/ChillMainBundle/Form/AbsenceType.php
+++ b/src/Bundle/ChillMainBundle/Form/AbsenceType.php
@@ -24,6 +24,7 @@ class AbsenceType extends AbstractType
         $builder
             ->add('absenceStart', ChillDateTimeType::class, [
                 'required' => true,
+                'input' => 'datetime_immutable',
             ]);
     }
 
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20230111160610.php b/src/Bundle/ChillMainBundle/migrations/Version20230111160610.php
index 1c5f74897..3bdffa6ea 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20230111160610.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20230111160610.php
@@ -22,6 +22,7 @@ final class Version20230111160610 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE users DROP absenceStart');
+        $this->addSql('COMMENT ON COLUMN users.absenceStart IS \'(DC2Type:datetime_immutable)\'');
     }
 
     public function getDescription(): string

From 68998c9156ec6764681b56d8e679c12d539ca07f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 12 Jan 2023 11:50:06 +0100
Subject: [PATCH 004/106] FEATURE [translations][absence] add translations

---
 src/Bundle/ChillMainBundle/Form/AbsenceType.php         | 9 +++++++++
 src/Bundle/ChillMainBundle/config/services/form.yaml    | 4 ++++
 src/Bundle/ChillMainBundle/translations/messages.fr.yml | 7 +++++++
 3 files changed, 20 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Form/AbsenceType.php b/src/Bundle/ChillMainBundle/Form/AbsenceType.php
index 8600fd019..e5e92398e 100644
--- a/src/Bundle/ChillMainBundle/Form/AbsenceType.php
+++ b/src/Bundle/ChillMainBundle/Form/AbsenceType.php
@@ -16,15 +16,24 @@ use Chill\MainBundle\Form\Type\ChillDateTimeType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AbsenceType extends AbstractType
 {
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('absenceStart', ChillDateTimeType::class, [
                 'required' => true,
                 'input' => 'datetime_immutable',
+                'label' => $this->translator->trans('absence.Absence start'),
             ]);
     }
 
diff --git a/src/Bundle/ChillMainBundle/config/services/form.yaml b/src/Bundle/ChillMainBundle/config/services/form.yaml
index 58f01883f..c8a46132f 100644
--- a/src/Bundle/ChillMainBundle/config/services/form.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/form.yaml
@@ -138,6 +138,10 @@ services:
         autowire: true
         autoconfigure: true
 
+    Chill\MainBundle\Form\AbsenceType:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Form\DataTransformer\IdToLocationDataTransformer: ~
     Chill\MainBundle\Form\DataTransformer\IdToUserDataTransformer: ~
     Chill\MainBundle\Form\DataTransformer\IdToUsersDataTransformer: ~
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index b19a7a52f..b80171c8c 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -573,3 +573,10 @@ saved_export:
     Export is deleted: L'export est supprimé
     Saved export is saved!: L'export est enregistré
     Created on %date%: Créé le %date%
+
+
+absence:
+    My absence: Mon absence
+    Unset absence: Supprimer la date d'absence
+    Set absence date: Indiquer date d'absence
+    Absence start: Absence à partir de

From 44ef21f940b03e43d1b3d030d474d97d25511546 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 12 Jan 2023 11:51:42 +0100
Subject: [PATCH 005/106] FEATURE [delete][absence] add functionality to unset
 absence

---
 .../Controller/AbsenceController.php          | 25 +++++++++-
 .../Resources/views/Menu/absence.html.twig    | 50 ++++++++++++++++---
 2 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
index 7241e15be..9c3dc679d 100644
--- a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
@@ -37,7 +37,7 @@ class AbsenceController extends AbstractController
             $em->persist($user);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_main_homepage'));
+            return $this->redirect($this->generateUrl('chill_absence_user'));
         }
 
         return $this->render('@ChillMain/Menu/absence.html.twig', [
@@ -45,4 +45,27 @@ class AbsenceController extends AbstractController
             'form' => $form->createView(),
         ]);
     }
+
+    /**
+     * @Route(
+     *     "/{_locale}/absence/unset",
+     *     name="chill_unset_absence_user",
+     *     methods={"GET", "POST", "DELETE"}
+     * )
+     */
+    public function unsetAbsence(Request $request)
+    {
+        $user = $this->getUser();
+        $form = $this->createForm(AbsenceType::class, $user);
+
+        $user->setAbsenceStart(null);
+        $em = $this->getDoctrine()->getManager();
+        $em->persist($user);
+        $em->flush();
+
+        return $this->render('@ChillMain/Menu/absence.html.twig', [
+            'user' => $user,
+            'form' => $form->createView(),
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
index 37b4bdd2f..8b27773e4 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
@@ -1,10 +1,46 @@
-{% if user.absenceStart is not null %}
+{% extends '@ChillMain/Admin/layout.html.twig' %}
 
-<p>Votre absence est indiqué à partier de {{ user.absenceStart|format_datetime() }}</p>
+{% block title %}
+    {{ 'My absence'|trans }}
+{% endblock title %}
 
-{% endif %}
+{% block content %}
 
-{{ form_start(form) }}
-{{ form_row(form.absenceStart) }}
-{{ form_row(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
-{{ form_end(form) }}
+    <div class="col-md-10">
+        <h2>{{ 'absence.My absence'|trans }}</h2>
+
+        {% if user.absenceStart is not null %}
+            <div>
+                <p>Votre absence est indiqué à partier de {{ user.absenceStart|format_datetime() }}.</p>
+                <ul class="record_actions">
+                    <li>
+                        <a href="{{ path('chill_unset_absence_user') }}"
+                           class="btn btn-delete">{{ 'absence.Unset absence'|trans }}</a>
+                    </li>
+                </ul>
+            </div>
+        {% else %}
+            <div>
+                <p class="chill-no-data-statement">Aucune absence indiquer.</p>
+            </div>
+        {% endif %}
+
+        <div>
+            {{ form_start(form) }}
+            {{ form_row(form.absenceStart) }}
+
+            <ul class="record_actions sticky-form-buttons">
+                <li>
+                    <button class="btn btn-save" type="submit">
+                        {{ 'Create'|trans }}
+                    </button>
+                </li>
+            </ul>
+
+            {{ form_end(form) }}
+        </div>
+    </div>
+
+
+
+{% endblock %}

From 2c5c815f68e7691b2903399768e4d4def74ee51b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 12 Jan 2023 12:02:52 +0100
Subject: [PATCH 006/106] FEATURE [admin][absence] add possibility for admin to
 set absence of a user

---
 src/Bundle/ChillMainBundle/Form/UserType.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index b738cc8c7..532bc7b5b 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Form\Type\ChillDateTimeType;
 use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
@@ -31,6 +32,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Regex;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserType extends AbstractType
 {
@@ -38,12 +40,16 @@ class UserType extends AbstractType
 
     private TranslatableStringHelper $translatableStringHelper;
 
+    private TranslatorInterface $translator;
+
     public function __construct(
         TranslatableStringHelper $translatableStringHelper,
-        ParameterBagInterface $parameterBag
+        ParameterBagInterface $parameterBag,
+        TranslatorInterface $translator
     ) {
         $this->translatableStringHelper = $translatableStringHelper;
         $this->parameterBag = $parameterBag;
+        $this->translator = $translator;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -110,6 +116,11 @@ class UserType extends AbstractType
 
                     return $qb;
                 },
+            ])
+            ->add('absenceStart', ChillDateTimeType::class, [
+                'required' => false,
+                'input' => 'datetime_immutable',
+                'label' => $this->translator->trans('absence.Absence start'),
             ]);
 
         // @phpstan-ignore-next-line

From 5bbe5af12488944d587790273e6b8d09ecb5058a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 12 Jan 2023 13:30:28 +0100
Subject: [PATCH 007/106] FEATURE [absence][render] add absence tag to
 renderbox and renderstring

---
 .../Resources/views/Entity/user.html.twig        |  5 +++++
 .../Templating/Entity/UserRender.php             | 16 ++++++++++++++--
 .../ChillMainBundle/translations/messages.fr.yml |  1 +
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
index 77dc959a2..12a1a618c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
@@ -6,4 +6,9 @@
     {%- if opts['main_scope'] and user.mainScope is not null %}
     <span class="main-scope">({{ user.mainScope.name|localize_translatable_string }})</span>
     {%- endif -%}
+    {%- if opts['absence'] and user.absenceStart is not null %}
+        {%- if date(user.absenceStart) < date() %}
+            <span class="user-absence">({{ 'absence.Absent'|trans }})</span>
+        {%- endif %}
+    {%- endif -%}
 </span>
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
index 141de2649..2cef950d5 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
@@ -13,8 +13,10 @@ namespace Chill\MainBundle\Templating\Entity;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Component\Templating\EngineInterface;
+use DateTimeImmutable;
 
+use Symfony\Component\Templating\EngineInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use function array_merge;
 
 class UserRender implements ChillEntityRenderInterface
@@ -22,16 +24,20 @@ class UserRender implements ChillEntityRenderInterface
     public const DEFAULT_OPTIONS = [
         'main_scope' => true,
         'user_job' => true,
+        'absence' => true,
     ];
 
     private EngineInterface $engine;
 
     private TranslatableStringHelper $translatableStringHelper;
 
-    public function __construct(TranslatableStringHelper $translatableStringHelper, EngineInterface $engine)
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper, EngineInterface $engine, TranslatorInterface $translator)
     {
         $this->translatableStringHelper = $translatableStringHelper;
         $this->engine = $engine;
+        $this->translator = $translator;
     }
 
     public function renderBox($entity, array $options): string
@@ -63,6 +69,12 @@ class UserRender implements ChillEntityRenderInterface
                 ->localize($entity->getMainScope()->getName()) . ')';
         }
 
+        $current_date = new DateTimeImmutable();
+
+        if (null !== $entity->getAbsenceStart() && $entity->getAbsenceStart() < $current_date && $opts['main_scope']) {
+            $str .= ' (' . $this->translator->trans('absence.Absent') . ')';
+        }
+
         return $str;
     }
 
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index b80171c8c..c7d376c48 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -580,3 +580,4 @@ absence:
     Unset absence: Supprimer la date d'absence
     Set absence date: Indiquer date d'absence
     Absence start: Absence à partir de
+    Absent: Absent

From 6c1108b8aa020c7464a767ead127260788f22f4f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 12 Jan 2023 13:50:29 +0100
Subject: [PATCH 008/106] FEATURE: [homepage][absence] display message to let
 user know they are still marked as absent

---
 .../Resources/views/Homepage/index.html.twig          | 11 ++++++++---
 .../ChillMainBundle/translations/messages.fr.yml      |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
index aec38f3c3..5dc88faf3 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
@@ -1,15 +1,20 @@
 <div class="col-10 mt-5">
-    
+
     {# vue component #}
+    {% if app.user.absenceStart is not null and date(app.user.absenceStart) < date() %}
+        <p class="alert alert-succes flash_message" style="text-align: center;">{{'absence.You are marked as being absent'|trans }}</p>
+    {% endif %}
+
     <div id="homepage_widget"></div>
-    
+
     {% include '@ChillMain/Homepage/fast_actions.html.twig' %}
 </div>
 
+
 {% block css %}
     {{ encore_entry_link_tags('page_homepage_widget') }}
 {% endblock %}
 
 {% block js %}
     {{ encore_entry_script_tags('page_homepage_widget') }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index c7d376c48..cffb0d6f9 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -581,3 +581,4 @@ absence:
     Set absence date: Indiquer date d'absence
     Absence start: Absence à partir de
     Absent: Absent
+    You are marked as being absent: Vous êtes marquer comme absent.

From de9d53936f805501c57ec8e6380f4aee946306a3 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 12 Jan 2023 19:51:43 +0100
Subject: [PATCH 009/106] FEATURE [styling][absence] give styling

---
 .../Resources/public/chill/scss/render_box.scss             | 2 +-
 .../ChillMainBundle/Resources/views/Entity/user.html.twig   | 6 +++++-
 .../Resources/views/Homepage/index.html.twig                | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
index 4d0bfcf8e..92becc089 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss
@@ -106,7 +106,7 @@ section.chill-entity {
     // used for comment-embeddable
     &.entity-comment-embeddable {
         width: 100%;
-        
+
         /* already defined !!
         div.metadata {
             font-size: smaller;
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
index 12a1a618c..779be6740 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
@@ -8,7 +8,11 @@
     {%- endif -%}
     {%- if opts['absence'] and user.absenceStart is not null %}
         {%- if date(user.absenceStart) < date() %}
-            <span class="user-absence">({{ 'absence.Absent'|trans }})</span>
+            <span class="fa-stack fa-holder" title="{{ 'absence.Absent'|trans }}">
+              <i class="fa fa-circle fa-stack-1x text-danger"></i>
+              <i class="fa fa-stack-1x text-white">A</i>
+            </span>
+
         {%- endif %}
     {%- endif -%}
 </span>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
index 5dc88faf3..60f6c88ff 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
@@ -2,7 +2,7 @@
 
     {# vue component #}
     {% if app.user.absenceStart is not null and date(app.user.absenceStart) < date() %}
-        <p class="alert alert-succes flash_message" style="text-align: center;">{{'absence.You are marked as being absent'|trans }}</p>
+        <p class="alert alert-warning" role="alert">{{'absence.You are marked as being absent'|trans }}</p>
     {% endif %}
 
     <div id="homepage_widget"></div>

From 7f9e045d5db27f0b627f1d8bef1433c073d63a28 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 26 Jan 2023 11:28:13 +0100
Subject: [PATCH 010/106] FEATURE [regroupment][exports] first commit to
 implement regroupment entity in exports

---
 .../ChillMainBundle/Controller/ExportController.php    |  2 ++
 .../Form/Type/Export/PickRegroupmentType.php           | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php

diff --git a/src/Bundle/ChillMainBundle/Controller/ExportController.php b/src/Bundle/ChillMainBundle/Controller/ExportController.php
index 84bf80c6b..caeec8327 100644
--- a/src/Bundle/ChillMainBundle/Controller/ExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ExportController.php
@@ -298,6 +298,8 @@ class ExportController extends AbstractController
                 'csrf_protection' => $isGenerate ? false : true,
             ]);
 
+        // TODO: add a condition to be able to select a regroupment of centers?
+
         if ('centers' === $step || 'generate_centers' === $step) {
             $builder->add('centers', PickCenterType::class, [
                 'export_alias' => $alias,
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php
new file mode 100644
index 000000000..e60388fd3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Chill\MainBundle\Form\Type\Export;
+
+use Symfony\Component\Form\AbstractType;
+
+class PickRegroupmentType extends AbstractType
+{
+
+}

From ded71c5997eb6bf8a82c78e486a1621aef4f8a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 26 Jan 2023 17:11:50 +0100
Subject: [PATCH 011/106] Fixed: [migration] fix the required comment for
 doctrine on new column

---
 src/Bundle/ChillMainBundle/migrations/Version20230111160610.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/migrations/Version20230111160610.php b/src/Bundle/ChillMainBundle/migrations/Version20230111160610.php
index 3bdffa6ea..c00a3f521 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20230111160610.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20230111160610.php
@@ -22,7 +22,6 @@ final class Version20230111160610 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE users DROP absenceStart');
-        $this->addSql('COMMENT ON COLUMN users.absenceStart IS \'(DC2Type:datetime_immutable)\'');
     }
 
     public function getDescription(): string
@@ -33,5 +32,6 @@ final class Version20230111160610 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE users ADD absenceStart TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('COMMENT ON COLUMN users.absenceStart IS \'(DC2Type:datetime_immutable)\'');
     }
 }

From 86b5f4dfac0a5bc6ac530dac68e00db2c0d58c7f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 27 Jan 2023 10:44:25 +0100
Subject: [PATCH 012/106] FIX [template][translations] fixes to template and
 translations

---
 .../Resources/views/Menu/absence.html.twig                | 8 ++++----
 src/Bundle/ChillMainBundle/translations/messages.fr.yml   | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
index 8b27773e4..d8508d8fd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
@@ -1,7 +1,7 @@
 {% extends '@ChillMain/Admin/layout.html.twig' %}
 
 {% block title %}
-    {{ 'My absence'|trans }}
+    {{ 'absence.My absence'|trans }}
 {% endblock title %}
 
 {% block content %}
@@ -11,7 +11,7 @@
 
         {% if user.absenceStart is not null %}
             <div>
-                <p>Votre absence est indiqué à partier de {{ user.absenceStart|format_datetime() }}.</p>
+                <p>{{ 'absence.You are listed as absent, as of'|trans }} {{ user.absenceStart|format_date('long') }}</p>
                 <ul class="record_actions">
                     <li>
                         <a href="{{ path('chill_unset_absence_user') }}"
@@ -21,7 +21,7 @@
             </div>
         {% else %}
             <div>
-                <p class="chill-no-data-statement">Aucune absence indiquer.</p>
+                <p class="chill-no-data-statement">{{ 'absence.No absence listed'|trans }}</p>
             </div>
         {% endif %}
 
@@ -32,7 +32,7 @@
             <ul class="record_actions sticky-form-buttons">
                 <li>
                     <button class="btn btn-save" type="submit">
-                        {{ 'Create'|trans }}
+                        {{ 'Save'|trans }}
                     </button>
                 </li>
             </ul>
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 8218bf827..94041b78d 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -589,6 +589,8 @@ absence:
     My absence: Mon absence
     Unset absence: Supprimer la date d'absence
     Set absence date: Indiquer date d'absence
-    Absence start: Absence à partir de
+    Absence start: Absence à partir du
     Absent: Absent
-    You are marked as being absent: Vous êtes marquer comme absent.
+    You are marked as being absent: Vous êtes indiqué absent.
+    You are listed as absent, as of: Votre absence est indiqué à partir du
+    No absence listed: Aucune absence indiquée.

From f76c031ff311eea32ec79942640cb3ec35333b37 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 27 Jan 2023 10:51:59 +0100
Subject: [PATCH 013/106] FIX [translations][types] remove redundant translator
 and change datetime field to date field

---
 src/Bundle/ChillMainBundle/Form/AbsenceType.php | 12 +++---------
 src/Bundle/ChillMainBundle/Form/UserType.php    | 11 ++++-------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/AbsenceType.php b/src/Bundle/ChillMainBundle/Form/AbsenceType.php
index e5e92398e..e23e350c9 100644
--- a/src/Bundle/ChillMainBundle/Form/AbsenceType.php
+++ b/src/Bundle/ChillMainBundle/Form/AbsenceType.php
@@ -13,6 +13,7 @@ namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillDateTimeType;
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -20,20 +21,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AbsenceType extends AbstractType
 {
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
-
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('absenceStart', ChillDateTimeType::class, [
+            ->add('absenceStart', ChillDateType::class, [
                 'required' => true,
                 'input' => 'datetime_immutable',
-                'label' => $this->translator->trans('absence.Absence start'),
+                'label' => 'absence.Absence start',
             ]);
     }
 
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index 532bc7b5b..f37c48a92 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Form\Type\ChillDateTimeType;
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
@@ -40,16 +41,12 @@ class UserType extends AbstractType
 
     private TranslatableStringHelper $translatableStringHelper;
 
-    private TranslatorInterface $translator;
-
     public function __construct(
         TranslatableStringHelper $translatableStringHelper,
-        ParameterBagInterface $parameterBag,
-        TranslatorInterface $translator
+        ParameterBagInterface $parameterBag
     ) {
         $this->translatableStringHelper = $translatableStringHelper;
         $this->parameterBag = $parameterBag;
-        $this->translator = $translator;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -117,10 +114,10 @@ class UserType extends AbstractType
                     return $qb;
                 },
             ])
-            ->add('absenceStart', ChillDateTimeType::class, [
+            ->add('absenceStart', ChillDateType::class, [
                 'required' => false,
                 'input' => 'datetime_immutable',
-                'label' => $this->translator->trans('absence.Absence start'),
+                'label' => 'absence.Absence start',
             ]);
 
         // @phpstan-ignore-next-line

From bb7d072cc8af6b83574c10de87f6dfe3a7b7e80f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 27 Jan 2023 11:10:17 +0100
Subject: [PATCH 014/106] FIX [render] use isAbsent method to render user as
 absent or not + place homepage msg above searchbar

---
 src/Bundle/ChillMainBundle/Entity/User.php                   | 2 +-
 .../ChillMainBundle/Resources/views/Entity/user.html.twig    | 2 +-
 .../ChillMainBundle/Resources/views/Homepage/index.html.twig | 5 -----
 src/Bundle/ChillMainBundle/Resources/views/layout.html.twig  | 5 +++++
 src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 43a63c52d..24e88e7ba 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -304,7 +304,7 @@ class User implements UserInterface
 
     public function isAbsent(): bool
     {
-        return null !== $this->getAbsenceStart() ? true : false;
+        return (null !== $this->getAbsenceStart() && $this->getAbsenceStart() <= new DateTimeImmutable('now')) ? true : false;
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
index 779be6740..6d6e095d5 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
@@ -6,7 +6,7 @@
     {%- if opts['main_scope'] and user.mainScope is not null %}
     <span class="main-scope">({{ user.mainScope.name|localize_translatable_string }})</span>
     {%- endif -%}
-    {%- if opts['absence'] and user.absenceStart is not null %}
+    {%- if opts['absence'] and user.isAbsent %}
         {%- if date(user.absenceStart) < date() %}
             <span class="fa-stack fa-holder" title="{{ 'absence.Absent'|trans }}">
               <i class="fa fa-circle fa-stack-1x text-danger"></i>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
index 60f6c88ff..98af21171 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
@@ -1,10 +1,5 @@
 <div class="col-10 mt-5">
-
     {# vue component #}
-    {% if app.user.absenceStart is not null and date(app.user.absenceStart) < date() %}
-        <p class="alert alert-warning" role="alert">{{'absence.You are marked as being absent'|trans }}</p>
-    {% endif %}
-
     <div id="homepage_widget"></div>
 
     {% include '@ChillMain/Homepage/fast_actions.html.twig' %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 319adad81..9b4007266 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -69,6 +69,11 @@
 
                 {% block content %}
                     <div class="col-8 main_search">
+                        {% if app.user.isAbsent %}
+                            <div class="row mb-5">
+                                <p class="alert alert-warning" role="alert">{{'absence.You are marked as being absent'|trans }}</p>
+                            </div>
+                        {% endif %}
                         <h2>{{ 'Search'|trans }}</h2>
 
                         <form action="{{ path('chill_main_search') }}" method="get">
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
index 2cef950d5..4f24808d4 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
@@ -71,7 +71,7 @@ class UserRender implements ChillEntityRenderInterface
 
         $current_date = new DateTimeImmutable();
 
-        if (null !== $entity->getAbsenceStart() && $entity->getAbsenceStart() < $current_date && $opts['main_scope']) {
+        if ($entity->isAbsent() && $opts['main_scope']) {
             $str .= ' (' . $this->translator->trans('absence.Absent') . ')';
         }
 

From 882e72b60920fe17a56ba3b439cfd4e2bb2b1d2c Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 27 Jan 2023 11:15:59 +0100
Subject: [PATCH 015/106] FIX fix condition to show form or not + sticky button
 for delete

---
 .../Resources/views/Menu/absence.html.twig    | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
index d8508d8fd..887894ae9 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
@@ -12,7 +12,7 @@
         {% if user.absenceStart is not null %}
             <div>
                 <p>{{ 'absence.You are listed as absent, as of'|trans }} {{ user.absenceStart|format_date('long') }}</p>
-                <ul class="record_actions">
+                <ul class="record_actions sticky-form-buttons">
                     <li>
                         <a href="{{ path('chill_unset_absence_user') }}"
                            class="btn btn-delete">{{ 'absence.Unset absence'|trans }}</a>
@@ -23,24 +23,21 @@
             <div>
                 <p class="chill-no-data-statement">{{ 'absence.No absence listed'|trans }}</p>
             </div>
+            <div>
+                {{ form_start(form) }}
+                {{ form_row(form.absenceStart) }}
+
+                <ul class="record_actions sticky-form-buttons">
+                    <li>
+                        <button class="btn btn-save" type="submit">
+                            {{ 'Save'|trans }}
+                        </button>
+                    </li>
+                </ul>
+
+                {{ form_end(form) }}
+            </div>
         {% endif %}
-
-        <div>
-            {{ form_start(form) }}
-            {{ form_row(form.absenceStart) }}
-
-            <ul class="record_actions sticky-form-buttons">
-                <li>
-                    <button class="btn btn-save" type="submit">
-                        {{ 'Save'|trans }}
-                    </button>
-                </li>
-            </ul>
-
-            {{ form_end(form) }}
-        </div>
     </div>
 
-
-
 {% endblock %}

From 4dd81da1efc767dee5d7c876c3a3988a4167a85c Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 27 Jan 2023 11:23:29 +0100
Subject: [PATCH 016/106] FIX [routes][redirect] fix route naming and
 redirection after delete action

---
 .../Controller/AbsenceController.php               | 14 ++++++--------
 .../Resources/views/Menu/absence.html.twig         |  2 +-
 .../Routing/MenuBuilder/UserMenuBuilder.php        |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
index 9c3dc679d..dcd5e2337 100644
--- a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
@@ -21,7 +21,7 @@ class AbsenceController extends AbstractController
     /**
      * @Route(
      *     "/{_locale}/absence",
-     *     name="chill_absence_user",
+     *     name="chill_main_user_absence_index",
      *     methods={"GET", "POST"}
      * )
      */
@@ -37,7 +37,7 @@ class AbsenceController extends AbstractController
             $em->persist($user);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_absence_user'));
+            return $this->redirect($this->generateUrl('chill_main_user_absence_index'));
         }
 
         return $this->render('@ChillMain/Menu/absence.html.twig', [
@@ -49,8 +49,8 @@ class AbsenceController extends AbstractController
     /**
      * @Route(
      *     "/{_locale}/absence/unset",
-     *     name="chill_unset_absence_user",
-     *     methods={"GET", "POST", "DELETE"}
+     *     name="chill_main_user_absence_unset",
+     *     methods={"GET", "POST"}
      * )
      */
     public function unsetAbsence(Request $request)
@@ -63,9 +63,7 @@ class AbsenceController extends AbstractController
         $em->persist($user);
         $em->flush();
 
-        return $this->render('@ChillMain/Menu/absence.html.twig', [
-            'user' => $user,
-            'form' => $form->createView(),
-        ]);
+        return $this->redirect($this->generateUrl('chill_main_user_absence_index'));
+        
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
index 887894ae9..3258b5ac1 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig
@@ -14,7 +14,7 @@
                 <p>{{ 'absence.You are listed as absent, as of'|trans }} {{ user.absenceStart|format_date('long') }}</p>
                 <ul class="record_actions sticky-form-buttons">
                     <li>
-                        <a href="{{ path('chill_unset_absence_user') }}"
+                        <a href="{{ path('chill_main_user_absence_unset') }}"
                            class="btn btn-delete">{{ 'absence.Unset absence'|trans }}</a>
                     </li>
                 </ul>
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
index e91aa040b..ea5ed2062 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
@@ -81,7 +81,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
             //TODO add an icon? How exactly? For example a clock icon...
             $menu
                 ->addChild($this->translator->trans('absence.Set absence date'), [
-                    'route' => 'chill_absence_user',
+                    'route' => 'chill_main_user_absence_index',
                 ])
                 ->setExtras([
                     'order' => -8888888,

From d46304e229eb94f3d72327d0ae9a87eca4c1ec31 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 27 Jan 2023 12:03:12 +0100
Subject: [PATCH 017/106] FEATURE [banner][render] display the A icon within
 accourse banner if user is absent instead of string

---
 .../Serializer/Normalizer/UserNormalizer.php               | 1 +
 .../ChillMainBundle/Templating/Entity/UserRender.php       | 4 ----
 .../public/vuejs/AccompanyingCourse/components/Banner.vue  | 7 ++++++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
index a8607cc21..25bcdbc48 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
@@ -87,6 +87,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
             'user_job' => $this->normalizer->normalize($object->getUserJob(), $format, $userJobContext),
             'main_center' => $this->normalizer->normalize($object->getMainCenter(), $format, $centerContext),
             'main_scope' => $this->normalizer->normalize($object->getMainScope(), $format, $scopeContext),
+            'isAbsent' => $object->isAbsent()
         ];
 
         if ('docgen' === $format) {
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
index 4f24808d4..43736eb81 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
@@ -71,10 +71,6 @@ class UserRender implements ChillEntityRenderInterface
 
         $current_date = new DateTimeImmutable();
 
-        if ($entity->isAbsent() && $opts['main_scope']) {
-            $str .= ' (' . $this->translator->trans('absence.Absent') . ')';
-        }
-
         return $str;
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
index 7e3b45103..c7c01f78e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
@@ -22,7 +22,12 @@
                <i>{{ $t('course.open_at') }}{{ $d(accompanyingCourse.openingDate.datetime, 'text') }}</i>
             </span>
             <span v-if="accompanyingCourse.user" class="d-md-block ms-3 ms-md-0">
-               <span class="item-key">{{ $t('course.referrer') }}:</span> <b>{{ accompanyingCourse.user.text }}</b>
+               <span class="item-key">{{ $t('course.referrer') }}:</span>
+               <b>{{ accompanyingCourse.user.text }}</b>
+               <span v-if="accompanyingCourse.user.isAbsent" class="fa-stack fa-holder" title="{{ 'absence.Absent'|trans }}">
+                <i class="fa fa-circle fa-stack-1x text-danger"></i>
+                <i class="fa fa-stack-1x text-white">A</i>
+               </span>
             </span>
          </span>
       </span>

From fa8a2c5cc5e9b5a472165f0e7767102307915d30 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 27 Jan 2023 12:04:11 +0100
Subject: [PATCH 018/106] FIX remove some whitespaces or empty lines + add btn
 in absence message homepage (still commented out)

---
 src/Bundle/ChillMainBundle/Controller/AbsenceController.php     | 2 +-
 .../ChillMainBundle/Resources/views/Entity/user.html.twig       | 1 -
 src/Bundle/ChillMainBundle/Resources/views/layout.html.twig     | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
index dcd5e2337..952435e68 100644
--- a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
@@ -64,6 +64,6 @@ class AbsenceController extends AbstractController
         $em->flush();
 
         return $this->redirect($this->generateUrl('chill_main_user_absence_index'));
-        
+
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
index 6d6e095d5..7b669aee3 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
@@ -12,7 +12,6 @@
               <i class="fa fa-circle fa-stack-1x text-danger"></i>
               <i class="fa fa-stack-1x text-white">A</i>
             </span>
-
         {%- endif %}
     {%- endif -%}
 </span>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 9b4007266..c011ec9a5 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -72,6 +72,7 @@
                         {% if app.user.isAbsent %}
                             <div class="row mb-5">
                                 <p class="alert alert-warning" role="alert">{{'absence.You are marked as being absent'|trans }}</p>
+{#                                <a class="btn btn-edit" title="Modifier" href="{{ path('chill_main_user_absence_index') }}"></a>#}
                             </div>
                         {% endif %}
                         <h2>{{ 'Search'|trans }}</h2>

From 1c673db628942ef11ebb848d880b9c17d8d83985 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 27 Jan 2023 12:18:19 +0100
Subject: [PATCH 019/106] FIX [phpcsfixer][phpstan]

---
 phpstan-types.neon                               |  5 -----
 .../Controller/AbsenceController.php             |  1 -
 src/Bundle/ChillMainBundle/Form/AbsenceType.php  |  2 --
 src/Bundle/ChillMainBundle/Form/UserType.php     |  2 --
 .../Serializer/Normalizer/UserNormalizer.php     |  2 +-
 .../ChillPersonBundle/Search/PersonSearch.php    | 16 +++++++---------
 6 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/phpstan-types.neon b/phpstan-types.neon
index 1aae06880..b11cbd153 100644
--- a/phpstan-types.neon
+++ b/phpstan-types.neon
@@ -340,11 +340,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
 
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
-
 		-
 			message: "#^Method Chill\\\\PersonBundle\\\\Search\\\\PersonSearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
diff --git a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
index 952435e68..73d9abd3e 100644
--- a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
@@ -64,6 +64,5 @@ class AbsenceController extends AbstractController
         $em->flush();
 
         return $this->redirect($this->generateUrl('chill_main_user_absence_index'));
-
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/AbsenceType.php b/src/Bundle/ChillMainBundle/Form/AbsenceType.php
index e23e350c9..d0aed640c 100644
--- a/src/Bundle/ChillMainBundle/Form/AbsenceType.php
+++ b/src/Bundle/ChillMainBundle/Form/AbsenceType.php
@@ -12,12 +12,10 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Form\Type\ChillDateTimeType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AbsenceType extends AbstractType
 {
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index f37c48a92..dc2140997 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\UserJob;
-use Chill\MainBundle\Form\Type\ChillDateTimeType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -33,7 +32,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Regex;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserType extends AbstractType
 {
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
index 25bcdbc48..7f5b62be5 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
@@ -87,7 +87,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
             'user_job' => $this->normalizer->normalize($object->getUserJob(), $format, $userJobContext),
             'main_center' => $this->normalizer->normalize($object->getMainCenter(), $format, $centerContext),
             'main_scope' => $this->normalizer->normalize($object->getMainScope(), $format, $scopeContext),
-            'isAbsent' => $object->isAbsent()
+            'isAbsent' => $object->isAbsent(),
         ];
 
         if ('docgen' === $format) {
diff --git a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
index c85f1dabd..83b2cff69 100644
--- a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
+++ b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
@@ -26,7 +26,6 @@ use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use DateTime;
 use Exception;
 use libphonenumber\PhoneNumber;
-use Symfony\Component\Form\Extension\Core\Type\TelType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Templating\EngineInterface;
@@ -116,24 +115,23 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
     {
         $string = '@person ';
 
-        $string .= empty($data['_default']) ? '' : $data['_default'] . ' ';
+        $string .= $data['_default'] ? '' : $data['_default'] . ' ';
 
         foreach (['firstname', 'lastname', 'gender', 'city'] as $key) {
-            $string .= empty($data[$key]) ? '' : $key . ':' .
+            $string .= $data[$key] ? '' : $key . ':' .
                 // add quote if contains spaces
                 (strpos($data[$key], ' ') !== false ? '"' . $data[$key] . '"' : $data[$key])
                 . ' ';
-
         }
 
         foreach (['birthdate', 'birthdate-before', 'birthdate-after'] as $key) {
-            $string .= empty($data[$key]) ?
+            $string .= $data[$key] ?
                 ''
                 :
                 $key . ':' . $data[$key]->format('Y-m-d') . ' ';
         }
 
-        $string .= empty($data['phonenumber']) ? '' : 'phonenumber:' . $data['phonenumber']->getNationalNumber();
+        $string .= $data['phonenumber'] ? '' : 'phonenumber:' . $data['phonenumber']->getNationalNumber();
 
         return $string;
     }
@@ -164,13 +162,13 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
                 $phonenumber = new PhoneNumber();
                 $phonenumber->setNationalNumber($terms['phonenumber']);
             } catch (Exception $ex) {
-                throw new ParsingException("The date for {$key} is "
+                throw new ParsingException('The date for phonenumber is '
                     . 'not parsable', 0, $ex);
             }
-
-            $data['phonenumber'] = $phonenumber ?? null;
         }
 
+        $data['phonenumber'] = $phonenumber ?? null;
+
         return $data;
     }
 

From 50bb8f10cfe27a9acacb0c2835f837cf8da60dd9 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 27 Jan 2023 12:25:05 +0100
Subject: [PATCH 020/106] FEATURE [admin] add absence in user index admin

---
 .../Resources/views/User/index.html.twig      | 26 ++++++++++++-------
 .../translations/messages.fr.yml              |  1 +
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index 0f1168113..b57e17c06 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -2,20 +2,21 @@
 
 {% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
-    
+
         {% block index_header %}
             <h1>{{"Users"|trans}}</h1>
         {% endblock %}
-    
+
         {% block filter_order %}{{ filter_order|chill_render_filter_order_helper }}{% endblock %}
-    
+
         {% block table_entities_thead_tr %}
             <th>{{ 'Active'|trans }}</th>
+            <th>{{ 'absence.Is absent'|trans }}</th>
             <th>{{ 'Username'|trans }}</th>
             <th>{{ 'Datas'|trans }}</th>
             <th>{{ 'Actions'|trans }}</th>
         {% endblock %}
-    
+
         {% block table_entities_tbody %}
             {% for entity in entities %}
                 <tr>
@@ -26,6 +27,13 @@
                             <i class="fa fa-square-o"></i>
                         {% endif %}
                     </td>
+                    <td>
+                        {% if entity.isAbsent %}
+                            <i class="fa fa-check-square-o"></i>
+                        {% else %}
+                            <i class="fa fa-square-o"></i>
+                        {% endif %}
+                    </td>
                     <td>
                         {#
                         {% if entity.civility is not null %}
@@ -64,13 +72,13 @@
                             <li>
                                 <a class="btn btn-edit" title="{{ 'Edit'|trans }}" href="{{ path('chill_crud_admin_user_edit', { 'id': entity.id }) }}"></a>
                             </li>
-        
+
                             {% if allow_change_password is same as(true) %}
                                 <li>
                                     <a class="btn btn-chill-red" href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}" title="{{ 'Edit password'|trans|e('html_attr') }}"><i class="fa fa-ellipsis-h"></i></a>
                                 </li>
                             {% endif %}
-        
+
                             {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
                                 <li>
                                     <a class="btn btn-chill-blue" href="{{ path('chill_main_homepage', {'_switch_user': entity.username }) }}" title="{{ "Impersonate"|trans|e('html_attr') }}"><i class="fa fa-user-secret"></i></a>
@@ -81,9 +89,9 @@
                 </tr>
             {% endfor %}
         {% endblock %}
-    
+
         {% block pagination %}{{ chill_pagination(paginator) }}{% endblock %}
-    
+
         {% block list_actions %}
             <ul class="record_actions sticky-form-buttons">
                 <li class='cancel'>
@@ -94,6 +102,6 @@
                 </li>
             </ul>
         {% endblock list_actions %}
-    
+
     {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 94041b78d..c176dbfae 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -594,3 +594,4 @@ absence:
     You are marked as being absent: Vous êtes indiqué absent.
     You are listed as absent, as of: Votre absence est indiqué à partir du
     No absence listed: Aucune absence indiquée.
+    Is absent: Absent?

From 1a8e21a77fd72136e07bb1d4e1e6473ee1506a4d Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 30 Jan 2023 15:01:24 +0100
Subject: [PATCH 021/106] Fixed: [vue] title hover translation for absent pill

---
 src/Bundle/ChillMainBundle/translations/messages.fr.yml     | 6 +++---
 .../public/vuejs/AccompanyingCourse/components/Banner.vue   | 6 +++---
 .../Resources/public/vuejs/AccompanyingCourse/js/i18n.js    | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index c176dbfae..9cc34d1b0 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -588,10 +588,10 @@ saved_export:
 absence:
     My absence: Mon absence
     Unset absence: Supprimer la date d'absence
-    Set absence date: Indiquer date d'absence
-    Absence start: Absence à partir du
+    Set absence date: Indiquer une date d'absence
+    Absence start: Absent à partir du
     Absent: Absent
     You are marked as being absent: Vous êtes indiqué absent.
-    You are listed as absent, as of: Votre absence est indiqué à partir du
+    You are listed as absent, as of: Votre absence est indiquée à partir du
     No absence listed: Aucune absence indiquée.
     Is absent: Absent?
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
index c7c01f78e..f29d75f26 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
@@ -22,12 +22,12 @@
                <i>{{ $t('course.open_at') }}{{ $d(accompanyingCourse.openingDate.datetime, 'text') }}</i>
             </span>
             <span v-if="accompanyingCourse.user" class="d-md-block ms-3 ms-md-0">
-               <span class="item-key">{{ $t('course.referrer') }}:</span>
-               <b>{{ accompanyingCourse.user.text }}</b>
-               <span v-if="accompanyingCourse.user.isAbsent" class="fa-stack fa-holder" title="{{ 'absence.Absent'|trans }}">
+               <span class="item-key">{{ $t('course.referrer') }}:</span>&nbsp;
+               <span v-if="accompanyingCourse.user.isAbsent" class="fa-stack fa-holder" :title="$t('course.absent')">
                 <i class="fa fa-circle fa-stack-1x text-danger"></i>
                 <i class="fa fa-stack-1x text-white">A</i>
                </span>
+               <b>{{ accompanyingCourse.user.text }}</b>
             </span>
          </span>
       </span>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 44238b0c7..170e19bf9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -29,7 +29,8 @@ const appMessages = {
          emergency: "urgent",
          confidential: "confidentiel",
          regular: "régulier",
-         occasional: "ponctuel"
+         occasional: "ponctuel",
+         absent: "Absent",
       },
       origin: {
          title: "Origine de la demande",

From 2165e04ec3745e2d7586b1350fb797a7af449bfd Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 30 Jan 2023 15:16:38 +0100
Subject: [PATCH 022/106] Fixed: [template] integration of absence alert box

---
 .../ChillMainBundle/Resources/views/layout.html.twig      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index c011ec9a5..944b1c17c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -70,9 +70,11 @@
                 {% block content %}
                     <div class="col-8 main_search">
                         {% if app.user.isAbsent %}
-                            <div class="row mb-5">
-                                <p class="alert alert-warning" role="alert">{{'absence.You are marked as being absent'|trans }}</p>
-{#                                <a class="btn btn-edit" title="Modifier" href="{{ path('chill_main_user_absence_index') }}"></a>#}
+                            <div class="d-flex flex-row mb-5 alert alert-warning" role="alert">
+                                <p class="m-2">{{'absence.You are marked as being absent'|trans }}</p>
+                                <span class="ms-auto">
+                                    <a class="btn btn-remove" title="Modifier" href="{{ path('chill_main_user_absence_index') }}">{{ 'absence.Unset absence'|trans }}</a>
+                                </span>
                             </div>
                         {% endif %}
                         <h2>{{ 'Search'|trans }}</h2>

From 5bfd2aefe6dedf4aade9dcc7d4efd33b344cc130 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 30 Jan 2023 15:20:13 +0100
Subject: [PATCH 023/106] DX: [html] change deprecated tag

---
 src/Bundle/ChillMainBundle/Resources/views/layout.html.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 944b1c17c..92454be35 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -81,14 +81,14 @@
 
                         <form action="{{ path('chill_main_search') }}" method="get">
                             <input class="form-control form-control-lg" name="q" type="search" placeholder="{{ 'Search persons, ...'|trans }}" />
-                            <center>
+                            <div class="text-center">
                                 <button type="submit" class="btn btn-lg btn-warning mt-3">
                                     <i class="fa fa-fw fa-search"></i> {{ 'Search'|trans }}
                                 </button>
                                 <a class="btn btn-lg btn-misc mt-3" href="{{ path('chill_main_advanced_search_list') }}">
                                     <i class="fa fa-fw fa-search"></i> {{ 'Advanced search'|trans }}
                                 </a>
-                            </center>
+                            </div>
                         </form>
                     </div>
 

From c83e8ad9a4344ab6e37abcc07592e5fb8a817f6f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 3 Feb 2023 12:29:38 +0100
Subject: [PATCH 024/106] FEATURE [regroupment][form] integrate in regroupment
 admin entity into PickCenterType, datamapping not working

---
 .../Form/Type/Export/PickCenterType.php       | 92 ++++++++++++++++---
 .../views/Export/new_centers_step.html.twig   | 52 ++++++-----
 2 files changed, 105 insertions(+), 39 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index 20db0b535..f2cda1628 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -13,13 +13,17 @@ namespace Chill\MainBundle\Form\Type\Export;
 
 use Chill\MainBundle\Center\GroupingCenterInterface;
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
@@ -34,7 +38,7 @@ use function in_array;
 /**
  * Pick centers amongst available centers for the user.
  */
-class PickCenterType extends AbstractType
+class PickCenterType extends AbstractType implements DataMapperInterface
 {
     public const CENTERS_IDENTIFIERS = 'c';
 
@@ -42,10 +46,10 @@ class PickCenterType extends AbstractType
 
     protected ExportManager $exportManager;
 
-    /**
-     * @var array|GroupingCenterInterface[]
-     */
-    protected array $groupingCenters = [];
+//    /**
+//     * @var array|GroupingCenterInterface[]
+//     */
+//    protected array $groupingCenters = [];
 
     protected UserInterface $user;
 
@@ -72,8 +76,9 @@ class PickCenterType extends AbstractType
             $export->requiredRole()
         );
 
-        $builder->add(self::CENTERS_IDENTIFIERS, EntityType::class, [
+        $builder->add('center', EntityType::class, [
             'class' => Center::class,
+            'label' => 'center',
             'choices' => $centers,
             'multiple' => true,
             'expanded' => true,
@@ -81,9 +86,19 @@ class PickCenterType extends AbstractType
                 return $c->getName();
             },
             'data' => count($this->groupingCenters) > 0 ? null : $centers,
-        ]);
+            ])
+            ->add('regroupment', EntityType::class, [
+                'class' => Regroupment::class,
+                'label' => 'regroupment',
+                'multiple' => true,
+                'expanded' => true,
+                'choice_label' => static function (Regroupment $r) {
+                    return $r->getName();
+                },
+            ])
+            ->setDataMapper($this);
 
-        if (count($this->groupingCenters) > 0) {
+/*        if (count($this->groupingCenters) > 0) {
             $groupingBuilder = $builder->create('g', null, [
                 'compound' => true,
             ]);
@@ -105,18 +120,65 @@ class PickCenterType extends AbstractType
             if ($groupingBuilder->count() > 0) {
                 $builder->add($groupingBuilder);
             }
-        }
+        }*/
 
-        $builder->addModelTransformer(new CallbackTransformer(
+/*        $builder->addModelTransformer(new CallbackTransformer(
             function ($data) use ($centers) {
                 return $this->transform($data, $centers);
             },
             function ($data) use ($centers) {
                 return $this->reverseTransform($data, $centers);
             }
-        ));
+        ));*/
     }
 
+    public function mapDataToForms($viewData, $forms)
+    {
+        if (null === $viewData) {
+            return;
+        }
+
+        if (!$viewData instanceof Center || !$viewData instanceof Regroupment) {
+            throw new UnexpectedTypeException($viewData, [Center::class, Regroupment::class]);
+        }
+
+        $forms = iterator_to_array($forms);
+
+        $forms['centers']->setData($viewData->getCenters());
+
+    }
+
+    public function mapFormsToData($forms, &$viewData)
+    {
+        $forms = iterator_to_array($forms);
+
+        $centersArray = [];
+
+        array_push($centersArray, $forms['center']);
+
+        dump($forms['regroupment']);
+
+//        array_push($centersArray, )
+
+//        $viewData = array_merge($centersArray, $forms['regroupment']);
+
+        $viewData = $forms['regroupment'];
+        dump($forms);
+        dump($viewData);
+
+    }
+
+    /*    public function buildView(FormView $view, FormInterface $form, array $options)
+        {
+            $export = $this->exportManager->getExport($options['export_alias']);
+            $centers = $this->authorizationHelper->getReachableCenters(
+                $this->user,
+                $export->requiredRole()
+            );
+
+            $view->vars['is_hidden'] = count($centers) <= 1;
+        }*/
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setRequired('export_alias');
@@ -137,7 +199,7 @@ class PickCenterType extends AbstractType
         return $result;
     }
 
-    protected function reverseTransform($data, $centers)
+/*    protected function reverseTransform($data, $centers)
     {
         $picked = $data[self::CENTERS_IDENTIFIERS]
             instanceof \Doctrine\Common\Collections\Collection ?
@@ -159,10 +221,10 @@ class PickCenterType extends AbstractType
         }
 
         return array_unique($picked);
-    }
+    }*/
 
-    protected function transform($data, $centers)
+/*    protected function transform($data, $centers)
     {
         return $data;
-    }
+    }*/
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
index 8874744c4..a73913154 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
@@ -1,5 +1,5 @@
 {#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
  <info@champs-libres.coop> / <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,39 +22,43 @@
 
 {% block content %}
     <div class="col-md-10">
-    
+
         {{ include('@ChillMain/Export/_breadcrumb.html.twig') }}
-        
+
         <h1>{{ export.title|trans }}</h1>
-        
+
         <p>{{ export.description|trans }}</p>
-    
+
         {{ form_start(form) }}
-        
+
         <section class="center mb-4">
-            
+
             <h2>{{ 'Pick centers'|trans }}</h2>
-            
+
             <p>{{ 'The export will contains only data from the picked centers.'|trans }}
                 {{ 'This will eventually restrict your possibilities in filtering the data.'|trans }}</p>
-        
-            {{ form_widget(form.centers.c) }}
-            
-            {% if form.centers.children.g is defined %}
-                
-                <h3>{{ 'Pick aggregated centers'|trans }}</h3>
-                
-                {% for f in form.centers.children.g.children %}
-                    {{ form_row(f) }}
-                {% endfor %}
-                
-            {% endif %}
-            
+
+            <h3 class="m-3">{{ 'Center'|trans }}</h3>
+            {{ form_widget(form.centers.center) }}
+
+            <h3 class="m-3">{{ 'Pick aggregated centers'|trans }}</h3>
+            {{ form_widget(form.centers.regroupment) }}
+
+{#            {% if form.centers.children.g is defined %}#}
+{##}
+{#                <h3>{{ 'Pick aggregated centers'|trans }}</h3>#}
+{##}
+{#                {% for f in form.centers.children.g.children %}#}
+{#                    {{ form_row(f) }}#}
+{#                {% endfor %}#}
+{##}
+{#            {% endif %}#}
+
         </section>
-        
+
         <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action btn-create' }, 'label' : 'Go to export options' } ) }}</p>
-        
+
         {{ form_end(form) }}
-    
+
     </div>
 {% endblock content %}

From 5756a371786d62882d51f448d63b996a2aad122f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 7 Feb 2023 10:23:19 +0100
Subject: [PATCH 025/106] FEATURE [datamapper][regroupment] moved datamapper to
 seperate class. Still not working

---
 .../Form/DataMapper/RegroupmentDataMapper.php |  67 ++++++++++
 .../Form/Type/Export/PickCenterType.php       | 121 +-----------------
 .../ChillMainBundle/config/services/form.yaml |   4 +
 3 files changed, 76 insertions(+), 116 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php

diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php
new file mode 100644
index 000000000..958e4c013
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Form\DataMapper;
+
+use Chill\MainBundle\Entity\Regroupment;
+use Symfony\Component\Form\DataMapperInterface;
+
+class RegroupmentDataMapper implements DataMapperInterface
+{
+    private $regroupment;
+
+    public function __construct(?Regroupment $regroupment = null)
+    {
+        $this->regroupment = $regroupment;
+    }
+
+    public function mapDataToForms($data, $forms)
+    {
+        $forms = iterator_to_array($forms);
+
+        if ($this->regroupment instanceof Regroupment) {
+            $forms['regroupment']->setData($this->regroupment->getCenters());
+
+            dump($forms['regroupment']);
+
+            return;
+        }
+
+        if (null === $data) {
+            return;
+        }
+
+        if ($data instanceof Regroupment) {
+            $forms['regroupment']->setData($data);
+        }
+    }
+
+    public function mapFormsToData($forms, &$data)
+    {
+        $forms = iterator_to_array($forms);
+
+        if (isset($forms['regroupment'])) {
+            if ($this->regroupment instanceof Regroupment) {
+                $data = $this->regroupment;
+            } else {
+                $data = [];
+
+                foreach ($forms['regroupment']->getData() as $key => $regroupment)
+                {
+                    dump($regroupment->getCenters());
+                    $data[$key] = $regroupment->getCenters();
+                    dump($data);
+                }
+//                $data = $forms['regroupment']->getData();
+            }
+        }
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index f2cda1628..1390809a5 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Center\GroupingCenterInterface;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Export\ExportManager;
+use Chill\MainBundle\Form\DataMapper\RegroupmentDataMapper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
@@ -38,7 +39,7 @@ use function in_array;
 /**
  * Pick centers amongst available centers for the user.
  */
-class PickCenterType extends AbstractType implements DataMapperInterface
+class PickCenterType extends AbstractType
 {
     public const CENTERS_IDENTIFIERS = 'c';
 
@@ -46,11 +47,6 @@ class PickCenterType extends AbstractType implements DataMapperInterface
 
     protected ExportManager $exportManager;
 
-//    /**
-//     * @var array|GroupingCenterInterface[]
-//     */
-//    protected array $groupingCenters = [];
-
     protected UserInterface $user;
 
     public function __construct(
@@ -86,7 +82,7 @@ class PickCenterType extends AbstractType implements DataMapperInterface
                 return $c->getName();
             },
             'data' => count($this->groupingCenters) > 0 ? null : $centers,
-            ])
+        ])
             ->add('regroupment', EntityType::class, [
                 'class' => Regroupment::class,
                 'label' => 'regroupment',
@@ -95,90 +91,11 @@ class PickCenterType extends AbstractType implements DataMapperInterface
                 'choice_label' => static function (Regroupment $r) {
                     return $r->getName();
                 },
-            ])
-            ->setDataMapper($this);
-
-/*        if (count($this->groupingCenters) > 0) {
-            $groupingBuilder = $builder->create('g', null, [
-                'compound' => true,
             ]);
 
-            foreach ($this->groupingCenters as $key => $gc) {
-                $choices = $this->buildChoices($centers, $gc);
-
-                if (count($choices) > 0) {
-                    $groupingBuilder->add($key, ChoiceType::class, [
-                        'choices' => $choices,
-                        'multiple' => true,
-                        'expanded' => true,
-                        'label' => $gc->getName(),
-                        'required' => false,
-                    ]);
-                }
-            }
-
-            if ($groupingBuilder->count() > 0) {
-                $builder->add($groupingBuilder);
-            }
-        }*/
-
-/*        $builder->addModelTransformer(new CallbackTransformer(
-            function ($data) use ($centers) {
-                return $this->transform($data, $centers);
-            },
-            function ($data) use ($centers) {
-                return $this->reverseTransform($data, $centers);
-            }
-        ));*/
+        $builder->setDataMapper(new RegroupmentDataMapper());
     }
-
-    public function mapDataToForms($viewData, $forms)
-    {
-        if (null === $viewData) {
-            return;
-        }
-
-        if (!$viewData instanceof Center || !$viewData instanceof Regroupment) {
-            throw new UnexpectedTypeException($viewData, [Center::class, Regroupment::class]);
-        }
-
-        $forms = iterator_to_array($forms);
-
-        $forms['centers']->setData($viewData->getCenters());
-
-    }
-
-    public function mapFormsToData($forms, &$viewData)
-    {
-        $forms = iterator_to_array($forms);
-
-        $centersArray = [];
-
-        array_push($centersArray, $forms['center']);
-
-        dump($forms['regroupment']);
-
-//        array_push($centersArray, )
-
-//        $viewData = array_merge($centersArray, $forms['regroupment']);
-
-        $viewData = $forms['regroupment'];
-        dump($forms);
-        dump($viewData);
-
-    }
-
-    /*    public function buildView(FormView $view, FormInterface $form, array $options)
-        {
-            $export = $this->exportManager->getExport($options['export_alias']);
-            $centers = $this->authorizationHelper->getReachableCenters(
-                $this->user,
-                $export->requiredRole()
-            );
-
-            $view->vars['is_hidden'] = count($centers) <= 1;
-        }*/
-
+    
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setRequired('export_alias');
@@ -199,32 +116,4 @@ class PickCenterType extends AbstractType implements DataMapperInterface
         return $result;
     }
 
-/*    protected function reverseTransform($data, $centers)
-    {
-        $picked = $data[self::CENTERS_IDENTIFIERS]
-            instanceof \Doctrine\Common\Collections\Collection ?
-                $data[self::CENTERS_IDENTIFIERS]->toArray()
-                :
-                $data[self::CENTERS_IDENTIFIERS];
-
-        if (array_key_exists('g', $data)) {
-            foreach ($data['g'] as $gcid => $group) {
-                $picked =
-                    array_merge(
-                        array_intersect(
-                            $this->groupingCenters[$gcid]->getCentersForGroup($group),
-                            $centers
-                        ),
-                        $picked
-                    );
-            }
-        }
-
-        return array_unique($picked);
-    }*/
-
-/*    protected function transform($data, $centers)
-    {
-        return $data;
-    }*/
 }
diff --git a/src/Bundle/ChillMainBundle/config/services/form.yaml b/src/Bundle/ChillMainBundle/config/services/form.yaml
index 8157c27e9..f306658fd 100644
--- a/src/Bundle/ChillMainBundle/config/services/form.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/form.yaml
@@ -138,6 +138,10 @@ services:
         autowire: true
         autoconfigure: true
 
+    Chill\MainBundle\Form\DataMapper\RegroupmentDataMapper:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Form\RegroupmentType:
         autowire: true
         autoconfigure: true

From 068311d071330e788ca1c4b9b342b62b13b304b6 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 7 Feb 2023 15:36:57 +0100
Subject: [PATCH 026/106] FEATURE [datamapper][regroupment] make the datamapper
 work

---
 .../ChillMainBundle/Entity/Regroupment.php    |  4 +-
 .../DataMapper/ExportPickCenterDataMapper.php | 77 +++++++++++++++++++
 .../Form/DataMapper/RegroupmentDataMapper.php | 67 ----------------
 .../Form/Type/Export/PickCenterType.php       | 22 +-----
 .../Repository/RegroupmentRepository.php      | 61 +++++++++++++++
 5 files changed, 144 insertions(+), 87 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
 delete mode 100644 src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php
 create mode 100644 src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php

diff --git a/src/Bundle/ChillMainBundle/Entity/Regroupment.php b/src/Bundle/ChillMainBundle/Entity/Regroupment.php
index 5faffd17c..5de02ade6 100644
--- a/src/Bundle/ChillMainBundle/Entity/Regroupment.php
+++ b/src/Bundle/ChillMainBundle/Entity/Regroupment.php
@@ -24,7 +24,7 @@ class Regroupment
     /**
      * @var Center
      * @ORM\ManyToMany(
-     *     targetEntity="Chill\MainBundle\Entity\Center"
+     *     targetEntity=Center::class
      * )
      * @ORM\Id
      */
@@ -52,7 +52,7 @@ class Regroupment
         $this->centers = new ArrayCollection();
     }
 
-    public function getCenters(): ?Collection
+    public function getCenters(): Collection
     {
         return $this->centers;
     }
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
new file mode 100644
index 000000000..884f8cb78
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Form\DataMapper;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Regroupment;
+use Chill\MainBundle\Repository\RegroupmentRepository;
+use Symfony\Component\Form\DataMapperInterface;
+use Symfony\Component\Form\FormInterface;
+
+class ExportPickCenterDataMapper implements DataMapperInterface
+{
+    protected RegroupmentRepository $regroupmentRepository;
+
+    /**
+     * @param array|Center[] $data
+     * @param $forms
+     * @return mixed
+     * @throws \Exception
+     */
+    public function mapDataToForms($data, $forms)
+    {
+       throw new \Exception("not implemented");
+
+       /** @var array<string, FormInterface> $form */
+       $form = iterator_to_array($forms);
+
+       $pickedRegroupment = [];
+       foreach ($this->regroupmentRepository->findAll() as $regroupment) {
+           [$contained, $notContained] = $regroupment->getCenters()->partition(function (Center $center) {
+
+           });
+
+           if (0 === count($notContained)) {
+               $pickedRegroupment[] = $regroupment;
+           }
+       }
+
+       $form['regroupment']->setData($pickedRegroupment);
+       $form['centers']->setData($data);
+    }
+
+    /**
+     * @param iterable $forms
+     * @param array $data
+     * @return void
+     */
+    public function mapFormsToData($forms, &$data)
+    {
+        /** @var array<string, FormInterface> $forms */
+        $forms = iterator_to_array($forms);
+
+        $centers = [];
+
+        foreach ($forms['center']->getData() as $center) {
+            $centers[spl_object_hash($center)] = $center;
+        }
+
+        foreach ($forms['regroupment']->getData() as $regroupment) {
+            /** @var Regroupment $regroupment */
+            foreach ($regroupment->getCenters() as $center) {
+                $centers[spl_object_hash($center)] = $center;
+            }
+        }
+
+        $data = array_values($centers);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php
deleted file mode 100644
index 958e4c013..000000000
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\MainBundle\Form\DataMapper;
-
-use Chill\MainBundle\Entity\Regroupment;
-use Symfony\Component\Form\DataMapperInterface;
-
-class RegroupmentDataMapper implements DataMapperInterface
-{
-    private $regroupment;
-
-    public function __construct(?Regroupment $regroupment = null)
-    {
-        $this->regroupment = $regroupment;
-    }
-
-    public function mapDataToForms($data, $forms)
-    {
-        $forms = iterator_to_array($forms);
-
-        if ($this->regroupment instanceof Regroupment) {
-            $forms['regroupment']->setData($this->regroupment->getCenters());
-
-            dump($forms['regroupment']);
-
-            return;
-        }
-
-        if (null === $data) {
-            return;
-        }
-
-        if ($data instanceof Regroupment) {
-            $forms['regroupment']->setData($data);
-        }
-    }
-
-    public function mapFormsToData($forms, &$data)
-    {
-        $forms = iterator_to_array($forms);
-
-        if (isset($forms['regroupment'])) {
-            if ($this->regroupment instanceof Regroupment) {
-                $data = $this->regroupment;
-            } else {
-                $data = [];
-
-                foreach ($forms['regroupment']->getData() as $key => $regroupment)
-                {
-                    dump($regroupment->getCenters());
-                    $data[$key] = $regroupment->getCenters();
-                    dump($data);
-                }
-//                $data = $forms['regroupment']->getData();
-            }
-        }
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index 1390809a5..674f42aa7 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -15,6 +15,8 @@ use Chill\MainBundle\Center\GroupingCenterInterface;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Export\ExportManager;
+use Chill\MainBundle\Form\DataMapper\ExportPickCenterDataMapper;
+use Chill\MainBundle\Form\DataMapper\PickCenterDataMapper;
 use Chill\MainBundle\Form\DataMapper\RegroupmentDataMapper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -93,27 +95,11 @@ class PickCenterType extends AbstractType
                 },
             ]);
 
-        $builder->setDataMapper(new RegroupmentDataMapper());
+        $builder->setDataMapper(new ExportPickCenterDataMapper());
     }
-    
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setRequired('export_alias');
     }
-
-    protected function buildChoices($reachablesCenters, GroupingCenterInterface $gc)
-    {
-        $result = [];
-
-        foreach ($gc->getGroups() as $group) {
-            foreach ($gc->getCentersForGroup($group) as $center) {
-                if (in_array($center, $reachablesCenters, true)) {
-                    $result[$group] = $group;
-                }
-            }
-        }
-
-        return $result;
-    }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
new file mode 100644
index 000000000..6e84ef9b7
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Repository;
+
+use Chill\MainBundle\Entity\Regroupment;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
+
+final class RegroupmentRepository implements ObjectRepository
+{
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(Regroupment::class);
+    }
+
+    public function find($id, $lockMode = null, $lockVersion = null): ?Regroupment
+    {
+        return $this->repository->find($id, $lockMode, $lockVersion);
+    }
+
+    /**
+     * @return Regroupment[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
+     * @return Regroupment[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?Regroupment
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    public function getClassName()
+    {
+        return Regroupment::class;
+    }
+}

From b5ec0919e769c454010a684b86c3e06c3a52ec5a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 7 Feb 2023 15:39:36 +0100
Subject: [PATCH 027/106] FEATURE [datamapper][regroupment] minor fix

---
 .../DataMapper/ExportPickCenterDataMapper.php | 35 +++++++++++--------
 .../Form/Type/Export/PickCenterType.php       | 12 -------
 .../Form/Type/Export/PickRegroupmentType.php  | 10 +++++-
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
index 884f8cb78..0d21b0adb 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
@@ -14,8 +14,10 @@ namespace Chill\MainBundle\Form\DataMapper;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Repository\RegroupmentRepository;
+use Exception;
 use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\FormInterface;
+use function count;
 
 class ExportPickCenterDataMapper implements DataMapperInterface
 {
@@ -24,34 +26,39 @@ class ExportPickCenterDataMapper implements DataMapperInterface
     /**
      * @param array|Center[] $data
      * @param $forms
+     *
+     * @throws Exception
+     *
      * @return mixed
-     * @throws \Exception
      */
     public function mapDataToForms($data, $forms)
     {
-       throw new \Exception("not implemented");
+        if (null === $data) {
+            return;
+        }
 
-       /** @var array<string, FormInterface> $form */
-       $form = iterator_to_array($forms);
+        /** @var array<string, FormInterface> $form */
+        $form = iterator_to_array($forms);
 
-       $pickedRegroupment = [];
-       foreach ($this->regroupmentRepository->findAll() as $regroupment) {
-           [$contained, $notContained] = $regroupment->getCenters()->partition(function (Center $center) {
+        $pickedRegroupment = [];
 
-           });
+        foreach ($this->regroupmentRepository->findAll() as $regroupment) {
+            [$contained, $notContained] = $regroupment->getCenters()->partition(static function (Center $center) {
+            });
 
-           if (0 === count($notContained)) {
-               $pickedRegroupment[] = $regroupment;
-           }
-       }
+            if (0 === count($notContained)) {
+                $pickedRegroupment[] = $regroupment;
+            }
+        }
 
-       $form['regroupment']->setData($pickedRegroupment);
-       $form['centers']->setData($data);
+        $form['regroupment']->setData($pickedRegroupment);
+        $form['centers']->setData($data);
     }
 
     /**
      * @param iterable $forms
      * @param array $data
+     *
      * @return void
      */
     public function mapFormsToData($forms, &$data)
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index 674f42aa7..17768544b 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -16,27 +16,15 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Form\DataMapper\ExportPickCenterDataMapper;
-use Chill\MainBundle\Form\DataMapper\PickCenterDataMapper;
-use Chill\MainBundle\Form\DataMapper\RegroupmentDataMapper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\CallbackTransformer;
-use Symfony\Component\Form\DataMapperInterface;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
 use Symfony\Component\Security\Core\User\UserInterface;
-use function array_intersect;
-use function array_key_exists;
-use function array_merge;
-use function array_unique;
 use function count;
-use function in_array;
 
 /**
  * Pick centers amongst available centers for the user.
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php
index e60388fd3..7b04d2ebd 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php
@@ -1,10 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Form\Type\Export;
 
 use Symfony\Component\Form\AbstractType;
 
 class PickRegroupmentType extends AbstractType
 {
-
 }

From 7d80507517d84cd50100cb66a74424bf21736fb4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 26 Jan 2023 11:28:13 +0100
Subject: [PATCH 028/106] FEATURE [regroupment][exports] first commit to
 implement regroupment entity in exports

---
 .../ChillMainBundle/Controller/ExportController.php    |  2 ++
 .../Form/Type/Export/PickRegroupmentType.php           | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php

diff --git a/src/Bundle/ChillMainBundle/Controller/ExportController.php b/src/Bundle/ChillMainBundle/Controller/ExportController.php
index 84bf80c6b..caeec8327 100644
--- a/src/Bundle/ChillMainBundle/Controller/ExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ExportController.php
@@ -298,6 +298,8 @@ class ExportController extends AbstractController
                 'csrf_protection' => $isGenerate ? false : true,
             ]);
 
+        // TODO: add a condition to be able to select a regroupment of centers?
+
         if ('centers' === $step || 'generate_centers' === $step) {
             $builder->add('centers', PickCenterType::class, [
                 'export_alias' => $alias,
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php
new file mode 100644
index 000000000..e60388fd3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Chill\MainBundle\Form\Type\Export;
+
+use Symfony\Component\Form\AbstractType;
+
+class PickRegroupmentType extends AbstractType
+{
+
+}

From 0ace1c1f6a78caaf1ade9f82cf6db5a1cbea3018 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 3 Feb 2023 12:29:38 +0100
Subject: [PATCH 029/106] FEATURE [regroupment][form] integrate in regroupment
 admin entity into PickCenterType, datamapping not working

---
 .../Form/Type/Export/PickCenterType.php       | 92 ++++++++++++++++---
 .../views/Export/new_centers_step.html.twig   | 52 ++++++-----
 2 files changed, 105 insertions(+), 39 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index 20db0b535..f2cda1628 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -13,13 +13,17 @@ namespace Chill\MainBundle\Form\Type\Export;
 
 use Chill\MainBundle\Center\GroupingCenterInterface;
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
@@ -34,7 +38,7 @@ use function in_array;
 /**
  * Pick centers amongst available centers for the user.
  */
-class PickCenterType extends AbstractType
+class PickCenterType extends AbstractType implements DataMapperInterface
 {
     public const CENTERS_IDENTIFIERS = 'c';
 
@@ -42,10 +46,10 @@ class PickCenterType extends AbstractType
 
     protected ExportManager $exportManager;
 
-    /**
-     * @var array|GroupingCenterInterface[]
-     */
-    protected array $groupingCenters = [];
+//    /**
+//     * @var array|GroupingCenterInterface[]
+//     */
+//    protected array $groupingCenters = [];
 
     protected UserInterface $user;
 
@@ -72,8 +76,9 @@ class PickCenterType extends AbstractType
             $export->requiredRole()
         );
 
-        $builder->add(self::CENTERS_IDENTIFIERS, EntityType::class, [
+        $builder->add('center', EntityType::class, [
             'class' => Center::class,
+            'label' => 'center',
             'choices' => $centers,
             'multiple' => true,
             'expanded' => true,
@@ -81,9 +86,19 @@ class PickCenterType extends AbstractType
                 return $c->getName();
             },
             'data' => count($this->groupingCenters) > 0 ? null : $centers,
-        ]);
+            ])
+            ->add('regroupment', EntityType::class, [
+                'class' => Regroupment::class,
+                'label' => 'regroupment',
+                'multiple' => true,
+                'expanded' => true,
+                'choice_label' => static function (Regroupment $r) {
+                    return $r->getName();
+                },
+            ])
+            ->setDataMapper($this);
 
-        if (count($this->groupingCenters) > 0) {
+/*        if (count($this->groupingCenters) > 0) {
             $groupingBuilder = $builder->create('g', null, [
                 'compound' => true,
             ]);
@@ -105,18 +120,65 @@ class PickCenterType extends AbstractType
             if ($groupingBuilder->count() > 0) {
                 $builder->add($groupingBuilder);
             }
-        }
+        }*/
 
-        $builder->addModelTransformer(new CallbackTransformer(
+/*        $builder->addModelTransformer(new CallbackTransformer(
             function ($data) use ($centers) {
                 return $this->transform($data, $centers);
             },
             function ($data) use ($centers) {
                 return $this->reverseTransform($data, $centers);
             }
-        ));
+        ));*/
     }
 
+    public function mapDataToForms($viewData, $forms)
+    {
+        if (null === $viewData) {
+            return;
+        }
+
+        if (!$viewData instanceof Center || !$viewData instanceof Regroupment) {
+            throw new UnexpectedTypeException($viewData, [Center::class, Regroupment::class]);
+        }
+
+        $forms = iterator_to_array($forms);
+
+        $forms['centers']->setData($viewData->getCenters());
+
+    }
+
+    public function mapFormsToData($forms, &$viewData)
+    {
+        $forms = iterator_to_array($forms);
+
+        $centersArray = [];
+
+        array_push($centersArray, $forms['center']);
+
+        dump($forms['regroupment']);
+
+//        array_push($centersArray, )
+
+//        $viewData = array_merge($centersArray, $forms['regroupment']);
+
+        $viewData = $forms['regroupment'];
+        dump($forms);
+        dump($viewData);
+
+    }
+
+    /*    public function buildView(FormView $view, FormInterface $form, array $options)
+        {
+            $export = $this->exportManager->getExport($options['export_alias']);
+            $centers = $this->authorizationHelper->getReachableCenters(
+                $this->user,
+                $export->requiredRole()
+            );
+
+            $view->vars['is_hidden'] = count($centers) <= 1;
+        }*/
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setRequired('export_alias');
@@ -137,7 +199,7 @@ class PickCenterType extends AbstractType
         return $result;
     }
 
-    protected function reverseTransform($data, $centers)
+/*    protected function reverseTransform($data, $centers)
     {
         $picked = $data[self::CENTERS_IDENTIFIERS]
             instanceof \Doctrine\Common\Collections\Collection ?
@@ -159,10 +221,10 @@ class PickCenterType extends AbstractType
         }
 
         return array_unique($picked);
-    }
+    }*/
 
-    protected function transform($data, $centers)
+/*    protected function transform($data, $centers)
     {
         return $data;
-    }
+    }*/
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
index 8874744c4..a73913154 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
@@ -1,5 +1,5 @@
 {#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
  <info@champs-libres.coop> / <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,39 +22,43 @@
 
 {% block content %}
     <div class="col-md-10">
-    
+
         {{ include('@ChillMain/Export/_breadcrumb.html.twig') }}
-        
+
         <h1>{{ export.title|trans }}</h1>
-        
+
         <p>{{ export.description|trans }}</p>
-    
+
         {{ form_start(form) }}
-        
+
         <section class="center mb-4">
-            
+
             <h2>{{ 'Pick centers'|trans }}</h2>
-            
+
             <p>{{ 'The export will contains only data from the picked centers.'|trans }}
                 {{ 'This will eventually restrict your possibilities in filtering the data.'|trans }}</p>
-        
-            {{ form_widget(form.centers.c) }}
-            
-            {% if form.centers.children.g is defined %}
-                
-                <h3>{{ 'Pick aggregated centers'|trans }}</h3>
-                
-                {% for f in form.centers.children.g.children %}
-                    {{ form_row(f) }}
-                {% endfor %}
-                
-            {% endif %}
-            
+
+            <h3 class="m-3">{{ 'Center'|trans }}</h3>
+            {{ form_widget(form.centers.center) }}
+
+            <h3 class="m-3">{{ 'Pick aggregated centers'|trans }}</h3>
+            {{ form_widget(form.centers.regroupment) }}
+
+{#            {% if form.centers.children.g is defined %}#}
+{##}
+{#                <h3>{{ 'Pick aggregated centers'|trans }}</h3>#}
+{##}
+{#                {% for f in form.centers.children.g.children %}#}
+{#                    {{ form_row(f) }}#}
+{#                {% endfor %}#}
+{##}
+{#            {% endif %}#}
+
         </section>
-        
+
         <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action btn-create' }, 'label' : 'Go to export options' } ) }}</p>
-        
+
         {{ form_end(form) }}
-    
+
     </div>
 {% endblock content %}

From fb9b9b922606afcfed058a42c7ef1c4fdc562fd1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 7 Feb 2023 10:23:19 +0100
Subject: [PATCH 030/106] FEATURE [datamapper][regroupment] moved datamapper to
 seperate class. Still not working

---
 .../Form/DataMapper/RegroupmentDataMapper.php |  67 ++++++++++
 .../Form/Type/Export/PickCenterType.php       | 121 +-----------------
 .../ChillMainBundle/config/services/form.yaml |   4 +
 3 files changed, 76 insertions(+), 116 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php

diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php
new file mode 100644
index 000000000..958e4c013
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Form\DataMapper;
+
+use Chill\MainBundle\Entity\Regroupment;
+use Symfony\Component\Form\DataMapperInterface;
+
+class RegroupmentDataMapper implements DataMapperInterface
+{
+    private $regroupment;
+
+    public function __construct(?Regroupment $regroupment = null)
+    {
+        $this->regroupment = $regroupment;
+    }
+
+    public function mapDataToForms($data, $forms)
+    {
+        $forms = iterator_to_array($forms);
+
+        if ($this->regroupment instanceof Regroupment) {
+            $forms['regroupment']->setData($this->regroupment->getCenters());
+
+            dump($forms['regroupment']);
+
+            return;
+        }
+
+        if (null === $data) {
+            return;
+        }
+
+        if ($data instanceof Regroupment) {
+            $forms['regroupment']->setData($data);
+        }
+    }
+
+    public function mapFormsToData($forms, &$data)
+    {
+        $forms = iterator_to_array($forms);
+
+        if (isset($forms['regroupment'])) {
+            if ($this->regroupment instanceof Regroupment) {
+                $data = $this->regroupment;
+            } else {
+                $data = [];
+
+                foreach ($forms['regroupment']->getData() as $key => $regroupment)
+                {
+                    dump($regroupment->getCenters());
+                    $data[$key] = $regroupment->getCenters();
+                    dump($data);
+                }
+//                $data = $forms['regroupment']->getData();
+            }
+        }
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index f2cda1628..1390809a5 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Center\GroupingCenterInterface;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Export\ExportManager;
+use Chill\MainBundle\Form\DataMapper\RegroupmentDataMapper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
@@ -38,7 +39,7 @@ use function in_array;
 /**
  * Pick centers amongst available centers for the user.
  */
-class PickCenterType extends AbstractType implements DataMapperInterface
+class PickCenterType extends AbstractType
 {
     public const CENTERS_IDENTIFIERS = 'c';
 
@@ -46,11 +47,6 @@ class PickCenterType extends AbstractType implements DataMapperInterface
 
     protected ExportManager $exportManager;
 
-//    /**
-//     * @var array|GroupingCenterInterface[]
-//     */
-//    protected array $groupingCenters = [];
-
     protected UserInterface $user;
 
     public function __construct(
@@ -86,7 +82,7 @@ class PickCenterType extends AbstractType implements DataMapperInterface
                 return $c->getName();
             },
             'data' => count($this->groupingCenters) > 0 ? null : $centers,
-            ])
+        ])
             ->add('regroupment', EntityType::class, [
                 'class' => Regroupment::class,
                 'label' => 'regroupment',
@@ -95,90 +91,11 @@ class PickCenterType extends AbstractType implements DataMapperInterface
                 'choice_label' => static function (Regroupment $r) {
                     return $r->getName();
                 },
-            ])
-            ->setDataMapper($this);
-
-/*        if (count($this->groupingCenters) > 0) {
-            $groupingBuilder = $builder->create('g', null, [
-                'compound' => true,
             ]);
 
-            foreach ($this->groupingCenters as $key => $gc) {
-                $choices = $this->buildChoices($centers, $gc);
-
-                if (count($choices) > 0) {
-                    $groupingBuilder->add($key, ChoiceType::class, [
-                        'choices' => $choices,
-                        'multiple' => true,
-                        'expanded' => true,
-                        'label' => $gc->getName(),
-                        'required' => false,
-                    ]);
-                }
-            }
-
-            if ($groupingBuilder->count() > 0) {
-                $builder->add($groupingBuilder);
-            }
-        }*/
-
-/*        $builder->addModelTransformer(new CallbackTransformer(
-            function ($data) use ($centers) {
-                return $this->transform($data, $centers);
-            },
-            function ($data) use ($centers) {
-                return $this->reverseTransform($data, $centers);
-            }
-        ));*/
+        $builder->setDataMapper(new RegroupmentDataMapper());
     }
-
-    public function mapDataToForms($viewData, $forms)
-    {
-        if (null === $viewData) {
-            return;
-        }
-
-        if (!$viewData instanceof Center || !$viewData instanceof Regroupment) {
-            throw new UnexpectedTypeException($viewData, [Center::class, Regroupment::class]);
-        }
-
-        $forms = iterator_to_array($forms);
-
-        $forms['centers']->setData($viewData->getCenters());
-
-    }
-
-    public function mapFormsToData($forms, &$viewData)
-    {
-        $forms = iterator_to_array($forms);
-
-        $centersArray = [];
-
-        array_push($centersArray, $forms['center']);
-
-        dump($forms['regroupment']);
-
-//        array_push($centersArray, )
-
-//        $viewData = array_merge($centersArray, $forms['regroupment']);
-
-        $viewData = $forms['regroupment'];
-        dump($forms);
-        dump($viewData);
-
-    }
-
-    /*    public function buildView(FormView $view, FormInterface $form, array $options)
-        {
-            $export = $this->exportManager->getExport($options['export_alias']);
-            $centers = $this->authorizationHelper->getReachableCenters(
-                $this->user,
-                $export->requiredRole()
-            );
-
-            $view->vars['is_hidden'] = count($centers) <= 1;
-        }*/
-
+    
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setRequired('export_alias');
@@ -199,32 +116,4 @@ class PickCenterType extends AbstractType implements DataMapperInterface
         return $result;
     }
 
-/*    protected function reverseTransform($data, $centers)
-    {
-        $picked = $data[self::CENTERS_IDENTIFIERS]
-            instanceof \Doctrine\Common\Collections\Collection ?
-                $data[self::CENTERS_IDENTIFIERS]->toArray()
-                :
-                $data[self::CENTERS_IDENTIFIERS];
-
-        if (array_key_exists('g', $data)) {
-            foreach ($data['g'] as $gcid => $group) {
-                $picked =
-                    array_merge(
-                        array_intersect(
-                            $this->groupingCenters[$gcid]->getCentersForGroup($group),
-                            $centers
-                        ),
-                        $picked
-                    );
-            }
-        }
-
-        return array_unique($picked);
-    }*/
-
-/*    protected function transform($data, $centers)
-    {
-        return $data;
-    }*/
 }
diff --git a/src/Bundle/ChillMainBundle/config/services/form.yaml b/src/Bundle/ChillMainBundle/config/services/form.yaml
index 8157c27e9..f306658fd 100644
--- a/src/Bundle/ChillMainBundle/config/services/form.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/form.yaml
@@ -138,6 +138,10 @@ services:
         autowire: true
         autoconfigure: true
 
+    Chill\MainBundle\Form\DataMapper\RegroupmentDataMapper:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Form\RegroupmentType:
         autowire: true
         autoconfigure: true

From 1a44a516c26055ef9cc03110921525b81dcab810 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 7 Feb 2023 15:36:57 +0100
Subject: [PATCH 031/106] FEATURE [datamapper][regroupment] make the datamapper
 work

---
 .../ChillMainBundle/Entity/Regroupment.php    |  4 +-
 .../DataMapper/ExportPickCenterDataMapper.php | 77 +++++++++++++++++++
 .../Form/DataMapper/RegroupmentDataMapper.php | 67 ----------------
 .../Form/Type/Export/PickCenterType.php       | 22 +-----
 .../Repository/RegroupmentRepository.php      | 61 +++++++++++++++
 5 files changed, 144 insertions(+), 87 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
 delete mode 100644 src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php
 create mode 100644 src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php

diff --git a/src/Bundle/ChillMainBundle/Entity/Regroupment.php b/src/Bundle/ChillMainBundle/Entity/Regroupment.php
index 5faffd17c..5de02ade6 100644
--- a/src/Bundle/ChillMainBundle/Entity/Regroupment.php
+++ b/src/Bundle/ChillMainBundle/Entity/Regroupment.php
@@ -24,7 +24,7 @@ class Regroupment
     /**
      * @var Center
      * @ORM\ManyToMany(
-     *     targetEntity="Chill\MainBundle\Entity\Center"
+     *     targetEntity=Center::class
      * )
      * @ORM\Id
      */
@@ -52,7 +52,7 @@ class Regroupment
         $this->centers = new ArrayCollection();
     }
 
-    public function getCenters(): ?Collection
+    public function getCenters(): Collection
     {
         return $this->centers;
     }
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
new file mode 100644
index 000000000..884f8cb78
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Form\DataMapper;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Regroupment;
+use Chill\MainBundle\Repository\RegroupmentRepository;
+use Symfony\Component\Form\DataMapperInterface;
+use Symfony\Component\Form\FormInterface;
+
+class ExportPickCenterDataMapper implements DataMapperInterface
+{
+    protected RegroupmentRepository $regroupmentRepository;
+
+    /**
+     * @param array|Center[] $data
+     * @param $forms
+     * @return mixed
+     * @throws \Exception
+     */
+    public function mapDataToForms($data, $forms)
+    {
+       throw new \Exception("not implemented");
+
+       /** @var array<string, FormInterface> $form */
+       $form = iterator_to_array($forms);
+
+       $pickedRegroupment = [];
+       foreach ($this->regroupmentRepository->findAll() as $regroupment) {
+           [$contained, $notContained] = $regroupment->getCenters()->partition(function (Center $center) {
+
+           });
+
+           if (0 === count($notContained)) {
+               $pickedRegroupment[] = $regroupment;
+           }
+       }
+
+       $form['regroupment']->setData($pickedRegroupment);
+       $form['centers']->setData($data);
+    }
+
+    /**
+     * @param iterable $forms
+     * @param array $data
+     * @return void
+     */
+    public function mapFormsToData($forms, &$data)
+    {
+        /** @var array<string, FormInterface> $forms */
+        $forms = iterator_to_array($forms);
+
+        $centers = [];
+
+        foreach ($forms['center']->getData() as $center) {
+            $centers[spl_object_hash($center)] = $center;
+        }
+
+        foreach ($forms['regroupment']->getData() as $regroupment) {
+            /** @var Regroupment $regroupment */
+            foreach ($regroupment->getCenters() as $center) {
+                $centers[spl_object_hash($center)] = $center;
+            }
+        }
+
+        $data = array_values($centers);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php
deleted file mode 100644
index 958e4c013..000000000
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/RegroupmentDataMapper.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\MainBundle\Form\DataMapper;
-
-use Chill\MainBundle\Entity\Regroupment;
-use Symfony\Component\Form\DataMapperInterface;
-
-class RegroupmentDataMapper implements DataMapperInterface
-{
-    private $regroupment;
-
-    public function __construct(?Regroupment $regroupment = null)
-    {
-        $this->regroupment = $regroupment;
-    }
-
-    public function mapDataToForms($data, $forms)
-    {
-        $forms = iterator_to_array($forms);
-
-        if ($this->regroupment instanceof Regroupment) {
-            $forms['regroupment']->setData($this->regroupment->getCenters());
-
-            dump($forms['regroupment']);
-
-            return;
-        }
-
-        if (null === $data) {
-            return;
-        }
-
-        if ($data instanceof Regroupment) {
-            $forms['regroupment']->setData($data);
-        }
-    }
-
-    public function mapFormsToData($forms, &$data)
-    {
-        $forms = iterator_to_array($forms);
-
-        if (isset($forms['regroupment'])) {
-            if ($this->regroupment instanceof Regroupment) {
-                $data = $this->regroupment;
-            } else {
-                $data = [];
-
-                foreach ($forms['regroupment']->getData() as $key => $regroupment)
-                {
-                    dump($regroupment->getCenters());
-                    $data[$key] = $regroupment->getCenters();
-                    dump($data);
-                }
-//                $data = $forms['regroupment']->getData();
-            }
-        }
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index 1390809a5..674f42aa7 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -15,6 +15,8 @@ use Chill\MainBundle\Center\GroupingCenterInterface;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Export\ExportManager;
+use Chill\MainBundle\Form\DataMapper\ExportPickCenterDataMapper;
+use Chill\MainBundle\Form\DataMapper\PickCenterDataMapper;
 use Chill\MainBundle\Form\DataMapper\RegroupmentDataMapper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -93,27 +95,11 @@ class PickCenterType extends AbstractType
                 },
             ]);
 
-        $builder->setDataMapper(new RegroupmentDataMapper());
+        $builder->setDataMapper(new ExportPickCenterDataMapper());
     }
-    
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setRequired('export_alias');
     }
-
-    protected function buildChoices($reachablesCenters, GroupingCenterInterface $gc)
-    {
-        $result = [];
-
-        foreach ($gc->getGroups() as $group) {
-            foreach ($gc->getCentersForGroup($group) as $center) {
-                if (in_array($center, $reachablesCenters, true)) {
-                    $result[$group] = $group;
-                }
-            }
-        }
-
-        return $result;
-    }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
new file mode 100644
index 000000000..6e84ef9b7
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Repository;
+
+use Chill\MainBundle\Entity\Regroupment;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
+
+final class RegroupmentRepository implements ObjectRepository
+{
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(Regroupment::class);
+    }
+
+    public function find($id, $lockMode = null, $lockVersion = null): ?Regroupment
+    {
+        return $this->repository->find($id, $lockMode, $lockVersion);
+    }
+
+    /**
+     * @return Regroupment[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
+     * @return Regroupment[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?Regroupment
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    public function getClassName()
+    {
+        return Regroupment::class;
+    }
+}

From a4e21b783482449ada97fa361987414f33b8526f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 7 Feb 2023 15:39:36 +0100
Subject: [PATCH 032/106] FEATURE [datamapper][regroupment] minor fix

---
 .../DataMapper/ExportPickCenterDataMapper.php | 35 +++++++++++--------
 .../Form/Type/Export/PickCenterType.php       | 12 -------
 .../Form/Type/Export/PickRegroupmentType.php  | 10 +++++-
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
index 884f8cb78..0d21b0adb 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
@@ -14,8 +14,10 @@ namespace Chill\MainBundle\Form\DataMapper;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Repository\RegroupmentRepository;
+use Exception;
 use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\FormInterface;
+use function count;
 
 class ExportPickCenterDataMapper implements DataMapperInterface
 {
@@ -24,34 +26,39 @@ class ExportPickCenterDataMapper implements DataMapperInterface
     /**
      * @param array|Center[] $data
      * @param $forms
+     *
+     * @throws Exception
+     *
      * @return mixed
-     * @throws \Exception
      */
     public function mapDataToForms($data, $forms)
     {
-       throw new \Exception("not implemented");
+        if (null === $data) {
+            return;
+        }
 
-       /** @var array<string, FormInterface> $form */
-       $form = iterator_to_array($forms);
+        /** @var array<string, FormInterface> $form */
+        $form = iterator_to_array($forms);
 
-       $pickedRegroupment = [];
-       foreach ($this->regroupmentRepository->findAll() as $regroupment) {
-           [$contained, $notContained] = $regroupment->getCenters()->partition(function (Center $center) {
+        $pickedRegroupment = [];
 
-           });
+        foreach ($this->regroupmentRepository->findAll() as $regroupment) {
+            [$contained, $notContained] = $regroupment->getCenters()->partition(static function (Center $center) {
+            });
 
-           if (0 === count($notContained)) {
-               $pickedRegroupment[] = $regroupment;
-           }
-       }
+            if (0 === count($notContained)) {
+                $pickedRegroupment[] = $regroupment;
+            }
+        }
 
-       $form['regroupment']->setData($pickedRegroupment);
-       $form['centers']->setData($data);
+        $form['regroupment']->setData($pickedRegroupment);
+        $form['centers']->setData($data);
     }
 
     /**
      * @param iterable $forms
      * @param array $data
+     *
      * @return void
      */
     public function mapFormsToData($forms, &$data)
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index 674f42aa7..17768544b 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -16,27 +16,15 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Form\DataMapper\ExportPickCenterDataMapper;
-use Chill\MainBundle\Form\DataMapper\PickCenterDataMapper;
-use Chill\MainBundle\Form\DataMapper\RegroupmentDataMapper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\CallbackTransformer;
-use Symfony\Component\Form\DataMapperInterface;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
 use Symfony\Component\Security\Core\User\UserInterface;
-use function array_intersect;
-use function array_key_exists;
-use function array_merge;
-use function array_unique;
 use function count;
-use function in_array;
 
 /**
  * Pick centers amongst available centers for the user.
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php
index e60388fd3..7b04d2ebd 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php
@@ -1,10 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Form\Type\Export;
 
 use Symfony\Component\Form\AbstractType;
 
 class PickRegroupmentType extends AbstractType
 {
-
 }

From 4370349f10ba10d7ba0a9511b5d978332ce77781 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Feb 2023 13:05:05 +0100
Subject: [PATCH 033/106] fix LoadCalendarRange fixture

---
 .../ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
index a1226ca6a..805386669 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
@@ -61,7 +61,7 @@ class LoadCalendarRange extends Fixture implements FixtureGroupInterface, Ordere
             ->setEmail('centreA@test.chill.social')
             ->setLocationType($type = new LocationType())
             ->setPhonenumber1(PhoneNumberUtil::getInstance()->parse('+3287653812'));
-        $type->setTitle('Service');
+        $type->setTitle(['fr' => 'Service']);
         $address->setStreet('Rue des Épaules')->setStreetNumber('14')
             ->setPostcode($postCode = new PostalCode());
         $postCode->setCode('4145')->setName('Houte-Si-Plout')->setCountry(

From 5ee0ab5ab85944ab038828942f0b4e3a275dbee4 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Feb 2023 13:30:34 +0100
Subject: [PATCH 034/106] fix LoadInvite fixture (CalendarBundle)

---
 .../DataFixtures/ORM/LoadInvite.php           | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
index 25b8ae8a8..2e021fc2b 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
@@ -12,6 +12,8 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\DataFixtures\ORM;
 
 use Chill\CalendarBundle\Entity\Invite;
+use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
+use Chill\MainBundle\Entity\User;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
 use Doctrine\Persistence\ObjectManager;
@@ -33,14 +35,21 @@ class LoadInvite extends Fixture implements FixtureGroupInterface
     public function load(ObjectManager $manager): void
     {
         $arr = [
-            ['name' => ['fr' => 'Rendez-vous décliné']],
-            ['name' => ['fr' => 'Rendez-vous accepté']],
+            [
+                'name' => ['fr' => 'Rendez-vous décliné'],
+                'status' => 'declined'
+            ],
+            [
+                'name' => ['fr' => 'Rendez-vous accepté'],
+                'status' => 'accepted'
+            ],
         ];
 
         foreach ($arr as $a) {
             echo 'Creating calendar invite : ' . $a['name']['fr'] . "\n";
             $invite = (new Invite())
-                ->setStatus($a['name']);
+                ->setStatus($a['status'])
+                ->setUser($this->getRandomUser());
             $manager->persist($invite);
             $reference = 'Invite_' . $a['name']['fr'];
             $this->addReference($reference, $invite);
@@ -49,4 +58,11 @@ class LoadInvite extends Fixture implements FixtureGroupInterface
 
         $manager->flush();
     }
+
+    private function getRandomUser(): User
+    {
+        $userRef = array_rand(LoadUsers::$refs);
+
+        return $this->getReference($userRef);
+    }
 }

From 744b62184a7b37ca8d0f2d911b359a3f293e4534 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 17 Feb 2023 14:48:02 +0100
Subject: [PATCH 035/106] fix LoadHousehold fixture

---
 .../DataFixtures/ORM/LoadHousehold.php             | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
index 8b1a1b8ec..342dfb020 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
@@ -11,11 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\DataFixtures\ORM\LoadCenters;
 use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Household\MembersEditorFactory;
 use DateInterval;
 use DateTime;
@@ -192,14 +194,20 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
     private function preparePersonIds()
     {
+        $centers = LoadCenters::$centers;
+
         // @TODO: Remove this and make this service stateless
         $this->personIds = $this->em
             ->createQuery(
                 'SELECT p.id FROM ' . Person::class . ' p ' .
-                'JOIN p.center c ' .
-                'WHERE c.name = :center '
+                'WHERE EXISTS( ' .
+                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch ' .
+                    'JOIN pch.center c ' .
+                    'WHERE pch.person = p.id ' .
+                    'AND c.name IN (:authorized_centers)' .
+                ')'
             )
-            ->setParameter('center', 'Center A')
+            ->setParameter('authorized_centers', $centers)
             ->getScalarResult();
 
         shuffle($this->personIds);

From 1f4438690e82dfd319b2f8b24604c57a9e5b6880 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 22 Feb 2023 11:36:57 +0100
Subject: [PATCH 036/106] FEATURE [email] add a line notifying referrer which
 user has moved a person or household

---
 .../notification_location_user_on_period_has_moved.fr.txt.twig   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/notification_location_user_on_period_has_moved.fr.txt.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/notification_location_user_on_period_has_moved.fr.txt.twig
index e4509d78a..df932067c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/notification_location_user_on_period_has_moved.fr.txt.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/notification_location_user_on_period_has_moved.fr.txt.twig
@@ -3,6 +3,7 @@
 #}{{ period.user.label }},
 
 L'usager {{ oldPersonLocation|chill_entity_render_string }} a déménagé.
+{{ app.user|chill_entity_render_string }} a enregistré ce déménagement.
 
 Son adresse était utilisée pour localiser le parcours n°{{ period.id }}, dont vous êtes
 le référent.

From f07ea3259ef229c212ddca2f35bc263134994b96 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 22 Feb 2023 11:54:03 +0100
Subject: [PATCH 037/106] php cs fixes

---
 .../Filter/ACPFilters/LocationFilter.php      |   2 +-
 .../src/Export/Export/ListAsideActivity.php   |  63 +++++-----
 .../src/Export/Filter/ByDateFilter.php        |   1 -
 .../src/Export/Filter/ByUserFilter.php        |   1 -
 .../Form/Admin/ChargeKindType.php             |   2 +-
 .../Form/Admin/ResourceKindType.php           |   2 +-
 .../Repository/ChargeKindRepository.php       |   3 +-
 .../ChargeKindRepositoryInterface.php         |   4 +-
 .../Repository/ResourceKindRepository.php     |   3 +-
 .../Repository/ResourceRepository.php         |   2 +-
 .../Service/Summary/SummaryBudget.php         |   2 -
 .../Service/Summary/SummaryBudgetTest.php     |  31 ++---
 .../migrations/Version20230209161546.php      |  19 ++-
 .../DocGeneratorTemplateController.php        |   3 +-
 .../Service/Generator/Generator.php           |  33 +++--
 .../Service/Generator/GeneratorException.php  |  23 +++-
 .../Generator/ObjectReadyException.php        |  15 ++-
 .../RelatedEntityNotFoundException.php        |  20 ++-
 .../Messenger/RequestGenerationMessage.php    |  25 ++--
 .../Context/Generator/GeneratorTest.php       | 115 ++++++++++--------
 .../Entity/StoredObject.php                   |  35 +++---
 .../Export/ExportInterface.php                |   1 -
 .../Export/Helper/DateTimeHelper.php          |   3 +-
 .../UserJobFilter.php                         |   1 -
 .../ParticipationOverlapValidatorTest.php     |  50 ++++----
 25 files changed, 273 insertions(+), 186 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationFilter.php
index ed591e957..5cdce5b31 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationFilter.php
@@ -50,7 +50,7 @@ class LocationFilter implements FilterInterface
     {
         $builder->add('accepted_location', PickUserLocationType::class, [
             'multiple' => true,
-            'label' => 'pick location'
+            'label' => 'pick location',
         ]);
     }
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
index bf370f71b..976f4171c 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
@@ -1,10 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\AsideActivityBundle\Export\Export;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
 use Chill\AsideActivityBundle\Export\Declarations;
-use Chill\AsideActivityBundle\Form\AsideActivityCategoryType;
 use Chill\AsideActivityBundle\Repository\AsideActivityCategoryRepository;
 use Chill\AsideActivityBundle\Security\AsideActivityVoter;
 use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
@@ -16,32 +24,32 @@ use Chill\MainBundle\Export\Helper\UserHelper;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Closure;
+use DateTimeInterface;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 final class ListAsideActivity implements ListInterface, GroupedExportInterface
 {
-    private EntityManagerInterface $em;
-
-    private UserHelper $userHelper;
-
-    private DateTimeHelper $dateTimeHelper;
-
-    private ScopeRepositoryInterface $scopeRepository;
-
-    private CenterRepositoryInterface $centerRepository;
-
     private AsideActivityCategoryRepository $asideActivityCategoryRepository;
 
     private CategoryRender $categoryRender;
 
+    private CenterRepositoryInterface $centerRepository;
+
+    private DateTimeHelper $dateTimeHelper;
+
+    private EntityManagerInterface $em;
+
+    private ScopeRepositoryInterface $scopeRepository;
+
     private TranslatableStringHelperInterface $translatableStringHelper;
 
+    private UserHelper $userHelper;
+
     public function __construct(
         EntityManagerInterface $em,
         DateTimeHelper $dateTimeHelper,
@@ -76,11 +84,6 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
         return 'export.aside_activity.List of aside activities';
     }
 
-    public function getTitle()
-    {
-        return 'export.aside_activity.List of aside activities';
-    }
-
     public function getGroup(): string
     {
         return 'export.Exports of aside activities';
@@ -91,15 +94,16 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
         switch ($key) {
             case 'id':
             case 'note':
-                return function ($value) use ($key) {
+                return static function ($value) use ($key) {
                     if ('_header' === $value) {
                         return 'export.aside_activity.' . $key;
                     }
 
                     return $value ?? '';
                 };
+
             case 'duration':
-                return function ($value) use ($key) {
+                return static function ($value) use ($key) {
                     if ('_header' === $value) {
                         return 'export.aside_activity.' . $key;
                     }
@@ -108,7 +112,7 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
                         return '';
                     }
 
-                    if ($value instanceof \DateTimeInterface) {
+                    if ($value instanceof DateTimeInterface) {
                         return $value->format('H:i:s');
                     }
 
@@ -118,7 +122,7 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
             case 'createdAt':
             case 'updatedAt':
             case 'date':
-                return $this->dateTimeHelper->getLabel('export.aside_activity.'.$key);
+                return $this->dateTimeHelper->getLabel('export.aside_activity.' . $key);
 
             case 'agent_id':
             case 'creator_id':
@@ -165,7 +169,7 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
                 };
 
             default:
-                throw new \LogicException('this key is not supported : ' . $key);
+                throw new LogicException('this key is not supported : ' . $key);
         }
     }
 
@@ -182,7 +186,7 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
             'aside_activity_type',
             'date',
             'duration',
-            'note'
+            'note',
         ];
     }
 
@@ -195,6 +199,11 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
         return $query->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY);
     }
 
+    public function getTitle()
+    {
+        return 'export.aside_activity.List of aside activities';
+    }
+
     public function getType(): string
     {
         return Declarations::ASIDE_ACTIVITY_TYPE;
@@ -204,8 +213,7 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
     {
         $qb = $this->em->createQueryBuilder()
             ->from(AsideActivity::class, 'aside')
-            ->leftJoin('aside.agent', 'agent')
-        ;
+            ->leftJoin('aside.agent', 'agent');
 
         $qb
             ->addSelect('aside.id AS id')
@@ -218,8 +226,7 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
             ->addSelect('IDENTITY(aside.type) AS aside_activity_type')
             ->addSelect('aside.date')
             ->addSelect('aside.duration')
-            ->addSelect('aside.note')
-        ;
+            ->addSelect('aside.note');
 
         return $qb;
     }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
index 2d49b3d57..7a1b6f4dc 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Form\Type\Export\FilterType;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
index c2a3b4c54..795c813cd 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
@@ -15,7 +15,6 @@ use Chill\AsideActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\Entity\UserRender;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
diff --git a/src/Bundle/ChillBudgetBundle/Form/Admin/ChargeKindType.php b/src/Bundle/ChillBudgetBundle/Form/Admin/ChargeKindType.php
index 59adf49af..c3c2a66bf 100644
--- a/src/Bundle/ChillBudgetBundle/Form/Admin/ChargeKindType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/Admin/ChargeKindType.php
@@ -30,7 +30,7 @@ class ChargeKindType extends AbstractType
             ])
             ->add('kind', TextType::class, [
                 'label' => 'budget.admin.form.Charge_kind_key',
-                'help' => 'budget.admin.form.This kind must contains only alphabeticals characters, and dashes. This string is in use during document generation. Changes may have side effect on document'
+                'help' => 'budget.admin.form.This kind must contains only alphabeticals characters, and dashes. This string is in use during document generation. Changes may have side effect on document',
             ])
             ->add('ordering', NumberType::class)
             ->add('isActive', CheckboxType::class, [
diff --git a/src/Bundle/ChillBudgetBundle/Form/Admin/ResourceKindType.php b/src/Bundle/ChillBudgetBundle/Form/Admin/ResourceKindType.php
index 0605b8731..41d3a8b53 100644
--- a/src/Bundle/ChillBudgetBundle/Form/Admin/ResourceKindType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/Admin/ResourceKindType.php
@@ -30,7 +30,7 @@ class ResourceKindType extends AbstractType
             ])
             ->add('kind', TextType::class, [
                 'label' => 'budget.admin.form.Resource_kind_key',
-                'help' => 'budget.admin.form.This kind must contains only alphabeticals characters, and dashes. This string is in use during document generation. Changes may have side effect on document'
+                'help' => 'budget.admin.form.This kind must contains only alphabeticals characters, and dashes. This string is in use during document generation. Changes may have side effect on document',
             ])
             ->add('ordering', NumberType::class)
             ->add('isActive', CheckboxType::class, [
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
index 10d02749a..01f5cd737 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
@@ -49,8 +49,7 @@ final class ChargeKindRepository implements ChargeKindRepositoryInterface
             ->where($qb->expr()->eq('c.isActive', 'true'))
             ->orderBy('c.ordering', 'ASC')
             ->getQuery()
-            ->getResult()
-        ;
+            ->getResult();
     }
 
     /**
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php
index 5099a5674..fb8c9dc35 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php
@@ -28,8 +28,6 @@ interface ChargeKindRepositoryInterface extends ObjectRepository
      */
     public function findAllActive(): array;
 
-    public function findOneByKind(string $kind): ?ChargeKind;
-
     /**
      * @return ChargeType[]
      */
@@ -45,5 +43,7 @@ interface ChargeKindRepositoryInterface extends ObjectRepository
 
     public function findOneBy(array $criteria): ?ChargeKind;
 
+    public function findOneByKind(string $kind): ?ChargeKind;
+
     public function getClassName(): string;
 }
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
index 140bb7cc7..f7935c5b7 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
@@ -49,8 +49,7 @@ final class ResourceKindRepository implements ResourceKindRepositoryInterface
             ->where($qb->expr()->eq('r.isActive', 'true'))
             ->orderBy('r.ordering', 'ASC')
             ->getQuery()
-            ->getResult()
-        ;
+            ->getResult();
     }
 
     /**
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
index b3f0a41da..12f9fd52f 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
@@ -34,7 +34,7 @@ class ResourceRepository extends EntityRepository
             //->andWhere('c.startDate < :date')
             // TODO: there is a misconception here, the end date must be lower or null. startDate are never null
             //->andWhere('c.startDate < :date OR c.startDate IS NULL');
-        ;
+;
 
         if (null !== $sort) {
             $qb->orderBy($sort);
diff --git a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
index 2f401f1ec..ad2a014ed 100644
--- a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
+++ b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
@@ -13,9 +13,7 @@ namespace Chill\BudgetBundle\Service\Summary;
 
 use Chill\BudgetBundle\Entity\ChargeKind;
 use Chill\BudgetBundle\Entity\ResourceKind;
-use Chill\BudgetBundle\Repository\ChargeKindRepository;
 use Chill\BudgetBundle\Repository\ChargeKindRepositoryInterface;
-use Chill\BudgetBundle\Repository\ResourceKindRepository;
 use Chill\BudgetBundle\Repository\ResourceKindRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Household\Household;
diff --git a/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php b/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
index cf8c00efe..7fcda6b11 100644
--- a/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
+++ b/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
@@ -20,12 +20,15 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
+use DateTimeImmutable;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
+use ReflectionClass;
+use RuntimeException;
 
 /**
  * @internal
@@ -47,10 +50,9 @@ final class SummaryBudgetTest extends TestCase
             ],
         ]);
         $queryCharges->setParameters(Argument::type('array'))
-            ->will(function ($args, $query) {
+            ->will(static function ($args, $query) {
                 return $query;
-            })
-        ;
+            });
 
         $queryResources = $this->prophesize(AbstractQuery::class);
         $queryResources->getResult()->willReturn([
@@ -61,23 +63,23 @@ final class SummaryBudgetTest extends TestCase
             ],
         ]);
         $queryResources->setParameters(Argument::type('array'))
-            ->will(function ($args, $query) {
+            ->will(static function ($args, $query) {
                 return $query;
-            })
-        ;
+            });
 
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->createNativeQuery(Argument::type('string'), Argument::type(Query\ResultSetMapping::class))
-            ->will(function ($args) use ($queryResources, $queryCharges) {
+            ->will(static function ($args) use ($queryResources, $queryCharges) {
                 if (false !== strpos($args[0], 'chill_budget.resource')) {
                     return $queryResources->reveal();
                 }
+
                 if (false !== strpos($args[0], 'chill_budget.charge')) {
                     return $queryCharges->reveal();
                 }
-                throw new \RuntimeException('this query does not have a stub counterpart: '.$args[0]);
-            })
-        ;
+
+                throw new RuntimeException('this query does not have a stub counterpart: ' . $args[0]);
+            });
 
         $chargeRepository = $this->prophesize(ChargeKindRepositoryInterface::class);
         $chargeRepository->findAll()->willReturn([
@@ -98,24 +100,23 @@ final class SummaryBudgetTest extends TestCase
         $resourceRepository->findOneByKind('misc')->willReturn($misc);
 
         $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
-        $translatableStringHelper->localize(Argument::type('array'))->will(function ($arg) {
+        $translatableStringHelper->localize(Argument::type('array'))->will(static function ($arg) {
             return $arg[0]['fr'];
         });
 
         $person = new Person();
-        $personReflection = new \ReflectionClass($person);
+        $personReflection = new ReflectionClass($person);
         $personIdReflection = $personReflection->getProperty('id');
         $personIdReflection->setAccessible(true);
         $personIdReflection->setValue($person, 1);
 
         $household = new Household();
-        $householdReflection = new \ReflectionClass($household);
+        $householdReflection = new ReflectionClass($household);
         $householdId = $householdReflection->getProperty('id');
         $householdId->setAccessible(true);
         $householdId->setValue($household, 1);
         $householdMember = (new HouseholdMember())->setPerson($person)
-            ->setStartDate(new \DateTimeImmutable('1 month ago'))
-        ;
+            ->setStartDate(new DateTimeImmutable('1 month ago'));
         $household->addMember($householdMember);
 
         $summaryBudget = new SummaryBudget(
diff --git a/src/Bundle/ChillBudgetBundle/migrations/Version20230209161546.php b/src/Bundle/ChillBudgetBundle/migrations/Version20230209161546.php
index 618b0c982..4495db8a7 100644
--- a/src/Bundle/ChillBudgetBundle/migrations/Version20230209161546.php
+++ b/src/Bundle/ChillBudgetBundle/migrations/Version20230209161546.php
@@ -2,6 +2,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\Budget;
 
 use Doctrine\DBAL\Schema\Schema;
@@ -9,6 +16,12 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20230209161546 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX resource_kind_unique_type_idx');
+        $this->addSql('DROP INDEX charge_kind_unique_type_idx');
+    }
+
     public function getDescription(): string
     {
         return 'Budget: add unique constraint on kind for charge_kind and resource_kind';
@@ -21,10 +34,4 @@ final class Version20230209161546 extends AbstractMigration
         $this->addSql('CREATE UNIQUE INDEX resource_kind_unique_type_idx ON chill_budget.resource_type (kind);');
         $this->addSql('CREATE UNIQUE INDEX charge_kind_unique_type_idx ON chill_budget.charge_type (kind);');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP INDEX resource_kind_unique_type_idx');
-        $this->addSql('DROP INDEX charge_kind_unique_type_idx');
-    }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index d618f758a..f65cb5d86 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -41,6 +41,7 @@ use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Throwable;
 use function strlen;
+use const JSON_PRETTY_PRINT;
 
 final class DocGeneratorTemplateController extends AbstractController
 {
@@ -273,7 +274,7 @@ final class DocGeneratorTemplateController extends AbstractController
 
         if ($isTest && isset($form) && $form['show_data']->getData()) {
             return $this->render('@ChillDocGenerator/Generator/debug_value.html.twig', [
-                'datas' => json_encode($context->getData($template, $entity, $contextGenerationData), JSON_PRETTY_PRINT)
+                'datas' => json_encode($context->getData($template, $entity, $contextGenerationData), JSON_PRETTY_PRINT),
             ]);
         }
 
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
index 755e608ba..c1f2f0631 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
 use Chill\DocGeneratorBundle\Context\ContextManagerInterface;
@@ -9,8 +18,10 @@ use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Doctrine\ORM\EntityManagerInterface;
+use Exception;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\File\File;
+use Throwable;
 
 class Generator
 {
@@ -41,18 +52,20 @@ class Generator
     /**
      * @template T of File|null
      * @template B of bool
+     *
      * @param B $isTest
      * @param (B is true ? T : null) $testFile
      * @psalm-return (B is true ? string : null)
-     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface|\Throwable
+     *
+     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface|Throwable
      */
     public function generateDocFromTemplate(
         DocGeneratorTemplate $template,
-        string               $entityClassName,
-        int                  $entityId,
-        ?StoredObject        $destinationStoredObject = null,
-        bool                 $isTest = false,
-        ?File                $testFile = null
+        string $entityClassName,
+        int $entityId,
+        ?StoredObject $destinationStoredObject = null,
+        bool $isTest = false,
+        ?File $testFile = null
     ): ?string {
         if ($destinationStoredObject instanceof StoredObject && StoredObject::STATUS_PENDING !== $destinationStoredObject->getStatus()) {
             throw new ObjectReadyException();
@@ -63,8 +76,7 @@ class Generator
 
         $entity = $this
             ->entityManager
-            ->find($context->getEntityClass(), $entityId)
-            ;
+            ->find($context->getEntityClass(), $entityId);
 
         if (null === $entity) {
             throw new RelatedEntityNotFoundException($entityClassName, $entityId);
@@ -97,8 +109,7 @@ class Generator
         $destinationStoredObject
             ->setType($template->getFile()->getType())
             ->setFilename(sprintf('%s_odt', uniqid('doc_', true)))
-            ->setStatus(StoredObject::STATUS_READY)
-            ;
+            ->setStatus(StoredObject::STATUS_READY);
 
         $this->storedObjectManager->write($destinationStoredObject, $generatedResource);
 
@@ -110,7 +121,7 @@ class Generator
                     $entity,
                     $contextGenerationData
                 );
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this
                 ->logger
                 ->error(
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
index 423d59dd4..98e493c29 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
@@ -1,18 +1,33 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
-class GeneratorException extends \RuntimeException
+use RuntimeException;
+use Throwable;
+
+class GeneratorException extends RuntimeException
 {
     /**
      * @var list<string>
      */
     private array $errors;
 
-    public function __construct(array $errors = [], \Throwable $previous = null)
+    public function __construct(array $errors = [], ?Throwable $previous = null)
     {
         $this->errors = $errors;
-        parent::__construct("Could not generate the document", 15252,
-            $previous);
+        parent::__construct(
+            'Could not generate the document',
+            15252,
+            $previous
+        );
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
index 85c82cf95..37540a2f8 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
@@ -1,11 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
-class ObjectReadyException extends \RuntimeException
+use RuntimeException;
+
+class ObjectReadyException extends RuntimeException
 {
     public function __construct()
     {
-        parent::__construct("object is already ready", 6698856);
+        parent::__construct('object is already ready', 6698856);
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
index b451b0ca5..b8966ac09 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
@@ -1,14 +1,26 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
-class RelatedEntityNotFoundException extends \RuntimeException
+use RuntimeException;
+
+class RelatedEntityNotFoundException extends RuntimeException
 {
-    public function __construct(string $relatedEntityClass, int $relatedEntityId, Throwable $previous = null)
+    public function __construct(string $relatedEntityClass, int $relatedEntityId, ?Throwable $previous = null)
     {
         parent::__construct(
-            sprintf("Related entity not found: %s, %s", $relatedEntityClass, $relatedEntityId),
+            sprintf('Related entity not found: %s, %s', $relatedEntityClass, $relatedEntityId),
             99876652,
-            $previous);
+            $previous
+        );
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
index 1489e2686..5d9f3ea9c 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\DocGeneratorBundle\Service\Messenger;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
@@ -7,13 +16,13 @@ use Chill\MainBundle\Entity\User;
 
 class RequestGenerationMessage
 {
-   private int $creatorId;
+    private int $creatorId;
 
-   private int $templateId;
+    private string $entityClassName;
 
-   private int $entityId;
+    private int $entityId;
 
-   private string $entityClassName;
+    private int $templateId;
 
     public function __construct(User $creator, DocGeneratorTemplate $template, int $entityId, string $entityClassName)
     {
@@ -28,9 +37,9 @@ class RequestGenerationMessage
         return $this->creatorId;
     }
 
-    public function getTemplateId(): int
+    public function getEntityClassName(): string
     {
-        return $this->templateId;
+        return $this->entityClassName;
     }
 
     public function getEntityId(): int
@@ -38,8 +47,8 @@ class RequestGenerationMessage
         return $this->entityId;
     }
 
-    public function getEntityClassName(): string
+    public function getTemplateId(): int
     {
-        return $this->entityClassName;
+        return $this->templateId;
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
index 2e68b443c..54fbce115 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\DocGeneratorBundle\tests\Service\Context\Generator;
 
 use Chill\DocGeneratorBundle\Context\ContextManagerInterface;
@@ -17,60 +26,14 @@ use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Log\NullLogger;
 
-class GeneratorTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class GeneratorTest extends TestCase
 {
     use ProphecyTrait;
 
-    public function testSuccessfulGeneration(): void
-    {
-        $template = (new DocGeneratorTemplate())->setFile($templateStoredObject = (new StoredObject())
-            ->setType('application/test'));
-        $destinationStoredObject = (new StoredObject())->setStatus(StoredObject::STATUS_PENDING);
-        $entity = new class {};
-        $data = [];
-
-        $context = $this->prophesize(DocGeneratorContextInterface::class);
-        $context->getData($template, $entity, Argument::type('array'))->willReturn($data);
-        $context->storeGenerated($template, $destinationStoredObject, $entity, Argument::type('array'))
-            ->shouldBeCalled();
-        $context->getName()->willReturn('dummy_context');
-        $context->getEntityClass()->willReturn('DummyClass');
-        $context = $context->reveal();
-
-        $contextManagerInterface = $this->prophesize(ContextManagerInterface::class);
-        $contextManagerInterface->getContextByDocGeneratorTemplate($template)
-            ->willReturn($context);
-
-        $driver = $this->prophesize(DriverInterface::class);
-        $driver->generateFromString('template', 'application/test', $data, Argument::any())
-            ->willReturn('generated');
-
-        $entityManager = $this->prophesize(EntityManagerInterface::class);
-        $entityManager->find(Argument::type('string'), Argument::type('int'))
-            ->willReturn($entity);
-        $entityManager->flush()->shouldBeCalled();
-
-        $storedObjectManager = $this->prophesize(StoredObjectManagerInterface::class);
-        $storedObjectManager->read($templateStoredObject)->willReturn('template');
-        $storedObjectManager->write($destinationStoredObject, 'generated')->shouldBeCalled();
-
-
-        $generator = new Generator(
-            $contextManagerInterface->reveal(),
-            $driver->reveal(),
-            $entityManager->reveal(),
-            new NullLogger(),
-            $storedObjectManager->reveal()
-        );
-
-        $generator->generateDocFromTemplate(
-            $template,
-            'DummyEntity',
-            1,
-            $destinationStoredObject
-        );
-    }
-
     public function testPreventRegenerateDocument(): void
     {
         $this->expectException(ObjectReadyException::class);
@@ -131,4 +94,54 @@ class GeneratorTest extends TestCase
             $destinationStoredObject
         );
     }
+
+    public function testSuccessfulGeneration(): void
+    {
+        $template = (new DocGeneratorTemplate())->setFile($templateStoredObject = (new StoredObject())
+            ->setType('application/test'));
+        $destinationStoredObject = (new StoredObject())->setStatus(StoredObject::STATUS_PENDING);
+        $entity = new class() {
+        };
+        $data = [];
+
+        $context = $this->prophesize(DocGeneratorContextInterface::class);
+        $context->getData($template, $entity, Argument::type('array'))->willReturn($data);
+        $context->storeGenerated($template, $destinationStoredObject, $entity, Argument::type('array'))
+            ->shouldBeCalled();
+        $context->getName()->willReturn('dummy_context');
+        $context->getEntityClass()->willReturn('DummyClass');
+        $context = $context->reveal();
+
+        $contextManagerInterface = $this->prophesize(ContextManagerInterface::class);
+        $contextManagerInterface->getContextByDocGeneratorTemplate($template)
+            ->willReturn($context);
+
+        $driver = $this->prophesize(DriverInterface::class);
+        $driver->generateFromString('template', 'application/test', $data, Argument::any())
+            ->willReturn('generated');
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->find(Argument::type('string'), Argument::type('int'))
+            ->willReturn($entity);
+        $entityManager->flush()->shouldBeCalled();
+
+        $storedObjectManager = $this->prophesize(StoredObjectManagerInterface::class);
+        $storedObjectManager->read($templateStoredObject)->willReturn('template');
+        $storedObjectManager->write($destinationStoredObject, 'generated')->shouldBeCalled();
+
+        $generator = new Generator(
+            $contextManagerInterface->reveal(),
+            $driver->reveal(),
+            $entityManager->reveal(),
+            new NullLogger(),
+            $storedObjectManager->reveal()
+        );
+
+        $generator->generateDocFromTemplate(
+            $template,
+            'DummyEntity',
+            1,
+            $destinationStoredObject
+        );
+    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index 21abc1f56..d02a94e82 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -18,6 +18,7 @@ use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use DateTime;
+use DateTimeImmutable;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Ramsey\Uuid\Uuid;
@@ -35,12 +36,14 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  */
 class StoredObject implements AsyncFileInterface, Document, TrackCreationInterface
 {
-    public const STATUS_READY = "ready";
-    public const STATUS_PENDING = "pending";
-    public const STATUS_FAILURE = "failure";
-
     use TrackCreationTrait;
 
+    public const STATUS_FAILURE = 'failure';
+
+    public const STATUS_PENDING = 'pending';
+
+    public const STATUS_READY = 'ready';
+
     /**
      * @ORM\Column(type="datetime", name="creation_date")
      * @Serializer\Groups({"read", "write"})
@@ -80,6 +83,16 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
      */
     private array $keyInfos = [];
 
+    /**
+     * @ORM\Column(type="text", options={"default": "ready"})
+     */
+    private string $status;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=DocGeneratorTemplate::class)
+     */
+    private ?DocGeneratorTemplate $template;
+
     /**
      * @ORM\Column(type="text", name="title")
      * @Serializer\Groups({"read", "write"})
@@ -98,20 +111,10 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
      */
     private UuidInterface $uuid;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=DocGeneratorTemplate::class)
-     */
-    private ?DocGeneratorTemplate $template;
-
-    /**
-     * @ORM\Column(type="text", options={"default": "ready"})
-     */
-    private string $status;
-
     /**
      * @param StoredObject::STATUS_* $status
      */
-    public function __construct(string $status = "ready")
+    public function __construct(string $status = 'ready')
     {
         $this->uuid = Uuid::uuid4();
         $this->status = $status;
@@ -188,7 +191,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
      */
     public function setCreationDate(DateTime $creationDate): self
     {
-        $this->createdAt = \DateTimeImmutable::createFromMutable($creationDate);
+        $this->createdAt = DateTimeImmutable::createFromMutable($creationDate);
 
         return $this;
     }
diff --git a/src/Bundle/ChillMainBundle/Export/ExportInterface.php b/src/Bundle/ChillMainBundle/Export/ExportInterface.php
index 79b59d241..95122ec0a 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportInterface.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Export;
 
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 
 /**
diff --git a/src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php b/src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php
index 648632e15..1c2c99083 100644
--- a/src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php
+++ b/src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Export\Helper;
 
 use DateTime;
+use DateTimeInterface;
 use Exception;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -35,7 +36,7 @@ class DateTimeHelper
                 return '';
             }
 
-            if ($value instanceof \DateTimeInterface) {
+            if ($value instanceof DateTimeInterface) {
                 return $value;
             }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php
index 2b69c528b..744c41735 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/ParticipationOverlapValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/ParticipationOverlapValidatorTest.php
index 181834b6a..1110bbe7b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/ParticipationOverlapValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/ParticipationOverlapValidatorTest.php
@@ -24,10 +24,36 @@ use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
-class ParticipationOverlapValidatorTest extends ConstraintValidatorTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ParticipationOverlapValidatorTest extends ConstraintValidatorTestCase
 {
     use ProphecyTrait;
 
+    /**
+     * @return mixed
+     */
+    public function getConstraint()
+    {
+        return new ParticipationOverlap();
+    }
+
+    public function testOneParticipation()
+    {
+        $period = new AccompanyingPeriod();
+        $person = new Person();
+
+        $collection = new ArrayCollection([
+            new AccompanyingPeriodParticipation($period, $person),
+        ]);
+
+        $this->validator->validate($collection, $this->getConstraint());
+
+        $this->assertNoViolation();
+    }
+
     protected function createValidator()
     {
         $personRender = $this->prophesize(PersonRenderInterface::class);
@@ -37,26 +63,4 @@ class ParticipationOverlapValidatorTest extends ConstraintValidatorTestCase
 
         return new ParticipationOverlapValidator($personRender->reveal(), $thirdPartyRender->reveal());
     }
-
-    public function testOneParticipation()
-    {
-        $period = new AccompanyingPeriod();
-        $person = new Person();
-
-        $collection = new ArrayCollection([
-            new AccompanyingPeriodParticipation($period, $person)
-        ]);
-
-        $this->validator->validate($collection, $this->getConstraint());
-
-        $this->assertNoViolation();
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getConstraint()
-    {
-        return new ParticipationOverlap();
-    }
 }

From 27f13e0dd175aafe7ec0708e899276f23f5c3968 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 13:54:44 +0100
Subject: [PATCH 038/106] FEATURE [menu][counters] show counter icon for person
 resources and residential address if there are any

---
 .../ChillPersonBundle/Menu/PersonMenuBuilder.php      | 11 ++++++++++-
 .../ChillPersonBundle/Resources/views/menu.html.twig  |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index 9185e372f..bf11a6c01 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -12,11 +12,13 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function count;
 
 /**
  * Add menu entrie to person menu.
@@ -35,16 +37,20 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
 
     protected TranslatorInterface $translator;
 
+    private ResidentialAddressRepository $residentialAddressRepo;
+
     private Security $security;
 
     public function __construct(
         ParameterBagInterface $parameterBag,
         Security $security,
-        TranslatorInterface $translator
+        TranslatorInterface $translator,
+        ResidentialAddressRepository $residentialAddressRepo
     ) {
         $this->showAccompanyingPeriod = $parameterBag->get('chill_person.accompanying_period');
         $this->security = $security;
         $this->translator = $translator;
+        $this->residentialAddressRepo = $residentialAddressRepo;
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
@@ -67,6 +73,8 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         ])
             ->setExtras([
                 'order' => 60,
+                'counter' => count($this->residentialAddressRepo->findBy(['person' => $parameters['person']])) > 0 ?
+                    count($this->residentialAddressRepo->findBy(['person' => $parameters['person']])) : null,
             ]);
 
         $menu->addChild($this->translator->trans('person_resources_menu'), [
@@ -77,6 +85,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         ])
             ->setExtras([
                 'order' => 70,
+                'counter' => count($parameters['person']->getResources()) > 0 ? count($parameters['person']->getResources()) : null,
             ]);
 
         $menu->addChild($this->translator->trans('household.person history'), [
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
index 23dda065e..cf60e31b7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
@@ -17,8 +17,12 @@
 
 <div class="list-group vertical-menu {{ 'menu-' ~ menus.name }}">
     {% for menu in menus %}
+
         <a class="list-group-item list-group-item-action"
             href="{{ menu.uri }}">
+            {% if menu.extras.counter is defined and menu.extras.counter is not null %}
+                <span class="badge rounded-pill bg-danger notification-counter">{{ menu.extras.counter }}</span>
+            {% endif %}
             {{ menu.label|upper }}
         </a>
     {% endfor %}

From 8b517f169f309e56985c123bceb5f4f072036c67 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 17:17:35 +0100
Subject: [PATCH 039/106] FEATURE [suggested][entities] add suggested entities
 option to dynamic picker types

---
 src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php  | 4 +++-
 .../ChillPersonBundle/Form/Type/PickPersonDynamicType.php     | 4 +++-
 .../Form/Type/PickThirdpartyDynamicType.php                   | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
index 2fbfdcf11..9a2c1fbb4 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
@@ -46,6 +46,7 @@ class PickUserDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['user'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
+        $view->vars['suggested'] = $this->serializer->serialize($options['suggested'], 'json', ['groups' => 'read']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -53,7 +54,8 @@ class PickUserDynamicType extends AbstractType
         $resolver
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
-            ->setDefault('compound', false);
+            ->setDefault('compound', false)
+            ->setDefault('suggested', null);
     }
 
     public function getBlockPrefix()
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
index b0be9dd27..91e46d193 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
@@ -45,6 +45,7 @@ class PickPersonDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['person'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
+        $view->vars['suggested'] = $this->serializer->serialize($options['suggested'], 'json', ['groups' => 'read']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -52,7 +53,8 @@ class PickPersonDynamicType extends AbstractType
         $resolver
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
-            ->setDefault('compound', false);
+            ->setDefault('compound', false)
+            ->setDefault('suggested', null);
     }
 
     public function getBlockPrefix()
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
index ada4064eb..d813918f7 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
@@ -45,6 +45,7 @@ class PickThirdpartyDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['thirdparty'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
+        $view->vars['suggested'] = $this->serializer->serialize($options['suggested'], 'json', ['groups' => 'read']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -52,7 +53,8 @@ class PickThirdpartyDynamicType extends AbstractType
         $resolver
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
-            ->setDefault('compound', false);
+            ->setDefault('compound', false)
+            ->setDefault('suggested', null);
     }
 
     public function getBlockPrefix()

From 9e6579a1769379485f7b0c671298179751067336 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 17:20:35 +0100
Subject: [PATCH 040/106] [workflow][method] add method to get
 involved/suggested users

---
 ...AccompanyingCourseDocumentWorkflowHandler.php | 10 ++++++++++
 .../Entity/Workflow/EntityWorkflow.php           | 16 ++++++++++++++++
 .../Workflow/EntityWorkflowHandlerInterface.php  |  5 +++++
 ...riodWorkEvaluationDocumentWorkflowHandler.php | 15 +++++++++++++++
 ...anyingPeriodWorkEvaluationWorkflowHandler.php | 14 ++++++++++++++
 .../AccompanyingPeriodWorkWorkflowHandler.php    | 13 +++++++++++++
 6 files changed, 73 insertions(+)

diff --git a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
index 96787a6fc..ec714aa74 100644
--- a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
@@ -95,6 +95,16 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
         return null;
     }
 
+    public function getSuggestedUsers(EntityWorkflow $entityWorkflow): array
+    {
+        $suggestedUsers = $entityWorkflow->getUsersInvolved();
+
+        $referrer = $this->getRelatedEntity($entityWorkflow)->getCourse()->getUser();
+        $suggestedUsers[$referrer->getId()] = $referrer;
+
+        return $suggestedUsers;
+    }
+
     public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string
     {
         return '@ChillDocStore/AccompanyingCourseDocument/_workflow.html.twig';
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
index c448ea19e..62e6bac0f 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
@@ -348,6 +348,22 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
         return $this->transitionningStep;
     }
 
+    /**
+     * @return User[]
+     */
+    public function getUsersInvolved(): array
+    {
+        $usersInvolved = [];
+
+        foreach ($this->steps as $step) {
+            foreach ($step->getDestUser() as $u) {
+                $usersInvolved[$u->getId()] = $u;
+            }
+        }
+
+        return $usersInvolved;
+    }
+
     public function getWorkflowName(): string
     {
         return $this->workflowName;
diff --git a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
index 5058fed7c..73e260c37 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
@@ -36,6 +36,11 @@ interface EntityWorkflowHandlerInterface
      */
     public function getRoleShow(EntityWorkflow $entityWorkflow): ?string;
 
+    /**
+     * @return User[]
+     */
+    public function getSuggestedUsers(EntityWorkflow $entityWorkflow): array;
+
     public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string;
 
     public function getTemplateData(EntityWorkflow $entityWorkflow, array $options = []): array;
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index 735463fc2..2c78e2099 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -97,6 +97,21 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
         return AccompanyingPeriodWorkEvaluationDocumentVoter::SEE;
     }
 
+    public function getSuggestedUsers(EntityWorkflow $entityWorkflow): array
+    {
+        $suggestedUsers = $entityWorkflow->getUsersInvolved();
+
+        $referrer = $this->getRelatedEntity($entityWorkflow)
+            ->getAccompanyingPeriodWorkEvaluation()
+            ->getAccompanyingPeriodWork()
+            ->getAccompanyingPeriod()
+            ->getUser();
+
+        $suggestedUsers[$referrer->getId()] = $referrer;
+
+        return $suggestedUsers;
+    }
+
     public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string
     {
         return '@ChillPerson/Workflow/_evaluation_document.html.twig';
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
index 25edce03b..a6d9fc9b4 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
@@ -87,6 +87,20 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
         return AccompanyingPeriodWorkEvaluationVoter::SEE;
     }
 
+    public function getSuggestedUsers(EntityWorkflow $entityWorkflow): array
+    {
+        $suggestedUsers = $entityWorkflow->getUsersInvolved();
+
+        $referrer = $this->getRelatedEntity($entityWorkflow)
+            ->getAccompanyingPeriodWork()
+            ->getAccompanyingPeriod()
+            ->getUser();
+
+        $suggestedUsers[$referrer->getId()] = $referrer;
+
+        return $suggestedUsers;
+    }
+
     public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string
     {
         return '@ChillPerson/Workflow/_evaluation.html.twig';
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
index b6829ab77..142a57229 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
@@ -94,6 +94,19 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
         return null;
     }
 
+    public function getSuggestedUsers(EntityWorkflow $entityWorkflow): array
+    {
+        $suggestedUsers = $entityWorkflow->getUsersInvolved();
+
+        $referrer = $this->getRelatedEntity($entityWorkflow)
+            ->getAccompanyingPeriod()
+            ->getUser();
+
+        $suggestedUsers[$referrer->getId()] = $referrer;
+
+        return $suggestedUsers;
+    }
+
     public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string
     {
         return '@ChillPerson/Workflow/_accompanying_period_work.html.twig';

From 365df4f3babd1a399e769880998e2c4936e25b4e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 17:22:41 +0100
Subject: [PATCH 041/106] [form][controller] pass suggested users on to
 workflow form

---
 .../Controller/WorkflowController.php            | 16 ++++++++++++++--
 .../ChillMainBundle/Form/WorkflowStepType.php    |  2 ++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
index 17b5db75e..0f00a177f 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
@@ -30,6 +30,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\TransitionBlocker;
@@ -48,11 +49,13 @@ class WorkflowController extends AbstractController
 
     private Registry $registry;
 
+    private Security $security;
+
     private TranslatorInterface $translator;
 
     private ValidatorInterface $validator;
 
-    public function __construct(EntityWorkflowManager $entityWorkflowManager, EntityWorkflowRepository $entityWorkflowRepository, ValidatorInterface $validator, PaginatorFactory $paginatorFactory, Registry $registry, EntityManagerInterface $entityManager, TranslatorInterface $translator)
+    public function __construct(EntityWorkflowManager $entityWorkflowManager, EntityWorkflowRepository $entityWorkflowRepository, ValidatorInterface $validator, PaginatorFactory $paginatorFactory, Registry $registry, EntityManagerInterface $entityManager, TranslatorInterface $translator, Security $security)
     {
         $this->entityWorkflowManager = $entityWorkflowManager;
         $this->entityWorkflowRepository = $entityWorkflowRepository;
@@ -61,6 +64,7 @@ class WorkflowController extends AbstractController
         $this->registry = $registry;
         $this->entityManager = $entityManager;
         $this->translator = $translator;
+        $this->security = $security;
     }
 
     /**
@@ -291,10 +295,18 @@ class WorkflowController extends AbstractController
 
         if (count($workflow->getEnabledTransitions($entityWorkflow)) > 0) {
             // possible transition
+
+            $usersInvolved = $entityWorkflow->getUsersInvolved();
+            $currentUserFound = array_search($this->security->getUser(), $usersInvolved, true);
+
+            if (false !== $currentUserFound) {
+                unset($usersInvolved[$currentUserFound]);
+            }
+
             $transitionForm = $this->createForm(
                 WorkflowStepType::class,
                 $entityWorkflow->getCurrentStep(),
-                ['transition' => true, 'entity_workflow' => $entityWorkflow]
+                ['transition' => true, 'entity_workflow' => $entityWorkflow, 'suggested_users' => $usersInvolved]
             );
 
             $transitionForm->handleRequest($request);
diff --git a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
index e01c7d4b6..23f932844 100644
--- a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
+++ b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
@@ -154,6 +154,7 @@ class WorkflowStepType extends AbstractType
                     'label' => 'workflow.dest for next steps',
                     'multiple' => true,
                     'mapped' => false,
+                    'suggested' => $options['suggested_users'],
                 ])
                 ->add('future_dest_emails', ChillCollectionType::class, [
                     'label' => 'workflow.dest by email',
@@ -200,6 +201,7 @@ class WorkflowStepType extends AbstractType
             ->setAllowedTypes('transition', 'bool')
             ->setRequired('entity_workflow')
             ->setAllowedTypes('entity_workflow', EntityWorkflow::class)
+            ->setDefault('suggested_users', [])
             ->setDefault('constraints', [
                 new Callback(
                     function ($step, ExecutionContextInterface $context, $payload) {

From 73af63a2b589e3826538252ad50ab76e49617597 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 17:24:42 +0100
Subject: [PATCH 042/106] [data][twig] pass suggested users to vue component
 through twig template data attribute

---
 .../ChillMainBundle/Resources/views/Form/fields.html.twig     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 15d7625dd..2a9015746 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -249,7 +249,7 @@
 
 {% block pick_entity_dynamic_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-module="pick-dynamic" data-types="{{ form.vars['types']|json_encode }}" data-multiple="{{ form.vars['multiple'] }}" data-uniqid="{{ form.vars['uniqid'] }}"></div>
+    <div data-module="pick-dynamic" data-types="{{ form.vars['types']|json_encode }}" data-multiple="{{ form.vars['multiple'] }}" data-uniqid="{{ form.vars['uniqid'] }}" data-suggested="{{ form.vars['suggested'] }}"></div>
 {% endblock %}
 
 {% block pick_postal_code_widget %}
@@ -269,4 +269,4 @@
             {{ form_errors(form.fixedDate) }}
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From c5fc6d4aadaaa7570ee33e3ca2f2928c38a36cb8 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 17:25:28 +0100
Subject: [PATCH 043/106] [vue][suggested users] add suggested users in vue
 component and write create/remove logic

---
 .../public/module/pick-entity/index.js        |   5 +
 .../public/vuejs/PickEntity/PickEntity.vue    | 105 ++++++++++--------
 2 files changed, 64 insertions(+), 46 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
index 890929c35..bb9cc744c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -23,8 +23,11 @@ function loadDynamicPicker(element) {
                     (input.value === '[]' || input.value === '') ?
                         null : [ JSON.parse(input.value) ]
                 )
+            suggested = null !== JSON.parse(el.dataset.suggested) ? JSON.parse(el.dataset.suggested) : null
         ;
 
+        console.log('suggested', suggested)
+
         if (!isMultiple) {
             if (input.value === '[]'){
                 input.value = null;
@@ -37,6 +40,7 @@ function loadDynamicPicker(element) {
                 ':types="types" ' +
                 ':picked="picked" ' +
                 ':uniqid="uniqid" ' +
+                ':suggested="suggested" ' +
                 '@addNewEntity="addNewEntity" ' +
                 '@removeEntity="removeEntity"></pick-entity>',
             components: {
@@ -48,6 +52,7 @@ function loadDynamicPicker(element) {
                     types: JSON.parse(el.dataset.types),
                     picked: picked === null ? [] : picked,
                     uniqid: el.dataset.uniqid,
+                    suggested: suggested
                 }
             },
             methods: {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index e121ca950..02b53a6d3 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -17,6 +17,9 @@
             </add-persons>
         </li>
     </ul>
+    <ul v-if="suggested !== null" class="list-suggest add-items inline">
+      <li v-for="s in suggested" :key="s.id" @click="addNewSuggested(s)"><span>{{ s.text }}</span></li>
+    </ul>
 </template>
 
 <script>
@@ -49,6 +52,10 @@ export default {
           // display picked entities.
           type: Boolean,
           default: true,
+        },
+        suggested: {
+          type: Array,
+          default: null
         }
     },
     emits: ['addNewEntity', 'removeEntity'],
@@ -61,55 +68,61 @@ export default {
         };
     },
     computed: {
-        addPersonsOptions() {
-            return {
-                uniq: !this.multiple,
-                type: this.types,
-                priority: null,
-                button: {
-                    size: 'btn-sm',
-                    class: 'btn-submit',
-                },
-            };
-        },
-        translatedListOfTypes() {
-            let trans = [];
-            this.types.forEach(t => {
-                if (this.$props.multiple) {
-                    trans.push(appMessages.fr.pick_entity[t].toLowerCase());
-                } else {
-                    trans.push(appMessages.fr.pick_entity[t + '_one'].toLowerCase());
-                }
-            })
+      addPersonsOptions() {
+          return {
+              uniq: !this.multiple,
+              type: this.types,
+              priority: null,
+              button: {
+                  size: 'btn-sm',
+                  class: 'btn-submit',
+              },
+          };
+      },
+      translatedListOfTypes() {
+          let trans = [];
+          this.types.forEach(t => {
+              if (this.$props.multiple) {
+                  trans.push(appMessages.fr.pick_entity[t].toLowerCase());
+              } else {
+                  trans.push(appMessages.fr.pick_entity[t + '_one'].toLowerCase());
+              }
+          })
 
-            if (this.$props.multiple) {
-                return appMessages.fr.pick_entity.modal_title + trans.join(', ');
-            } else {
-                return appMessages.fr.pick_entity.modal_title_one + trans.join(', ');
-            }
-        },
-        listClasses() {
-            return {
-                'list-suggest': true,
-                'remove-items': this.$props.removableIfSet,
-            };
-        },
+          if (this.$props.multiple) {
+              return appMessages.fr.pick_entity.modal_title + trans.join(', ');
+          } else {
+              return appMessages.fr.pick_entity.modal_title_one + trans.join(', ');
+          }
+      },
+      listClasses() {
+          return {
+              'list-suggest': true,
+              'remove-items': this.$props.removableIfSet,
+          };
+      },
     },
     methods: {
-        addNewEntity({ selected, modal }) {
-            selected.forEach((item) => {
-                    this.$emit('addNewEntity', item.result);
-                }, this
-            );
-            this.$refs.addPersons.resetSearch(); // to cast child method
-            modal.showModal = false;
-        },
-        removeEntity(entity) {
-            if (!this.$props.removableIfSet) {
-                return;
-            }
-            this.$emit('removeEntity', entity);
-        }
+      addNewSuggested(entity) {
+        this.$emit('addNewEntity', entity);
+        const indexToRemove = this.suggested.findIndex(e => e.id === entity.id)
+        this.suggested.splice(indexToRemove, 1);
+      },
+      addNewEntity({ selected, modal }) {
+          selected.forEach((item) => {
+                  this.$emit('addNewEntity', item.result);
+              }, this
+          );
+          this.$refs.addPersons.resetSearch(); // to cast child method
+          modal.showModal = false;
+      },
+      removeEntity(entity) {
+          if (!this.$props.removableIfSet) {
+              return;
+          }
+          this.$emit('removeEntity', entity);
+          this.suggested.push(entity);
+      }
     },
 }
 </script>

From a16244a3f59f1bf9a12c7e823d3bd728d314755e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Feb 2023 15:25:47 +0000
Subject: [PATCH 044/106] Feature: [docgen] generate documents in an async
 queue

The documents are now generated in a queue, using symfony messenger. This queue should be configured:

```yaml
# app/config/messenger.yaml
framework:
    messenger:
        # reset services after consuming messages
        # reset_on_message: true

        failure_transport: failed

        transports:
            # https://symfony.com/doc/current/messenger.html#transport-configuration
            async: '%env(MESSENGER_TRANSPORT_DSN)%'
            priority:
                dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
            failed: 'doctrine://default?queue_name=failed'

        routing:
            # ... other messages
            'Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage': priority
```

`StoredObject`s now have additionnal properties:

* status (pending, failure, ready (by default) ), which explain if the document is generated;
* a generationTrialCounter, which is incremented on each generation trial, which prevent each generation more than 5 times;

The generator computation is moved from the `DocGenTemplateController` to a `Generator` (implementing `GeneratorInterface`.

There are new methods to `Context` which allow to normalize/denormalize context data to/from a messenger's `Message`.
---
 .../Service/DocGenerator/ActivityContext.php  |  31 ++++
 ...tActivitiesByAccompanyingPeriodContext.php |  10 ++
 .../Service/DocGenerator/CalendarContext.php  |  10 ++
 .../DocGenerator/CalendarContextInterface.php |   4 +
 ...eneratorContextWithPublicFormInterface.php |  13 ++
 .../DocGeneratorTemplateController.php        | 144 ++++++----------
 .../Email/on_generation_failed_email.txt.twig |  16 ++
 .../Service/Generator/Generator.php           |  73 ++++----
 .../Service/Generator/GeneratorException.php  |   8 +
 .../Service/Generator/GeneratorInterface.php  |  27 +++
 .../Service/Messenger/OnGenerationFails.php   | 156 ++++++++++++++++++
 .../Messenger/RequestGenerationHandler.php    |  66 ++++++++
 .../Messenger/RequestGenerationMessage.php    |  26 ++-
 .../config/services.yaml                      |  16 +-
 .../migrations/Version20230214192558.php      |  47 ++++++
 .../Context/Generator/GeneratorTest.php       |  19 ++-
 .../translations/messages.fr.yml              |  12 +-
 .../Controller/StoredObjectApiController.php  |  39 +++++
 .../Entity/StoredObject.php                   |  62 ++++++-
 .../document_action_buttons_group/index.ts    |  20 ++-
 .../Resources/public/types.ts                 |  12 +-
 .../vuejs/DocumentActionButtonsGroup.vue      |  66 +++++++-
 .../vuejs/StoredObjectButton/helpers.ts       |  14 ++
 .../delete.html.twig                          |   5 -
 .../Resources/views/List/list_item.html.twig  |  17 +-
 .../migrations/Version20230227161327.php      |  26 +++
 .../Phonenumber/PhonenumberHelper.php         |  10 +-
 .../components/FormEvaluation.vue             |   5 +
 .../vuejs/AccompanyingCourseWorkEdit/store.js |  17 +-
 .../AccompanyingPeriodContext.php             |  30 ++++
 .../AccompanyingPeriodWorkContext.php         |  21 ++-
 ...ccompanyingPeriodWorkEvaluationContext.php |  12 ++
 .../Service/DocGenerator/PersonContext.php    |  38 +++++
 .../DocGenerator/PersonContextInterface.php   |   4 +
 .../PersonContextWithThirdParty.php           |  27 ++-
 .../ChillWopiBundle/chill.webpack.config.js   |   5 +-
 .../ChillWopiBundle/src/Controller/Editor.php |  28 ++++
 .../Resources/public/module/pending/index.ts  |  40 +++++
 .../Editor/stored_object_failure.html.twig    |  15 ++
 .../Editor/stored_object_pending.html.twig    |  36 ++++
 40 files changed, 1050 insertions(+), 177 deletions(-)
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Resources/views/Email/on_generation_failed_email.txt.twig
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php
 create mode 100644 src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php
 create mode 100644 src/Bundle/ChillDocStoreBundle/migrations/Version20230227161327.php
 create mode 100644 src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts
 create mode 100644 src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig
 create mode 100644 src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_pending.html.twig

diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index 4e2970138..ac832b34b 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -22,6 +22,7 @@ use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -45,6 +46,8 @@ class ActivityContext implements
 
     private PersonRenderInterface $personRender;
 
+    private PersonRepository $personRepository;
+
     private TranslatableStringHelperInterface $translatableStringHelper;
 
     private TranslatorInterface $translator;
@@ -55,6 +58,7 @@ class ActivityContext implements
         TranslatableStringHelperInterface $translatableStringHelper,
         EntityManagerInterface $em,
         PersonRenderInterface $personRender,
+        PersonRepository $personRepository,
         TranslatorInterface $translator,
         BaseContextData $baseContextData
     ) {
@@ -63,6 +67,7 @@ class ActivityContext implements
         $this->translatableStringHelper = $translatableStringHelper;
         $this->em = $em;
         $this->personRender = $personRender;
+        $this->personRepository = $personRepository;
         $this->translator = $translator;
         $this->baseContextData = $baseContextData;
     }
@@ -206,6 +211,32 @@ class ActivityContext implements
         return $options['mainPerson'] || $options['person1'] || $options['person2'];
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $normalized = [];
+
+        foreach (['mainPerson', 'person1', 'person2'] as $k) {
+            $normalized[$k] = null === $data[$k] ? null : $data[$k]->getId();
+        }
+
+        return $normalized;
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $denormalized = [];
+
+        foreach (['mainPerson', 'person1', 'person2'] as $k) {
+            if (null !== ($id = ($data[$k] ?? null))) {
+                $denormalized[$k] = $this->personRepository->find($id);
+            } else {
+                $denormalized[$k] = null;
+            }
+        }
+
+        return $denormalized;
+    }
+
     /**
      * @param Activity $entity
      */
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
index 3189307f9..7e1873710 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
@@ -146,6 +146,16 @@ class ListActivitiesByAccompanyingPeriodContext implements
         return $this->accompanyingPeriodContext->hasPublicForm($template, $entity);
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return $this->accompanyingPeriodContext->contextGenerationDataNormalize($template, $entity, $data);
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return $this->accompanyingPeriodContext->contextGenerationDataDenormalize($template, $entity, $data);
+    }
+
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $this->accompanyingPeriodContext->storeGenerated($template, $storedObject, $entity, $contextGenerationData);
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
index 9ba9e36b4..4984c359a 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
@@ -226,6 +226,16 @@ final class CalendarContext implements CalendarContextInterface
         return true;
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormTransform() method.
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        // TODO: Implement publicFormReverseTransform() method.
+    }
+
     /**
      * @param array{mainPerson?: Person, thirdParty?: ThirdParty, title: string} $contextGenerationData
      */
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
index d02cdc2c2..eeef3b417 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
@@ -56,6 +56,10 @@ interface CalendarContextInterface extends DocGeneratorContextWithPublicFormInte
      */
     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array;
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array;
+
     /**
      * @param Calendar $entity
      */
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
index f013c8435..4f58bd049 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
@@ -23,6 +23,9 @@ interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContext
      */
     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void;
 
+    /**
+     * Fill the form with initial data
+     */
     public function getFormData(DocGeneratorTemplate $template, $entity): array;
 
     /**
@@ -31,4 +34,14 @@ interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContext
      * @param mixed $entity
      */
     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
+
+    /**
+     * Transform the data from the form into serializable data, storable into messenger's message
+     */
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array;
+
+    /**
+     * Reverse the data from the messenger's message into data usable for doc's generation
+     */
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array;
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index d618f758a..6f153acd8 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -16,67 +16,57 @@ use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
-use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
 use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use Chill\DocGeneratorBundle\Service\Generator\GeneratorInterface;
+use Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Doctrine\ORM\EntityManagerInterface;
-use Exception;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
-use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 // TODO à mettre dans services
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use Throwable;
 use function strlen;
 
 final class DocGeneratorTemplateController extends AbstractController
 {
-    private HttpClientInterface $client;
-
     private ContextManager $contextManager;
 
     private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
 
-    private DriverInterface $driver;
-
     private EntityManagerInterface $entityManager;
 
-    private LoggerInterface $logger;
+    private GeneratorInterface $generator;
+
+    private MessageBusInterface $messageBus;
 
     private PaginatorFactory $paginatorFactory;
 
-    private StoredObjectManagerInterface $storedObjectManager;
-
     public function __construct(
         ContextManager $contextManager,
         DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
-        DriverInterface $driver,
-        LoggerInterface $logger,
+        GeneratorInterface $generator,
+        MessageBusInterface $messageBus,
         PaginatorFactory $paginatorFactory,
-        HttpClientInterface $client,
-        StoredObjectManagerInterface $storedObjectManager,
         EntityManagerInterface $entityManager
     ) {
         $this->contextManager = $contextManager;
         $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
-        $this->driver = $driver;
-        $this->logger = $logger;
+        $this->generator = $generator;
+        $this->messageBus = $messageBus;
         $this->paginatorFactory = $paginatorFactory;
-        $this->client = $client;
-        $this->storedObjectManager = $storedObjectManager;
         $this->entityManager = $entityManager;
     }
 
@@ -94,7 +84,6 @@ final class DocGeneratorTemplateController extends AbstractController
     ): Response {
         return $this->generateDocFromTemplate(
             $template,
-            $entityClassName,
             $entityId,
             $request,
             true
@@ -115,7 +104,6 @@ final class DocGeneratorTemplateController extends AbstractController
     ): Response {
         return $this->generateDocFromTemplate(
             $template,
-            $entityClassName,
             $entityId,
             $request,
             false
@@ -185,7 +173,6 @@ final class DocGeneratorTemplateController extends AbstractController
 
     private function generateDocFromTemplate(
         DocGeneratorTemplate $template,
-        string $entityClassName,
         int $entityId,
         Request $request,
         bool $isTest
@@ -206,7 +193,7 @@ final class DocGeneratorTemplateController extends AbstractController
 
         if (null === $entity) {
             throw new NotFoundHttpException(
-                sprintf('Entity with classname %s and id %s is not found', $entityClassName, $entityId)
+                sprintf('Entity with classname %s and id %s is not found', $context->getEntityClass(), $entityId)
             );
         }
 
@@ -259,99 +246,68 @@ final class DocGeneratorTemplateController extends AbstractController
             }
         }
 
-        $document = $template->getFile();
-
-        if ($isTest && ($contextGenerationData['test_file'] instanceof File)) {
-            $dataDecrypted = file_get_contents($contextGenerationData['test_file']->getPathname());
-        } else {
-            try {
-                $dataDecrypted = $this->storedObjectManager->read($document);
-            } catch (Throwable $exception) {
-                throw $exception;
-            }
-        }
+        // transform context generation data
+        $contextGenerationDataSanitized =
+            $context instanceof DocGeneratorContextWithPublicFormInterface ?
+                $context->contextGenerationDataNormalize($template, $entity, $contextGenerationData)
+                : [];
 
+        // if is test, render the data or generate the doc
         if ($isTest && isset($form) && $form['show_data']->getData()) {
             return $this->render('@ChillDocGenerator/Generator/debug_value.html.twig', [
                 'datas' => json_encode($context->getData($template, $entity, $contextGenerationData), JSON_PRETTY_PRINT)
             ]);
-        }
-
-        try {
-            $generatedResource = $this
-                ->driver
-                ->generateFromString(
-                    $dataDecrypted,
-                    $template->getFile()->getType(),
-                    $context->getData($template, $entity, $contextGenerationData),
-                    $template->getFile()->getFilename()
-                );
-        } catch (TemplateException $e) {
-            return new Response(
-                implode("\n", $e->getErrors()),
-                400,
-                [
-                    'Content-Type' => 'text/plain',
-                ]
+        } elseif ($isTest) {
+            $generated = $this->generator->generateDocFromTemplate(
+                $template,
+                $entityId,
+                $contextGenerationDataSanitized,
+                null,
+                true,
+                isset($form) ? $form['test_file']->getData() : null
             );
-        }
 
-        if ($isTest) {
             return new Response(
-                $generatedResource,
+                $generated,
                 Response::HTTP_OK,
                 [
                     'Content-Transfer-Encoding', 'binary',
                     'Content-Type' => 'application/vnd.oasis.opendocument.text',
                     'Content-Disposition' => 'attachment; filename="generated.odt"',
-                    'Content-Length' => strlen($generatedResource),
+                    'Content-Length' => strlen($generated),
                 ],
             );
         }
 
-        /** @var StoredObject $storedObject */
-        $storedObject = (new ObjectNormalizer())
-            ->denormalize(
-                [
-                    'type' => $template->getFile()->getType(),
-                    'filename' => sprintf('%s_odt', uniqid('doc_', true)),
-                ],
-                StoredObject::class
-            );
-
-        try {
-            $this->storedObjectManager->write($storedObject, $generatedResource);
-        } catch (Throwable $exception) {
-            throw $exception;
-        }
+        // this is not a test
+        // we prepare the object to store the document
+        $storedObject = (new StoredObject())
+            ->setStatus(StoredObject::STATUS_PENDING)
+            ;
 
         $this->entityManager->persist($storedObject);
 
-        try {
-            $context
-                ->storeGenerated(
-                    $template,
-                    $storedObject,
-                    $entity,
-                    $contextGenerationData
-                );
-        } catch (Exception $e) {
-            $this
-                ->logger
-                ->error(
-                    'Unable to store the associated document to entity',
-                    [
-                        'entityClassName' => $entityClassName,
-                        'entityId' => $entityId,
-                        'contextKey' => $context->getName(),
-                    ]
-                );
-
-            throw $e;
-        }
+        // we store the generated document
+        $context
+            ->storeGenerated(
+                $template,
+                $storedObject,
+                $entity,
+                $contextGenerationData
+            );
 
         $this->entityManager->flush();
 
+        $this->messageBus->dispatch(
+            new RequestGenerationMessage(
+                $this->getUser(),
+                $template,
+                $entityId,
+                $storedObject,
+                $contextGenerationDataSanitized,
+            )
+        );
+
         return $this
             ->redirectToRoute(
                 'chill_wopi_file_edit',
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Email/on_generation_failed_email.txt.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Email/on_generation_failed_email.txt.twig
new file mode 100644
index 000000000..c4ca7079d
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Email/on_generation_failed_email.txt.twig
@@ -0,0 +1,16 @@
+{{ creator.label }},
+
+{{ 'docgen.failure_email.The generation of the document {template_name} failed'|trans({'{template_name}': template.name|localize_translatable_string}) }}
+
+{{ 'docgen.failure_email.Forward this email to your administrator for solving'|trans }}
+
+{{ 'docgen.failure_email.References'|trans }}:
+{% if errors|length > 0 %}
+{{ 'docgen.failure_email.The following errors were encoutered'|trans }}:
+
+{% for error in errors %}
+- {{ error }}
+{% endfor %}
+{% endif %}
+- template_id: {{ template.id }}
+- stored_object_destination_id: {{ stored_object_id }}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
index 755e608ba..0775cfb49 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
@@ -3,6 +3,7 @@
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
 use Chill\DocGeneratorBundle\Context\ContextManagerInterface;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
 use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
@@ -12,7 +13,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\File\File;
 
-class Generator
+class Generator implements GeneratorInterface
 {
     private ContextManagerInterface $contextManager;
 
@@ -24,6 +25,8 @@ class Generator
 
     private StoredObjectManagerInterface $storedObjectManager;
 
+    private const LOG_PREFIX = '[docgen generator] ';
+
     public function __construct(
         ContextManagerInterface $contextManager,
         DriverInterface $driver,
@@ -48,18 +51,23 @@ class Generator
      */
     public function generateDocFromTemplate(
         DocGeneratorTemplate $template,
-        string               $entityClassName,
         int                  $entityId,
+        array                $contextGenerationDataNormalized,
         ?StoredObject        $destinationStoredObject = null,
         bool                 $isTest = false,
         ?File                $testFile = null
     ): ?string {
         if ($destinationStoredObject instanceof StoredObject && StoredObject::STATUS_PENDING !== $destinationStoredObject->getStatus()) {
+            $this->logger->info(self::LOG_PREFIX.'Aborting generation of an already generated document');
             throw new ObjectReadyException();
         }
 
+        $this->logger->info(self::LOG_PREFIX.'Starting generation of a document', [
+            'entity_id' => $entityId,
+            'destination_stored_object' => $destinationStoredObject === null ? null : $destinationStoredObject->getId()
+        ]);
+
         $context = $this->contextManager->getContextByDocGeneratorTemplate($template);
-        $contextGenerationData = ['test_file' => $testFile];
 
         $entity = $this
             ->entityManager
@@ -67,22 +75,38 @@ class Generator
             ;
 
         if (null === $entity) {
-            throw new RelatedEntityNotFoundException($entityClassName, $entityId);
+            throw new RelatedEntityNotFoundException($template->getEntity(), $entityId);
+        }
+
+        $contextGenerationDataNormalized = array_merge(
+            $contextGenerationDataNormalized,
+                $context instanceof DocGeneratorContextWithPublicFormInterface ?
+                    $context->contextGenerationDataDenormalize($template, $entity, $contextGenerationDataNormalized)
+                    : []
+        );
+
+        $data = $context->getData($template, $entity, $contextGenerationDataNormalized);
+
+        $destinationStoredObjectId = $destinationStoredObject instanceof StoredObject ? $destinationStoredObject->getId() : null;
+        $this->entityManager->clear();
+        gc_collect_cycles();
+        if (null !== $destinationStoredObjectId) {
+            $destinationStoredObject = $this->entityManager->find(StoredObject::class, $destinationStoredObjectId);
         }
 
         if ($isTest && ($testFile instanceof File)) {
-            $dataDecrypted = file_get_contents($testFile->getPathname());
+            $templateDecrypted = file_get_contents($testFile->getPathname());
         } else {
-            $dataDecrypted = $this->storedObjectManager->read($template->getFile());
+            $templateDecrypted = $this->storedObjectManager->read($template->getFile());
         }
 
         try {
             $generatedResource = $this
                 ->driver
                 ->generateFromString(
-                    $dataDecrypted,
+                    $templateDecrypted,
                     $template->getFile()->getType(),
-                    $context->getData($template, $entity, $contextGenerationData),
+                    $data,
                     $template->getFile()->getFilename()
                 );
         } catch (TemplateException $e) {
@@ -90,6 +114,11 @@ class Generator
         }
 
         if ($isTest) {
+            $this->logger->info(self::LOG_PREFIX.'Finished generation of a document', [
+                'is_test' => true,
+                'entity_id' => $entityId,
+                'destination_stored_object' => $destinationStoredObject === null ? null : $destinationStoredObject->getId()
+            ]);
             return $generatedResource;
         }
 
@@ -102,31 +131,13 @@ class Generator
 
         $this->storedObjectManager->write($destinationStoredObject, $generatedResource);
 
-        try {
-            $context
-                ->storeGenerated(
-                    $template,
-                    $destinationStoredObject,
-                    $entity,
-                    $contextGenerationData
-                );
-        } catch (\Exception $e) {
-            $this
-                ->logger
-                ->error(
-                    'Unable to store the associated document to entity',
-                    [
-                        'entityClassName' => $entityClassName,
-                        'entityId' => $entityId,
-                        'contextKey' => $context->getName(),
-                    ]
-                );
-
-            throw $e;
-        }
-
         $this->entityManager->flush();
 
+        $this->logger->info(self::LOG_PREFIX.'Finished generation of a document', [
+            'entity_id' => $entityId,
+            'destination_stored_object' => $destinationStoredObject->getId(),
+        ]);
+
         return null;
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
index 423d59dd4..0f3412859 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
@@ -15,4 +15,12 @@ class GeneratorException extends \RuntimeException
         parent::__construct("Could not generate the document", 15252,
             $previous);
     }
+
+    /**
+     * @return array
+     */
+    public function getErrors(): array
+    {
+        return $this->errors;
+    }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
new file mode 100644
index 000000000..385e1d010
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Service\Generator;
+
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Symfony\Component\HttpFoundation\File\File;
+
+interface GeneratorInterface
+{
+    /**
+     * @template T of File|null
+     * @template B of bool
+     * @param B $isTest
+     * @param (B is true ? T : null) $testFile
+     * @psalm-return (B is true ? string : null)
+     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface|\Throwable
+     */
+    public function generateDocFromTemplate(
+        DocGeneratorTemplate $template,
+        int                  $entityId,
+        array                $contextGenerationDataNormalized,
+        ?StoredObject        $destinationStoredObject = null,
+        bool                 $isTest = false,
+        ?File                $testFile = null
+    ): ?string;
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
new file mode 100644
index 000000000..e3b91d7e4
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Service\Messenger;
+
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use Chill\DocGeneratorBundle\Service\Generator\GeneratorException;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Repository\StoredObjectRepository;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Bridge\Twig\Mime\TemplatedEmail;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final class OnGenerationFails implements EventSubscriberInterface
+{
+    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
+
+    private EntityManagerInterface $entityManager;
+
+    private LoggerInterface $logger;
+
+    private MailerInterface $mailer;
+
+    private StoredObjectRepository $storedObjectRepository;
+
+    private TranslatorInterface $translator;
+
+    private UserRepositoryInterface $userRepository;
+
+    const LOG_PREFIX = '[docgen failed] ';
+
+    /**
+     * @param DocGeneratorTemplateRepository $docGeneratorTemplateRepository
+     * @param EntityManagerInterface $entityManager
+     * @param LoggerInterface $logger
+     * @param MailerInterface $mailer
+     * @param StoredObjectRepository $storedObjectRepository
+     * @param TranslatorInterface $translator
+     * @param UserRepositoryInterface $userRepository
+     */
+    public function __construct(
+        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
+        EntityManagerInterface $entityManager,
+        LoggerInterface $logger,
+        MailerInterface $mailer,
+        StoredObjectRepository $storedObjectRepository,
+        TranslatorInterface $translator,
+        UserRepositoryInterface $userRepository
+    ) {
+        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
+        $this->entityManager = $entityManager;
+        $this->logger = $logger;
+        $this->mailer = $mailer;
+        $this->storedObjectRepository = $storedObjectRepository;
+        $this->translator = $translator;
+        $this->userRepository = $userRepository;
+    }
+
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            WorkerMessageFailedEvent::class => 'onMessageFailed'
+        ];
+    }
+
+    public function onMessageFailed(WorkerMessageFailedEvent $event): void
+    {
+        if ($event->willRetry()) {
+            return;
+        }
+
+        if (!$event->getEnvelope()->getMessage() instanceof RequestGenerationMessage) {
+            return;
+        }
+
+        /** @var \Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage $message */
+        $message = $event->getEnvelope()->getMessage();
+
+        $this->logger->error(self::LOG_PREFIX.'Docgen failed', [
+            'stored_object_id' => $message->getDestinationStoredObjectId(),
+            'entity_id' => $message->getEntityId(),
+            'template_id' => $message->getTemplateId(),
+            'creator_id' => $message->getCreatorId(),
+            'throwable_class' => get_class($event->getThrowable()),
+        ]);
+
+        $this->markObjectAsFailed($message);
+        $this->warnCreator($message, $event);
+    }
+
+    private function markObjectAsFailed(RequestGenerationMessage $message): void
+    {
+        $object = $this->storedObjectRepository->find($message->getDestinationStoredObjectId());
+
+        if (null === $object) {
+            $this->logger->error(self::LOG_PREFIX.'Stored object not found', ['stored_object_id', $message->getDestinationStoredObjectId()]);
+        }
+
+        $object->setStatus(StoredObject::STATUS_FAILURE);
+
+        $this->entityManager->flush();
+    }
+
+    private function warnCreator(RequestGenerationMessage $message, WorkerMessageFailedEvent $event): void
+    {
+        if (null === $creatorId = $message->getCreatorId()) {
+            $this->logger->info(self::LOG_PREFIX.'creator id is null');
+            return;
+        }
+
+        if (null === $creator = $this->userRepository->find($creatorId)) {
+            $this->logger->error(self::LOG_PREFIX.'Creator not found with given id', ['creator_id', $creatorId]);
+            return;
+        }
+
+        if (null === $creator->getEmail() || '' === $creator->getEmail()) {
+            $this->logger->info(self::LOG_PREFIX.'Creator does not have any email', ['user' => $creator->getUsernameCanonical()]);
+            return;
+        }
+
+        // if the exception is not a GeneratorException, we try the previous one...
+        $throwable = $event->getThrowable();
+        if (!$throwable instanceof GeneratorException) {
+            $throwable = $throwable->getPrevious();
+        }
+
+        if ($throwable instanceof GeneratorException) {
+            $errors = $throwable->getErrors();
+        } else {
+            $errors = [$throwable->getTraceAsString()];
+        }
+
+        if (null === $template = $this->docGeneratorTemplateRepository->find($message->getTemplateId())) {
+            $this->logger->info(self::LOG_PREFIX.'Template not found', ['template_id' => $message->getTemplateId()]);
+            return;
+        }
+
+        $email = (new TemplatedEmail())
+            ->to($creator->getEmail())
+            ->subject($this->translator->trans('docgen.failure_email.The generation of a document failed'))
+            ->textTemplate('@ChillDocGenerator/Email/on_generation_failed_email.txt.twig')
+            ->context([
+                'errors' => $errors,
+                'template' => $template,
+                'creator' => $creator,
+                'stored_object_id' => $message->getDestinationStoredObjectId(),
+            ]);
+
+        $this->mailer->send($email);
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
new file mode 100644
index 000000000..981a3dde7
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Service\Messenger;
+
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use Chill\DocGeneratorBundle\Service\Generator\Generator;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Repository\StoredObjectRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+
+/**
+ * Handle the request of document generation
+ */
+class RequestGenerationHandler implements MessageHandlerInterface
+{
+    private StoredObjectRepository $storedObjectRepository;
+
+    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
+
+    private EntityManagerInterface $entityManager;
+
+    private Generator $generator;
+
+    public const AUTHORIZED_TRIALS = 5;
+
+    public function __construct(
+        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
+        EntityManagerInterface $entityManager,
+        Generator $generator,
+        StoredObjectRepository $storedObjectRepository,
+    ) {
+        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
+        $this->entityManager = $entityManager;
+        $this->generator = $generator;
+        $this->storedObjectRepository = $storedObjectRepository;
+    }
+
+    public function __invoke(RequestGenerationMessage $message)
+    {
+        if (null === $template = $this->docGeneratorTemplateRepository->find($message->getTemplateId())) {
+            throw new \RuntimeException('template not found: ' . $message->getTemplateId());
+        }
+
+        if (null === $destinationStoredObject = $this->storedObjectRepository->find($message->getDestinationStoredObjectId())) {
+            throw new \RuntimeException('destination stored object not found : ' . $message->getDestinationStoredObjectId());
+        }
+
+        if ($destinationStoredObject->getGenerationTrialsCounter() >= self::AUTHORIZED_TRIALS) {
+            throw new UnrecoverableMessageHandlingException('maximum number of retry reached');
+        }
+
+        $destinationStoredObject->addGenerationTrial();
+        $this->entityManager->createQuery('UPDATE '.StoredObject::class.' s SET s.generationTrialsCounter = s.generationTrialsCounter + 1 WHERE s.id = :id')
+            ->setParameter('id', $destinationStoredObject->getId())
+            ->execute();
+
+        $this->generator->generateDocFromTemplate(
+            $template,
+            $message->getEntityId(),
+            $message->getContextGenerationData(),
+            $destinationStoredObject
+        );
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
index 1489e2686..edba90ce4 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
@@ -3,6 +3,7 @@
 namespace Chill\DocGeneratorBundle\Service\Messenger;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\User;
 
 class RequestGenerationMessage
@@ -13,14 +14,22 @@ class RequestGenerationMessage
 
    private int $entityId;
 
-   private string $entityClassName;
+   private int $destinationStoredObjectId;
 
-    public function __construct(User $creator, DocGeneratorTemplate $template, int $entityId, string $entityClassName)
-    {
+   private array $contextGenerationData;
+
+    public function __construct(
+        User $creator,
+        DocGeneratorTemplate $template,
+        int $entityId,
+        StoredObject $destinationStoredObject,
+        array $contextGenerationData
+    ) {
         $this->creatorId = $creator->getId();
         $this->templateId = $template->getId();
         $this->entityId = $entityId;
-        $this->entityClassName = $entityClassName;
+        $this->destinationStoredObjectId = $destinationStoredObject->getId();
+        $this->contextGenerationData = $contextGenerationData;
     }
 
     public function getCreatorId(): int
@@ -28,6 +37,11 @@ class RequestGenerationMessage
         return $this->creatorId;
     }
 
+    public function getDestinationStoredObjectId(): int
+    {
+        return $this->destinationStoredObjectId;
+    }
+
     public function getTemplateId(): int
     {
         return $this->templateId;
@@ -38,8 +52,8 @@ class RequestGenerationMessage
         return $this->entityId;
     }
 
-    public function getEntityClassName(): string
+    public function getContextGenerationData(): array
     {
-        return $this->entityClassName;
+        return $this->contextGenerationData;
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/config/services.yaml b/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
index 5bdfe2a11..5fef6fb22 100644
--- a/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
+++ b/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
@@ -20,10 +20,14 @@ services:
         resource: '../Serializer/Normalizer/'
         tags:
             - { name: 'serializer.normalizer', priority: -152 }
+
     Chill\DocGeneratorBundle\Serializer\Normalizer\CollectionDocGenNormalizer:
         tags:
             - { name: 'serializer.normalizer', priority: -126 }
 
+    Chill\DocGeneratorBundle\Service\Context\:
+        resource: "../Service/Context"
+
     Chill\DocGeneratorBundle\Controller\:
         resource: "../Controller"
         autowire: true
@@ -34,18 +38,20 @@ services:
         autowire: true
         autoconfigure: true
 
-    Chill\DocGeneratorBundle\Service\Context\:
-        resource: "../Service/Context/"
-        autowire: true
-        autoconfigure: true
-
     Chill\DocGeneratorBundle\GeneratorDriver\:
         resource: "../GeneratorDriver/"
         autowire: true
         autoconfigure: true
 
+    Chill\DocGeneratorBundle\Service\Messenger\:
+        resource: "../Service/Messenger/"
+
+    Chill\DocGeneratorBundle\Service\Generator\Generator: ~
+    Chill\DocGeneratorBundle\Service\Generator\GeneratorInterface: '@Chill\DocGeneratorBundle\Service\Generator\Generator'
+
     Chill\DocGeneratorBundle\Driver\RelatorioDriver: '@Chill\DocGeneratorBundle\Driver\DriverInterface'
 
     Chill\DocGeneratorBundle\Context\ContextManager:
         arguments:
             $contexts: !tagged_iterator { tag: chill_docgen.context, default_index_method: getKey }
+    Chill\DocGeneratorBundle\Context\ContextManagerInterface: '@Chill\DocGeneratorBundle\Context\ContextManager'
diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php
new file mode 100644
index 000000000..de536ca84
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20230214192558.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\DocGenerator;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230214192558 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add status, template_id and fix defaults on chill_doc.stored_object';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD template_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD status TEXT DEFAULT \'ready\' NOT NULL');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('UPDATE chill_doc.stored_object SET createdAt = creation_date');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD createdBy_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP creation_date;');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER type SET DEFAULT \'\'');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER title DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_doc.stored_object.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD CONSTRAINT FK_49604E365DA0FB8 FOREIGN KEY (template_id) REFERENCES chill_docgen_template (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD CONSTRAINT FK_49604E363174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_49604E365DA0FB8 ON chill_doc.stored_object (template_id)');
+        $this->addSql('CREATE INDEX IDX_49604E363174800F ON chill_doc.stored_object (createdBy_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP CONSTRAINT FK_49604E365DA0FB8');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP CONSTRAINT FK_49604E363174800F');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP template_id');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP status');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD creation_date TIMESTAMP(0) DEFAULT NOW()');
+        $this->addSql('UPDATE chill_doc.stored_object SET creation_date = createdAt');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP createdAt');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP createdBy_id');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER title SET DEFAULT \'\'');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER type DROP DEFAULT');
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
index 2e68b443c..066715b60 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
@@ -26,13 +26,14 @@ class GeneratorTest extends TestCase
         $template = (new DocGeneratorTemplate())->setFile($templateStoredObject = (new StoredObject())
             ->setType('application/test'));
         $destinationStoredObject = (new StoredObject())->setStatus(StoredObject::STATUS_PENDING);
+        $reflection = new \ReflectionClass($destinationStoredObject);
+        $reflection->getProperty('id')->setAccessible(true);
+        $reflection->getProperty('id')->setValue($destinationStoredObject, 1);
         $entity = new class {};
         $data = [];
 
         $context = $this->prophesize(DocGeneratorContextInterface::class);
         $context->getData($template, $entity, Argument::type('array'))->willReturn($data);
-        $context->storeGenerated($template, $destinationStoredObject, $entity, Argument::type('array'))
-            ->shouldBeCalled();
         $context->getName()->willReturn('dummy_context');
         $context->getEntityClass()->willReturn('DummyClass');
         $context = $context->reveal();
@@ -46,8 +47,11 @@ class GeneratorTest extends TestCase
             ->willReturn('generated');
 
         $entityManager = $this->prophesize(EntityManagerInterface::class);
-        $entityManager->find(Argument::type('string'), Argument::type('int'))
+        $entityManager->find(StoredObject::class, 1)
+            ->willReturn($destinationStoredObject);
+        $entityManager->find('DummyClass', Argument::type('int'))
             ->willReturn($entity);
+        $entityManager->clear()->shouldBeCalled();
         $entityManager->flush()->shouldBeCalled();
 
         $storedObjectManager = $this->prophesize(StoredObjectManagerInterface::class);
@@ -65,8 +69,8 @@ class GeneratorTest extends TestCase
 
         $generator->generateDocFromTemplate(
             $template,
-            'DummyEntity',
             1,
+            [],
             $destinationStoredObject
         );
     }
@@ -89,8 +93,8 @@ class GeneratorTest extends TestCase
 
         $generator->generateDocFromTemplate(
             $template,
-            'DummyEntity',
             1,
+            [],
             $destinationStoredObject
         );
     }
@@ -102,6 +106,9 @@ class GeneratorTest extends TestCase
         $template = (new DocGeneratorTemplate())->setFile($templateStoredObject = (new StoredObject())
             ->setType('application/test'));
         $destinationStoredObject = (new StoredObject())->setStatus(StoredObject::STATUS_PENDING);
+        $reflection = new \ReflectionClass($destinationStoredObject);
+        $reflection->getProperty('id')->setAccessible(true);
+        $reflection->getProperty('id')->setValue($destinationStoredObject, 1);
 
         $context = $this->prophesize(DocGeneratorContextInterface::class);
         $context->getName()->willReturn('dummy_context');
@@ -126,8 +133,8 @@ class GeneratorTest extends TestCase
 
         $generator->generateDocFromTemplate(
             $template,
-            'DummyEntity',
             1,
+            [],
             $destinationStoredObject
         );
     }
diff --git a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
index bf37ff838..d0950482e 100644
--- a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
@@ -10,6 +10,16 @@ docgen:
     test generate: Tester la génération
     With context %name%: 'Avec le contexte "%name%"'
 
+    Doc generation failed: La génération de ce document a échoué
+    Doc generation is pending: La génération de ce document est en cours
+    Come back later: Revenir plus tard
+
+    failure_email:
+        The generation of a document failed: La génération d'un document a échoué
+        The generation of the document {template_name} failed: La génération d'un document à partir du modèle {{ template_name }} a échoué.
+        The following errors were encoutered: Les erreurs suivantes ont été rencontrées
+        Forward this email to your administrator for solving: Faites suivre ce message vers votre administrateur pour la résolution du problème.
+        References: Références
 
 crud:
     docgen_template:
@@ -19,4 +29,4 @@ crud:
 
 
 Show data instead of generating: Montrer les données au lieu de générer le document
-Template file: Fichier modèle
\ No newline at end of file
+Template file: Fichier modèle
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php
new file mode 100644
index 000000000..29b978ffb
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Chill\DocStoreBundle\Controller;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+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;
+
+class StoredObjectApiController
+{
+    private Security $security;
+
+    public function __construct(Security $security)
+    {
+        $this->security = $security;
+    }
+
+    /**
+     * @Route("/api/1.0/doc-store/stored-object/{uuid}/is-ready")
+     */
+    public function isDocumentReady(StoredObject $storedObject): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException();
+        }
+
+        return new JsonResponse(
+            [
+                'id' => $storedObject->getId(),
+                'filename' => $storedObject->getFilename(),
+                'status' => $storedObject->getStatus(),
+                'type' => $storedObject->getType(),
+            ]
+        );
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index 21abc1f56..8821ead7c 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -41,12 +41,6 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     use TrackCreationTrait;
 
-    /**
-     * @ORM\Column(type="datetime", name="creation_date")
-     * @Serializer\Groups({"read", "write"})
-     */
-    private DateTimeInterface $creationDate;
-
     /**
      * @ORM\Column(type="json", name="datas")
      * @Serializer\Groups({"read", "write"})
@@ -87,7 +81,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
     private string $title = '';
 
     /**
-     * @ORM\Column(type="text", name="type")
+     * @ORM\Column(type="text", name="type", options={"default": ""})
      * @Serializer\Groups({"read", "write"})
      */
     private string $type = '';
@@ -105,9 +99,20 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     /**
      * @ORM\Column(type="text", options={"default": "ready"})
+     * @Serializer\Groups({"read"})
      */
     private string $status;
 
+    /**
+     * Store the number of times a generation has been tryied for this StoredObject.
+     *
+     * This is a workaround, as generation consume lot of memory, and out-of-memory errors
+     * are not handled by messenger.
+     *
+     * @ORM\Column(type="integer", options={"default": 0})
+     */
+    private int $generationTrialsCounter = 0;
+
     /**
      * @param StoredObject::STATUS_* $status
      */
@@ -117,8 +122,16 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
         $this->status = $status;
     }
 
+    public function addGenerationTrial(): self
+    {
+        $this->generationTrialsCounter++;
+
+        return $this;
+    }
+
     /**
      * @Serializer\Groups({"read", "write"})
+     * @deprecated
      */
     public function getCreationDate(): DateTime
     {
@@ -135,6 +148,11 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
         return $this->filename;
     }
 
+    public function getGenerationTrialsCounter(): int
+    {
+        return $this->generationTrialsCounter;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -158,6 +176,9 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
         return $this->getFilename();
     }
 
+    /**
+     * @return StoredObject::STATUS_*
+     */
     public function getStatus(): string
     {
         return $this->status;
@@ -185,6 +206,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     /**
      * @Serializer\Groups({"write"})
+     * @deprecated
      */
     public function setCreationDate(DateTime $creationDate): self
     {
@@ -244,4 +266,30 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
         return $this;
     }
+
+    public function getTemplate(): ?DocGeneratorTemplate
+    {
+        return $this->template;
+    }
+
+    public function hasTemplate(): bool
+    {
+        return null !== $this->template;
+    }
+
+    public function setTemplate(?DocGeneratorTemplate $template): StoredObject
+    {
+        $this->template = $template;
+        return $this;
+    }
+
+    public function isPending(): bool
+    {
+        return self::STATUS_PENDING === $this->getStatus();
+    }
+
+    public function isFailure(): bool
+    {
+        return self::STATUS_FAILURE === $this->getStatus();
+    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts
index ec1d50a86..e5912d38a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts
@@ -1,7 +1,8 @@
 import {_createI18n} from "../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
 import DocumentActionButtonsGroup from "../../vuejs/DocumentActionButtonsGroup.vue";
 import {createApp} from "vue";
-import {StoredObject} from "../../types";
+import {StoredObject, StoredObjectStatusChange} from "../../types";
+import {is_object_ready} from "../../vuejs/StoredObjectButton/helpers";
 
 const i18n = _createI18n({});
 
@@ -19,7 +20,7 @@ window.addEventListener('DOMContentLoaded', function (e) {
          };
 
          const
-           storedObject = JSON.parse(datasets.storedObject),
+           storedObject = JSON.parse(datasets.storedObject) as StoredObject,
            filename = datasets.filename,
            canEdit = datasets.canEdit === '1',
            small = datasets.small === '1'
@@ -27,7 +28,20 @@ window.addEventListener('DOMContentLoaded', function (e) {
 
          return { storedObject, filename, canEdit, small };
        },
-       template: '<document-action-buttons-group :can-edit="canEdit" :filename="filename" :stored-object="storedObject" :small="small"></document-action-buttons-group>',
+       template: '<document-action-buttons-group :can-edit="canEdit" :filename="filename" :stored-object="storedObject" :small="small" @on-stored-object-status-change="onStoredObjectStatusChange"></document-action-buttons-group>',
+       methods: {
+         onStoredObjectStatusChange: function(newStatus: StoredObjectStatusChange): void {
+           this.$data.storedObject.status = newStatus.status;
+           this.$data.storedObject.filename = newStatus.filename;
+           this.$data.storedObject.type = newStatus.type;
+
+           // remove eventual div which inform pending status
+           document.querySelectorAll(`[data-docgen-is-pending="${this.$data.storedObject.id}"]`)
+             .forEach(function(el) {
+               el.remove();
+             });
+         }
+       }
      });
 
      app.use(i18n).mount(el);
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
index 918526117..825055973 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types.ts
@@ -1,5 +1,7 @@
 import {DateTime} from "../../../ChillMainBundle/Resources/public/types";
 
+export type StoredObjectStatus = "ready"|"failure"|"pending";
+
 export interface StoredObject {
   id: number,
 
@@ -13,7 +15,15 @@ export interface StoredObject {
   keyInfos: object,
   title: string,
   type: string,
-  uuid: string
+  uuid: string,
+  status: StoredObjectStatus,
+}
+
+export interface StoredObjectStatusChange {
+  id: number,
+  filename: string,
+  status: StoredObjectStatus,
+  type: string,
 }
 
 /**
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
index 60b368cd3..ac841f5cf 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="dropdown">
+  <div v-if="'ready' === props.storedObject.status" class="dropdown">
     <button :class="Object.assign({'btn': true, 'btn-outline-primary': true, 'dropdown-toggle': true, small: props.small})" type="button" data-bs-toggle="dropdown" aria-expanded="false">
       Actions
     </button>
@@ -15,16 +15,27 @@
       </li>
     </ul>
   </div>
+  <div v-else-if="'pending' === props.storedObject.status">
+    <div class="btn btn-outline-info">Génération en cours</div>
+  </div>
+  <div v-else-if="'failure' === props.storedObject.status">
+    <div class="btn btn-outline-danger">La génération a échoué</div>
+  </div>
 
 </template>
 
 <script lang="ts" setup>
 
+import {onMounted} from "vue";
 import ConvertButton from "./StoredObjectButton/ConvertButton.vue";
 import DownloadButton from "./StoredObjectButton/DownloadButton.vue";
 import WopiEditButton from "./StoredObjectButton/WopiEditButton.vue";
-import {is_extension_editable, is_extension_viewable} from "./StoredObjectButton/helpers";
-import {StoredObject, WopiEditButtonExecutableBeforeLeaveFunction} from "../types";
+import {is_extension_editable, is_extension_viewable, is_object_ready} from "./StoredObjectButton/helpers";
+import {
+  StoredObject,
+  StoredObjectStatusChange,
+  WopiEditButtonExecutableBeforeLeaveFunction
+} from "../types";
 
 interface DocumentActionButtonsGroupConfig {
   storedObject: StoredObject,
@@ -48,6 +59,10 @@ interface DocumentActionButtonsGroupConfig {
   executeBeforeLeave?: WopiEditButtonExecutableBeforeLeaveFunction,
 }
 
+const emit = defineEmits<{
+  (e: 'onStoredObjectStatusChange', newStatus: StoredObjectStatusChange): void
+}>();
+
 const props = withDefaults(defineProps<DocumentActionButtonsGroupConfig>(), {
   small: false,
   canEdit: true,
@@ -56,6 +71,51 @@ const props = withDefaults(defineProps<DocumentActionButtonsGroupConfig>(), {
   returnPath: window.location.pathname + window.location.search + window.location.hash,
 });
 
+/**
+ * counter for the number of times that we check for a new status
+ */
+let tryiesForReady = 0;
+
+/**
+ * how many times we may check for a new status, once loaded
+ */
+const maxTryiesForReady = 120;
+
+const checkForReady = function(): void {
+  if (
+    'ready' === props.storedObject.status
+    || 'failure' === props.storedObject.status
+    // stop reloading if the page stays opened for a long time
+    || tryiesForReady > maxTryiesForReady
+  ) {
+    return;
+  }
+
+  tryiesForReady = tryiesForReady + 1;
+
+  setTimeout(onObjectNewStatusCallback, 5000);
+};
+
+const onObjectNewStatusCallback = async function(): Promise<void> {
+  const new_status = await is_object_ready(props.storedObject);
+  if (props.storedObject.status !== new_status.status) {
+    emit('onStoredObjectStatusChange', new_status);
+    return Promise.resolve();
+  } else if ('failure' === new_status.status) {
+    return Promise.resolve();
+  }
+
+  if ('ready' !== new_status.status) {
+    // we check for new status, unless it is ready
+    checkForReady();
+  }
+
+  return Promise.resolve();
+};
+
+onMounted(() => {
+  checkForReady();
+})
 </script>
 
 <style scoped>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
index d82efb111..5b61a108d 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
@@ -1,3 +1,4 @@
+import {StoredObject, StoredObjectStatus, StoredObjectStatusChange} from "../../types";
 
 const MIMES_EDIT = new Set([
   'application/vnd.ms-powerpoint',
@@ -168,6 +169,18 @@ async function download_and_decrypt_doc(urlGenerator: string, keyData: JsonWebKe
    }
 }
 
+async function is_object_ready(storedObject: StoredObject): Promise<StoredObjectStatusChange>
+{
+    const new_status_response = await window
+      .fetch( `/api/1.0/doc-store/stored-object/${storedObject.uuid}/is-ready`);
+
+    if (!new_status_response.ok) {
+      throw new Error("could not fetch the new status");
+    }
+
+    return await new_status_response.json();
+}
+
 export {
   build_convert_link,
   build_download_info_link,
@@ -176,4 +189,5 @@ export {
   download_doc,
   is_extension_editable,
   is_extension_viewable,
+  is_object_ready,
 };
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig
index a6679829b..c9bb608cf 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig
@@ -9,11 +9,6 @@
         <dt>{{ 'Title'|trans }}</dt>
         <dd>{{ document.title }}</dd>
 
-        {% if document.scope is not null %}
-            <dt>{{ 'Scope' | trans }}</dt>
-            <dd>{{ document.scope.name | localize_translatable_string }}</dd>
-        {% endif %}
-
         <dt>{{ 'Category'|trans }}</dt>
         <dd>{{ document.category.name|localize_translatable_string }}</dd>
 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
index 4cbcb7bef..dffff01aa 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
@@ -5,18 +5,25 @@
 <div class="item-bloc">
     <div class="item-row">
         <div class="item-col" style="width: unset">
+            {% if document.object.isPending %}
+                <div class="badge text-bg-info" data-docgen-is-pending="{{ document.object.id }}">{{ 'docgen.Doc generation is pending'|trans }}</div>
+            {% elseif document.object.isFailure %}
+                <div class="badge text-bg-warning">{{ 'docgen.Doc generation failed'|trans }}</div>
+            {% endif %}
             <div class="denomination h2">
                 {{ document.title }}
             </div>
-            <div>
-                {{ mm.mimeIcon(document.object.type) }}
-            </div>
+            {% if document.object.type is not empty %}
+                <div>
+                    {{ mm.mimeIcon(document.object.type) }}
+                </div>
+            {% endif %}
             <div>
                 <p>{{ document.category.name|localize_translatable_string }}</p>
             </div>
-            {% if document.template is not null %}
+            {% if document.object.hasTemplate %}
                 <div>
-                    <p>{{ document.template.name.fr }}</p>
+                    <p>{{ document.object.template.name|localize_translatable_string }}</p>
                 </div>
             {% endif %}
         </div>
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20230227161327.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20230227161327.php
new file mode 100644
index 000000000..f3b29b8b1
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20230227161327.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\DocStore;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230227161327 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add a generation counter on doc store';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD generationTrialsCounter INT DEFAULT 0 NOT NULL;');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP generationTrialsCounter');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
index 5b52f6819..94a09cafb 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
@@ -118,7 +118,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * Return true if the phonenumber is a landline or voip phone.  Return always true
      * if the validation is not configured.
      *
-     * @param string $phonenumber
+     * @param string|PhoneNumber $phonenumber
      */
     public function isValidPhonenumberAny($phonenumber): bool
     {
@@ -138,7 +138,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * Return true if the phonenumber is a landline or voip phone.  Return always true
      * if the validation is not configured.
      *
-     * @param string $phonenumber
+     * @param string|PhoneNumber $phonenumber
      */
     public function isValidPhonenumberLandOrVoip($phonenumber): bool
     {
@@ -159,7 +159,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * REturn true if the phonenumber is a mobile phone. Return always true
      * if the validation is not configured.
      *
-     * @param string $phonenumber
+     * @param string|PhoneNumber $phonenumber
      */
     public function isValidPhonenumberMobile($phonenumber): bool
     {
@@ -182,6 +182,10 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             return null;
         }
 
+        if ($phonenumber instanceof PhoneNumber) {
+            $phonenumber = (string) $phonenumber;
+        }
+
         // filter only number
         $filtered = preg_replace('/[^0-9]/', '', $phonenumber);
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 4bf9e1a8a..d6e42f743 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -116,6 +116,7 @@
                          :filename="d.title"
                          :can-edit="true"
                          :execute-before-leave="submitBeforeLeaveToEditor"
+                         @on-stored-object-status-change="onStatusDocumentChanged"
                      ></document-action-buttons-group>
                    </li>
                    <li v-if="d.workflows.length === 0">
@@ -338,6 +339,10 @@ export default {
             this.$store.commit('removeDocument', {key: this.evaluation.key, document: document});
          }
       },
+      onStatusDocumentChanged(newStatus) {
+        console.log('onStatusDocumentChanged', newStatus);
+        this.$store.commit('statusDocumentChanged', {key: this.evaluation.key, newStatus: newStatus});
+      },
       goToGenerateWorkflowEvaluationDocument({event, link, workflowName, payload}) {
          const callback = (data) => {
             let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index acbe51981..d9f317b4c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -360,7 +360,22 @@ const store = createStore({
         state.evaluationsPicked.find(e => e.key === payload.evaluationKey)
           .documents.find(d => d.id === payload.id).title = payload.title;
       }
-    }
+    },
+    statusDocumentChanged(state, {newStatus, key}) {
+      const e = state.evaluationsPicked.find(e => e.key === key);
+      if (typeof e === 'undefined') {
+        console.error('evaluation not found for given key', {key});
+      }
+
+      const doc = e.documents.find(d => d.storedObject?.id === newStatus.id);
+      if (typeof doc === 'undefined') {
+        console.error('document not found', {newStatus});
+      }
+
+      doc.storedObject.status = newStatus.status;
+      doc.storedObject.type = newStatus.type;
+      doc.storedObject.filename = newStatus.filename;
+    },
   },
   actions: {
     updateThirdParty({ commit }, payload) {
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index 23bfac56f..9ab733d87 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -24,6 +24,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
@@ -51,6 +52,8 @@ class AccompanyingPeriodContext implements
 
     private PersonRenderInterface $personRender;
 
+    private PersonRepository $personRepository;
+
     private TranslatableStringHelperInterface $translatableStringHelper;
 
     private TranslatorInterface $translator;
@@ -61,6 +64,7 @@ class AccompanyingPeriodContext implements
         TranslatableStringHelperInterface $translatableStringHelper,
         EntityManagerInterface $em,
         PersonRenderInterface $personRender,
+        PersonRepository $personRepository,
         TranslatorInterface $translator,
         BaseContextData $baseContextData
     ) {
@@ -69,6 +73,7 @@ class AccompanyingPeriodContext implements
         $this->translatableStringHelper = $translatableStringHelper;
         $this->em = $em;
         $this->personRender = $personRender;
+        $this->personRepository = $personRepository;
         $this->translator = $translator;
         $this->baseContextData = $baseContextData;
     }
@@ -256,6 +261,31 @@ class AccompanyingPeriodContext implements
         return $options['mainPerson'] || $options['person1'] || $options['person2'];
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $normalized = [];
+        foreach (['mainPerson', 'person1', 'person2'] as $k) {
+            $normalized[$k] = null !== ($data[$k] ?? null) ? $data[$k]->getId() : null;
+        }
+
+        return $normalized;
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $denormalized = [];
+
+        foreach (['mainPerson', 'person1', 'person2'] as $k) {
+            if (null !== ($id = ($data[$k] ?? null))) {
+                $denormalized[$k] = $this->personRepository->find($id);
+            } else {
+                $denormalized[$k] = null;
+            }
+        }
+
+        return $denormalized;
+    }
+
     /**
      * @param AccompanyingPeriod $entity
      */
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
index 7e9280e5d..59f5fdb0c 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\DocGenerator;
 
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
@@ -18,7 +19,13 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-class AccompanyingPeriodWorkContext
+/**
+ * Generate a context for an @link{AccompanyingPeriodWork}.
+ *
+ * Although there isn't any document associated to AccompanyingPeriodWork, this context
+ * is use by @link{AccompanyingPeriodWorkEvaluationContext}.
+ */
+class AccompanyingPeriodWorkContext implements DocGeneratorContextWithPublicFormInterface
 {
     private NormalizerInterface $normalizer;
 
@@ -109,8 +116,18 @@ class AccompanyingPeriodWorkContext
         return $this->periodContext->hasPublicForm($template, $entity);
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return $this->periodContext->contextGenerationDataNormalize($template, $entity, $data);
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return $this->periodContext->contextGenerationDataDenormalize($template, $entity, $data);
+    }
+
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
-        // TODO: Implement storeGenerated() method.
+        // currently, no document associated with a AccompanyingPeriodWork
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index 4dd14faab..978aac066 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -174,6 +174,18 @@ class AccompanyingPeriodWorkEvaluationContext implements
             ->hasPublicForm($template, $entity->getAccompanyingPeriodWork());
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return $this->accompanyingPeriodWorkContext
+            ->contextGenerationDataNormalize($template, $entity, $data);
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return $this->accompanyingPeriodWorkContext
+            ->contextGenerationDataDenormalize($template, $entity, $data);
+    }
+
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $doc = new AccompanyingPeriodWorkEvaluationDocument();
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index af6c6e114..988c50829 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -21,11 +21,13 @@ use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
@@ -55,6 +57,8 @@ final class PersonContext implements PersonContextInterface
 
     private NormalizerInterface $normalizer;
 
+    private ScopeRepositoryInterface $scopeRepository;
+
     private Security $security;
 
     private bool $showScopes;
@@ -71,6 +75,7 @@ final class PersonContext implements PersonContextInterface
         EntityManagerInterface $em,
         NormalizerInterface $normalizer,
         ParameterBagInterface $parameterBag,
+        ScopeRepositoryInterface $scopeRepository,
         Security $security,
         TranslatorInterface $translator,
         TranslatableStringHelperInterface $translatableStringHelper
@@ -81,6 +86,7 @@ final class PersonContext implements PersonContextInterface
         $this->documentCategoryRepository = $documentCategoryRepository;
         $this->em = $em;
         $this->normalizer = $normalizer;
+        $this->scopeRepository = $scopeRepository;
         $this->security = $security;
         $this->showScopes = $parameterBag->get('chill_main')['acl']['form_show_scopes'];
         $this->translator = $translator;
@@ -211,6 +217,38 @@ final class PersonContext implements PersonContextInterface
         return true;
     }
 
+    /**
+     * @param Person $entity
+     */
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $scope = $data['scope'] ?? null;
+
+        return [
+            'title' => $data['title'] ?? '',
+            'scope_id' => $scope instanceof Scope ? $scope->getId() : null,
+        ];
+    }
+
+    /**
+     * @param Person $entity
+     */
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        if (!isset($data['scope'])) {
+            $scope = null;
+        } else {
+            if (null === $scope = $this->scopeRepository->find($data['scope'])) {
+                throw new \UnexpectedValueException('scope not found');
+            }
+        }
+
+        return [
+            'title' => $data['title'] ?? '',
+            'scope' => $scope,
+        ];
+    }
+
     /**
      * @param Person $entity
      */
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
index 58a6b5863..ab50655a0 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
@@ -48,6 +48,10 @@ interface PersonContextInterface extends DocGeneratorContextWithAdminFormInterfa
      */
     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array;
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array;
+
     /**
      * @param Person $entity
      */
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
index 23d57c431..53f8064a3 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
@@ -17,6 +17,7 @@ use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -30,12 +31,16 @@ class PersonContextWithThirdParty implements DocGeneratorContextWithAdminFormInt
 
     private PersonContextInterface $personContext;
 
+    private ThirdPartyRepository $thirdPartyRepository;
+
     public function __construct(
         PersonContextInterface $personContext,
-        NormalizerInterface $normalizer
+        NormalizerInterface $normalizer,
+        ThirdPartyRepository $thirdPartyRepository
     ) {
         $this->personContext = $personContext;
         $this->normalizer = $normalizer;
+        $this->thirdPartyRepository = $thirdPartyRepository;
     }
 
     public function adminFormReverseTransform(array $data): array
@@ -123,6 +128,26 @@ class PersonContextWithThirdParty implements DocGeneratorContextWithAdminFormInt
         return true;
     }
 
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return array_merge(
+            [
+                'thirdParty' => null === $data['thirdParty'] ? null : $data['thirdParty']->getId(),
+            ],
+            $this->personContext->contextGenerationDataNormalize($template, $entity, $data),
+        );
+    }
+
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        return array_merge(
+            [
+                'thirdParty' => null === $data['thirdParty'] ? null : $this->thirdPartyRepository->find($data['thirdParty']),
+            ],
+            $this->personContext->contextGenerationDataDenormalize($template, $entity, $data),
+        );
+    }
+
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $this->personContext->storeGenerated($template, $storedObject, $entity, $contextGenerationData);
diff --git a/src/Bundle/ChillWopiBundle/chill.webpack.config.js b/src/Bundle/ChillWopiBundle/chill.webpack.config.js
index 1c4b53fe1..bf0ebb665 100644
--- a/src/Bundle/ChillWopiBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillWopiBundle/chill.webpack.config.js
@@ -1,6 +1,5 @@
 // this file loads all assets from the Chill person bundle
-module.exports = function(encore, entries)
-{
+module.exports = function(encore, entries) {
     encore.addEntry('page_wopi_editor', __dirname + '/src/Resources/public/page/editor/index.js');
-    //home/julien/dev/département-vendee/chill/vendor/chill-project/chill-bundles/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
+    encore.addEntry('mod_reload_page', __dirname + '/src/Resources/public/module/pending/index');
 };
diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Editor.php b/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
index 4be848489..d19a98052 100644
--- a/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
+++ b/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
@@ -26,6 +26,10 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Templating\EngineInterface;
+use Twig\Environment;
 
 /**
  * @internal
@@ -35,6 +39,8 @@ final class Editor
 {
     private DocumentManagerInterface $documentManager;
 
+    private EngineInterface $engine;
+
     private JWTTokenManagerInterface $JWTTokenManager;
 
     private Psr17Interface $psr17;
@@ -49,18 +55,24 @@ final class Editor
 
     private DiscoveryInterface $wopiDiscovery;
 
+    private NormalizerInterface $normalizer;
+
     public function __construct(
         ConfigurationInterface $wopiConfiguration,
         DiscoveryInterface $wopiDiscovery,
         DocumentManagerInterface $documentManager,
+        EngineInterface $engine,
         JWTTokenManagerInterface $JWTTokenManager,
+        NormalizerInterface $normalizer,
         ResponderInterface $responder,
         Security $security,
         Psr17Interface $psr17,
         RouterInterface $router
     ) {
         $this->documentManager = $documentManager;
+        $this->engine = $engine;
         $this->JWTTokenManager = $JWTTokenManager;
+        $this->normalizer = $normalizer;
         $this->wopiConfiguration = $wopiConfiguration;
         $this->wopiDiscovery = $wopiDiscovery;
         $this->responder = $responder;
@@ -87,6 +99,22 @@ final class Editor
             throw new NotFoundHttpException(sprintf('Unable to find object %s', $fileId));
         }
 
+        if (StoredObject::STATUS_FAILURE === $storedObject->getStatus()) {
+            return new Response(
+                $this->engine
+                    ->render('@ChillWopi/Editor/stored_object_failure.html.twig')
+            );
+        } elseif (StoredObject::STATUS_PENDING === $storedObject->getStatus()) {
+            return new Response(
+                $this->engine
+                    ->render('@ChillWopi/Editor/stored_object_pending.html.twig', [
+                        'storedObject' => $this->normalizer->normalize($storedObject, 'json', [
+                            AbstractNormalizer::GROUPS => ['read']
+                        ])
+                    ])
+            );
+        }
+
         if ([] === $discoverExtension = $this->wopiDiscovery->discoverMimeType($storedObject->getType())) {
             throw new Exception(sprintf('Unable to find mime type %s', $storedObject->getType()));
         }
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts b/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts
new file mode 100644
index 000000000..27879be67
--- /dev/null
+++ b/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts
@@ -0,0 +1,40 @@
+import {is_object_ready} from "../../../../../../ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers";
+import {
+    StoredObject,
+    StoredObjectStatus,
+    StoredObjectStatusChange
+} from "../../../../../../ChillDocStoreBundle/Resources/public/types";
+
+async function reload_if_needed(stored_object: StoredObject, i: number): Promise<void> {
+    let current_status = await is_object_ready(stored_object);
+
+    if (stored_object.status !== current_status.status) {
+        window.location.reload();
+    }
+    wait_before_reload(stored_object, i + 1);
+    return Promise.resolve();
+}
+
+function wait_before_reload(stored_object: StoredObject, i: number): void {
+    /**
+     * value of the timeout. Set to 5 sec during the first 10 minutes, then every 1 minute
+     */
+    let timeout = i < 1200 ? 5000 : 60000;
+
+    setTimeout(
+       reload_if_needed,
+       timeout,
+       stored_object,
+       i
+   );
+}
+
+window.addEventListener('DOMContentLoaded', async function (e) {
+    if (undefined === (<any>window).stored_object) {
+        console.error('window.stored_object is undefined');
+        throw Error('window.stored_object is undefined');
+    }
+
+    let stored_object = JSON.parse((<any>window).stored_object) as StoredObject;
+    reload_if_needed(stored_object, 0);
+});
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig b/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig
new file mode 100644
index 000000000..145b58b8b
--- /dev/null
+++ b/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig
@@ -0,0 +1,15 @@
+{% extends 'ChillMainBundle::layout.html.twig' %}
+
+{% block content %}
+    <div class="alert alert-danger">
+        {{ 'docgen.Doc generation failed'|trans }}
+    </div>
+
+    <ul class="sticky-form-buttons record_actions">
+        <li class="cancel">
+            <a href="{{ chill_return_path_or('chill_main_homepage') }}" class="btn btn-cancel">
+                {{ 'Cancel'|trans|chill_return_path_label }}
+            </a>
+        </li>
+    </ul>
+{% endblock %}
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_pending.html.twig b/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_pending.html.twig
new file mode 100644
index 000000000..ec90b6cd8
--- /dev/null
+++ b/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_pending.html.twig
@@ -0,0 +1,36 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block js %}
+    <script type="application/javascript">
+        window.stored_object = '{{ storedObject|json_encode|escape('js') }}'
+    </script>
+    {{ encore_entry_script_tags('mod_reload_page') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_reload_page') }}
+{% endblock %}
+
+{% block content %}
+    <div class="alert alert-danger text-center">
+        <div>
+            <p>
+                {{ 'docgen.Doc generation is pending'|trans }}
+            </p>
+        </div>
+
+        <div>
+            <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
+            <span class="sr-only">Loading...</span>
+        </div>
+
+    </div>
+
+    <ul class="sticky-form-buttons record_actions">
+        <li class="cancel">
+            <a href="{{ chill_return_path_or('chill_main_homepage') }}" class="btn btn-cancel">
+                {{ 'docgen.Come back later'|trans|chill_return_path_label }}
+            </a>
+        </li>
+    </ul>
+{% endblock content %}

From 77c545344c877f60d479b86ec8f6c488ccab0d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Feb 2023 16:44:37 +0100
Subject: [PATCH 045/106] DX: adapt to php 7.4

---
 .../Service/Messenger/RequestGenerationHandler.php              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
index 981a3dde7..0cfdecd0a 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
@@ -29,7 +29,7 @@ class RequestGenerationHandler implements MessageHandlerInterface
         DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
         EntityManagerInterface $entityManager,
         Generator $generator,
-        StoredObjectRepository $storedObjectRepository,
+        StoredObjectRepository $storedObjectRepository
     ) {
         $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
         $this->entityManager = $entityManager;

From dbcc425f5f1340e8d5190b987ec418e12c2365b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Feb 2023 17:22:54 +0100
Subject: [PATCH 046/106] DX: improve performance for counting feature linked
 to person

---
 src/Bundle/ChillPersonBundle/Entity/Person.php  | 17 +++++++++++++++++
 .../Menu/PersonMenuBuilder.php                  | 15 ++++++++++++---
 .../Repository/ResidentialAddressRepository.php | 10 ++++++++++
 .../Resources/views/menu.html.twig              |  8 ++++----
 4 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 4e2bd4e89..d107ff4bd 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -680,6 +680,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $this->proxyAccompanyingPeriodOpenState = false;
     }
 
+    public function countResources(): int
+    {
+        return $this->resources->count();
+    }
+
     /**
      * This public function is the same but return only true or false.
      */
@@ -764,6 +769,18 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $result;
     }
 
+    public function countAccompanyingPeriodInvolved(
+        bool $asParticipantOpen = true,
+        bool $asRequestor = true
+    ): int {
+        // TODO should be optimized to avoid loading accompanying period ?
+        return $this->getAccompanyingPeriodInvolved($asParticipantOpen, $asRequestor)
+            ->filter(function (AccompanyingPeriod $p) {
+                return $p->getStep() !== AccompanyingPeriod::STEP_DRAFT;
+            })
+            ->count();
+    }
+
     /**
      * Get AccompanyingPeriodParticipations Collection.
      *
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index bf11a6c01..8c46b571e 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Knp\Menu\MenuItem;
@@ -53,6 +54,12 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         $this->residentialAddressRepo = $residentialAddressRepo;
     }
 
+    /**
+     * @param $menuId
+     * @param MenuItem $menu
+     * @param array{person: Person} $parameters
+     * @return void
+     */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         $menu->addChild($this->translator->trans('Person details'), [
@@ -73,8 +80,8 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         ])
             ->setExtras([
                 'order' => 60,
-                'counter' => count($this->residentialAddressRepo->findBy(['person' => $parameters['person']])) > 0 ?
-                    count($this->residentialAddressRepo->findBy(['person' => $parameters['person']])) : null,
+                'counter' => 0 < ($nbResidentials = $this->residentialAddressRepo->countByPerson($parameters['person'])) ?
+                    $nbResidentials : null,
             ]);
 
         $menu->addChild($this->translator->trans('person_resources_menu'), [
@@ -85,7 +92,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         ])
             ->setExtras([
                 'order' => 70,
-                'counter' => count($parameters['person']->getResources()) > 0 ? count($parameters['person']->getResources()) : null,
+                'counter' => 0 < ($nbResources = $parameters['person']->countResources()) ? $nbResources : null,
             ]);
 
         $menu->addChild($this->translator->trans('household.person history'), [
@@ -120,6 +127,8 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
             ])
                 ->setExtras([
                     'order' => 100,
+                    'counter' => 0 < ($nbAccompanyingPeriod = $parameters['person']->countAccompanyingPeriodInvolved())
+                        ? $nbAccompanyingPeriod : null,
                 ]);
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
index 96eb872cd..424411a72 100644
--- a/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
@@ -32,6 +32,16 @@ class ResidentialAddressRepository extends ServiceEntityRepository
         parent::__construct($registry, ResidentialAddress::class);
     }
 
+    public function countByPerson(Person $person): int
+    {
+        return $this->createQueryBuilder('ra')
+            ->select('COUNT(ra)')
+            ->where('ra.person = :person')
+            ->setParameter('person', $person)
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
     public function buildQueryFindCurrentResidentialAddresses(Person $person, ?DateTimeImmutable $at = null): QueryBuilder
     {
         $date = null === $at ? new DateTimeImmutable('today') : $at;
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
index cf60e31b7..931c84699 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
@@ -18,12 +18,12 @@
 <div class="list-group vertical-menu {{ 'menu-' ~ menus.name }}">
     {% for menu in menus %}
 
-        <a class="list-group-item list-group-item-action"
+        <a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center"
             href="{{ menu.uri }}">
-            {% if menu.extras.counter is defined and menu.extras.counter is not null %}
-                <span class="badge rounded-pill bg-danger notification-counter">{{ menu.extras.counter }}</span>
-            {% endif %}
             {{ menu.label|upper }}
+            {% if menu.extras.counter is defined and menu.extras.counter is not null %}
+                <span class="badge rounded-pill bg-secondary notification-counter">{{ menu.extras.counter }}</span>
+            {% endif %}
         </a>
     {% endfor %}
 </div>

From fe4388c884099196b1616205560f21149965157d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Feb 2023 22:01:52 +0100
Subject: [PATCH 047/106] Feature: [docgen] implements normalization of data on
 CalendarContext

---
 .../Service/DocGenerator/CalendarContext.php  | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
index 4984c359a..aed77bc65 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
@@ -18,8 +18,10 @@ use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRender;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -39,6 +41,10 @@ final class CalendarContext implements CalendarContextInterface
 
     private PersonRender $personRender;
 
+    private PersonRepository $personRepository;
+
+    private ThirdPartyRepository $thirdPartyRepository;
+
     private ThirdPartyRender $thirdPartyRender;
 
     private TranslatableStringHelperInterface $translatableStringHelper;
@@ -48,14 +54,18 @@ final class CalendarContext implements CalendarContextInterface
         EntityManagerInterface $entityManager,
         NormalizerInterface $normalizer,
         PersonRender $personRender,
+        PersonRepository $personRepository,
         ThirdPartyRender $thirdPartyRender,
+        ThirdPartyRepository $thirdPartyRepository,
         TranslatableStringHelperInterface $translatableStringHelper
     ) {
         $this->baseContextData = $baseContextData;
         $this->entityManager = $entityManager;
         $this->normalizer = $normalizer;
         $this->personRender = $personRender;
+        $this->personRepository = $personRepository;
         $this->thirdPartyRender = $thirdPartyRender;
+        $this->thirdPartyRepository = $thirdPartyRepository;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
@@ -228,16 +238,40 @@ final class CalendarContext implements CalendarContextInterface
 
     public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
     {
-        // TODO: Implement publicFormTransform() method.
+        $normalized['title'] = $data['title'] ?? '';
+
+        foreach (['mainPerson', 'thirdParty'] as $k) {
+            if (isset($data[$k])) {
+                $normalized[$k] = $data[$k]->getId();
+            }
+        }
+
+        return $normalized;
     }
 
     public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
     {
-        // TODO: Implement publicFormReverseTransform() method.
+        $denormalized['title'] = $data['title'];
+
+        if (null !== ($data['mainPerson'] ?? null)) {
+            if (null === $person = $this->personRepository->find($data['mainPerson'])) {
+                throw new \RuntimeException('person not found');
+            }
+            $denormalized['mainPerson'] = $person;
+        }
+
+        if (null !== ($data['thirdParty'] ?? null)) {
+            if (null === $thirdParty = $this->thirdPartyRepository->find($data['thirdParty'])) {
+                throw new \RuntimeException('third party not found');
+            }
+            $denormalized['thirdParty'] = $thirdParty;
+        }
+
+        return $denormalized;
     }
 
     /**
-     * @param array{mainPerson?: Person, thirdParty?: ThirdParty, title: string} $contextGenerationData
+     * param array{mainPerson?: Person, thirdParty?: ThirdParty, title: string} $contextGenerationData
      */
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {

From 14df8fe9ad0888e4ba456a41a199aea4371954d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Feb 2023 22:09:07 +0100
Subject: [PATCH 048/106] DX: remove implicit creation of a variable

---
 .../Service/DocGenerator/CalendarContext.php                    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
index aed77bc65..6eadaf997 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
@@ -238,6 +238,7 @@ final class CalendarContext implements CalendarContextInterface
 
     public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
     {
+        $normalized = [];
         $normalized['title'] = $data['title'] ?? '';
 
         foreach (['mainPerson', 'thirdParty'] as $k) {
@@ -251,6 +252,7 @@ final class CalendarContext implements CalendarContextInterface
 
     public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
     {
+        $denormalized = [];
         $denormalized['title'] = $data['title'];
 
         if (null !== ($data['mainPerson'] ?? null)) {

From cf1cc937ca144ebb2e58a02a317799fbb7a6568a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Feb 2023 22:37:00 +0100
Subject: [PATCH 049/106] DX: ignore file in .cache directory (in use with
 php82 branch)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ebdc16e56..26802dca0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ composer.lock
 docs/build/
 node_modules/*
 .php_cs.cache
+.cache/*
 
 ###> symfony/framework-bundle ###
 /.env.local

From 3db5b62d57b0b9bb95eced6c5a0386a9e0c56db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Feb 2023 22:37:46 +0100
Subject: [PATCH 050/106] Feature: [UI] use download button group in calendar
 list

---
 .../views/Calendar/_documents.twig.html       | 38 +++++++------------
 .../listByAccompanyingCourse.html.twig        |  4 +-
 .../document_action_buttons_group/index.ts    |  4 +-
 .../vuejs/DocumentActionButtonsGroup.vue      |  2 +-
 .../WopiEditTwigExtensionRuntime.php          |  2 +-
 5 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_documents.twig.html b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_documents.twig.html
index 499fb0a83..09824b5cc 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_documents.twig.html
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_documents.twig.html
@@ -17,30 +17,20 @@
                     <td class="eval">
                         <ul class="eval_title">
                             <li>
-                                {{ mm.mimeIcon(d.storedObject.type) }}
-                                {{ d.storedObject.title }}
-                                {% if d.dateTimeVersion < d.calendar.dateTimeVersion %}
-                                <span class="badge bg-danger">{{ 'chill_calendar.Document outdated'|trans }}</span>
-                                {% endif %}
-
-                                <ul class="record_actions small inline">
-                                    {% if chill_document_is_editable(d.storedObject) and is_granted('CHILL_CALENDAR_DOC_EDIT', d) %}
-                                        <li>
-                                            <a href="{{ chill_path_add_return_path('chill_calendar_calendardoc_delete', {'id': d.id})}}" class="btn btn-delete"></a>
-                                        </li>
-                                        <li>
-                                            {{ d.storedObject|chill_document_edit_button }}
-                                        </li>
-                                    {% endif %}
-                                    {% if is_granted('CHILL_CALENDAR_DOC_EDIT', d) %}
-                                    <li>
-                                        <a href="{{ chill_path_add_return_path('chill_calendar_calendardoc_edit', {'id': d.id})}}" class="btn btn-edit"></a>
-                                    </li>
-                                    {% endif %}
-                                    <li>
-                                        {{ m.download_button(d.storedObject, d.storedObject.title) }}
-                                    </li>
-                                </ul>
+                                <div class="row">
+                                    <div class="col text-start">
+                                        {{ d.storedObject.title }}
+                                        {% if d.dateTimeVersion < d.calendar.dateTimeVersion %}
+                                        <span class="badge bg-danger">{{ 'chill_calendar.Document outdated'|trans }}</span>
+                                        {% endif %}
+                                    </div>
+                                    <div class="col-md-auto text-center">
+                                        {{ mm.mimeIcon(d.storedObject.type) }}
+                                    </div>
+                                    <div class="col col-lg-4 text-end">
+                                        {{ d.storedObject|chill_document_button_group(d.storedObject.title, is_granted('CHILL_CALENDAR_DOC_EDIT', d), {'small': true}) }}
+                                    </div>
+                                </div>
                             </li>
                         </ul>
                     </td>
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
index d85c5237e..7ce1003bc 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
@@ -10,13 +10,13 @@
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_answer') }}
-    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_answer') }}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block content %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts
index e5912d38a..4180808dd 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts
@@ -16,14 +16,14 @@ window.addEventListener('DOMContentLoaded', function (e) {
            filename: string,
            canEdit: string,
            storedObject: string,
-           small: string,
+           buttonSmall: string,
          };
 
          const
            storedObject = JSON.parse(datasets.storedObject) as StoredObject,
            filename = datasets.filename,
            canEdit = datasets.canEdit === '1',
-           small = datasets.small === '1'
+           small = datasets.buttonSmall === '1'
            ;
 
          return { storedObject, filename, canEdit, small };
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
index ac841f5cf..2cb5e64fe 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="'ready' === props.storedObject.status" class="dropdown">
-    <button :class="Object.assign({'btn': true, 'btn-outline-primary': true, 'dropdown-toggle': true, small: props.small})" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+    <button :class="Object.assign({'btn': true, 'btn-outline-primary': true, 'dropdown-toggle': true, 'btn-sm': props.small})" type="button" data-bs-toggle="dropdown" aria-expanded="false">
       Actions
     </button>
     <ul class="dropdown-menu">
diff --git a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
index bae436b0a..ec1df1465 100644
--- a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
+++ b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
@@ -157,7 +157,7 @@ final class WopiEditTwigExtensionRuntime implements RuntimeExtensionInterface
             'document_json' => $this->normalizer->normalize($document, 'json', [AbstractNormalizer::GROUPS => ['read']]),
             'title' => $title,
             'can_edit' => $canEdit,
-            'options' => array_merge($options, self::DEFAULT_OPTIONS_TEMPLATE_BUTTON_GROUP),
+            'options' => array_merge(self::DEFAULT_OPTIONS_TEMPLATE_BUTTON_GROUP, $options),
         ]);
     }
 

From 95984eff6d9857916f64480ec1225fa6af774a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 1 Mar 2023 13:55:35 +0000
Subject: [PATCH 051/106] Apply 1 suggestion(s) to 1 file(s)

---
 .../ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
index 2e021fc2b..ba325e296 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
@@ -37,11 +37,11 @@ class LoadInvite extends Fixture implements FixtureGroupInterface
         $arr = [
             [
                 'name' => ['fr' => 'Rendez-vous décliné'],
-                'status' => 'declined'
+                'status' => Invite::DECLINED,
             ],
             [
                 'name' => ['fr' => 'Rendez-vous accepté'],
-                'status' => 'accepted'
+                'status' => Invite::ACCEPTED,
             ],
         ];
 

From 6749758b467d2fb3952da8c35a0b187a9f139b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 1 Mar 2023 16:08:49 +0100
Subject: [PATCH 052/106] Fixes for features "allow to set user absences"

---
 src/Bundle/ChillMainBundle/Entity/User.php           |  2 +-
 src/Bundle/ChillMainBundle/Resources/public/types.ts |  1 +
 .../vuejs/_components/Entity/UserRenderBoxBadge.vue  |  3 +--
 .../Resources/views/Entity/user.html.twig            |  7 +------
 .../Serializer/Normalizer/UserNormalizer.php         |  2 ++
 .../ChillMainBundle/Templating/Entity/UserRender.php |  4 +++-
 .../ChillMainBundle/translations/messages.fr.yml     |  2 ++
 .../vuejs/AccompanyingCourse/components/Banner.vue   | 12 +++++++-----
 8 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 24e88e7ba..a8ef88fbe 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -304,7 +304,7 @@ class User implements UserInterface
 
     public function isAbsent(): bool
     {
-        return (null !== $this->getAbsenceStart() && $this->getAbsenceStart() <= new DateTimeImmutable('now')) ? true : false;
+        return null !== $this->getAbsenceStart() && $this->getAbsenceStart() <= new DateTimeImmutable('now');
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index 142864393..9453c89b0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -35,6 +35,7 @@ export interface User {
   id: number;
   username: string;
   text: string;
+  text_without_absence: string;
   email: string;
   user_job: Job;
   label: string;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
index a5e1cf183..a9c2db9b4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
@@ -1,8 +1,7 @@
 <template>
 <span class="chill-entity entity-user">
     {{ user.label }}
-    <span class="user-job" v-if="user.user_job !== null">({{ user.user_job.label.fr }})</span>
-    <span class="main-scope" v-if="user.main_scope !== null">({{ user.main_scope.name.fr }})</span>
+    <span class="user-job" v-if="user.user_job !== null">({{ user.user_job.label.fr }})</span> <span class="main-scope" v-if="user.main_scope !== null">({{ user.main_scope.name.fr }})</span> <span v-if="user.isAbsent" class="badge bg-danger rounded-pill" :title="Absent">A</span>
 </span>
 </template>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
index 7b669aee3..ad05a5a2c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
@@ -7,11 +7,6 @@
     <span class="main-scope">({{ user.mainScope.name|localize_translatable_string }})</span>
     {%- endif -%}
     {%- if opts['absence'] and user.isAbsent %}
-        {%- if date(user.absenceStart) < date() %}
-            <span class="fa-stack fa-holder" title="{{ 'absence.Absent'|trans }}">
-              <i class="fa fa-circle fa-stack-1x text-danger"></i>
-              <i class="fa fa-stack-1x text-white">A</i>
-            </span>
-        {%- endif %}
+        <span class="badge bg-danger rounded-pill" title="{{ 'absence.Absent'|trans|escape('html_attr') }}">{{ 'absence.A'|trans }}</span>
     {%- endif -%}
 </span>
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
index 7f5b62be5..fde3a3d8e 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
@@ -31,6 +31,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
         'id' => '',
         'username' => '',
         'text' => '',
+        'text_without_absent' => '',
         'label' => '',
         'email' => '',
     ];
@@ -82,6 +83,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
             'id' => $object->getId(),
             'username' => $object->getUsername(),
             'text' => $this->userRender->renderString($object, []),
+            'text_without_absent' => $this->userRender->renderString($object, ['absence' => false]),
             'label' => $object->getLabel(),
             'email' => (string) $object->getEmail(),
             'user_job' => $this->normalizer->normalize($object->getUserJob(), $format, $userJobContext),
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
index 43736eb81..6780db742 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
@@ -69,7 +69,9 @@ class UserRender implements ChillEntityRenderInterface
                 ->localize($entity->getMainScope()->getName()) . ')';
         }
 
-        $current_date = new DateTimeImmutable();
+        if ($entity->isAbsent() && $opts['absence']) {
+            $str .= ' (' . $this->translator->trans('absence.Absent') . ')';
+        }
 
         return $str;
     }
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index d6beea337..f01976e87 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -587,6 +587,8 @@ saved_export:
 
 
 absence:
+    # single letter for absence
+    A: A
     My absence: Mon absence
     Unset absence: Supprimer la date d'absence
     Set absence date: Indiquer une date d'absence
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
index f29d75f26..dcade7e0f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
@@ -23,11 +23,11 @@
             </span>
             <span v-if="accompanyingCourse.user" class="d-md-block ms-3 ms-md-0">
                <span class="item-key">{{ $t('course.referrer') }}:</span>&nbsp;
-               <span v-if="accompanyingCourse.user.isAbsent" class="fa-stack fa-holder" :title="$t('course.absent')">
-                <i class="fa fa-circle fa-stack-1x text-danger"></i>
-                <i class="fa fa-stack-1x text-white">A</i>
-               </span>
                <b>{{ accompanyingCourse.user.text }}</b>
+               <template v-if="accompanyingCourse.user.isAbsent">
+                 &nbsp;
+                 <span class="badge bg-danger rounded-pill" title="Absent">A</span>
+               </template>
             </span>
          </span>
       </span>
@@ -64,13 +64,15 @@
 import ToggleFlags from './Banner/ToggleFlags';
 import SocialIssue from './Banner/SocialIssue.vue';
 import PersonsAssociated from './Banner/PersonsAssociated.vue';
+import UserRenderBoxBadge from 'ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue';
 
 export default {
    name: 'Banner',
    components: {
       ToggleFlags,
       SocialIssue,
-      PersonsAssociated
+      PersonsAssociated,
+      UserRenderBoxBadge,
    },
    computed: {
       accompanyingCourse() {

From 9696a8194c6df09ae7b899ea0d97900c2b512925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 1 Mar 2023 16:10:51 +0100
Subject: [PATCH 053/106] DX: use the UserRenderBoxBadge to display user in
 AddPerson

---
 .../public/vuejs/_components/AddPersons/TypeUser.vue        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
index 7a8b302c7..a549e7970 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
@@ -1,9 +1,7 @@
 <template>
     <div class="container usercontainer">
       <div class="user-identification">
-        <span class="name">
-           {{ item.result.text }}
-        </span>
+        <user-render-box-badge :user="item.result"></user-render-box-badge>
       </div>
     </div>
     <div class="right_actions">
@@ -16,10 +14,12 @@
 
 <script>
 import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
+import UserRenderBoxBadge from 'ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue';
 
 export default {
    name: 'SuggestionUser',
    components: {
+     UserRenderBoxBadge,
       BadgeEntity
    },
    props: ['item'],

From b30e966316443a8008975521aaa3d044697b8010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 1 Mar 2023 16:32:20 +0100
Subject: [PATCH 054/106] DX: [absence] Remove unneccessary `$em->persist()`

---
 src/Bundle/ChillMainBundle/Controller/AbsenceController.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
index 73d9abd3e..5dafa4615 100644
--- a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
@@ -34,7 +34,6 @@ class AbsenceController extends AbstractController
 
         if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
-            $em->persist($user);
             $em->flush();
 
             return $this->redirect($this->generateUrl('chill_main_user_absence_index'));
@@ -56,11 +55,9 @@ class AbsenceController extends AbstractController
     public function unsetAbsence(Request $request)
     {
         $user = $this->getUser();
-        $form = $this->createForm(AbsenceType::class, $user);
 
         $user->setAbsenceStart(null);
         $em = $this->getDoctrine()->getManager();
-        $em->persist($user);
         $em->flush();
 
         return $this->redirect($this->generateUrl('chill_main_user_absence_index'));

From 62532e0a90f0ccc36d7c8c8667a192dc450129d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 1 Mar 2023 17:10:59 +0100
Subject: [PATCH 055/106] Fixes for feature "Regroupment of center"

* allow more than 15 character in regroupment name
* remove unused methods in PickCenterType
* show only active Regroupment in form
* remove dead code and commented code
---
 .../ChillMainBundle/Entity/Regroupment.php    |  2 +-
 .../Form/Type/Export/PickCenterType.php       | 21 ++++++++-------
 .../Form/Type/Export/PickRegroupmentType.php  | 18 -------------
 .../Repository/RegroupmentRepository.php      |  5 ++++
 .../views/Export/new_centers_step.html.twig   | 10 -------
 .../migrations/Version20230301155213.php      | 26 +++++++++++++++++++
 6 files changed, 43 insertions(+), 39 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20230301155213.php

diff --git a/src/Bundle/ChillMainBundle/Entity/Regroupment.php b/src/Bundle/ChillMainBundle/Entity/Regroupment.php
index 5de02ade6..96953abf5 100644
--- a/src/Bundle/ChillMainBundle/Entity/Regroupment.php
+++ b/src/Bundle/ChillMainBundle/Entity/Regroupment.php
@@ -43,7 +43,7 @@ class Regroupment
     private bool $isActive = true;
 
     /**
-     * @ORM\Column(type="string", length=15, options={"default": ""}, nullable=false)
+     * @ORM\Column(type="text", options={"default": ""}, nullable=false)
      */
     private string $name = '';
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index 17768544b..55157b1ab 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Form\DataMapper\ExportPickCenterDataMapper;
+use Chill\MainBundle\Repository\RegroupmentRepository;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
@@ -29,29 +30,28 @@ use function count;
 /**
  * Pick centers amongst available centers for the user.
  */
-class PickCenterType extends AbstractType
+final class PickCenterType extends AbstractType
 {
     public const CENTERS_IDENTIFIERS = 'c';
 
-    protected AuthorizationHelperInterface $authorizationHelper;
+    private AuthorizationHelperInterface $authorizationHelper;
 
-    protected ExportManager $exportManager;
+    private ExportManager $exportManager;
 
-    protected UserInterface $user;
+    private RegroupmentRepository $regroupmentRepository;
+
+    private UserInterface $user;
 
     public function __construct(
         TokenStorageInterface $tokenStorage,
         ExportManager $exportManager,
+        RegroupmentRepository $regroupmentRepository,
         AuthorizationHelperInterface $authorizationHelper
     ) {
         $this->exportManager = $exportManager;
         $this->user = $tokenStorage->getToken()->getUser();
         $this->authorizationHelper = $authorizationHelper;
-    }
-
-    public function addGroupingCenter(GroupingCenterInterface $grouping)
-    {
-        $this->groupingCenters[md5($grouping->getName())] = $grouping;
+        $this->regroupmentRepository = $regroupmentRepository;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -71,13 +71,14 @@ class PickCenterType extends AbstractType
             'choice_label' => static function (Center $c) {
                 return $c->getName();
             },
-            'data' => count($this->groupingCenters) > 0 ? null : $centers,
+            'data' => $centers,
         ])
             ->add('regroupment', EntityType::class, [
                 'class' => Regroupment::class,
                 'label' => 'regroupment',
                 'multiple' => true,
                 'expanded' => true,
+                'choices' => $this->regroupmentRepository->findAllActive(),
                 'choice_label' => static function (Regroupment $r) {
                     return $r->getName();
                 },
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php
deleted file mode 100644
index 7b04d2ebd..000000000
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickRegroupmentType.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\MainBundle\Form\Type\Export;
-
-use Symfony\Component\Form\AbstractType;
-
-class PickRegroupmentType extends AbstractType
-{
-}
diff --git a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
index 6e84ef9b7..a28f2f341 100644
--- a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
@@ -38,6 +38,11 @@ final class RegroupmentRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
+    public function findAllActive(): array
+    {
+        return $this->repository->findBy(['isActive' => true], ['name' => 'ASC']);
+    }
+
     /**
      * @param mixed|null $limit
      * @param mixed|null $offset
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
index a73913154..e08ec84d9 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
@@ -44,16 +44,6 @@
             <h3 class="m-3">{{ 'Pick aggregated centers'|trans }}</h3>
             {{ form_widget(form.centers.regroupment) }}
 
-{#            {% if form.centers.children.g is defined %}#}
-{##}
-{#                <h3>{{ 'Pick aggregated centers'|trans }}</h3>#}
-{##}
-{#                {% for f in form.centers.children.g.children %}#}
-{#                    {{ form_row(f) }}#}
-{#                {% endfor %}#}
-{##}
-{#            {% endif %}#}
-
         </section>
 
         <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action btn-create' }, 'label' : 'Go to export options' } ) }}</p>
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20230301155213.php b/src/Bundle/ChillMainBundle/migrations/Version20230301155213.php
new file mode 100644
index 000000000..6d93b71d9
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20230301155213.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230301155213 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Alter type to TEXT for regroupment.name';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE regroupment ALTER name TYPE TEXT');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE regroupment ALTER name TYPE VARCHAR(15)');
+    }
+}

From 678defdee79d55c0e13b0bea1994924e935a4891 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 2 Mar 2023 10:52:48 +0100
Subject: [PATCH 056/106] FIX [regroupment][form] add check to display
 regroupment field in the form or not. Only if regroupments exist

---
 .../ChillMainBundle/Form/Type/Export/PickCenterType.php   | 8 +++++---
 .../Resources/views/Export/new_centers_step.html.twig     | 7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index 55157b1ab..8287a8814 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form\Type\Export;
 
-use Chill\MainBundle\Center\GroupingCenterInterface;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Export\ExportManager;
@@ -72,8 +71,10 @@ final class PickCenterType extends AbstractType
                 return $c->getName();
             },
             'data' => $centers,
-        ])
-            ->add('regroupment', EntityType::class, [
+        ]);
+
+        if (count($this->regroupmentRepository->findAllActive()) > 0) {
+            $builder->add('regroupment', EntityType::class, [
                 'class' => Regroupment::class,
                 'label' => 'regroupment',
                 'multiple' => true,
@@ -83,6 +84,7 @@ final class PickCenterType extends AbstractType
                     return $r->getName();
                 },
             ]);
+        }
 
         $builder->setDataMapper(new ExportPickCenterDataMapper());
     }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
index e08ec84d9..9e37dc2cd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
@@ -41,9 +41,10 @@
             <h3 class="m-3">{{ 'Center'|trans }}</h3>
             {{ form_widget(form.centers.center) }}
 
-            <h3 class="m-3">{{ 'Pick aggregated centers'|trans }}</h3>
-            {{ form_widget(form.centers.regroupment) }}
-
+            {% if form.centers.regroupment is defined %}
+                <h3 class="m-3">{{ 'Pick aggregated centers'|trans }}</h3>
+                {{ form_widget(form.centers.regroupment) }}
+            {% endif %}
         </section>
 
         <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action btn-create' }, 'label' : 'Go to export options' } ) }}</p>

From 26a6169b958df8f90293e60ea6f02b64eea31b26 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 2 Mar 2023 11:11:40 +0100
Subject: [PATCH 057/106] FIX [budget][calculator] fix method call getAlias()

---
 .../ChillBudgetBundle/Calculator/CalculatorManager.php      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
index a37ac68dc..934c22e36 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
@@ -29,10 +29,10 @@ class CalculatorManager
 
     public function addCalculator(CalculatorInterface $calculator, bool $default)
     {
-        $this->calculators[$calculator::getAlias()] = $calculator;
+        $this->calculators[$calculator->getAlias()] = $calculator;
 
         if ($default) {
-            $this->defaultCalculator[] = $calculator::getAlias();
+            $this->defaultCalculator[] = $calculator->getAlias();
         }
     }
 
@@ -50,7 +50,7 @@ class CalculatorManager
             $result = $calculator->calculate($elements);
 
             if (null !== $result) {
-                $results[$calculator::getAlias()] = $result;
+                $results[$calculator->getAlias()] = $result;
             }
         }
 

From ef75deda26b277699da94442ce009fabcd98b16a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 2 Mar 2023 11:23:29 +0100
Subject: [PATCH 058/106] FIX [regroupment] remove CenterCompilerPass - no
 longer in use

---
 .../ChillMainBundle/ChillMainBundle.php       |  1 -
 .../GroupingCenterCompilerPass.php            | 37 -------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/GroupingCenterCompilerPass.php

diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php
index 9fd6a9891..9e276311d 100644
--- a/src/Bundle/ChillMainBundle/ChillMainBundle.php
+++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php
@@ -72,7 +72,6 @@ class ChillMainBundle extends Bundle
         $container->addCompilerPass(new NotificationCounterCompilerPass());
         $container->addCompilerPass(new MenuCompilerPass());
         $container->addCompilerPass(new ACLFlagsCompilerPass());
-        $container->addCompilerPass(new GroupingCenterCompilerPass());
         $container->addCompilerPass(new CRUDControllerCompilerPass());
         $container->addCompilerPass(new ShortMessageCompilerPass());
     }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/GroupingCenterCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/GroupingCenterCompilerPass.php
deleted file mode 100644
index f0c06564b..000000000
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/GroupingCenterCompilerPass.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\MainBundle\DependencyInjection\CompilerPass;
-
-use LogicException;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-
-class GroupingCenterCompilerPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container)
-    {
-        if (false === $container->hasDefinition('chill.main.form.pick_centers_type')) {
-            throw new LogicException('The service chill.main.form.pick_centers_type does '
-                . 'not exists in container');
-        }
-
-        $pickCenterType = $container->getDefinition('chill.main.form.pick_centers_type');
-
-        foreach ($container->findTaggedServiceIds('chill.grouping_center') as $serviceId => $tagged) {
-            $pickCenterType->addMethodCall(
-                'addGroupingCenter',
-                [new Reference($serviceId)]
-            );
-        }
-    }
-}

From 73f332927db7215343ce8199658879079973b5a1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 2 Mar 2023 11:45:41 +0100
Subject: [PATCH 059/106] FIX [personMatcher] wrong syntax was used to
 setParameter for query in similar person matcher

---
 .../Search/SimilarPersonMatcher.php              | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
index b8209eaeb..6555f7835 100644
--- a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
+++ b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
@@ -79,6 +79,11 @@ class SimilarPersonMatcher
             ->where('SIMILARITY(p.fullnameCanonical, UNACCENT(LOWER(:fullName))) >= :precision')
             ->andWhere($qb->expr()->in('p.center', ':centers'));
 
+        $qb
+            ->setParameter('fullName', $this->personRender->renderString($person, []))
+            ->setParameter('centers', $centers)
+            ->setParameter('precision', $precision);
+
         if (null !== $person->getBirthdate()) {
             $qb->andWhere($qb->expr()->orX(
                 $qb->expr()->eq('p.birthdate', ':personBirthdate'),
@@ -90,13 +95,13 @@ class SimilarPersonMatcher
 
         if ($person->getId() !== null) {
             $qb->andWhere($qb->expr()->neq('p.id', ':personId'));
-            $query->setParameter('personId', $person->getId());
+            $qb->setParameter('personId', $person->getId());
 
             $notDuplicatePersons = $this->personNotDuplicateRepository->findNotDuplicatePerson($person);
 
             if (count($notDuplicatePersons)) {
                 $qb->andWhere($qb->expr()->notIn('p.id', ':notDuplicatePersons'));
-                $query->setParameter('notDuplicatePersons', $notDuplicatePersons);
+                $qb->setParameter('notDuplicatePersons', $notDuplicatePersons);
             }
         }
 
@@ -109,13 +114,10 @@ class SimilarPersonMatcher
             case self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY:
             default:
                 $qb->orderBy('SIMILARITY(p.fullnameCanonical, UNACCENT(LOWER(:fullName)))', 'DESC');
+                $qb->setParameter('fullName', $this->personRender->renderString($person, []));
         }
 
-        $qb
-            ->setParameter('fullName', $this->personRender->renderString($person, []))
-            ->setParameter('centers', $centers)
-            ->setParameter('precision', $precision);
-
+        dump($qb->getQuery());
         return $qb->getQuery()->getResult();
     }
 }

From ac4c82129093d37c6fe840e1224e037e64bddff1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 15 Feb 2023 20:08:04 +0100
Subject: [PATCH 060/106] FEATURE [profession] change field type of profession
 into string

---
 .../Entity/ThirdParty.php                     | 13 ++++-----
 .../migrations/Version20230215175150.php      | 29 +++++++++++++++++++
 2 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php

diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 2e8cebfb6..43f053c77 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -250,14 +250,11 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * [fr] Qualité.
-     *
-     * @var ThirdPartyProfession
-     * @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdPartyProfession")
-     * ORM\JoinColumn(name="profession", referencedColumnName="id", nullable=true)
+     * @ORM\Column(name="profession", type="string", length=255, nullable=false)
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      * @Context(normalizationContext={"groups": "docgen:read"}, groups={"docgen:read:3party:parent"})
      */
-    private ?ThirdPartyProfession $profession = null;
+    private string $profession = '';
 
     /**
      * @ORM\Column(name="telephone", type="phone_number", nullable=true)
@@ -491,9 +488,9 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     }
 
     /**
-     * @return ThirdPartyProfession
+     * @return string
      */
-    public function getProfession(): ?ThirdPartyProfession
+    public function getProfession(): string
     {
         return $this->profession;
     }
@@ -811,7 +808,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @return $this
      */
-    public function setProfession(?ThirdPartyProfession $profession): ThirdParty
+    public function setProfession(string $profession): self
     {
         $this->profession = $profession;
 
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
new file mode 100644
index 000000000..b87e722b4
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\ThirdParty;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230215175150 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Change profession to a string field and transfer values';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_3party.third_party ADD profession VARCHAR(255) DEFAULT \'\' NOT NULL');
+
+//        $this->addSql('ALTER TABLE chill_3party.third_party DROP profession_id');
+    }
+
+    public function down(Schema $schema): void
+    {
+//        $this->addSql('ALTER TABLE chill_3party.third_party ADD profession_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP profession');
+    }
+}

From bea839663f022736f4292f92c40ee72c903f6c60 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 15 Feb 2023 20:08:53 +0100
Subject: [PATCH 061/106] FEATURE [form] adjust symfony form to use text type

---
 .../ChillThirdPartyBundle/Form/ThirdPartyType.php | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index 79f107575..384c743c2 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -20,14 +20,10 @@ use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Chill\ThirdPartyBundle\Entity\ThirdPartyProfession;
 use Chill\ThirdPartyBundle\Form\Type\PickThirdPartyTypeCategoryType;
 use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
 use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -111,17 +107,8 @@ class ThirdPartyType extends AbstractType
                     'placeholder' => 'thirdparty.choose civility',
                     'required' => false,
                 ])
-                ->add('profession', EntityType::class, [
+                ->add('profession', TextType::class, [
                     'label' => 'thirdparty.Profession',
-                    'class' => ThirdPartyProfession::class,
-                    'choice_label' => function (ThirdPartyProfession $profession): string {
-                        return $this->translatableStringHelper->localize($profession->getName());
-                    },
-                    'query_builder' => static function (EntityRepository $er): QueryBuilder {
-                        return $er->createQueryBuilder('p')
-                            ->where('p.active = true');
-                    },
-                    'placeholder' => 'thirdparty.choose profession',
                     'required' => false,
                 ])
                 ->add('contactDataAnonymous', CheckboxType::class, [

From e50b02a8c7c73c030ca07a493fa3aa9a2946e5ce Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 22 Feb 2023 17:56:28 +0100
Subject: [PATCH 062/106] FIX [rendering] adjust vue components to correctly
 render profession string

---
 .../public/vuejs/_components/AddPersons/TypeThirdParty.vue   | 2 +-
 .../public/vuejs/_components/Entity/ThirdPartyRenderBox.vue  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
index 0c8251e4a..7fb77226d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="container tpartycontainer">
       <div class="tparty-identification">
-        <span v-if="item.result.profession" class="profession">{{ item.result.profession.name.fr }}</span>
+        <span v-if="item.result.profession" class="profession">{{ item.result.profession }}</span>
         <span class="name">
           {{ item.result.text }}&nbsp;
         </span>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 662911714..49066a082 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -36,7 +36,7 @@
                 <ul class="list-content fa-ul">
                     <li v-if="getProfession.length > 0">
                         <i class="fa fa-li fa-id-card"></i>
-                        <p><span v-for="p in getProfession" :key="p" class="list-item list-professions">{{ p[0].toUpperCase() + p.slice(1).toLowerCase() }}</span></p>
+                        <p><span>{{ getProfession[0] }}</span></p>
                     </li>
                     <li v-if="hasParent">
                         <i class="fa fa-li fa-hand-o-right"></i>
@@ -136,13 +136,14 @@ export default {
         getProfession() {
             let profession = []
             if (this.hasParent && this.thirdparty.profession) {
-                profession.push(this.thirdparty.profession.name.fr)
+                profession.push(this.thirdparty.profession)
                 return profession;
             }
 
             if (!this.hasParent && this.thirdparty.category) {
                 profession = this.thirdparty.category.map((category) => category.text);
             }
+
             return profession;
         }
         /* TODO need backend normalizer to serve children without circular reference

From e982e81900c93a355f98299a1ec96bc71ff6ddf4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 22 Feb 2023 17:57:30 +0100
Subject: [PATCH 063/106] FIX [post] adjust vue components to allow thirdparty
 to be posted with new profession type as string

---
 .../vuejs/OnTheFly/components/OnTheFly.vue    |  6 ++--
 .../components/Resources/ResourceItem.vue     |  2 +-
 .../vuejs/_components/OnTheFly/ThirdParty.vue | 30 +++++--------------
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 6dcca0d8a..28a51c4e6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -233,7 +233,7 @@ export default {
                      // console.log('data original', data);
                      data.parent = {type: "thirdparty", id: this.parent.id};
                      data.civility = data.civility !== null ? {type: 'chill_main_civility', id: data.civility.id} : null;
-                     data.profession = data.profession !== null ? {type: 'third_party_profession', id:  data.profession.id} : null;
+                     data.profession = data.profession !== '' ? data.profession : '';
                   } else {
                      type = this.$refs.castNew.radioType;
                      data = this.$refs.castNew.castDataByType();
@@ -241,8 +241,8 @@ export default {
                      if (typeof data.civility !== 'undefined' && null !== data.civility) {
                         data.civility = data.civility !== null ? {type: 'chill_main_civility', id: data.civility.id} : null;
                      }
-                     if (typeof data.profession !== 'undefined' && null !== data.profession) {
-                        data.profession = data.profession !== null ? {type: 'third_party_profession', id: data.profession.id} : null;
+                     if (typeof data.profession !== 'undefined' && '' !== data.profession) {
+                        data.profession = data.profession !== '' ? data.profession : '';
                      }
                      // console.log('onthefly data', data);
                   }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index 140a0e8b4..287d98b07 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -178,7 +178,7 @@ export default {
                body.civility = {type: 'chill_main_civility', id: payload.data.civility.id};
             }
             if (null !== payload.data.profession) {
-               body.profession = {type: 'third_party_profession', id: payload.data.profession.id};
+               body.profession = payload.data.profession;
             }
             // console.log('body', body);
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 765d67fe8..0c830d673 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -73,13 +73,13 @@
                   <option v-for="civility in civilities" :key="civility.id" :value="civility">{{ civility.name.fr }}</option>
                </select>
             </div>
-            <div class="input-group mb-3 input-section">
-               <select class="form-select form-select-lg" id="profession"
-                  v-model="thirdparty.profession">
-                  <option selected disabled :value="null">{{ $t('thirdparty.profession') }}</option>
-                  <option v-for="profession in professions" :key="profession.id" :value="profession">{{ profession.name.fr }}</option>
-               </select>
-            </div>
+           <div class="input-group mb-3 input-section">
+             <input class="form-control form-control-lg"
+                    v-model="thirdparty.profession"
+                    v-bind:placeholder="$t('thirdparty.profession')"
+                    v-bind:aria-label="$t('thirdparty.profession')"
+                    aria-describedby="profession" />
+           </div>
          </div>
          <div class="child-info">
             <div class="input-section">
@@ -192,9 +192,8 @@ export default {
             name: '',
             telephone: '',
             civility: null,
-            profession: null,
+            profession: '',
          },
-         professions: [],
          civilities: [],
          addAddress: {
             options: {
@@ -274,18 +273,6 @@ export default {
                   this.$toast.open({message: error.body})
                })
       },
-      loadProfessions() {
-         const url = `/api/1.0/thirdparty/professions.json`;
-         return makeFetch('GET', url)
-               .then(response => {
-                  this.$data.professions = response.results;
-                  return Promise.resolve();
-               })
-               .catch((error) => {
-                  console.log(error)
-                  this.$toast.open({message: error.body})
-               })
-      },
       submitAddress(payload) {
          console.log('submitAddress', payload);
           if (typeof payload.addressId !== 'undefined') { // <--
@@ -311,7 +298,6 @@ export default {
    },
    mounted() {
       let dependencies = [];
-      dependencies.push(this.loadProfessions());
       dependencies.push(this.loadCivilities());
       if (this.action !== 'create') {
          if (this.id) {

From 11e7f2179ca595aa01d03fcd34f0560ca1f844e0 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 22 Feb 2023 17:58:26 +0100
Subject: [PATCH 064/106] FIX [obsolete] remove obsolete code since thirdparty
 entity will be removed

---
 .../ChillThirdPartyExtension.php                  | 15 ---------------
 .../ChillThirdPartyBundle/chill.api.specs.yaml    | 11 -----------
 .../config/services/fixtures.yaml                 |  4 ----
 3 files changed, 30 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
index 76742951b..3c870449c 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
@@ -151,21 +151,6 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
                         ],
                     ],
                 ],
-                [
-                    'class' => \Chill\ThirdPartyBundle\Entity\ThirdPartyProfession::class,
-                    // 'controller' => \Chill\MainBundle\Controller\ProfessionApiController::class,
-                    'name' => 'profession',
-                    'base_path' => '/api/1.0/thirdparty/professions',
-                    'base_role' => 'ROLE_USER',
-                    'actions' => [
-                        '_index' => [
-                            'methods' => [
-                                Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true,
-                            ],
-                        ],
-                    ],
-                ],
             ],
         ]);
     }
diff --git a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
index 035185181..5477075e0 100644
--- a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
@@ -112,14 +112,3 @@ paths:
           description: "OK"
         422:
           description: "Object with validation errors"
-
-  /1.0/thirdparty/professions.json:
-    get:
-      tags:
-        - thirdparty
-      summary: Return all thirdparty professions
-      responses:
-          200:
-              description: "ok"
-          401:
-              description: "Unauthorized"
diff --git a/src/Bundle/ChillThirdPartyBundle/config/services/fixtures.yaml b/src/Bundle/ChillThirdPartyBundle/config/services/fixtures.yaml
index 40f663e6d..063188be9 100644
--- a/src/Bundle/ChillThirdPartyBundle/config/services/fixtures.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/config/services/fixtures.yaml
@@ -7,7 +7,3 @@ services:
   Chill\ThirdPartyBundle\DataFixtures\ORM\LoadThirdPartyCategory:
     tags:
       - { 'name': doctrine.fixture.orm }
-
-  Chill\ThirdPartyBundle\DataFixtures\ORM\LoadThirdPartyProfession:
-    tags:
-      - { 'name': doctrine.fixture.orm }

From 9a56a1b1152b73ee5b387e33985180033972133a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 3 Mar 2023 15:14:53 +0100
Subject: [PATCH 065/106] FEATURE [migration] migrate the old profession_id to
 inserting the corresponding string into new profession column string type

---
 .../migrations/Version20230215175150.php      | 50 ++++++++++++++++---
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
index b87e722b4..38acc8750 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
@@ -2,28 +2,64 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\ThirdParty;
 
+use Chill\ThirdPartyBundle\Entity\ThirdPartyProfession;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
-final class Version20230215175150 extends AbstractMigration
+final class Version20230215175150 extends AbstractMigration implements ContainerAwareInterface
 {
+    public ContainerInterface $container;
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP profession');
+        $this->addSql('ALTER TABLE chill_3party.third_party ADD profession_id INT DEFAULT NULL');
+    }
+
     public function getDescription(): string
     {
         return 'Change profession to a string field and transfer values';
     }
 
+    /**
+     * @return mixed
+     */
+    public function setContainer(?ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
     public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_3party.third_party ADD profession VARCHAR(255) DEFAULT \'\' NOT NULL');
 
-//        $this->addSql('ALTER TABLE chill_3party.third_party DROP profession_id');
-    }
+        $em = $this->container->get('doctrine.orm.entity_manager');
+        $professions = $em->getRepository(ThirdPartyProfession::class)->findAll();
 
-    public function down(Schema $schema): void
-    {
-//        $this->addSql('ALTER TABLE chill_3party.third_party ADD profession_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP profession');
+        foreach ($professions as $p) {
+            $id = $p->getId();
+            $name = $p->getName()['fr'];
+
+            $this->addSql(
+                'UPDATE chill_3party.third_party SET profession = :profession
+                          WHERE chill_3party.third_party.profession_id = :id;',
+                ['profession' => $name, 'id' => $id],
+                ['profession' => Types::STRING, 'id' => Types::INTEGER]
+            );
+        }
+
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP profession_id');
     }
 }

From f15017ebd74104bec277cce1fa52f4955dbe8240 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 3 Mar 2023 15:34:57 +0100
Subject: [PATCH 066/106] FIX don't delete profession_id column yet

---
 .../migrations/Version20230215175150.php                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
index 38acc8750..321922a7e 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
@@ -25,7 +25,7 @@ final class Version20230215175150 extends AbstractMigration implements Container
     public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_3party.third_party DROP profession');
-        $this->addSql('ALTER TABLE chill_3party.third_party ADD profession_id INT DEFAULT NULL');
+//        $this->addSql('ALTER TABLE chill_3party.third_party ADD profession_id INT DEFAULT NULL');
     }
 
     public function getDescription(): string
@@ -60,6 +60,6 @@ final class Version20230215175150 extends AbstractMigration implements Container
             );
         }
 
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP profession_id');
+//        $this->addSql('ALTER TABLE chill_3party.third_party DROP profession_id');
     }
 }

From 1b2c0ecc870917ccea320ec543f5df20adc009e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 6 Mar 2023 13:01:10 +0100
Subject: [PATCH 067/106] fixed: use TEXT instead of VARCHAR to store
 profession

---
 src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php        | 2 +-
 .../migrations/Version20230215175150.php                      | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 43f053c77..b13118168 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -250,7 +250,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * [fr] Qualité.
-     * @ORM\Column(name="profession", type="string", length=255, nullable=false)
+     * @ORM\Column(name="profession", type="text", nullable=false)
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      * @Context(normalizationContext={"groups": "docgen:read"}, groups={"docgen:read:3party:parent"})
      */
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
index 321922a7e..223c9aeae 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
@@ -43,7 +43,7 @@ final class Version20230215175150 extends AbstractMigration implements Container
 
     public function up(Schema $schema): void
     {
-        $this->addSql('ALTER TABLE chill_3party.third_party ADD profession VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE chill_3party.third_party ADD profession TEXT DEFAULT \'\' NOT NULL');
 
         $em = $this->container->get('doctrine.orm.entity_manager');
         $professions = $em->getRepository(ThirdPartyProfession::class)->findAll();
@@ -59,7 +59,5 @@ final class Version20230215175150 extends AbstractMigration implements Container
                 ['profession' => Types::STRING, 'id' => Types::INTEGER]
             );
         }
-
-//        $this->addSql('ALTER TABLE chill_3party.third_party DROP profession_id');
     }
 }

From 03ee04978c867c9bffcfa929cf619027281b328c Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 22 Feb 2023 16:04:55 +0100
Subject: [PATCH 068/106] FEATURE [confirm][popup] Add a popup asking for
 confirmation when referrer is changed to prevent mistakes and unecessary
 notifications

---
 .../components/Referrer.vue                   | 78 +++++++++++++------
 .../vuejs/AccompanyingCourse/js/i18n.js       |  2 +
 2 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
index c0093fa77..c5bb15147 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
@@ -2,6 +2,29 @@
   <div class="vue-component">
     <h2><a id="section-80"></a>{{ $t('referrer.title') }}</h2>
 
+    <teleport to="body">
+      <modal v-if="modal.showModal"
+             :modalDialogClass="modal.modalDialogClass"
+             @close="cancelChange">
+        <template v-slot:header>
+          <h3 class="modal-title">{{ $t('confirm.title') }}</h3>
+        </template>
+
+        <template v-slot:body-head>
+          <div class="modal-body">
+            <p v-html="$t('confirm.sure_referrer', { referrer: this.value.text })"></p>
+          </div>
+        </template>
+
+        <template v-slot:footer>
+          <button class="btn btn-save"
+                  @click.prevent="this.confirmReferrer">
+            {{ $t('confirm.ok_referrer')}}
+          </button>
+        </template>
+      </modal>
+    </teleport>
+
     <div>
 
       <label class="col-form-label" for="selectJob">
@@ -35,6 +58,7 @@
           :searchable="true"
           :placeholder="$t('referrer.placeholder')"
           v-model="value"
+          @select="updateReferrer"
           :options="users"
           :select-label="$t('multiselect.select_label')"
           :deselect-label="$t('multiselect.deselect_label')"
@@ -43,7 +67,7 @@
 
       <template v-if="usersSuggestedFilteredByJob.length > 0">
         <ul class="list-suggest add-items inline">
-          <li v-for="(u, i) in usersSuggestedFilteredByJob" @click="updateReferrer(u)" :key="`referrer-${i}`">
+          <li v-for="(u, i) in usersSuggestedFilteredByJob" @click="updateReferrer" :key="`referrer-${i}`">
                <span>
                   <user-render-box-badge :user="u"></user-render-box-badge>
                </span>
@@ -78,16 +102,24 @@ import VueMultiselect from 'vue-multiselect';
 import {makeFetch} from 'ChillMainAssets/lib/api/apiMethods';
 import {mapState, mapGetters} from 'vuex';
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge";
+import Modal from 'ChillMainAssets/vuejs/_components/Modal';
 
 export default {
   name: "Referrer",
   components: {
     UserRenderBoxBadge,
     VueMultiselect,
+    Modal
   },
   data() {
     return {
-      jobs: []
+      jobs: [],
+      modal: {
+        showModal: false,
+        modalDialogClass: "modal-dialog-scrollable modal-xl"
+      },
+      value: this.$store.state.accompanyingCourse.user,
+      confirmed: false
     }
   },
   computed: {
@@ -118,22 +150,6 @@ export default {
             });
       }
     },
-    value: {
-      get() {
-        return this.$store.state.accompanyingCourse.user;
-      },
-      set(value) {
-        console.log('set referrer', value);
-        this.$store.dispatch('updateReferrer', value)
-            .catch(({name, violations}) => {
-              if (name === 'ValidationException' || name === 'AccessException') {
-                violations.forEach((violation) => this.$toast.open({message: violation}));
-              } else {
-                this.$toast.open({message: 'An error occurred'})
-              }
-            });
-      }
-    },
   },
   mounted() {
     this.getJobs();
@@ -141,6 +157,7 @@ export default {
   methods: {
     updateReferrer(value) {
       this.value = value;
+      this.toggleModal();
     },
     getJobs() {
       const url = '/api/1.0/main/user-job.json';
@@ -159,12 +176,27 @@ export default {
       const url = `/api/1.0/main/whoami.json`;
       makeFetch('GET', url)
           .then(user => {
-            this.value = user
+            // this.value = user
+            this.updateReferrer(user);
           })
-      /*.catch((error) => {
-         commit('catchError', error);
-         this.$toast.open({message: error.body})
-      })*/
+    },
+    toggleModal() {
+      this.modal.showModal = !this.modal.showModal;
+    },
+    confirmReferrer() {
+      this.$store.dispatch('updateReferrer', this.value)
+          .catch(({name, violations}) => {
+            if (name === 'ValidationException' || name === 'AccessException') {
+              violations.forEach((violation) => this.$toast.open({message: violation}));
+            } else {
+              this.$toast.open({message: 'An error occurred'})
+            }
+          });
+      this.toggleModal()
+    },
+    cancelChange() {
+      this.value = this.$store.state.accompanyingCourse.user
+      this.toggleModal()
     }
   }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 170e19bf9..8bbd5c4ca 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -139,8 +139,10 @@ const appMessages = {
          set_a_scope: "indiquez au moins un service",
          sure: "Êtes-vous sûr ?",
          sure_description: "Une fois le changement confirmé, il ne sera plus possible de le remettre à l'état de brouillon !",
+         sure_referrer: "Êtes-vous sûr de vouloir assigner ce parcours à <b>{referrer}</b>",
          ok: "Confirmer le parcours",
          delete: "Supprimer le parcours",
+         ok_referrer: "Confirmer le référent",
          no_suggested_referrer: "Il n'y a aucun référent qui puisse être suggéré pour ce parcours. Vérifiez la localisation du parcours, les métiers et service indiqués. Si les données sont correctes, vous pouvez confirmer ce parcours.",
          one_suggested_referrer: "Un unique référent peut être suggéré pour ce parcours",
          choose_suggested_referrer: "Voulez-vous le désigner directement ?",

From c0675aee9b5da7f5a96c5ba737e425feb6e5617d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 6 Mar 2023 13:28:47 +0100
Subject: [PATCH 069/106] Fixed: set referrer from suggestion

---
 .../public/vuejs/AccompanyingCourse/components/Referrer.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
index c5bb15147..b16e8828a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
@@ -67,7 +67,7 @@
 
       <template v-if="usersSuggestedFilteredByJob.length > 0">
         <ul class="list-suggest add-items inline">
-          <li v-for="(u, i) in usersSuggestedFilteredByJob" @click="updateReferrer" :key="`referrer-${i}`">
+          <li v-for="(u, i) in usersSuggestedFilteredByJob" @click="updateReferrer(u)" :key="`referrer-${i}`">
                <span>
                   <user-render-box-badge :user="u"></user-render-box-badge>
                </span>

From e78eb8789d5ec0c366889af61e42de5e0c94c67f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 12:17:22 +0100
Subject: [PATCH 070/106] FIX [private comment] show private comment in
 activity listings

---
 .../views/Activity/_list_item.html.twig         | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
index 3a4749f3c..47dc8518c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -137,12 +137,27 @@
                         {{ activity.comment|chill_entity_render_box({
                             'disable_markdown': false,
                             'limit_lines': 3,
-                            'metadata': false
+                            'metadata': false,
                         }) }}
                     </div>
                 </div>
             {% endif %}
 
+            {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) and activity.privateComment.hasCommentForUser(app.user) %}
+                <div class="wl-row">
+                    <div class="wl-col title">
+                        <h3>{{ 'Private comment'|trans }}</h3>
+                    </div>
+                    <div class="wl-col list">
+                        <section class="chill-entity entity-comment-embeddable">
+                            <blockquote class="chill-user-quote private-quote">
+                                {{ activity.privateComment.comments[app.user.id]|chill_markdown_to_html }}
+                            </blockquote>
+                        </section>
+                    </div>
+                </div>
+            {% endif %}
+
             {#  Only if ACL SEE_DETAILS AND/OR only on template SHOW ??
                 durationTime
                 travelTime

From 1965fc55f47211dc080adbad0561afad8b52aa12 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Mar 2023 17:47:33 +0100
Subject: [PATCH 071/106] Fixed button DocumentActionsButtonsGroup display bug

- improve document table
- add a smallfont css classe to handle table style
when called from index or from show page
---
 .../vuejs/DocumentActionButtonsGroup.vue      |  2 +-
 .../views/Workflow/_attachment.html.twig      |  2 +-
 .../chill/scss/accompanying_period_work.scss  |  7 +++--
 .../AccompanyingCourseWork/_item.html.twig    |  3 +-
 .../_objectifs_results_evaluations.html.twig  | 31 +++++++------------
 .../AccompanyingCourseWork/index.html.twig    |  1 +
 .../views/Workflow/_evaluation.html.twig      |  2 +-
 .../Workflow/_evaluation_document.html.twig   |  2 +-
 8 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
index 2cb5e64fe..88587e90f 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="'ready' === props.storedObject.status" class="dropdown">
+  <div v-if="'ready' === props.storedObject.status" class="btn-group">
     <button :class="Object.assign({'btn': true, 'btn-outline-primary': true, 'dropdown-toggle': true, 'btn-sm': props.small})" type="button" data-bs-toggle="dropdown" aria-expanded="false">
       Actions
     </button>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig
index 24cf3cab4..2a1041c6f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig
@@ -72,7 +72,7 @@
                     </div>
                 </div>
                 <div class="item-row column">
-                    <table class="obj-res-eval my-3">
+                    <table class="obj-res-eval smallfont my-3">
                         <thead>
                         <tr><th class="obj"><h4 class="title_label">Objectif - motif - dispositif</h4></th>
                             <th class="res"><h4 class="title_label">Résultats - orientations</h4></th>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
index eeb2eb2be..03bbcbcf2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
@@ -20,9 +20,6 @@ div.accompanying-course-work {
                 margin: 0;
             }
         }
-        td {
-            font-size: 85%;
-        }
         td.obj,
         td.res {
             width: 50%;
@@ -37,6 +34,10 @@ div.accompanying-course-work {
         }
     }
 
+    .smallfont table.obj-res-eval td {
+        font-size: 85%;
+    }
+
     ul {
         &.goal_title,
         &.result_list,
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 8ab7a932c..94d31cb24 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -3,6 +3,7 @@
 #  - itemBlocClass: [uniq|colored|extended]
 #  - displayContent: [short|long] default: short
 #  - displayAction: [true|false] default: false
+#  - 'displayFontSmall': [true|false] default: false
 #}
 <div class="item-bloc{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
 
@@ -110,7 +111,7 @@
     </div>
 
     {% if displayContent is not defined or displayContent == 'short' %}
-        <div class="item-row column">
+        <div class="item-row column smallfont">
             {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
                 'displayContent': displayContent
             } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
index 63e4ff638..0dd0cc84a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
@@ -130,27 +130,20 @@
                         {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
                         {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
 
-                        <div class="download mb-4 container">
-                            {% if e.documents|length > 0 %}
-
+                        {% if e.documents|length > 0 %}
+                            <table class="table mt-4 mx-auto">
                                 {% for d in e.documents %}
-                                    <div class="row">
-                                        <div class="col text-start">
-                                            {{ d.title }}
-                                        </div>
-                                        <div class="col-md-auto text-center">
-                                            {{ mm.mimeIcon(d.storedObject.type) }}
-                                        </div>
-                                        <div class="col col-lg-4 text-end">
-                                            {{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}
-                                        </div>
-                                    </div>
+                                    <tr class="border-0">
+                                        <td class="border-0">{{ d.title }}</td>
+                                        <td class="border-0">{{ mm.mimeIcon(d.storedObject.type) }}</td>
+                                        <td class="border-0 text-end">{{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}</td>
+                                    </tr>
                                 {% endfor %}
-
-                            {% else %}
-                                <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
-                            {% endif %}
-                        </div>
+                            </table>
+                        {% else %}
+                            <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
+                        {% endif %}
+                        
 
                     {% endif %}
                 </td>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
index b12466e18..9214bd30d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
@@ -25,6 +25,7 @@
                     {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with {
                         'displayAction': true,
                         'displayContent': 'short',
+                        'displayFontSmall': true,
                         'itemBlocClass': ''
                     } %}
                 {% endfor %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig
index ca95760dd..b49455cfd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig
@@ -21,7 +21,7 @@
             </h2>
         </div>
         <div class="item-row column">
-            <table class="obj-res-eval my-3" style="font-size: 110% !important;">
+            <table class="obj-res-eval my-3">
                 <thead>
                     <tr>
                         <th class="eval">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index e5d8f9c9a..691a903ab 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -49,7 +49,7 @@
                 </div>
             </div>
             <div class="item-row column">
-                <table class="obj-res-eval my-3" style="font-size: 110% !important;">
+                <table class="obj-res-eval my-3">
                     <thead>
                         <tr>
                             <th class="eval">

From 1b15abe635589062bda31ef3cc3dd9ae3bfdc863 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Mar 2023 17:59:55 +0100
Subject: [PATCH 072/106] oops.. with condition

---
 .../Resources/views/AccompanyingCourseWork/_item.html.twig    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 94d31cb24..72d2bf375 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -3,7 +3,7 @@
 #  - itemBlocClass: [uniq|colored|extended]
 #  - displayContent: [short|long] default: short
 #  - displayAction: [true|false] default: false
-#  - 'displayFontSmall': [true|false] default: false
+#  - displayFontSmall: [true|false] default: false
 #}
 <div class="item-bloc{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
 
@@ -111,7 +111,7 @@
     </div>
 
     {% if displayContent is not defined or displayContent == 'short' %}
-        <div class="item-row column smallfont">
+        <div class="item-row column{% if displayFontSmall is defined and displayFontSmall == true %} smallfont{% endif %}">
             {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
                 'displayContent': displayContent
             } %}

From dd621186e81101b48a1e6dad0ad662cfb710d62d Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 6 Mar 2023 18:07:06 +0100
Subject: [PATCH 073/106] improve

---
 .../Resources/public/chill/scss/accompanying_period_work.scss   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
index 03bbcbcf2..a12f1554c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
@@ -34,7 +34,7 @@ div.accompanying-course-work {
         }
     }
 
-    .smallfont table.obj-res-eval td {
+    .smallfont table.obj-res-eval {
         font-size: 85%;
     }
 

From f376b1af49d0b5f40e5e60805be0a0c54e35e6c8 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 7 Mar 2023 16:23:41 +0100
Subject: [PATCH 074/106] UX: [badges] uniformize user badges in lists, shows
 and dashboards

---
 .../Resources/views/Activity/_list_item.html.twig             | 2 +-
 .../Resources/views/Activity/list_recent.html.twig            | 2 +-
 .../Resources/views/Activity/show.html.twig                   | 4 +++-
 .../Resources/views/AccompanyingCourseWork/_item.html.twig    | 2 +-
 .../list_recent_by_accompanying_period.html.twig              | 4 +++-
 .../Resources/views/Person/list_with_period.html.twig         | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
index 47dc8518c..b7f13210b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -68,7 +68,7 @@
                     <div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
                     <div class="wl-col list">
                         <p class="wl-item">
-                            {{ activity.user|chill_entity_render_box }}
+                            <span class="badge-user">{{ activity.user|chill_entity_render_box }}</span>
                         </p>
                     </div>
                 </div>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
index e4184da36..aa0bbea0c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
@@ -41,7 +41,7 @@
                         {% if activity.user and t.userVisible %}
                             <li>
                                 <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                                <b>{{ activity.user|chill_entity_render_box}}</b>
+                                <span class="badge-user">{{ activity.user|chill_entity_render_box }}</span>
                             </li>
                         {% endif %}
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 1ec0ab274..5fe93a3b8 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -35,7 +35,9 @@
         <div class="item-row separator">
             <dl class="chill_view_data">
                 <dt class="inline">{{ 'Referrer'|trans|capitalize }}</dt>
-                <dd>{{ entity.user|chill_entity_render_box }}</dd>
+                <dd>
+                    <span class="badge-user">{{ entity.user|chill_entity_render_box }}</span>
+                </dd>
 
                 {%- if entity.scope -%}
                     <dt class="inline">{{ 'Scope'|trans }}</dt>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 72d2bf375..001ac1661 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -84,7 +84,7 @@
                     {%- if w.referrers|length > 0 -%}
                         {% for u in w.referrers %}
                             <span class="wl-item">
-                                {{ u|chill_entity_render_box }}
+                                <span class="badge-user">{{ u|chill_entity_render_box }}</span>
                                 {% if not loop.last %}, {% endif %}
                             </span>
                         {% endfor %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
index 51c9bf926..92b2e3920 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
@@ -33,8 +33,10 @@
                         <span class="item-key">{{ 'Referrers'|trans ~ ' : ' }}</span>
                         {% for u in w.referrers %}
                             <span class="badge-user">{{ u|chill_entity_render_box }}</span>
-                            {% if not loop.last %}, {% endif %}
                         {% endfor %}
+                        {% if w.referrers|length == 0 %}
+                            <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                        {% endif %}
                     </li>
                     {% endif %}
                     <li class="associated-persons">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
index c0af2efc3..4497b8226 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
@@ -69,7 +69,7 @@
                         </div>
                         <div class="wl-col list">
                             <div class="user">
-                                {{ acp.user|chill_entity_render_box }}
+                                <span class="badge-user">{{ acp.user|chill_entity_render_box }}</span>
                             </div>
                         </div>
                     </div>

From 2e822a9486e0bbe19e809a614b6d500c454aa63c Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 9 Mar 2023 12:35:29 +0100
Subject: [PATCH 075/106] Fix bug on admin Location Page with availableForUsers
 value

---
 src/Bundle/ChillMainBundle/Controller/LocationController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/LocationController.php b/src/Bundle/ChillMainBundle/Controller/LocationController.php
index 232c9c6cf..78a4f7ba3 100644
--- a/src/Bundle/ChillMainBundle/Controller/LocationController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LocationController.php
@@ -28,7 +28,7 @@ class LocationController extends CRUDController
 
     protected function customizeQuery(string $action, Request $request, $query): void
     {
-        $query->where('e.availableForUsers = "TRUE"');
+        $query->where('e.availableForUsers = TRUE');
     }
 
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)

From 23cee274a59d99c2ac72a2c6096e03b5756be3d8 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 12:31:46 +0100
Subject: [PATCH 076/106] FEATURE [documents][listing] show document titles in
 activity listing if there are any and user has see_detail rights

---
 .../views/Activity/_list_item.html.twig          | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
index b7f13210b..8faa68b6b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -165,6 +165,22 @@
                 documents
                 attendee
             #}
+
+            {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) and activity.documents|length > 0 %}
+                <div class="wl-row">
+                    <div class="wl-col title">
+                        <h3>{{ 'Documents'|trans }}</h3>
+                    </div>
+                    <div class="wl-col list">
+                        <ul>
+                            {% for d in activity.documents %}
+                                <li>{{ d.title }}</li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                </div>
+            {% endif %}
+
         </div>
     </div>
 

From 3aac4d5d35b9a52c83d031310990d5ede3d11bc1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 7 Mar 2023 14:25:17 +0100
Subject: [PATCH 077/106] FEATURE add download button to document listing

---
 .../Resources/public/chill/chillactivity.scss      | 14 ++++++++++++++
 .../Resources/views/Activity/_list_item.html.twig  | 12 ++----------
 .../Activity/listAccompanyingCourse.html.twig      |  2 ++
 .../Resources/views/Activity/listPerson.html.twig  |  2 ++
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
index 5c1c83d06..01364717e 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
@@ -88,3 +88,17 @@ div.flex-bloc.concerned-groups {
       font-size: 120%;
    }
 }
+
+/// DOCUMENT LIST IN ACTIVITY ITEM
+
+li.document-list-item {
+    display: flex;
+    width: 100%;
+    justify-content: space-between;
+    margin-bottom: 0.3rem;
+
+    .dropdown-toggle {
+        border-radius: 5px;
+        line-height: 1rem;
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
index 8faa68b6b..dc8415659 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -157,15 +157,7 @@
                     </div>
                 </div>
             {% endif %}
-
-            {#  Only if ACL SEE_DETAILS AND/OR only on template SHOW ??
-                durationTime
-                travelTime
-                comment
-                documents
-                attendee
-            #}
-
+            
             {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) and activity.documents|length > 0 %}
                 <div class="wl-row">
                     <div class="wl-col title">
@@ -174,7 +166,7 @@
                     <div class="wl-col list">
                         <ul>
                             {% for d in activity.documents %}
-                                <li>{{ d.title }}</li>
+                                <li class="document-list-item">{{ d.title }} {{ d|chill_document_button_group() }}</li>
                             {% endfor %}
                         </ul>
                     </div>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
index a666f183d..bdf55d86f 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
@@ -8,11 +8,13 @@
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block content %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
index 0514284a2..0c1afdac9 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -23,11 +23,13 @@
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block content %}

From 83e0a50b572375d65b57ed970c2cc647fc49a9e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 9 Mar 2023 17:47:32 +0100
Subject: [PATCH 078/106] Fixed: do not alter layout for bootstrap

---
 .../Resources/public/chill/chillactivity.scss               | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
index 01364717e..d70bd28c3 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
@@ -90,15 +90,9 @@ div.flex-bloc.concerned-groups {
 }
 
 /// DOCUMENT LIST IN ACTIVITY ITEM
-
 li.document-list-item {
     display: flex;
     width: 100%;
     justify-content: space-between;
     margin-bottom: 0.3rem;
-
-    .dropdown-toggle {
-        border-radius: 5px;
-        line-height: 1rem;
-    }
 }

From 6e812b54e140aa7c64c8e885eb91e24a8efd29c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 9 Mar 2023 17:47:52 +0100
Subject: [PATCH 079/106] Fixed: add small button and ACL on document edit

---
 .../Resources/views/Activity/_list_item.html.twig             | 4 ++--
 .../Resources/views/Activity/show.html.twig                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
index dc8415659..f2430c200 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -157,7 +157,7 @@
                     </div>
                 </div>
             {% endif %}
-            
+
             {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) and activity.documents|length > 0 %}
                 <div class="wl-row">
                     <div class="wl-col title">
@@ -166,7 +166,7 @@
                     <div class="wl-col list">
                         <ul>
                             {% for d in activity.documents %}
-                                <li class="document-list-item">{{ d.title }} {{ d|chill_document_button_group() }}</li>
+                                <li class="document-list-item">{{ d.title }} {{ d|chill_document_button_group(d.title, is_granted('CHILL_ACTIVITY_UPDATE', activity), {small: true}) }}</li>
                             {% endfor %}
                         </ul>
                     </div>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 5fe93a3b8..b7a9d7239 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -170,7 +170,7 @@
                     {% if entity.documents|length > 0 %}
                         <ul>
                             {% for d in entity.documents %}
-                                <li>{{ d.title }} {{ d|chill_document_button_group() }}</li>
+                                <li class="document-list-item">{{ d.title }} {{ d|chill_document_button_group(d.title, is_granted('CHILL_ACTIVITY_UPDATE', entity), {small: true}) }}</li>
                             {% endfor %}
                         </ul>
                     {% else %}

From 78858e84f288278bc93e730f368e1c7d5b7505ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 9 Mar 2023 18:01:39 +0100
Subject: [PATCH 080/106] Fixed: force a name when downloading a document
 without filename

see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/1005
---
 .../Resources/views/Activity/_list_item.html.twig      |  2 +-
 .../Resources/views/Activity/show.html.twig            |  2 +-
 .../public/vuejs/StoredObjectButton/DownloadButton.vue | 10 ++++------
 .../ChillDocStoreBundle/translations/messages.fr.yml   |  5 ++++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
index f2430c200..885125aa6 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -166,7 +166,7 @@
                     <div class="wl-col list">
                         <ul>
                             {% for d in activity.documents %}
-                                <li class="document-list-item">{{ d.title }} {{ d|chill_document_button_group(d.title, is_granted('CHILL_ACTIVITY_UPDATE', activity), {small: true}) }}</li>
+                                <li class="document-list-item">{{ d.title|chill_print_or_message('document.Any title') }} {{ d|chill_document_button_group(d.title, is_granted('CHILL_ACTIVITY_UPDATE', activity), {small: true}) }}</li>
                             {% endfor %}
                         </ul>
                     </div>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index b7a9d7239..acda43b97 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -170,7 +170,7 @@
                     {% if entity.documents|length > 0 %}
                         <ul>
                             {% for d in entity.documents %}
-                                <li class="document-list-item">{{ d.title }} {{ d|chill_document_button_group(d.title, is_granted('CHILL_ACTIVITY_UPDATE', entity), {small: true}) }}</li>
+                                <li class="document-list-item">{{ d.title|chill_print_or_message('document.Any title') }} {{ d|chill_document_button_group(d.title, is_granted('CHILL_ACTIVITY_UPDATE', entity), {small: true}) }}</li>
                             {% endfor %}
                         </ul>
                     {% else %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
index ca6a0f618..f05d1e91c 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
@@ -38,13 +38,11 @@ async function download_and_open(event: Event): Promise<void> {
     button.href = window.URL.createObjectURL(raw);
     button.type = props.storedObject.type;
 
-    if (props.filename !== undefined) {
-      button.download = props.filename || 'document';
+    button.download = props.filename || 'document';
 
-      const ext = mime.getExtension(props.storedObject.type);
-      if (null !== ext) {
-        button.download = button.download + '.' + ext;
-      }
+    const ext = mime.getExtension(props.storedObject.type);
+    if (null !== ext) {
+      button.download = button.download + '.' + ext;
     }
   }
 
diff --git a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
index b658dbbee..1d06c58e4 100644
--- a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
@@ -19,6 +19,9 @@ The document is successfully registered: Le document est enregistré
 The document is successfully updated: Le document est mis à jour
 Any description: Aucune description
 
+document:
+    Any title: Aucun titre
+
 # delete
 Delete document ?: Supprimer le document ?
 Are you sure you want to remove this document ?: Êtes-vous sûr·e de vouloir supprimer ce document ?
@@ -73,4 +76,4 @@ CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE: Créer un document
 CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE: Supprimer un document
 CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE: Voir les documents
 CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS: Voir les détails d'un document
-CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE: Modifier un document
\ No newline at end of file
+CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE: Modifier un document

From 3901fe2d32b3a99ac8f87587a158455d47f1d1c4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 10 Mar 2023 12:03:33 +0100
Subject: [PATCH 081/106] FIX [translations][dutch] change some dutch
 translations

---
 .../translations/messages.nl.yml              |  4 +-
 .../translations/messages.nl.yml              |  4 +-
 .../translations/messages.nl.yml              | 54 +++++++++----------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/Bundle/ChillBudgetBundle/translations/messages.nl.yml b/src/Bundle/ChillBudgetBundle/translations/messages.nl.yml
index 5fd21520d..de334f79f 100644
--- a/src/Bundle/ChillBudgetBundle/translations/messages.nl.yml
+++ b/src/Bundle/ChillBudgetBundle/translations/messages.nl.yml
@@ -2,8 +2,8 @@ Budget: Budget
 Resource: Inkomsten
 Charge: Onkosten
 Budget for %name%: Budget van %name%
-Budget for household %household%: Budget van gezin
-Current budget household members: Actuele budget van gezinsleden
+Budget for household %household%: Budget van huishouden
+Current budget household members: Actuele budget van leden huishouden
 Show budget of %name%: Toon budget van %name%
 See complete budget: Toon volledige budget
 Hide budget: Verbergen
diff --git a/src/Bundle/ChillMainBundle/translations/messages.nl.yml b/src/Bundle/ChillMainBundle/translations/messages.nl.yml
index 4412ad015..97341dd3c 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.nl.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.nl.yml
@@ -253,8 +253,8 @@ No options availables. Your report is fully configured.: Geen beschikbare opties
 Ungrouped exports: Overige expor
 
 #export download
-Download export: Téléchargement du rapport
-Waiting for your report: En attente de votre rapport
+Download export: Downloaden van rapport
+Waiting for your report: Wachten op je rapport
 Download your report: Télécharger votre rapport
 Problem during download: Problème durant le téléchargement
 # sans valeur
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.nl.yml b/src/Bundle/ChillPersonBundle/translations/messages.nl.yml
index 2ecbd41a0..941f9d585 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.nl.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.nl.yml
@@ -125,7 +125,7 @@ address_country_code: Landscode
 'Alreay existing person': 'Reeds bestaand persoonsdossier'
 'Add the person': 'Persoon toevoegen'
 'Add the person and create an accompanying period': "Persoon & hulpverleningstraject aanmaken"
-'Add the person and create a household': "Persoon & gezin aanmaken"
+'Add the person and create a household': "Persoon & huishouden aanmaken"
 Show person: Toon persoonsdossier
 'Confirm the creation': 'Aanmaak dossier bevestigen'
 'You will create this person': 'U zal het volgende dossier aanmaken'
@@ -177,9 +177,9 @@ An accompanying period ends: Een hulpverleningstraject loopt op zijn einde
 An accompanying period starts: Een hulpverleningstraject gaat van start
 Any accompanying periods are open: Geen enkel hulpverleningstraject open
 An accompanying period is open: Een hulpverleningstraject staat open
-Accompanying period list: Hulpverleningstraject
+Accompanying period list: Hulpverleningstrajecten
 Accompanying period list for person: Hulpverleningstrajecten van persoon
-Accompanying period: Hulpverleningstraject
+Accompanying period: Hulpverleningstrajecten
 Any accompanying period: Geen enkel hulpverleningstraject
 period: Hulpverleningstraject
 New accompanying course: Nieuw hulpverleningstraject
@@ -215,8 +215,8 @@ No resources: "Geen hulpverlening partners"
 Persons associated: Betrokken personen
 Referrer: Doorverwijzer
 Referrers: Doorverwijzers
-Some peoples does not belong to any household currently. Add them to an household soon: Sommige personen maken nog geen deel uit van een gezin. Voeg ze zo snel mogelijk aan gezin toe.
-Add to household now: Toevoegen aan een gezin
+Some peoples does not belong to any household currently. Add them to an household soon: Sommige personen maken nog geen deel uit van een huishouden. Voeg ze zo snel mogelijk aan huishouden toe.
+Add to household now: Toevoegen aan een huishouden
 Any resource for this accompanying course: Geen enkele hulpverlening partner
 course.draft: Ontwerp
 course.closed: Afgesloten
@@ -458,7 +458,7 @@ Accompanying course location: Locatie van hulpverleningstraject
 This course is located by: Locatie bij
 This course has a temporarily location: Voorlopige locatie
 Choose a person to locate by: Adres van persoon toewijzen
-Associate at least one member with an household, and set an address to this household: Associeer minstens één betrokken persoon in dit hulpverleningstraject met een gezin en wijs een adres toe aan dit gezin.
+Associate at least one member with an household, and set an address to this household: Associeer minstens één betrokken persoon in dit hulpverleningstraject met een huishouden en wijs een adres toe aan dit huishouden.
 Locate by: Adres toewijzen
 fix it: Aanvullen
 accompanying_course:
@@ -480,23 +480,23 @@ accompanying_course_comment:
 Read more: Meer lezen..
 
 # Household
-Household: Gezin
+Household: Huishouden
 Summary: Samenvatting
-Members: Gezinsleden
+Members: Leden huishouden
 Addresses: Addressen
 Move household: Nieuwe verhuis
 Addresses history for household: Historiek adressen
-Household accompanying period: Hulpverleningstrajecten van gezin
-Household summary: Samenvatting gezin
-Edit household address: Adres gezin bijwerken
-Show household: Gezin bekijken
-Back to household: Terugkeren naar gezin
-Remove household composition: Gezinssamenstelling verwijderen
-Are you sure you want to remove this composition?: Bent u zeker deze gezinssamenstelling te willen verwijderen?
-Concerns household n°%id%: Betrokken gezin n°%id%
-Composition: Gezinssamenstelling
+Household accompanying period: Hulpverleningstrajecten van huishouden
+Household summary: Samenvatting huishouden
+Edit household address: Adres huishouden bijwerken
+Show household: huishouden bekijken
+Back to household: Terugkeren naar huishouden
+Remove household composition: huishoudenssamenstelling verwijderen
+Are you sure you want to remove this composition?: Bent u zeker deze huishoudenssamenstelling te willen verwijderen?
+Concerns household n°%id%: Betrokken huishouden n°%id%
+Composition: huishoudenssamenstelling
 Budget: Budget
-The composition has been successfully removed.: De gezinssamenstelling werd verwijdert.
+The composition has been successfully removed.: De huishoudenssamenstelling werd verwijdert.
 
 # accompanying course work
 Accompanying Course Actions: Hulpverleningsmaatregelen
@@ -560,16 +560,16 @@ You are getting a notification for a period you are not allowed to see: De notif
 This is the minimal period details: Hulpverleningstraject n°
 
 household_composition:
-    No composition yet: Geen enkele gezinssamenstelling toegewezen
-    Compositions: Gezinssamenstelling
+    No composition yet: Geen enkele huishoudenssamenstelling toegewezen
+    Compositions: huishoudenssamenstelling
     endDate: Einddatum
-    numberOfChildren: Aantal kinderen in het gezin
-    Household composition: Gezinssamenstelling
-    Composition added: Informatie over de gezinssamenstelling toegevoegd
-    Currently no composition: Geen enkele gezinssamenstelling toegewezen
-    Add a composition: Een gezinssamenstelling toevoegen
-    Update composition: Gezinssamenstelling bijwerken
-    Create: Een nieuwe gezinssamenstelling toewijzen
+    numberOfChildren: Aantal kinderen in het huishouden
+    Household composition: huishoudenssamenstelling
+    Composition added: Informatie over de huishoudenssamenstelling toegevoegd
+    Currently no composition: Geen enkele huishoudenssamenstelling toegewezen
+    Add a composition: Een huishoudenssamenstelling toevoegen
+    Update composition: huishoudenssamenstelling bijwerken
+    Create: Een nieuwe huishoudenssamenstelling toewijzen
 
 # docgen
 Linked evaluations: Gerelateerde evaluaties

From 4df6a6fc85f517c2955228d02300e33fecdc8815 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 10 Mar 2023 12:56:05 +0100
Subject: [PATCH 082/106] FIX [review] processing review, but stuck at
 transformation of json string to array

---
 .../AccompanyingCourseDocumentWorkflowHandler.php         | 2 +-
 .../ChillMainBundle/Entity/Workflow/EntityWorkflow.php    | 2 +-
 .../ChillMainBundle/Form/Type/PickUserDynamicType.php     | 2 +-
 .../Resources/public/module/pick-entity/index.js          | 8 +++++---
 .../Resources/public/vuejs/PickEntity/PickEntity.vue      | 5 +++--
 .../ChillPersonBundle/Form/Type/PickPersonDynamicType.php | 2 +-
 ...panyingPeriodWorkEvaluationDocumentWorkflowHandler.php | 2 +-
 .../AccompanyingPeriodWorkEvaluationWorkflowHandler.php   | 2 +-
 .../Workflow/AccompanyingPeriodWorkWorkflowHandler.php    | 2 +-
 .../Form/Type/PickThirdpartyDynamicType.php               | 2 +-
 10 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
index ec714aa74..c538bd107 100644
--- a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
@@ -100,7 +100,7 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
         $suggestedUsers = $entityWorkflow->getUsersInvolved();
 
         $referrer = $this->getRelatedEntity($entityWorkflow)->getCourse()->getUser();
-        $suggestedUsers[$referrer->getId()] = $referrer;
+        $suggestedUsers[spl_object_hash($referrer)] = $referrer;
 
         return $suggestedUsers;
     }
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
index 62e6bac0f..99aba07fd 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
@@ -357,7 +357,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 
         foreach ($this->steps as $step) {
             foreach ($step->getDestUser() as $u) {
-                $usersInvolved[$u->getId()] = $u;
+                $usersInvolved[spl_object_hash($u)] = $u;
             }
         }
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
index 9a2c1fbb4..6bfd95fe8 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
@@ -55,7 +55,7 @@ class PickUserDynamicType extends AbstractType
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
             ->setDefault('compound', false)
-            ->setDefault('suggested', null);
+            ->setDefault('suggested', []);
     }
 
     public function getBlockPrefix()
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
index bb9cc744c..41330c186 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -23,10 +23,12 @@ function loadDynamicPicker(element) {
                     (input.value === '[]' || input.value === '') ?
                         null : [ JSON.parse(input.value) ]
                 )
-            suggested = null !== JSON.parse(el.dataset.suggested) ? JSON.parse(el.dataset.suggested) : null
-        ;
+            suggested = JSON.parse('[' + el.dataset.suggested + ']');
+            // suggested = suggested[0];
 
-        console.log('suggested', suggested)
+        console.log(typeof suggested)
+        // console.log(el.dataset.suggested)
+        console.log('suggested', typeof suggested[0])
 
         if (!isMultiple) {
             if (input.value === '[]'){
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 02b53a6d3..23a904b14 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -17,7 +17,8 @@
             </add-persons>
         </li>
     </ul>
-    <ul v-if="suggested !== null" class="list-suggest add-items inline">
+    <ul v-if="Object.keys(suggested).length > 0" class="list-suggest add-items inline">
+      <p>hello {{ Object.keys(suggested) }}</p>
       <li v-for="s in suggested" :key="s.id" @click="addNewSuggested(s)"><span>{{ s.text }}</span></li>
     </ul>
 </template>
@@ -55,7 +56,7 @@ export default {
         },
         suggested: {
           type: Array,
-          default: null
+          default: []
         }
     },
     emits: ['addNewEntity', 'removeEntity'],
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
index 91e46d193..c0955b3ad 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
@@ -54,7 +54,7 @@ class PickPersonDynamicType extends AbstractType
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
             ->setDefault('compound', false)
-            ->setDefault('suggested', null);
+            ->setDefault('suggested', []);
     }
 
     public function getBlockPrefix()
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index 2c78e2099..500daab6f 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -107,7 +107,7 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
             ->getAccompanyingPeriod()
             ->getUser();
 
-        $suggestedUsers[$referrer->getId()] = $referrer;
+        $suggestedUsers[spl_object_hash($referrer)] = $referrer;
 
         return $suggestedUsers;
     }
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
index a6d9fc9b4..db67ef045 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
@@ -96,7 +96,7 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
             ->getAccompanyingPeriod()
             ->getUser();
 
-        $suggestedUsers[$referrer->getId()] = $referrer;
+        $suggestedUsers[spl_object_hash($referrer)] = $referrer;
 
         return $suggestedUsers;
     }
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
index 142a57229..75ad04cfb 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
@@ -102,7 +102,7 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
             ->getAccompanyingPeriod()
             ->getUser();
 
-        $suggestedUsers[$referrer->getId()] = $referrer;
+        $suggestedUsers[spl_object_hash($referrer)] = $referrer;
 
         return $suggestedUsers;
     }
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
index d813918f7..2e282a31b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
@@ -54,7 +54,7 @@ class PickThirdpartyDynamicType extends AbstractType
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
             ->setDefault('compound', false)
-            ->setDefault('suggested', null);
+            ->setDefault('suggested', []);
     }
 
     public function getBlockPrefix()

From 896b4cdfe315f0659e8b5e0602a971654f8f1b15 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 10 Mar 2023 15:36:18 +0100
Subject: [PATCH 083/106] FIX [regroupment][datamapper] add condition to check
 if key exists in forms array

---
 .../Form/DataMapper/ExportPickCenterDataMapper.php  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
index 0d21b0adb..549805fc5 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
@@ -17,6 +17,7 @@ use Chill\MainBundle\Repository\RegroupmentRepository;
 use Exception;
 use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\FormInterface;
+use function array_key_exists;
 use function count;
 
 class ExportPickCenterDataMapper implements DataMapperInterface
@@ -29,7 +30,7 @@ class ExportPickCenterDataMapper implements DataMapperInterface
      *
      * @throws Exception
      *
-     * @return mixed
+     * @return void
      */
     public function mapDataToForms($data, $forms)
     {
@@ -72,10 +73,12 @@ class ExportPickCenterDataMapper implements DataMapperInterface
             $centers[spl_object_hash($center)] = $center;
         }
 
-        foreach ($forms['regroupment']->getData() as $regroupment) {
-            /** @var Regroupment $regroupment */
-            foreach ($regroupment->getCenters() as $center) {
-                $centers[spl_object_hash($center)] = $center;
+        if (array_key_exists('regroupment', $forms)) {
+            foreach ($forms['regroupment']->getData() as $regroupment) {
+                /** @var Regroupment $regroupment */
+                foreach ($regroupment->getCenters() as $center) {
+                    $centers[spl_object_hash($center)] = $center;
+                }
             }
         }
 

From 4a30f310b82b785df8229ca670492a40eb8aed1b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 13 Mar 2023 16:41:43 +0100
Subject: [PATCH 084/106] FIX [referrer][deselect] allow referrer to be
 deselected in parcours edit form

---
 .../vuejs/AccompanyingCourse/components/Referrer.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
index b16e8828a..aff143dfe 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
@@ -59,6 +59,7 @@
           :placeholder="$t('referrer.placeholder')"
           v-model="value"
           @select="updateReferrer"
+          @remove="removeReferrer"
           :options="users"
           :select-label="$t('multiselect.select_label')"
           :deselect-label="$t('multiselect.deselect_label')"
@@ -194,6 +195,17 @@ export default {
           });
       this.toggleModal()
     },
+    removeReferrer() {
+      console.log('remove option')  
+      this.$store.dispatch('updateReferrer', null)
+          .catch(({name, violations}) => {
+            if (name === 'ValidationException' || name === 'AccessException') {
+              violations.forEach((violation) => this.$toast.open({message: violation}));
+            } else {
+              this.$toast.open({message: 'An error occurred'})
+            }
+          });
+    },
     cancelChange() {
       this.value = this.$store.state.accompanyingCourse.user
       this.toggleModal()

From 3821bc3a70d7e51b92a6bec66d1b699b9874ebf4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 15 Mar 2023 09:37:28 +0100
Subject: [PATCH 085/106] FIX [review] implement changes based on review

---
 .../Form/Type/PickUserDynamicType.php         | 11 +++++++++--
 .../public/module/pick-entity/index.js        | 19 +++++++++++--------
 .../public/vuejs/PickEntity/PickEntity.vue    | 14 +++++---------
 .../Resources/views/Form/fields.html.twig     |  6 +++++-
 .../Form/Type/PickPersonDynamicType.php       | 13 ++++++++++---
 .../Form/Type/PickThirdpartyDynamicType.php   | 11 +++++++++--
 6 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
index 6bfd95fe8..de54d071a 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
@@ -19,6 +19,7 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
@@ -28,12 +29,15 @@ class PickUserDynamicType extends AbstractType
 {
     private DenormalizerInterface $denormalizer;
 
+    private NormalizerInterface $normalizer;
+
     private SerializerInterface $serializer;
 
-    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer)
+    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, NormalizerInterface $normalizer)
     {
         $this->denormalizer = $denormalizer;
         $this->serializer = $serializer;
+        $this->normalizer = $normalizer;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -46,7 +50,10 @@ class PickUserDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['user'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
-        $view->vars['suggested'] = $this->serializer->serialize($options['suggested'], 'json', ['groups' => 'read']);
+
+        foreach ($options['suggested'] as $user) {
+            $view->vars['suggested'][spl_object_hash($user)] = $this->normalizer->normalize($user, 'json', ['groups' => 'read']);
+        }
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
index 41330c186..ce9c66145 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -23,12 +23,7 @@ function loadDynamicPicker(element) {
                     (input.value === '[]' || input.value === '') ?
                         null : [ JSON.parse(input.value) ]
                 )
-            suggested = JSON.parse('[' + el.dataset.suggested + ']');
-            // suggested = suggested[0];
-
-        console.log(typeof suggested)
-        // console.log(el.dataset.suggested)
-        console.log('suggested', typeof suggested[0])
+            suggested = JSON.parse(el.dataset.suggested);
 
         if (!isMultiple) {
             if (input.value === '[]'){
@@ -58,13 +53,18 @@ function loadDynamicPicker(element) {
                 }
             },
             methods: {
-                addNewEntity(entity) {
+                addNewEntity({entity, isSuggested = false}) {
                     if (this.multiple) {
                         if (!this.picked.some(el => {
                             return el.type === entity.type && el.id === entity.id;
                         })) {
                             this.picked.push(entity);
                             input.value = JSON.stringify(this.picked);
+                            console.log(entity)
+                            if (isSuggested) {
+                              const indexToRemove = this.suggested.findIndex(e => e.id === entity.id)
+                              this.suggested.splice(indexToRemove, 1);
+                            }
                         }
                     } else {
                         if (!this.picked.some(el => {
@@ -76,9 +76,12 @@ function loadDynamicPicker(element) {
                         }
                     }
                 },
-                removeEntity(entity) {
+                removeEntity({entity, isSuggested = false}) {
                     this.picked = this.picked.filter(e => !(e.type === entity.type && e.id === entity.id));
                     input.value = JSON.stringify(this.picked);
+                    if (isSuggested) {
+                      this.suggested.push(entity);
+                    }
                 },
             }
         })
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 23a904b14..7d6d0bd83 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -17,8 +17,7 @@
             </add-persons>
         </li>
     </ul>
-    <ul v-if="Object.keys(suggested).length > 0" class="list-suggest add-items inline">
-      <p>hello {{ Object.keys(suggested) }}</p>
+    <ul class="list-suggest add-items inline">
       <li v-for="s in suggested" :key="s.id" @click="addNewSuggested(s)"><span>{{ s.text }}</span></li>
     </ul>
 </template>
@@ -105,14 +104,12 @@ export default {
     },
     methods: {
       addNewSuggested(entity) {
-        this.$emit('addNewEntity', entity);
-        const indexToRemove = this.suggested.findIndex(e => e.id === entity.id)
-        this.suggested.splice(indexToRemove, 1);
+        this.$emit('addNewEntity', {entity: entity, isSuggested: true});
       },
       addNewEntity({ selected, modal }) {
           selected.forEach((item) => {
-                  this.$emit('addNewEntity', item.result);
-              }, this
+              this.$emit('addNewEntity', { entity: item.result });
+            }, this
           );
           this.$refs.addPersons.resetSearch(); // to cast child method
           modal.showModal = false;
@@ -121,8 +118,7 @@ export default {
           if (!this.$props.removableIfSet) {
               return;
           }
-          this.$emit('removeEntity', entity);
-          this.suggested.push(entity);
+          this.$emit('removeEntity',{ entity: entity, isSuggested: true });
       }
     },
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 2a9015746..96c194a76 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -249,7 +249,11 @@
 
 {% block pick_entity_dynamic_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-module="pick-dynamic" data-types="{{ form.vars['types']|json_encode }}" data-multiple="{{ form.vars['multiple'] }}" data-uniqid="{{ form.vars['uniqid'] }}" data-suggested="{{ form.vars['suggested'] }}"></div>
+    <div data-module="pick-dynamic"
+         data-types="{{ form.vars['types']|json_encode }}"
+         data-multiple="{{ form.vars['multiple'] }}"
+         data-uniqid="{{ form.vars['uniqid'] }}"
+         data-suggested="{{ form.vars['suggested']|json_encode|escape('html_attr') }}"></div>
 {% endblock %}
 
 {% block pick_postal_code_widget %}
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
index c0955b3ad..3a875f8aa 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
@@ -18,21 +18,25 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
- * Pick user dymically, using vuejs module "AddPerson".
+ * m* Pick user dymically, using vuejs module "AddPerson".
  */
 class PickPersonDynamicType extends AbstractType
 {
     private DenormalizerInterface $denormalizer;
 
+    private DenormalizerInterface $normalizer;
+
     private SerializerInterface $serializer;
 
-    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer)
+    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, NormalizerInterface $normalizer)
     {
         $this->denormalizer = $denormalizer;
         $this->serializer = $serializer;
+        $this->normalizer = $normalizer;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -45,7 +49,10 @@ class PickPersonDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['person'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
-        $view->vars['suggested'] = $this->serializer->serialize($options['suggested'], 'json', ['groups' => 'read']);
+
+        foreach ($options['suggested'] as $person) {
+            $view->vars['suggested'][spl_object_hash($person)] = $this->normalizer->normalize($person, 'json', ['groups' => 'read']);
+        }
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
index 2e282a31b..7d5625ec6 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
@@ -18,6 +18,7 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
@@ -27,12 +28,15 @@ class PickThirdpartyDynamicType extends AbstractType
 {
     private DenormalizerInterface $denormalizer;
 
+    private NormalizerInterface $normalizer;
+
     private SerializerInterface $serializer;
 
-    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer)
+    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, NormalizerInterface $normalizer)
     {
         $this->denormalizer = $denormalizer;
         $this->serializer = $serializer;
+        $this->normalizer = $normalizer;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -45,7 +49,10 @@ class PickThirdpartyDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['thirdparty'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
-        $view->vars['suggested'] = $this->serializer->serialize($options['suggested'], 'json', ['groups' => 'read']);
+
+        foreach ($options['suggested'] as $tp) {
+            $view->vars['suggested'][spl_object_hash($tp)] = $this->normalizer->normalize($tp, 'json', ['groups' => 'read']);
+        }
     }
 
     public function configureOptions(OptionsResolver $resolver)

From 9c589b929611badd02e179eb7836f4a7daa0e899 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 17:17:35 +0100
Subject: [PATCH 086/106] FEATURE [suggested][entities] add suggested entities
 option to dynamic picker types

---
 src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php  | 4 +++-
 .../ChillPersonBundle/Form/Type/PickPersonDynamicType.php     | 4 +++-
 .../Form/Type/PickThirdpartyDynamicType.php                   | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
index 2fbfdcf11..9a2c1fbb4 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
@@ -46,6 +46,7 @@ class PickUserDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['user'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
+        $view->vars['suggested'] = $this->serializer->serialize($options['suggested'], 'json', ['groups' => 'read']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -53,7 +54,8 @@ class PickUserDynamicType extends AbstractType
         $resolver
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
-            ->setDefault('compound', false);
+            ->setDefault('compound', false)
+            ->setDefault('suggested', null);
     }
 
     public function getBlockPrefix()
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
index b0be9dd27..91e46d193 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
@@ -45,6 +45,7 @@ class PickPersonDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['person'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
+        $view->vars['suggested'] = $this->serializer->serialize($options['suggested'], 'json', ['groups' => 'read']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -52,7 +53,8 @@ class PickPersonDynamicType extends AbstractType
         $resolver
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
-            ->setDefault('compound', false);
+            ->setDefault('compound', false)
+            ->setDefault('suggested', null);
     }
 
     public function getBlockPrefix()
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
index ada4064eb..d813918f7 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
@@ -45,6 +45,7 @@ class PickThirdpartyDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['thirdparty'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
+        $view->vars['suggested'] = $this->serializer->serialize($options['suggested'], 'json', ['groups' => 'read']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -52,7 +53,8 @@ class PickThirdpartyDynamicType extends AbstractType
         $resolver
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
-            ->setDefault('compound', false);
+            ->setDefault('compound', false)
+            ->setDefault('suggested', null);
     }
 
     public function getBlockPrefix()

From 4c7a16587bbcc79e0f46688e719d3b79475780fb Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 17:20:35 +0100
Subject: [PATCH 087/106] [workflow][method] add method to get
 involved/suggested users

---
 ...AccompanyingCourseDocumentWorkflowHandler.php | 10 ++++++++++
 .../Entity/Workflow/EntityWorkflow.php           | 16 ++++++++++++++++
 .../Workflow/EntityWorkflowHandlerInterface.php  |  5 +++++
 ...riodWorkEvaluationDocumentWorkflowHandler.php | 15 +++++++++++++++
 ...anyingPeriodWorkEvaluationWorkflowHandler.php | 14 ++++++++++++++
 .../AccompanyingPeriodWorkWorkflowHandler.php    | 13 +++++++++++++
 6 files changed, 73 insertions(+)

diff --git a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
index 96787a6fc..ec714aa74 100644
--- a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
@@ -95,6 +95,16 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
         return null;
     }
 
+    public function getSuggestedUsers(EntityWorkflow $entityWorkflow): array
+    {
+        $suggestedUsers = $entityWorkflow->getUsersInvolved();
+
+        $referrer = $this->getRelatedEntity($entityWorkflow)->getCourse()->getUser();
+        $suggestedUsers[$referrer->getId()] = $referrer;
+
+        return $suggestedUsers;
+    }
+
     public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string
     {
         return '@ChillDocStore/AccompanyingCourseDocument/_workflow.html.twig';
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
index c448ea19e..62e6bac0f 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
@@ -348,6 +348,22 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
         return $this->transitionningStep;
     }
 
+    /**
+     * @return User[]
+     */
+    public function getUsersInvolved(): array
+    {
+        $usersInvolved = [];
+
+        foreach ($this->steps as $step) {
+            foreach ($step->getDestUser() as $u) {
+                $usersInvolved[$u->getId()] = $u;
+            }
+        }
+
+        return $usersInvolved;
+    }
+
     public function getWorkflowName(): string
     {
         return $this->workflowName;
diff --git a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
index 5058fed7c..73e260c37 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
@@ -36,6 +36,11 @@ interface EntityWorkflowHandlerInterface
      */
     public function getRoleShow(EntityWorkflow $entityWorkflow): ?string;
 
+    /**
+     * @return User[]
+     */
+    public function getSuggestedUsers(EntityWorkflow $entityWorkflow): array;
+
     public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string;
 
     public function getTemplateData(EntityWorkflow $entityWorkflow, array $options = []): array;
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index 735463fc2..2c78e2099 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -97,6 +97,21 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
         return AccompanyingPeriodWorkEvaluationDocumentVoter::SEE;
     }
 
+    public function getSuggestedUsers(EntityWorkflow $entityWorkflow): array
+    {
+        $suggestedUsers = $entityWorkflow->getUsersInvolved();
+
+        $referrer = $this->getRelatedEntity($entityWorkflow)
+            ->getAccompanyingPeriodWorkEvaluation()
+            ->getAccompanyingPeriodWork()
+            ->getAccompanyingPeriod()
+            ->getUser();
+
+        $suggestedUsers[$referrer->getId()] = $referrer;
+
+        return $suggestedUsers;
+    }
+
     public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string
     {
         return '@ChillPerson/Workflow/_evaluation_document.html.twig';
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
index 25edce03b..a6d9fc9b4 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
@@ -87,6 +87,20 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
         return AccompanyingPeriodWorkEvaluationVoter::SEE;
     }
 
+    public function getSuggestedUsers(EntityWorkflow $entityWorkflow): array
+    {
+        $suggestedUsers = $entityWorkflow->getUsersInvolved();
+
+        $referrer = $this->getRelatedEntity($entityWorkflow)
+            ->getAccompanyingPeriodWork()
+            ->getAccompanyingPeriod()
+            ->getUser();
+
+        $suggestedUsers[$referrer->getId()] = $referrer;
+
+        return $suggestedUsers;
+    }
+
     public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string
     {
         return '@ChillPerson/Workflow/_evaluation.html.twig';
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
index b6829ab77..142a57229 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
@@ -94,6 +94,19 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
         return null;
     }
 
+    public function getSuggestedUsers(EntityWorkflow $entityWorkflow): array
+    {
+        $suggestedUsers = $entityWorkflow->getUsersInvolved();
+
+        $referrer = $this->getRelatedEntity($entityWorkflow)
+            ->getAccompanyingPeriod()
+            ->getUser();
+
+        $suggestedUsers[$referrer->getId()] = $referrer;
+
+        return $suggestedUsers;
+    }
+
     public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string
     {
         return '@ChillPerson/Workflow/_accompanying_period_work.html.twig';

From 1195564adbbc37ce7352f8e871ade9586f8d3df6 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 17:22:41 +0100
Subject: [PATCH 088/106] [form][controller] pass suggested users on to
 workflow form

---
 .../Controller/WorkflowController.php            | 16 ++++++++++++++--
 .../ChillMainBundle/Form/WorkflowStepType.php    |  2 ++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
index 17b5db75e..0f00a177f 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
@@ -30,6 +30,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\TransitionBlocker;
@@ -48,11 +49,13 @@ class WorkflowController extends AbstractController
 
     private Registry $registry;
 
+    private Security $security;
+
     private TranslatorInterface $translator;
 
     private ValidatorInterface $validator;
 
-    public function __construct(EntityWorkflowManager $entityWorkflowManager, EntityWorkflowRepository $entityWorkflowRepository, ValidatorInterface $validator, PaginatorFactory $paginatorFactory, Registry $registry, EntityManagerInterface $entityManager, TranslatorInterface $translator)
+    public function __construct(EntityWorkflowManager $entityWorkflowManager, EntityWorkflowRepository $entityWorkflowRepository, ValidatorInterface $validator, PaginatorFactory $paginatorFactory, Registry $registry, EntityManagerInterface $entityManager, TranslatorInterface $translator, Security $security)
     {
         $this->entityWorkflowManager = $entityWorkflowManager;
         $this->entityWorkflowRepository = $entityWorkflowRepository;
@@ -61,6 +64,7 @@ class WorkflowController extends AbstractController
         $this->registry = $registry;
         $this->entityManager = $entityManager;
         $this->translator = $translator;
+        $this->security = $security;
     }
 
     /**
@@ -291,10 +295,18 @@ class WorkflowController extends AbstractController
 
         if (count($workflow->getEnabledTransitions($entityWorkflow)) > 0) {
             // possible transition
+
+            $usersInvolved = $entityWorkflow->getUsersInvolved();
+            $currentUserFound = array_search($this->security->getUser(), $usersInvolved, true);
+
+            if (false !== $currentUserFound) {
+                unset($usersInvolved[$currentUserFound]);
+            }
+
             $transitionForm = $this->createForm(
                 WorkflowStepType::class,
                 $entityWorkflow->getCurrentStep(),
-                ['transition' => true, 'entity_workflow' => $entityWorkflow]
+                ['transition' => true, 'entity_workflow' => $entityWorkflow, 'suggested_users' => $usersInvolved]
             );
 
             $transitionForm->handleRequest($request);
diff --git a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
index e01c7d4b6..23f932844 100644
--- a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
+++ b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
@@ -154,6 +154,7 @@ class WorkflowStepType extends AbstractType
                     'label' => 'workflow.dest for next steps',
                     'multiple' => true,
                     'mapped' => false,
+                    'suggested' => $options['suggested_users'],
                 ])
                 ->add('future_dest_emails', ChillCollectionType::class, [
                     'label' => 'workflow.dest by email',
@@ -200,6 +201,7 @@ class WorkflowStepType extends AbstractType
             ->setAllowedTypes('transition', 'bool')
             ->setRequired('entity_workflow')
             ->setAllowedTypes('entity_workflow', EntityWorkflow::class)
+            ->setDefault('suggested_users', [])
             ->setDefault('constraints', [
                 new Callback(
                     function ($step, ExecutionContextInterface $context, $payload) {

From 1198133a7f391a1c18f018cdacce0ce805f7e0c5 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 17:24:42 +0100
Subject: [PATCH 089/106] [data][twig] pass suggested users to vue component
 through twig template data attribute

---
 .../ChillMainBundle/Resources/views/Form/fields.html.twig     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 15d7625dd..2a9015746 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -249,7 +249,7 @@
 
 {% block pick_entity_dynamic_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-module="pick-dynamic" data-types="{{ form.vars['types']|json_encode }}" data-multiple="{{ form.vars['multiple'] }}" data-uniqid="{{ form.vars['uniqid'] }}"></div>
+    <div data-module="pick-dynamic" data-types="{{ form.vars['types']|json_encode }}" data-multiple="{{ form.vars['multiple'] }}" data-uniqid="{{ form.vars['uniqid'] }}" data-suggested="{{ form.vars['suggested'] }}"></div>
 {% endblock %}
 
 {% block pick_postal_code_widget %}
@@ -269,4 +269,4 @@
             {{ form_errors(form.fixedDate) }}
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From 5319991a6f8e3fb194078bfac9ed945770dfe45a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 24 Feb 2023 17:25:28 +0100
Subject: [PATCH 090/106] [vue][suggested users] add suggested users in vue
 component and write create/remove logic

---
 .../public/module/pick-entity/index.js        |   5 +
 .../public/vuejs/PickEntity/PickEntity.vue    | 105 ++++++++++--------
 2 files changed, 64 insertions(+), 46 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
index 890929c35..bb9cc744c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -23,8 +23,11 @@ function loadDynamicPicker(element) {
                     (input.value === '[]' || input.value === '') ?
                         null : [ JSON.parse(input.value) ]
                 )
+            suggested = null !== JSON.parse(el.dataset.suggested) ? JSON.parse(el.dataset.suggested) : null
         ;
 
+        console.log('suggested', suggested)
+
         if (!isMultiple) {
             if (input.value === '[]'){
                 input.value = null;
@@ -37,6 +40,7 @@ function loadDynamicPicker(element) {
                 ':types="types" ' +
                 ':picked="picked" ' +
                 ':uniqid="uniqid" ' +
+                ':suggested="suggested" ' +
                 '@addNewEntity="addNewEntity" ' +
                 '@removeEntity="removeEntity"></pick-entity>',
             components: {
@@ -48,6 +52,7 @@ function loadDynamicPicker(element) {
                     types: JSON.parse(el.dataset.types),
                     picked: picked === null ? [] : picked,
                     uniqid: el.dataset.uniqid,
+                    suggested: suggested
                 }
             },
             methods: {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index e121ca950..02b53a6d3 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -17,6 +17,9 @@
             </add-persons>
         </li>
     </ul>
+    <ul v-if="suggested !== null" class="list-suggest add-items inline">
+      <li v-for="s in suggested" :key="s.id" @click="addNewSuggested(s)"><span>{{ s.text }}</span></li>
+    </ul>
 </template>
 
 <script>
@@ -49,6 +52,10 @@ export default {
           // display picked entities.
           type: Boolean,
           default: true,
+        },
+        suggested: {
+          type: Array,
+          default: null
         }
     },
     emits: ['addNewEntity', 'removeEntity'],
@@ -61,55 +68,61 @@ export default {
         };
     },
     computed: {
-        addPersonsOptions() {
-            return {
-                uniq: !this.multiple,
-                type: this.types,
-                priority: null,
-                button: {
-                    size: 'btn-sm',
-                    class: 'btn-submit',
-                },
-            };
-        },
-        translatedListOfTypes() {
-            let trans = [];
-            this.types.forEach(t => {
-                if (this.$props.multiple) {
-                    trans.push(appMessages.fr.pick_entity[t].toLowerCase());
-                } else {
-                    trans.push(appMessages.fr.pick_entity[t + '_one'].toLowerCase());
-                }
-            })
+      addPersonsOptions() {
+          return {
+              uniq: !this.multiple,
+              type: this.types,
+              priority: null,
+              button: {
+                  size: 'btn-sm',
+                  class: 'btn-submit',
+              },
+          };
+      },
+      translatedListOfTypes() {
+          let trans = [];
+          this.types.forEach(t => {
+              if (this.$props.multiple) {
+                  trans.push(appMessages.fr.pick_entity[t].toLowerCase());
+              } else {
+                  trans.push(appMessages.fr.pick_entity[t + '_one'].toLowerCase());
+              }
+          })
 
-            if (this.$props.multiple) {
-                return appMessages.fr.pick_entity.modal_title + trans.join(', ');
-            } else {
-                return appMessages.fr.pick_entity.modal_title_one + trans.join(', ');
-            }
-        },
-        listClasses() {
-            return {
-                'list-suggest': true,
-                'remove-items': this.$props.removableIfSet,
-            };
-        },
+          if (this.$props.multiple) {
+              return appMessages.fr.pick_entity.modal_title + trans.join(', ');
+          } else {
+              return appMessages.fr.pick_entity.modal_title_one + trans.join(', ');
+          }
+      },
+      listClasses() {
+          return {
+              'list-suggest': true,
+              'remove-items': this.$props.removableIfSet,
+          };
+      },
     },
     methods: {
-        addNewEntity({ selected, modal }) {
-            selected.forEach((item) => {
-                    this.$emit('addNewEntity', item.result);
-                }, this
-            );
-            this.$refs.addPersons.resetSearch(); // to cast child method
-            modal.showModal = false;
-        },
-        removeEntity(entity) {
-            if (!this.$props.removableIfSet) {
-                return;
-            }
-            this.$emit('removeEntity', entity);
-        }
+      addNewSuggested(entity) {
+        this.$emit('addNewEntity', entity);
+        const indexToRemove = this.suggested.findIndex(e => e.id === entity.id)
+        this.suggested.splice(indexToRemove, 1);
+      },
+      addNewEntity({ selected, modal }) {
+          selected.forEach((item) => {
+                  this.$emit('addNewEntity', item.result);
+              }, this
+          );
+          this.$refs.addPersons.resetSearch(); // to cast child method
+          modal.showModal = false;
+      },
+      removeEntity(entity) {
+          if (!this.$props.removableIfSet) {
+              return;
+          }
+          this.$emit('removeEntity', entity);
+          this.suggested.push(entity);
+      }
     },
 }
 </script>

From 67e68ac149ceb51e3d3815fea9b6cdc1e217c4fa Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 10 Mar 2023 12:56:05 +0100
Subject: [PATCH 091/106] FIX [review] processing review, but stuck at
 transformation of json string to array

---
 .../AccompanyingCourseDocumentWorkflowHandler.php         | 2 +-
 .../ChillMainBundle/Entity/Workflow/EntityWorkflow.php    | 2 +-
 .../ChillMainBundle/Form/Type/PickUserDynamicType.php     | 2 +-
 .../Resources/public/module/pick-entity/index.js          | 8 +++++---
 .../Resources/public/vuejs/PickEntity/PickEntity.vue      | 5 +++--
 .../ChillPersonBundle/Form/Type/PickPersonDynamicType.php | 2 +-
 ...panyingPeriodWorkEvaluationDocumentWorkflowHandler.php | 2 +-
 .../AccompanyingPeriodWorkEvaluationWorkflowHandler.php   | 2 +-
 .../Workflow/AccompanyingPeriodWorkWorkflowHandler.php    | 2 +-
 .../Form/Type/PickThirdpartyDynamicType.php               | 2 +-
 10 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
index ec714aa74..c538bd107 100644
--- a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
@@ -100,7 +100,7 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
         $suggestedUsers = $entityWorkflow->getUsersInvolved();
 
         $referrer = $this->getRelatedEntity($entityWorkflow)->getCourse()->getUser();
-        $suggestedUsers[$referrer->getId()] = $referrer;
+        $suggestedUsers[spl_object_hash($referrer)] = $referrer;
 
         return $suggestedUsers;
     }
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
index 62e6bac0f..99aba07fd 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
@@ -357,7 +357,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 
         foreach ($this->steps as $step) {
             foreach ($step->getDestUser() as $u) {
-                $usersInvolved[$u->getId()] = $u;
+                $usersInvolved[spl_object_hash($u)] = $u;
             }
         }
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
index 9a2c1fbb4..6bfd95fe8 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
@@ -55,7 +55,7 @@ class PickUserDynamicType extends AbstractType
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
             ->setDefault('compound', false)
-            ->setDefault('suggested', null);
+            ->setDefault('suggested', []);
     }
 
     public function getBlockPrefix()
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
index bb9cc744c..41330c186 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -23,10 +23,12 @@ function loadDynamicPicker(element) {
                     (input.value === '[]' || input.value === '') ?
                         null : [ JSON.parse(input.value) ]
                 )
-            suggested = null !== JSON.parse(el.dataset.suggested) ? JSON.parse(el.dataset.suggested) : null
-        ;
+            suggested = JSON.parse('[' + el.dataset.suggested + ']');
+            // suggested = suggested[0];
 
-        console.log('suggested', suggested)
+        console.log(typeof suggested)
+        // console.log(el.dataset.suggested)
+        console.log('suggested', typeof suggested[0])
 
         if (!isMultiple) {
             if (input.value === '[]'){
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 02b53a6d3..23a904b14 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -17,7 +17,8 @@
             </add-persons>
         </li>
     </ul>
-    <ul v-if="suggested !== null" class="list-suggest add-items inline">
+    <ul v-if="Object.keys(suggested).length > 0" class="list-suggest add-items inline">
+      <p>hello {{ Object.keys(suggested) }}</p>
       <li v-for="s in suggested" :key="s.id" @click="addNewSuggested(s)"><span>{{ s.text }}</span></li>
     </ul>
 </template>
@@ -55,7 +56,7 @@ export default {
         },
         suggested: {
           type: Array,
-          default: null
+          default: []
         }
     },
     emits: ['addNewEntity', 'removeEntity'],
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
index 91e46d193..c0955b3ad 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
@@ -54,7 +54,7 @@ class PickPersonDynamicType extends AbstractType
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
             ->setDefault('compound', false)
-            ->setDefault('suggested', null);
+            ->setDefault('suggested', []);
     }
 
     public function getBlockPrefix()
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index 2c78e2099..500daab6f 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -107,7 +107,7 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
             ->getAccompanyingPeriod()
             ->getUser();
 
-        $suggestedUsers[$referrer->getId()] = $referrer;
+        $suggestedUsers[spl_object_hash($referrer)] = $referrer;
 
         return $suggestedUsers;
     }
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
index a6d9fc9b4..db67ef045 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
@@ -96,7 +96,7 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
             ->getAccompanyingPeriod()
             ->getUser();
 
-        $suggestedUsers[$referrer->getId()] = $referrer;
+        $suggestedUsers[spl_object_hash($referrer)] = $referrer;
 
         return $suggestedUsers;
     }
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
index 142a57229..75ad04cfb 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
@@ -102,7 +102,7 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
             ->getAccompanyingPeriod()
             ->getUser();
 
-        $suggestedUsers[$referrer->getId()] = $referrer;
+        $suggestedUsers[spl_object_hash($referrer)] = $referrer;
 
         return $suggestedUsers;
     }
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
index d813918f7..2e282a31b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
@@ -54,7 +54,7 @@ class PickThirdpartyDynamicType extends AbstractType
             ->setDefault('multiple', false)
             ->setAllowedTypes('multiple', ['bool'])
             ->setDefault('compound', false)
-            ->setDefault('suggested', null);
+            ->setDefault('suggested', []);
     }
 
     public function getBlockPrefix()

From 1a3d66213b63be5bebeda47eed81afa092dc9b65 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 15 Mar 2023 09:37:28 +0100
Subject: [PATCH 092/106] FIX [review] implement changes based on review

---
 .../Form/Type/PickUserDynamicType.php         | 11 +++++++++--
 .../public/module/pick-entity/index.js        | 19 +++++++++++--------
 .../public/vuejs/PickEntity/PickEntity.vue    | 14 +++++---------
 .../Resources/views/Form/fields.html.twig     |  6 +++++-
 .../Form/Type/PickPersonDynamicType.php       | 13 ++++++++++---
 .../Form/Type/PickThirdpartyDynamicType.php   | 11 +++++++++--
 6 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
index 6bfd95fe8..de54d071a 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
@@ -19,6 +19,7 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
@@ -28,12 +29,15 @@ class PickUserDynamicType extends AbstractType
 {
     private DenormalizerInterface $denormalizer;
 
+    private NormalizerInterface $normalizer;
+
     private SerializerInterface $serializer;
 
-    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer)
+    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, NormalizerInterface $normalizer)
     {
         $this->denormalizer = $denormalizer;
         $this->serializer = $serializer;
+        $this->normalizer = $normalizer;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -46,7 +50,10 @@ class PickUserDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['user'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
-        $view->vars['suggested'] = $this->serializer->serialize($options['suggested'], 'json', ['groups' => 'read']);
+
+        foreach ($options['suggested'] as $user) {
+            $view->vars['suggested'][spl_object_hash($user)] = $this->normalizer->normalize($user, 'json', ['groups' => 'read']);
+        }
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
index 41330c186..ce9c66145 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -23,12 +23,7 @@ function loadDynamicPicker(element) {
                     (input.value === '[]' || input.value === '') ?
                         null : [ JSON.parse(input.value) ]
                 )
-            suggested = JSON.parse('[' + el.dataset.suggested + ']');
-            // suggested = suggested[0];
-
-        console.log(typeof suggested)
-        // console.log(el.dataset.suggested)
-        console.log('suggested', typeof suggested[0])
+            suggested = JSON.parse(el.dataset.suggested);
 
         if (!isMultiple) {
             if (input.value === '[]'){
@@ -58,13 +53,18 @@ function loadDynamicPicker(element) {
                 }
             },
             methods: {
-                addNewEntity(entity) {
+                addNewEntity({entity, isSuggested = false}) {
                     if (this.multiple) {
                         if (!this.picked.some(el => {
                             return el.type === entity.type && el.id === entity.id;
                         })) {
                             this.picked.push(entity);
                             input.value = JSON.stringify(this.picked);
+                            console.log(entity)
+                            if (isSuggested) {
+                              const indexToRemove = this.suggested.findIndex(e => e.id === entity.id)
+                              this.suggested.splice(indexToRemove, 1);
+                            }
                         }
                     } else {
                         if (!this.picked.some(el => {
@@ -76,9 +76,12 @@ function loadDynamicPicker(element) {
                         }
                     }
                 },
-                removeEntity(entity) {
+                removeEntity({entity, isSuggested = false}) {
                     this.picked = this.picked.filter(e => !(e.type === entity.type && e.id === entity.id));
                     input.value = JSON.stringify(this.picked);
+                    if (isSuggested) {
+                      this.suggested.push(entity);
+                    }
                 },
             }
         })
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 23a904b14..7d6d0bd83 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -17,8 +17,7 @@
             </add-persons>
         </li>
     </ul>
-    <ul v-if="Object.keys(suggested).length > 0" class="list-suggest add-items inline">
-      <p>hello {{ Object.keys(suggested) }}</p>
+    <ul class="list-suggest add-items inline">
       <li v-for="s in suggested" :key="s.id" @click="addNewSuggested(s)"><span>{{ s.text }}</span></li>
     </ul>
 </template>
@@ -105,14 +104,12 @@ export default {
     },
     methods: {
       addNewSuggested(entity) {
-        this.$emit('addNewEntity', entity);
-        const indexToRemove = this.suggested.findIndex(e => e.id === entity.id)
-        this.suggested.splice(indexToRemove, 1);
+        this.$emit('addNewEntity', {entity: entity, isSuggested: true});
       },
       addNewEntity({ selected, modal }) {
           selected.forEach((item) => {
-                  this.$emit('addNewEntity', item.result);
-              }, this
+              this.$emit('addNewEntity', { entity: item.result });
+            }, this
           );
           this.$refs.addPersons.resetSearch(); // to cast child method
           modal.showModal = false;
@@ -121,8 +118,7 @@ export default {
           if (!this.$props.removableIfSet) {
               return;
           }
-          this.$emit('removeEntity', entity);
-          this.suggested.push(entity);
+          this.$emit('removeEntity',{ entity: entity, isSuggested: true });
       }
     },
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 2a9015746..96c194a76 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -249,7 +249,11 @@
 
 {% block pick_entity_dynamic_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-module="pick-dynamic" data-types="{{ form.vars['types']|json_encode }}" data-multiple="{{ form.vars['multiple'] }}" data-uniqid="{{ form.vars['uniqid'] }}" data-suggested="{{ form.vars['suggested'] }}"></div>
+    <div data-module="pick-dynamic"
+         data-types="{{ form.vars['types']|json_encode }}"
+         data-multiple="{{ form.vars['multiple'] }}"
+         data-uniqid="{{ form.vars['uniqid'] }}"
+         data-suggested="{{ form.vars['suggested']|json_encode|escape('html_attr') }}"></div>
 {% endblock %}
 
 {% block pick_postal_code_widget %}
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
index c0955b3ad..3a875f8aa 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
@@ -18,21 +18,25 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
- * Pick user dymically, using vuejs module "AddPerson".
+ * m* Pick user dymically, using vuejs module "AddPerson".
  */
 class PickPersonDynamicType extends AbstractType
 {
     private DenormalizerInterface $denormalizer;
 
+    private DenormalizerInterface $normalizer;
+
     private SerializerInterface $serializer;
 
-    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer)
+    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, NormalizerInterface $normalizer)
     {
         $this->denormalizer = $denormalizer;
         $this->serializer = $serializer;
+        $this->normalizer = $normalizer;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -45,7 +49,10 @@ class PickPersonDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['person'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
-        $view->vars['suggested'] = $this->serializer->serialize($options['suggested'], 'json', ['groups' => 'read']);
+
+        foreach ($options['suggested'] as $person) {
+            $view->vars['suggested'][spl_object_hash($person)] = $this->normalizer->normalize($person, 'json', ['groups' => 'read']);
+        }
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
index 2e282a31b..7d5625ec6 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
@@ -18,6 +18,7 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
@@ -27,12 +28,15 @@ class PickThirdpartyDynamicType extends AbstractType
 {
     private DenormalizerInterface $denormalizer;
 
+    private NormalizerInterface $normalizer;
+
     private SerializerInterface $serializer;
 
-    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer)
+    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, NormalizerInterface $normalizer)
     {
         $this->denormalizer = $denormalizer;
         $this->serializer = $serializer;
+        $this->normalizer = $normalizer;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -45,7 +49,10 @@ class PickThirdpartyDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['thirdparty'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
-        $view->vars['suggested'] = $this->serializer->serialize($options['suggested'], 'json', ['groups' => 'read']);
+
+        foreach ($options['suggested'] as $tp) {
+            $view->vars['suggested'][spl_object_hash($tp)] = $this->normalizer->normalize($tp, 'json', ['groups' => 'read']);
+        }
     }
 
     public function configureOptions(OptionsResolver $resolver)

From de4cb1585bae1a04c29105f708ac6ccf762485aa Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 15 Mar 2023 09:49:46 +0100
Subject: [PATCH 093/106] FIX [normalizer] remove keys to have simple array of
 objects

---
 src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php    | 2 +-
 .../Resources/public/module/pick-entity/index.js                | 2 +-
 .../ChillPersonBundle/Form/Type/PickPersonDynamicType.php       | 2 +-
 .../Form/Type/PickThirdpartyDynamicType.php                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
index de54d071a..c48650f8e 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
@@ -52,7 +52,7 @@ class PickUserDynamicType extends AbstractType
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
 
         foreach ($options['suggested'] as $user) {
-            $view->vars['suggested'][spl_object_hash($user)] = $this->normalizer->normalize($user, 'json', ['groups' => 'read']);
+            $view->vars['suggested'][] = $this->normalizer->normalize($user, 'json', ['groups' => 'read']);
         }
     }
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
index ce9c66145..fce3d43cc 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -23,7 +23,7 @@ function loadDynamicPicker(element) {
                     (input.value === '[]' || input.value === '') ?
                         null : [ JSON.parse(input.value) ]
                 )
-            suggested = JSON.parse(el.dataset.suggested);
+            suggested = JSON.parse(el.dataset.suggested)
 
         if (!isMultiple) {
             if (input.value === '[]'){
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
index 3a875f8aa..e8b83a416 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
@@ -51,7 +51,7 @@ class PickPersonDynamicType extends AbstractType
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
 
         foreach ($options['suggested'] as $person) {
-            $view->vars['suggested'][spl_object_hash($person)] = $this->normalizer->normalize($person, 'json', ['groups' => 'read']);
+            $view->vars['suggested'][] = $this->normalizer->normalize($person, 'json', ['groups' => 'read']);
         }
     }
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
index 7d5625ec6..1c3984b69 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
@@ -51,7 +51,7 @@ class PickThirdpartyDynamicType extends AbstractType
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
 
         foreach ($options['suggested'] as $tp) {
-            $view->vars['suggested'][spl_object_hash($tp)] = $this->normalizer->normalize($tp, 'json', ['groups' => 'read']);
+            $view->vars['suggested'][] = $this->normalizer->normalize($tp, 'json', ['groups' => 'read']);
         }
     }
 

From eaea702454a2e528f53d18c60f1a6aafd4575d20 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 15 Mar 2023 10:14:25 +0100
Subject: [PATCH 094/106] FIX add initial user as suggestion and fix error when
 there are no suggestions

---
 src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php    | 1 +
 src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php     | 1 +
 src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php | 1 +
 .../Form/Type/PickThirdpartyDynamicType.php                      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
index 99aba07fd..e4683f24b 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
@@ -354,6 +354,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
     public function getUsersInvolved(): array
     {
         $usersInvolved = [];
+        $usersInvolved[spl_object_hash($this->getCreatedBy())] = $this->getCreatedBy();
 
         foreach ($this->steps as $step) {
             foreach ($step->getDestUser() as $u) {
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
index c48650f8e..f6c2b7f4a 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
@@ -50,6 +50,7 @@ class PickUserDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['user'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
+        $view->vars['suggested'] = [];
 
         foreach ($options['suggested'] as $user) {
             $view->vars['suggested'][] = $this->normalizer->normalize($user, 'json', ['groups' => 'read']);
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
index e8b83a416..76891a74d 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
@@ -49,6 +49,7 @@ class PickPersonDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['person'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
+        $view->vars['suggested'] = [];
 
         foreach ($options['suggested'] as $person) {
             $view->vars['suggested'][] = $this->normalizer->normalize($person, 'json', ['groups' => 'read']);
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
index 1c3984b69..eb9e7e5ea 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
@@ -49,6 +49,7 @@ class PickThirdpartyDynamicType extends AbstractType
         $view->vars['multiple'] = $options['multiple'];
         $view->vars['types'] = ['thirdparty'];
         $view->vars['uniqid'] = uniqid('pick_user_dyn');
+        $view->vars['suggested'] = [];
 
         foreach ($options['suggested'] as $tp) {
             $view->vars['suggested'][] = $this->normalizer->normalize($tp, 'json', ['groups' => 'read']);

From d1bdf41c4c011d197d1c2190fa6eaf3093611845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 15 Mar 2023 13:36:41 +0100
Subject: [PATCH 095/106] Feature: Force language when converting documents

---
 src/Bundle/ChillWopiBundle/src/Controller/Convert.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Convert.php b/src/Bundle/ChillWopiBundle/src/Controller/Convert.php
index 0a4dc8762..aced2d0c5 100644
--- a/src/Bundle/ChillWopiBundle/src/Controller/Convert.php
+++ b/src/Bundle/ChillWopiBundle/src/Controller/Convert.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Entity\User;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Mime\Part\DataPart;
@@ -40,6 +41,8 @@ class Convert
 
     private LoggerInterface $logger;
 
+    private RequestStack $requestStack;
+
     private Security $security;
 
     private StoredObjectManagerInterface $storedObjectManager;
@@ -49,12 +52,14 @@ class Convert
      */
     public function __construct(
         HttpClientInterface $httpClient,
+        RequestStack $requestStack,
         Security $security,
         StoredObjectManagerInterface $storedObjectManager,
         LoggerInterface $logger,
         ParameterBagInterface $parameters
     ) {
         $this->httpClient = $httpClient;
+        $this->requestStack = $requestStack;
         $this->security = $security;
         $this->storedObjectManager = $storedObjectManager;
         $this->logger = $logger;
@@ -68,6 +73,10 @@ class Convert
         }
 
         $content = $this->storedObjectManager->read($storedObject);
+        $query = [];
+        if (null !== $request = $this->requestStack->getCurrentRequest()) {
+            $query['lang'] = $request->getLocale();
+        }
 
         try {
             $url = sprintf('%s/cool/convert-to/pdf', $this->collaboraDomain);
@@ -76,6 +85,7 @@ class Convert
             ]);
             $response = $this->httpClient->request('POST', $url, [
                 'headers' => $form->getPreparedHeaders()->toArray(),
+                'query' => $query,
                 'body' => $form->bodyToString(),
                 'timeout' => 10,
             ]);

From 44ecad2bca2d755f832d939cc61ac01e24cc127f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 15 Mar 2023 13:38:19 +0100
Subject: [PATCH 096/106] Fixed: re-introduce creator in async doc generation

---
 .../Service/DocGenerator/ActivityContext.php  |  2 +-
 .../Service/DocGenerator/CalendarContext.php  |  2 +-
 .../DocGenerator/CalendarContextTest.php      |  2 +-
 .../Service/Context/BaseContextData.php       |  8 ++----
 .../Service/Generator/Generator.php           |  5 +++-
 .../Service/Generator/GeneratorInterface.php  |  4 ++-
 .../Messenger/RequestGenerationHandler.php    | 27 +++++++++++++++++--
 .../Messenger/RequestGenerationMessage.php    |  8 ++++++
 .../AccompanyingPeriodContext.php             |  2 +-
 .../Service/DocGenerator/PersonContext.php    |  2 +-
 10 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index ac832b34b..3df0d886d 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -152,7 +152,7 @@ class ActivityContext implements
         $options = $template->getOptions();
 
         $data = [];
-        $data = array_merge($data, $this->baseContextData->getData());
+        $data = array_merge($data, $this->baseContextData->getData($contextGenerationData['creator'] ?? null));
         $data['activity'] = $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => Activity::class, 'groups' => 'docgen:read']);
 
         $data['course'] = $this->normalizer->normalize($entity->getAccompanyingPeriod(), 'docgen', ['docgen:expects' => AccompanyingPeriod::class, 'groups' => 'docgen:read']);
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
index 6eadaf997..cba7fc661 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
@@ -156,7 +156,7 @@ final class CalendarContext implements CalendarContextInterface
         $options = $this->getOptions($template);
 
         $data = array_merge(
-            $this->baseContextData->getData(),
+            $this->baseContextData->getData($contextGenerationData['creator'] ?? null),
             [
                 'calendar' => $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => Calendar::class, 'groups' => ['docgen:read']]),
             ]
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php
index be31485d4..cbb4ea3af 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php
@@ -205,7 +205,7 @@ final class CalendarContextTest extends TestCase
         ?NormalizerInterface $normalizer = null
     ): CalendarContext {
         $baseContext = $this->prophesize(BaseContextData::class);
-        $baseContext->getData()->willReturn(['base_context' => 'data']);
+        $baseContext->getData(null)->willReturn(['base_context' => 'data']);
 
         $personRender = $this->prophesize(PersonRender::class);
         $personRender->renderString(Argument::type(Person::class), [])->willReturn('person name');
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php b/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php
index e7b56ed88..5aed8554b 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php
@@ -21,18 +21,14 @@ class BaseContextData
 {
     private NormalizerInterface $normalizer;
 
-    private Security $security;
-
-    public function __construct(Security $security, NormalizerInterface $normalizer)
+    public function __construct(NormalizerInterface $normalizer)
     {
-        $this->security = $security;
         $this->normalizer = $normalizer;
     }
 
-    public function getData(): array
+    public function getData(?User $user = null): array
     {
         $data = [];
-        $user = $this->security->getUser();
 
         $data['creator'] = $this->normalizer->normalize(
             $user instanceof User ? $user : null,
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
index 0775cfb49..4ddcb461c 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
@@ -9,6 +9,7 @@ use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
 use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
+use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\File\File;
@@ -55,7 +56,8 @@ class Generator implements GeneratorInterface
         array                $contextGenerationDataNormalized,
         ?StoredObject        $destinationStoredObject = null,
         bool                 $isTest = false,
-        ?File                $testFile = null
+        ?File                $testFile = null,
+        ?User                $creator = null
     ): ?string {
         if ($destinationStoredObject instanceof StoredObject && StoredObject::STATUS_PENDING !== $destinationStoredObject->getStatus()) {
             $this->logger->info(self::LOG_PREFIX.'Aborting generation of an already generated document');
@@ -80,6 +82,7 @@ class Generator implements GeneratorInterface
 
         $contextGenerationDataNormalized = array_merge(
             $contextGenerationDataNormalized,
+                ['creator' => $creator],
                 $context instanceof DocGeneratorContextWithPublicFormInterface ?
                     $context->contextGenerationDataDenormalize($template, $entity, $contextGenerationDataNormalized)
                     : []
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
index 385e1d010..a8f01b97c 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
@@ -4,6 +4,7 @@ namespace Chill\DocGeneratorBundle\Service\Generator;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Entity\User;
 use Symfony\Component\HttpFoundation\File\File;
 
 interface GeneratorInterface
@@ -22,6 +23,7 @@ interface GeneratorInterface
         array                $contextGenerationDataNormalized,
         ?StoredObject        $destinationStoredObject = null,
         bool                 $isTest = false,
-        ?File                $testFile = null
+        ?File                $testFile = null,
+        ?User                $creator = null
     ): ?string;
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
index 0cfdecd0a..8fef8cf41 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
@@ -6,7 +6,9 @@ use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
 use Chill\DocGeneratorBundle\Service\Generator\Generator;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\StoredObjectRepository;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Doctrine\ORM\EntityManagerInterface;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 
@@ -23,18 +25,28 @@ class RequestGenerationHandler implements MessageHandlerInterface
 
     private Generator $generator;
 
+    private LoggerInterface $logger;
+
+    private UserRepositoryInterface $userRepository;
+
     public const AUTHORIZED_TRIALS = 5;
 
+    private const LOG_PREFIX = '[docgen message handler] ';
+
     public function __construct(
         DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
         EntityManagerInterface $entityManager,
         Generator $generator,
-        StoredObjectRepository $storedObjectRepository
+        LoggerInterface $logger,
+        StoredObjectRepository $storedObjectRepository,
+        UserRepositoryInterface $userRepository
     ) {
         $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
         $this->entityManager = $entityManager;
         $this->generator = $generator;
+        $this->logger = $logger;
         $this->storedObjectRepository = $storedObjectRepository;
+        $this->userRepository = $userRepository;
     }
 
     public function __invoke(RequestGenerationMessage $message)
@@ -51,6 +63,8 @@ class RequestGenerationHandler implements MessageHandlerInterface
             throw new UnrecoverableMessageHandlingException('maximum number of retry reached');
         }
 
+        $creator = $this->userRepository->find($message->getCreatorId());
+
         $destinationStoredObject->addGenerationTrial();
         $this->entityManager->createQuery('UPDATE '.StoredObject::class.' s SET s.generationTrialsCounter = s.generationTrialsCounter + 1 WHERE s.id = :id')
             ->setParameter('id', $destinationStoredObject->getId())
@@ -60,7 +74,16 @@ class RequestGenerationHandler implements MessageHandlerInterface
             $template,
             $message->getEntityId(),
             $message->getContextGenerationData(),
-            $destinationStoredObject
+            $destinationStoredObject,
+            false,
+            null,
+            $creator
         );
+
+        $this->logger->info(self::LOG_PREFIX.'Request generation finished', [
+            'template_id' => $message->getTemplateId(),
+            'destination_stored_object' => $message->getDestinationStoredObjectId(),
+            'duration_int' => (new \DateTimeImmutable('now'))->getTimestamp() - $message->getCreatedAt()->getTimestamp(),
+        ]);
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
index edba90ce4..8362e4ecc 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
@@ -18,6 +18,8 @@ class RequestGenerationMessage
 
    private array $contextGenerationData;
 
+   private \DateTimeImmutable $createdAt;
+
     public function __construct(
         User $creator,
         DocGeneratorTemplate $template,
@@ -30,6 +32,7 @@ class RequestGenerationMessage
         $this->entityId = $entityId;
         $this->destinationStoredObjectId = $destinationStoredObject->getId();
         $this->contextGenerationData = $contextGenerationData;
+        $this->createdAt = new \DateTimeImmutable('now');
     }
 
     public function getCreatorId(): int
@@ -56,4 +59,9 @@ class RequestGenerationMessage
     {
         return $this->contextGenerationData;
     }
+
+    public function getCreatedAt(): \DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index 9ab733d87..bbfb67b43 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -204,7 +204,7 @@ class AccompanyingPeriodContext implements
         $options = $template->getOptions();
 
         $data = [];
-        $data = array_merge($data, $this->baseContextData->getData());
+        $data = array_merge($data, $this->baseContextData->getData($contextGenerationData['creator'] ?? null));
         $data['course'] = $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => AccompanyingPeriod::class, 'groups' => 'docgen:read']);
 
         foreach (['mainPerson', 'person1', 'person2'] as $k) {
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index 988c50829..ff3c4ef49 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -165,7 +165,7 @@ final class PersonContext implements PersonContextInterface
         }
 
         $data = [];
-        $data = array_merge($data, $this->baseContextData->getData());
+        $data = array_merge($data, $this->baseContextData->getData($contextGenerationData['creator'] ?? null));
         $data['person'] = $this->normalizer->normalize($entity, 'docgen', [
             'docgen:expects' => Person::class,
             'groups' => ['docgen:read'],

From c3558beee145a9328e0108ad428beb2ee8d500b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 16 Mar 2023 00:12:09 +0100
Subject: [PATCH 097/106] Fixed: add a social issue on an activity to an
 accompanying period

---
 src/Bundle/ChillActivityBundle/Entity/Activity.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index 8fcae3e0b..2a5ae6acb 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -257,12 +257,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     /**
      * Add a social issue.
      *
-     * Note: the social issue consistency (the fact that only yougest social issues
+     * Note: the social issue consistency (the fact that only youngest social issues
      * are kept) is processed by an entity listener:
      *
      * @see{\Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener}
-     *
-     * @return $this
      */
     public function addSocialIssue(SocialIssue $socialIssue): self
     {
@@ -270,6 +268,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
             $this->socialIssues[] = $socialIssue;
         }
 
+        if ($this->getAccompanyingPeriod() !== null) {
+            $this->getAccompanyingPeriod()->addSocialIssue($socialIssue);
+        }
+
         return $this;
     }
 
@@ -550,6 +552,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     {
         $this->accompanyingPeriod = $accompanyingPeriod;
 
+        foreach ($this->getSocialIssues() as $issue) {
+            $this->accompanyingPeriod->addSocialIssue($issue);
+        }
+
         return $this;
     }
 

From 1cc80c8e6af7149f9c7942612d1f6e18d56cbaea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 16 Mar 2023 00:12:41 +0100
Subject: [PATCH 098/106] Fixed: takes all activity into account to check
 social issue consistency

---
 .../AccompanyingPeriodValidityValidator.php                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
index 51462c56e..9454d31d0 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
@@ -54,7 +54,7 @@ class AccompanyingPeriodValidityValidator extends ConstraintValidator
         $activities = $this->activityRepository->findBy(['accompanyingPeriod' => $period]);
 
         foreach ($activities as $activity) {
-            $socialIssues = $activity->getSocialIssues()->toArray();
+            $socialIssues = array_merge($socialIssues, $activity->getSocialIssues()->toArray());
         }
 
         foreach ($period->getWorks() as $work) {
@@ -64,7 +64,7 @@ class AccompanyingPeriodValidityValidator extends ConstraintValidator
         $socialIssuesByKey = [];
 
         foreach ($socialIssues as $si) {
-            $socialIssuesByKey[$si->getId()] = $si;
+            $socialIssuesByKey[spl_object_hash($si)] = $si;
         }
 
         $periodIssuesWithAncestors = [];
@@ -75,7 +75,7 @@ class AccompanyingPeriodValidityValidator extends ConstraintValidator
                 $periodIssuesWithAncestors,
                 array_map(
                     static function (SocialIssue $si) {
-                        return $si->getId();
+                        return spl_object_hash($si);
                     },
                     $si->getAncestors(true)
                 )

From 06b7e8427003c6875c08b45a4e20c64a751fb571 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 16 Mar 2023 13:48:01 +0100
Subject: [PATCH 099/106] FIX [thirdparty][profession] set default value for
 profession in symfony form

---
 src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index 384c743c2..b1446a543 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -110,6 +110,7 @@ class ThirdPartyType extends AbstractType
                 ->add('profession', TextType::class, [
                     'label' => 'thirdparty.Profession',
                     'required' => false,
+                    'empty_data' => '',
                 ])
                 ->add('contactDataAnonymous', CheckboxType::class, [
                     'required' => false,

From c729a1430473b7d3d9e889a5e0bd35c5f7596e82 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 20 Mar 2023 07:54:16 +0100
Subject: [PATCH 100/106] FIX [minor] remove dump, use statement, ...

---
 src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
index 6555f7835..c2caf13bb 100644
--- a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
+++ b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
@@ -117,7 +117,6 @@ class SimilarPersonMatcher
                 $qb->setParameter('fullName', $this->personRender->renderString($person, []));
         }
 
-        dump($qb->getQuery());
         return $qb->getQuery()->getResult();
     }
 }

From df2480c47c3bbe72be73396736b01445b9689383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 20 Mar 2023 21:36:46 +0100
Subject: [PATCH 101/106] Fixed: transform null value into emtpy string into
 ThirdParty::setProfession

---
 src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index b13118168..29565e86a 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -807,10 +807,10 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @return $this
-     */
-    public function setProfession(string $profession): self
+     */""
+    public function setProfession(?string $profession): self
     {
-        $this->profession = $profession;
+        $this->profession = (string) $profession;
 
         return $this;
     }

From ecac40958696e0ad588b8b3a434e95a0c0961397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 20 Mar 2023 21:38:42 +0100
Subject: [PATCH 102/106] fixed: fix 3party syntax

---
 src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 29565e86a..966e40bd1 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -805,9 +805,6 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    /**
-     * @return $this
-     */""
     public function setProfession(?string $profession): self
     {
         $this->profession = (string) $profession;

From a8977729fea74410de53df3939ab1cce9d73f88d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 21 Mar 2023 16:39:31 +0100
Subject: [PATCH 103/106] Fixed: [similar person matcher] properly takes person
 center into account

Center comes from the table person_center_history, not person.center_id
---
 .../ChillPersonBundle/Search/SimilarPersonMatcher.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
index 6555f7835..b7e2c12b0 100644
--- a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
+++ b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
@@ -76,8 +76,17 @@ class SimilarPersonMatcher
 
         $qb->select('p')
             ->from(Person::class, 'p')
+            ->join('p.centerHistory', 'center_history')
             ->where('SIMILARITY(p.fullnameCanonical, UNACCENT(LOWER(:fullName))) >= :precision')
-            ->andWhere($qb->expr()->in('p.center', ':centers'));
+            ->andWhere($qb->expr()->in('center_history.center', ':centers'))
+            ->andWhere($qb->expr()->andX(
+               $qb->expr()->lte('center_history.startDate', 'CURRENT_DATE()'),
+                $qb->expr()->orX(
+                    $qb->expr()->isNull('center_history.endDate'),
+                    $qb->expr()->gt('center_history.endDate', 'CURRENT_DATE()')
+                )
+            ))
+        ;
 
         $qb
             ->setParameter('fullName', $this->personRender->renderString($person, []))

From 4eb7d10e459b4dd5b99d288f08132a63c5a716e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 23 Mar 2023 11:23:14 +0100
Subject: [PATCH 104/106] Fixed: [calendar ms synchro] do not throw an error if
 we are not allowed to get the default calendar

---
 .../Connector/MSGraph/MapCalendarToUser.php      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php
index 504d48ffc..563bd3a38 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php
@@ -22,6 +22,7 @@ use Chill\MainBundle\Entity\User;
 use DateTimeImmutable;
 use LogicException;
 use Psr\Log\LoggerInterface;
+use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use function array_key_exists;
 
@@ -74,9 +75,18 @@ class MapCalendarToUser
 
     public function getDefaultUserCalendar(string $idOrUserPrincipalName): ?array
     {
-        $value = $this->machineHttpClient->request('GET', "users/{$idOrUserPrincipalName}/calendars", [
-            'query' => ['$filter' => 'isDefaultCalendar eq true'],
-        ])->toArray()['value'];
+        try {
+            $value = $this->machineHttpClient->request('GET', "users/{$idOrUserPrincipalName}/calendars", [
+                'query' => ['$filter' => 'isDefaultCalendar eq true'],
+            ])->toArray()['value'];
+        } catch (ClientExceptionInterface $e) {
+            $this->logger->error('[MapCalendarToUser] Error while listing calendars for a user', [
+                'http_status_code' => $e->getResponse()->getStatusCode(),
+                'id_user' => $idOrUserPrincipalName,
+            ]);
+
+            return null;
+        }
 
         return $value[0] ?? null;
     }

From 96ddc73e45c406cf49ee2762417f3c171683a402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 23 Mar 2023 12:48:37 +0100
Subject: [PATCH 105/106] Feature: [calendar sync msgraph] Allow to show the
 calendar details if the user does not have msgraph mapping

We first check that there are "msgraph" attributes before forcing redirection to MSGraph authorization. If not, we let's the user see the calendar edit/create page.
---
 .../MSGraphRemoteCalendarConnector.php        | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
index c376f9680..d409e6f03 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
@@ -34,6 +34,7 @@ use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -64,6 +65,8 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
 
     private OnBehalfOfUserHttpClient $userHttpClient;
 
+    private Security $security;
+
     public function __construct(
         CalendarRepository $calendarRepository,
         CalendarRangeRepository $calendarRangeRepository,
@@ -74,7 +77,8 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         OnBehalfOfUserHttpClient $userHttpClient,
         RemoteEventConverter $remoteEventConverter,
         TranslatorInterface $translator,
-        UrlGeneratorInterface $urlGenerator
+        UrlGeneratorInterface $urlGenerator,
+        Security $security
     ) {
         $this->calendarRepository = $calendarRepository;
         $this->calendarRangeRepository = $calendarRangeRepository;
@@ -86,6 +90,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         $this->translator = $translator;
         $this->urlGenerator = $urlGenerator;
         $this->userHttpClient = $userHttpClient;
+        $this->security = $security;
     }
 
     public function countEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate): int
@@ -133,6 +138,24 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
 
     public function isReady(): bool
     {
+        $user = $this->security->getUser();
+
+        if (!$user instanceof User) {
+            // this is not a user from chill. This is not the role of this class to
+            // restrict access, so we will just say that we do not have to do anything more
+            // here...
+            return true;
+        }
+
+        if (null === $this->mapCalendarToUser->getUserId($user)) {
+            // this user is not mapped with remote calendar. The user will have to wait for
+            // the next calendar subscription iteration
+            $this->logger->debug('mark user ready for msgraph calendar as he does not have any mapping', [
+                'userId' => $user->getId(),
+            ]);
+            return true;
+        }
+
         return $this->tokenStorage->hasToken();
     }
 

From 782bda074439d45fbb7136fae4a2457d7bd48c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 24 Mar 2023 17:06:00 +0100
Subject: [PATCH 106/106] Fixed: [Pick entity / suggestion] handle case when
 user choose one suggested in the modal

In the previous implementation, if the user would add an entity from the modal, and if this entity is also present in the suggestion, the entity would not be removed from the suggestion list.
---
 .../public/module/pick-entity/index.js        | 29 ++++++++++++-------
 .../public/vuejs/PickEntity/PickEntity.vue    |  6 ++--
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
index fce3d43cc..6b143a11d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -37,7 +37,7 @@ function loadDynamicPicker(element) {
                 ':types="types" ' +
                 ':picked="picked" ' +
                 ':uniqid="uniqid" ' +
-                ':suggested="suggested" ' +
+                ':suggested="notPickedSuggested" ' +
                 '@addNewEntity="addNewEntity" ' +
                 '@removeEntity="removeEntity"></pick-entity>',
             components: {
@@ -52,8 +52,21 @@ function loadDynamicPicker(element) {
                     suggested: suggested
                 }
             },
+            computed: {
+              notPickedSuggested() {
+                if (this.multiple) {
+                  const pickedIds = new Set();
+                  for (const p of this.picked) {
+                    pickedIds.add(`${p.type}${p.id}`);
+                  }
+                  return this.suggested.filter(e => !pickedIds.has(`${e.type}${e.id}`))
+                }
+
+                return this.suggested.filter(e => e.type !== this.picked.type && e.id !== e.picked.id);
+              }
+            },
             methods: {
-                addNewEntity({entity, isSuggested = false}) {
+                addNewEntity({entity}) {
                     if (this.multiple) {
                         if (!this.picked.some(el => {
                             return el.type === entity.type && el.id === entity.id;
@@ -61,10 +74,6 @@ function loadDynamicPicker(element) {
                             this.picked.push(entity);
                             input.value = JSON.stringify(this.picked);
                             console.log(entity)
-                            if (isSuggested) {
-                              const indexToRemove = this.suggested.findIndex(e => e.id === entity.id)
-                              this.suggested.splice(indexToRemove, 1);
-                            }
                         }
                     } else {
                         if (!this.picked.some(el => {
@@ -76,12 +85,12 @@ function loadDynamicPicker(element) {
                         }
                     }
                 },
-                removeEntity({entity, isSuggested = false}) {
-                    this.picked = this.picked.filter(e => !(e.type === entity.type && e.id === entity.id));
-                    input.value = JSON.stringify(this.picked);
-                    if (isSuggested) {
+                removeEntity({entity}) {
+                    if (-1 === this.suggested.findIndex(e => e.type === entity.type && e.id === entity.id)) {
                       this.suggested.push(entity);
                     }
+                    this.picked = this.picked.filter(e => !(e.type === entity.type && e.id === entity.id));
+                    input.value = JSON.stringify(this.picked);
                 },
             }
         })
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 7d6d0bd83..0a39718e2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -104,11 +104,11 @@ export default {
     },
     methods: {
       addNewSuggested(entity) {
-        this.$emit('addNewEntity', {entity: entity, isSuggested: true});
+        this.$emit('addNewEntity', {entity: entity});
       },
       addNewEntity({ selected, modal }) {
           selected.forEach((item) => {
-              this.$emit('addNewEntity', { entity: item.result });
+              this.$emit('addNewEntity', { entity: item.result});
             }, this
           );
           this.$refs.addPersons.resetSearch(); // to cast child method
@@ -118,7 +118,7 @@ export default {
           if (!this.$props.removableIfSet) {
               return;
           }
-          this.$emit('removeEntity',{ entity: entity, isSuggested: true });
+          this.$emit('removeEntity',{ entity: entity });
       }
     },
 }