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 01/43] 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 02/43] 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 03/43] 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 04/43] 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 05/43] 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 06/43] 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 07/43] 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 08/43] 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 09/43] 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 10/43] 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 11/43] 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 12/43] 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 13/43] 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 14/43] 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 15/43] 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 16/43] 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 17/43] 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 18/43] 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 19/43] 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 20/43] 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 21/43] 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 22/43] 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 23/43] 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 24/43] 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 25/43] 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 26/43] 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 27/43] 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 28/43] 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 29/43] 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 30/43] 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 31/43] 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 32/43] 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 33/43] 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 34/43] 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 35/43] 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 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 36/43] 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 37/43] 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 38/43] 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 39/43] 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 40/43] 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 41/43] 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 42/43] 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 43/43] 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)');
+    }
+}