From d163783ed3e4fa6f1d7261cb02ed792d287be7e9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 28 Feb 2022 11:42:54 +0100
Subject: [PATCH 001/174] Person Document: add a PersonContext class

---
 .../Service/DocGenerator/PersonContext.php    | 214 ++++++++++++++++++
 1 file changed, 214 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php

diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
new file mode 100644
index 000000000..2b22d607c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -0,0 +1,214 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Service\DocGenerator;
+
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
+use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
+use Chill\DocStoreBundle\Entity\PersonDocument;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\Person;
+use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+use function array_key_exists;
+
+class PersonContext implements DocGeneratorContextWithAdminFormInterface
+{
+    private BaseContextData $baseContextData;
+
+    private DocumentCategoryRepository $documentCategoryRepository;
+
+    private EntityManagerInterface $em;
+
+    private NormalizerInterface $normalizer;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        DocumentCategoryRepository $documentCategoryRepository,
+        NormalizerInterface $normalizer,
+        TranslatableStringHelperInterface $translatableStringHelper,
+        EntityManagerInterface $em,
+        BaseContextData $baseContextData
+    ) {
+        $this->documentCategoryRepository = $documentCategoryRepository;
+        $this->normalizer = $normalizer;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->em = $em;
+        $this->baseContextData = $baseContextData;
+    }
+
+    public function adminFormReverseTransform(array $data): array
+    {
+        if (array_key_exists('category', $data)) {
+            $data['category'] = [
+                'idInsideBundle' => $data['category']->getIdInsideBundle(),
+                'bundleId' => $data['category']->getBundleId(),
+            ];
+        }
+
+        return $data;
+    }
+
+    public function adminFormTransform(array $data): array
+    {
+        // $r = [
+        //     'mainPerson' => $data['mainPerson'] ?? false,
+        //     'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'),
+        //     'person1' => $data['person1'] ?? false,
+        //     'person1Label' => $data['person1Label'] ?? $this->translator->trans('docgen.person 1'),
+        //     'person2' => $data['person2'] ?? false,
+        //     'person2Label' => $data['person2Label'] ?? $this->translator->trans('docgen.person 2'),
+        // ];
+
+        if (array_key_exists('category', $data)) {
+            $r['category'] = array_key_exists('category', $data) ?
+                $this->documentCategoryRepository->find($data['category']) : null;
+        }
+
+        return $r;
+    }
+
+    public function buildAdminForm(FormBuilderInterface $builder): void
+    {
+        $builder
+            // ->add('mainPerson', CheckboxType::class, [
+            //     'required' => false,
+            //     'label' => 'docgen.Ask for main person',
+            // ])
+            // ->add('mainPersonLabel', TextType::class, [
+            //     'label' => 'main person label',
+            //     'required' => true,
+            // ])
+            // ->add('person1', CheckboxType::class, [
+            //     'required' => false,
+            //     'label' => 'docgen.Ask for person 1',
+            // ])
+            // ->add('person1Label', TextType::class, [
+            //     'label' => 'person 1 label',
+            //     'required' => true,
+            // ])
+            // ->add('person2', CheckboxType::class, [
+            //     'required' => false,
+            //     'label' => 'docgen.Ask for person 2',
+            // ])
+            // ->add('person2Label', TextType::class, [
+            //     'label' => 'person 2 label',
+            //     'required' => true,
+            // ])
+            ->add('category', EntityType::class, [
+                'placeholder' => 'Choose a document category',
+                'class' => 'ChillDocStoreBundle:DocumentCategory',
+                'query_builder' => static function (EntityRepository $er) {
+                    return $er->createQueryBuilder('c')
+                        ->where('c.documentClass = :docClass')
+                        ->setParameter('docClass', PersonDocument::class);
+                },
+                'choice_label' => function ($entity = null) {
+                    return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
+                },
+            ]);
+    }
+
+    public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
+    {
+        if (!$entity instanceof Person) {
+            throw new UnexpectedTypeException($entity, Person::class);
+        }
+        $options = $template->getOptions();
+
+        $data = [];
+        $data = array_merge($data, $this->baseContextData->getData());
+        $data['person'] = $this->normalizer->normalize($entity, 'docgen', [
+            'docgen:expects' => Person::class,
+            'groups' => 'docgen:read'
+        ]);
+
+        // foreach (['mainPerson', 'person1', 'person2'] as $k) {
+        //     if ($options[$k]) {
+        //         $data[$k] = $this->normalizer->normalize($contextGenerationData[$k], 'docgen', [
+        //             'docgen:expects' => Person::class,
+        //             'groups' => 'docgen:read',
+        //             'docgen:person:with-household' => true,
+        //             'docgen:person:with-relations' => true,
+        //         ]);
+        //     }
+        // }
+
+        return $data;
+    }
+
+    public function getDescription(): string
+    {
+        return 'docgen.A basic context for person';
+    }
+
+    public function getEntityClass(): string
+    {
+        return Person::class;
+    }
+
+    public function getFormData(DocGeneratorTemplate $template, $entity): array
+    {
+        return [
+            'person' => $entity,
+        ];
+    }
+
+    public static function getKey(): string
+    {
+        return self::class;
+    }
+
+    public function getName(): string
+    {
+        return 'docgen.Person basic';
+    }
+
+    public function hasAdminForm(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param Person $entity
+     */
+    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
+    {
+        $doc = new PersonDocument();
+        $doc->setTemplate($template)
+            ->setTitle($this->translatableStringHelper->localize($template->getName()))
+            ->setDate(new DateTime())
+            ->setDescription($this->translatableStringHelper->localize($template->getName()))
+            ->setPerson($entity)
+            ->setObject($storedObject);
+
+        if (array_key_exists('category', $template->getOptions())) {
+            $doc
+                ->setCategory(
+                    $this->documentCategoryRepository->find(
+                        $template->getOptions()['category']
+                    )
+                );
+        }
+
+        $this->em->persist($doc);
+    }
+}
\ No newline at end of file

From 7aefa5014c5af9c0437080ef3f117a7041de012a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 28 Feb 2022 12:33:38 +0100
Subject: [PATCH 002/174] Add docgen:read group on Person + 2 fields in
 PersonContext admin form

---
 .../ChillPersonBundle/Entity/Person.php       | 15 ++++++++
 .../Service/DocGenerator/PersonContext.php    | 36 ++++++++++---------
 .../translations/messages.fr.yml              |  2 ++
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 49f7ae297..b51b4490c 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -38,6 +38,7 @@ use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
 use Exception;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use function count;
@@ -152,6 +153,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * @ORM\Column(type="date", nullable=true)
      * @Birthdate
+     * @Groups({"docgen:read"})
      */
     private $birthdate;
 
@@ -200,6 +202,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *     sf4 check: option inversedBy="birthsIn" return error mapping !!
      *
      * @ORM\JoinColumn(nullable=true)
+     * @Groups({"docgen:read"})
      */
     private $countryOfBirth;
 
@@ -237,6 +240,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @Assert\Date
      * @Assert\GreaterThanOrEqual(propertyPath="birthdate")
      * @Assert\LessThanOrEqual("today")
+     * @Groups({"docgen:read"})
      */
     private ?DateTimeImmutable $deathdate = null;
 
@@ -249,6 +253,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @Assert\Email(
      *     checkMX=true
      * )
+     * @Groups({"docgen:read"})
      */
     private $email = '';
 
@@ -262,6 +267,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @Assert\Length(
      *     max=255,
      * )
+     * @Groups({"docgen:read"})
      */
     private $firstName;
 
@@ -282,6 +288,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * @ORM\Column(type="string", length=9, nullable=true)
      * @Assert\NotNull(message="The gender must be set")
+     * @Groups({"docgen:read"})
      */
     private $gender;
 
@@ -339,6 +346,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\MaritalStatus")
      * @ORM\JoinColumn(nullable=true)
+     * @Groups({"docgen:read"})
      */
     private $maritalStatus;
 
@@ -346,6 +354,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * Comment on marital status.
      *
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="maritalStatusComment_")
+     * @Groups({"docgen:read"})
      */
     private CommentEmbeddable $maritalStatusComment;
 
@@ -356,6 +365,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * @ORM\Column(type="date", nullable=true)
      * @Assert\Date
+     * @Groups({"docgen:read"})
      */
     private ?DateTime $maritalStatusDate = null;
 
@@ -378,6 +388,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @PhonenumberConstraint(
      *     type="mobile",
      * )
+     * @Groups({"docgen:read"})
      */
     private string $mobilenumber = '';
 
@@ -391,6 +402,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *    sf4 check: option inversedBy="nationals" return error mapping !!
      *
      * @ORM\JoinColumn(nullable=true)
+     * @Groups({"docgen:read"})
      */
     private $nationality;
 
@@ -400,6 +412,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var int
      *
      * @ORM\Column(type="integer", nullable=true)
+     * @Groups({"docgen:read"})
      */
     private ?int $numberOfChildren = null;
 
@@ -436,6 +449,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @PhonenumberConstraint(
      *     type="landline",
      * )
+     * @Groups({"docgen:read"})
      */
     private string $phonenumber = '';
 
@@ -445,6 +459,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="string", length=255, name="place_of_birth")
+     * @Groups({"docgen:read"})
      */
     private $placeOfBirth = '';
 
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index 2b22d607c..30b020728 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -24,8 +24,11 @@ use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_key_exists;
 
@@ -41,11 +44,14 @@ class PersonContext implements DocGeneratorContextWithAdminFormInterface
 
     private TranslatableStringHelperInterface $translatableStringHelper;
 
+    private TranslatorInterface $translator;
+
     public function __construct(
         DocumentCategoryRepository $documentCategoryRepository,
         NormalizerInterface $normalizer,
         TranslatableStringHelperInterface $translatableStringHelper,
         EntityManagerInterface $em,
+        TranslatorInterface $translator,
         BaseContextData $baseContextData
     ) {
         $this->documentCategoryRepository = $documentCategoryRepository;
@@ -53,6 +59,7 @@ class PersonContext implements DocGeneratorContextWithAdminFormInterface
         $this->translatableStringHelper = $translatableStringHelper;
         $this->em = $em;
         $this->baseContextData = $baseContextData;
+        $this->translator = $translator;
     }
 
     public function adminFormReverseTransform(array $data): array
@@ -69,14 +76,10 @@ class PersonContext implements DocGeneratorContextWithAdminFormInterface
 
     public function adminFormTransform(array $data): array
     {
-        // $r = [
-        //     'mainPerson' => $data['mainPerson'] ?? false,
-        //     'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'),
-        //     'person1' => $data['person1'] ?? false,
-        //     'person1Label' => $data['person1Label'] ?? $this->translator->trans('docgen.person 1'),
-        //     'person2' => $data['person2'] ?? false,
-        //     'person2Label' => $data['person2Label'] ?? $this->translator->trans('docgen.person 2'),
-        // ];
+        $r = [
+            'mainPerson' => $data['mainPerson'] ?? false,
+            'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'),
+        ];
 
         if (array_key_exists('category', $data)) {
             $r['category'] = array_key_exists('category', $data) ?
@@ -89,14 +92,14 @@ class PersonContext implements DocGeneratorContextWithAdminFormInterface
     public function buildAdminForm(FormBuilderInterface $builder): void
     {
         $builder
-            // ->add('mainPerson', CheckboxType::class, [
-            //     'required' => false,
-            //     'label' => 'docgen.Ask for main person',
-            // ])
-            // ->add('mainPersonLabel', TextType::class, [
-            //     'label' => 'main person label',
-            //     'required' => true,
-            // ])
+            ->add('mainPerson', CheckboxType::class, [
+                'required' => false,
+                'label' => 'docgen.Ask for main person',
+            ])
+            ->add('mainPersonLabel', TextType::class, [
+                'label' => 'main person label',
+                'required' => true,
+            ])
             // ->add('person1', CheckboxType::class, [
             //     'required' => false,
             //     'label' => 'docgen.Ask for person 1',
@@ -140,7 +143,6 @@ class PersonContext implements DocGeneratorContextWithAdminFormInterface
             'docgen:expects' => Person::class,
             'groups' => 'docgen:read'
         ]);
-
         // foreach (['mainPerson', 'person1', 'person2'] as $k) {
         //     if ($options[$k]) {
         //         $data[$k] = $this->normalizer->normalize($contextGenerationData[$k], 'docgen', [
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 3b1aea377..ba990125c 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -541,6 +541,8 @@ docgen:
     A basic context for accompanying period: Contexte pour les parcours
     A context for accompanying period work: Contexte pour les actions d'accompagnement
     A context for accompanying period work evaluation: Contexte pour les évaluations dans les actions d'accompagnement
+    Person basic: Personne (basique)
+    A basic context for person: Contexte pour les personnes
 
 period_notification:
     period_designated_subject: Vous êtes référent d'un parcours d'accompagnement

From a187bac7b0d008f3e70ee852d234645c51bfb8ec Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 1 Mar 2022 15:48:32 +0100
Subject: [PATCH 003/174] DocGeneratorTemplateController: fix in case there is
 no public form

---
 .../Controller/DocGeneratorTemplateController.php            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index 2aff33af0..d332f11c2 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -207,20 +207,21 @@ final class DocGeneratorTemplateController extends AbstractController
             $context instanceof DocGeneratorContextWithPublicFormInterface
             && $context->hasPublicForm($template, $entity) || $isTest
         ) {
-            if ($context instanceof DocGeneratorContextWithPublicFormInterface) {
+            if ($context instanceof DocGeneratorContextWithPublicFormInterface && $context->hasPublicForm($template, $entity)) {
                 $builder = $this->createFormBuilder(
                     array_merge(
                         $context->getFormData($template, $entity),
                         $isTest ? ['test_file' => null] : []
                     )
                 );
+
+                $context->buildPublicForm($builder, $template, $entity);
             } else {
                 $builder = $this->createFormBuilder(
                     ['test_file' => null]
                 );
             }
 
-            $context->buildPublicForm($builder, $template, $entity);
 
             if ($isTest) {
                 $builder->add('test_file', FileType::class, [

From 88e9a96e0e21eca94e615425b6745c089a5999a2 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 1 Mar 2022 15:51:34 +0100
Subject: [PATCH 004/174] Person document generation: clean build Admin form +
 add household and relations groups

---
 .../Service/DocGenerator/PersonContext.php    | 39 +------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index 30b020728..f84dd83c7 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -24,8 +24,6 @@ use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -92,30 +90,6 @@ class PersonContext implements DocGeneratorContextWithAdminFormInterface
     public function buildAdminForm(FormBuilderInterface $builder): void
     {
         $builder
-            ->add('mainPerson', CheckboxType::class, [
-                'required' => false,
-                'label' => 'docgen.Ask for main person',
-            ])
-            ->add('mainPersonLabel', TextType::class, [
-                'label' => 'main person label',
-                'required' => true,
-            ])
-            // ->add('person1', CheckboxType::class, [
-            //     'required' => false,
-            //     'label' => 'docgen.Ask for person 1',
-            // ])
-            // ->add('person1Label', TextType::class, [
-            //     'label' => 'person 1 label',
-            //     'required' => true,
-            // ])
-            // ->add('person2', CheckboxType::class, [
-            //     'required' => false,
-            //     'label' => 'docgen.Ask for person 2',
-            // ])
-            // ->add('person2Label', TextType::class, [
-            //     'label' => 'person 2 label',
-            //     'required' => true,
-            // ])
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
                 'class' => 'ChillDocStoreBundle:DocumentCategory',
@@ -135,24 +109,13 @@ class PersonContext implements DocGeneratorContextWithAdminFormInterface
         if (!$entity instanceof Person) {
             throw new UnexpectedTypeException($entity, Person::class);
         }
-        $options = $template->getOptions();
 
         $data = [];
         $data = array_merge($data, $this->baseContextData->getData());
         $data['person'] = $this->normalizer->normalize($entity, 'docgen', [
             'docgen:expects' => Person::class,
-            'groups' => 'docgen:read'
+            'groups' => ['docgen:read', 'docgen:person:with-household', 'docgen:person:with-relations']
         ]);
-        // foreach (['mainPerson', 'person1', 'person2'] as $k) {
-        //     if ($options[$k]) {
-        //         $data[$k] = $this->normalizer->normalize($contextGenerationData[$k], 'docgen', [
-        //             'docgen:expects' => Person::class,
-        //             'groups' => 'docgen:read',
-        //             'docgen:person:with-household' => true,
-        //             'docgen:person:with-relations' => true,
-        //         ]);
-        //     }
-        // }
 
         return $data;
     }

From 84478c651e14dd2037518d87ee7ff8b00d2d62eb Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 1 Mar 2022 15:54:36 +0100
Subject: [PATCH 005/174] Person: remove useless serialisation groups

---
 src/Bundle/ChillPersonBundle/Entity/Person.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index b51b4490c..49f7ae297 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -38,7 +38,6 @@ use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
 use Exception;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
-use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use function count;
@@ -153,7 +152,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * @ORM\Column(type="date", nullable=true)
      * @Birthdate
-     * @Groups({"docgen:read"})
      */
     private $birthdate;
 
@@ -202,7 +200,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *     sf4 check: option inversedBy="birthsIn" return error mapping !!
      *
      * @ORM\JoinColumn(nullable=true)
-     * @Groups({"docgen:read"})
      */
     private $countryOfBirth;
 
@@ -240,7 +237,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @Assert\Date
      * @Assert\GreaterThanOrEqual(propertyPath="birthdate")
      * @Assert\LessThanOrEqual("today")
-     * @Groups({"docgen:read"})
      */
     private ?DateTimeImmutable $deathdate = null;
 
@@ -253,7 +249,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @Assert\Email(
      *     checkMX=true
      * )
-     * @Groups({"docgen:read"})
      */
     private $email = '';
 
@@ -267,7 +262,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @Assert\Length(
      *     max=255,
      * )
-     * @Groups({"docgen:read"})
      */
     private $firstName;
 
@@ -288,7 +282,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * @ORM\Column(type="string", length=9, nullable=true)
      * @Assert\NotNull(message="The gender must be set")
-     * @Groups({"docgen:read"})
      */
     private $gender;
 
@@ -346,7 +339,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\MaritalStatus")
      * @ORM\JoinColumn(nullable=true)
-     * @Groups({"docgen:read"})
      */
     private $maritalStatus;
 
@@ -354,7 +346,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * Comment on marital status.
      *
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="maritalStatusComment_")
-     * @Groups({"docgen:read"})
      */
     private CommentEmbeddable $maritalStatusComment;
 
@@ -365,7 +356,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * @ORM\Column(type="date", nullable=true)
      * @Assert\Date
-     * @Groups({"docgen:read"})
      */
     private ?DateTime $maritalStatusDate = null;
 
@@ -388,7 +378,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @PhonenumberConstraint(
      *     type="mobile",
      * )
-     * @Groups({"docgen:read"})
      */
     private string $mobilenumber = '';
 
@@ -402,7 +391,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *    sf4 check: option inversedBy="nationals" return error mapping !!
      *
      * @ORM\JoinColumn(nullable=true)
-     * @Groups({"docgen:read"})
      */
     private $nationality;
 
@@ -412,7 +400,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var int
      *
      * @ORM\Column(type="integer", nullable=true)
-     * @Groups({"docgen:read"})
      */
     private ?int $numberOfChildren = null;
 
@@ -449,7 +436,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @PhonenumberConstraint(
      *     type="landline",
      * )
-     * @Groups({"docgen:read"})
      */
     private string $phonenumber = '';
 
@@ -459,7 +445,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @var string
      *
      * @ORM\Column(type="string", length=255, name="place_of_birth")
-     * @Groups({"docgen:read"})
      */
     private $placeOfBirth = '';
 

From d6d7edf25d9067d6faa9928c1f89976e47f0c89f Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 1 Mar 2022 16:14:21 +0100
Subject: [PATCH 006/174] Add doc generation for PersonDocument form

---
 .../Resources/views/PersonDocument/index.html.twig   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
index b3d2baab6..e63538c22 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
@@ -26,7 +26,17 @@
 {% endblock %}
 
 {% block js %}
+	{{ parent() }}
 	{{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
+{% endblock %}
+
+{% block css %}
+	{{ parent() }}
+	{{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
 {% endblock %}
 
 {% block personcontent %}
@@ -46,6 +56,8 @@
 
 	{{ chill_pagination(pagination) }}
 
+	<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\PersonBundle\Entity\Person" data-entity-id="{{ person.id }}"></div>
+
 	{% if is_granted('CHILL_PERSON_DOCUMENT_CREATE', person) %}
 		<ul class="record_actions sticky-form-buttons">
 			<li class="create">

From 4406016f823fb01942d297f62bd4a3285d7a1131 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 10:17:16 +0100
Subject: [PATCH 007/174] code fix for PersonContext

---
 .../Controller/DocGeneratorTemplateController.php             | 1 -
 .../ChillPersonBundle/Service/DocGenerator/PersonContext.php  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index d332f11c2..000fcb03a 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -222,7 +222,6 @@ final class DocGeneratorTemplateController extends AbstractController
                 );
             }
 
-
             if ($isTest) {
                 $builder->add('test_file', FileType::class, [
                     'label' => 'Template file',
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index f84dd83c7..85ca1c161 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -114,7 +114,7 @@ class PersonContext implements DocGeneratorContextWithAdminFormInterface
         $data = array_merge($data, $this->baseContextData->getData());
         $data['person'] = $this->normalizer->normalize($entity, 'docgen', [
             'docgen:expects' => Person::class,
-            'groups' => ['docgen:read', 'docgen:person:with-household', 'docgen:person:with-relations']
+            'groups' => ['docgen:read', 'docgen:person:with-household', 'docgen:person:with-relations'],
         ]);
 
         return $data;
@@ -176,4 +176,4 @@ class PersonContext implements DocGeneratorContextWithAdminFormInterface
 
         $this->em->persist($doc);
     }
-}
\ No newline at end of file
+}

From 23fd4be2e54b4b4aab2e8eb23cc7b3cae91fbe72 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 10:17:29 +0100
Subject: [PATCH 008/174] upd CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b38afb37..7168e027f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)
+
 * [docstore] Add an API entrypoint for StoredObject (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
 * [person] Add the possibility of uploading existing documents to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
 * [person] Add title to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)

From dca17c409b5fd112f1ebe0abc97fb0917db383b5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 12:03:22 +0100
Subject: [PATCH 009/174] activity: do not override location if already exist
 (when validating new activity)

---
 .../Resources/public/vuejs/Activity/store.locations.js        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.locations.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.locations.js
index 311bdc219..6125140a5 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.locations.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.locations.js
@@ -110,10 +110,8 @@ export default function prepareLocations(store) {
         console.log('default loation id', window.default_location_id);
         if (window.default_location_id) {
             for (let group of store.state.availableLocations) {
-                console.log(group);
                 let location = group.locations.find((l) => l.id === window.default_location_id);
-                console.log(location);
-                if (location !== undefined) {
+                if (location !== undefined & store.state.activity.location === null) {
                     store.dispatch('updateLocation', location);
                     break;
                 }

From 1b66941746a3bdbc51daabe9458f07800858a863 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 12:05:55 +0100
Subject: [PATCH 010/174] upd CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bd743078..daf880138 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [activity] do not override location if already exist (when validating new activity) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/470)
+
 * [parcours] Toggle emergency/intensity only by referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
 * [docstore] Add an API entrypoint for StoredObject (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
 * [person] Add the possibility of uploading existing documents to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)

From 86bf0115dd9489552448230447e4d3793076f980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 3 Mar 2022 13:05:01 +0100
Subject: [PATCH 011/174] fix condition when empty phonenumber

---
 .../ChillMainBundle/Validation/Validator/ValidPhonenumber.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php b/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
index 9620f7cb9..267b2a70b 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
@@ -43,7 +43,7 @@ final class ValidPhonenumber extends ConstraintValidator
             return;
         }
 
-        if ('' === $value) {
+        if (null === $value) {
             return;
         }
 

From 6171b3411fe82bd94801380cb75258b262e1b8fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 3 Mar 2022 13:07:36 +0100
Subject: [PATCH 012/174] fix creation of document when overriding center
 resolver

---
 .../Controller/DocumentPersonController.php   |  2 -
 .../Form/PersonDocumentType.php               | 39 +++++--------------
 2 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
index fcb3a4958..eb9698aee 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
@@ -98,7 +98,6 @@ class DocumentPersonController extends AbstractController
             PersonDocumentType::class,
             $document,
             [
-                'center' => $document->getCenter(),
                 'role' => 'CHILL_PERSON_DOCUMENT_UPDATE',
             ]
         );
@@ -199,7 +198,6 @@ class DocumentPersonController extends AbstractController
         $document->setDate(new DateTime('Now'));
 
         $form = $this->createForm(PersonDocumentType::class, $document, [
-            'center' => $document->getCenter(),
             'role' => 'CHILL_PERSON_DOCUMENT_CREATE',
         ]);
         $form->handleRequest($request);
diff --git a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
index bcbd4d707..41dc73154 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
@@ -13,15 +13,13 @@ namespace Chill\DocStoreBundle\Form;
 
 use Chill\DocStoreBundle\Entity\Document;
 use Chill\DocStoreBundle\Entity\PersonDocument;
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\Persistence\ObjectManager;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
@@ -31,34 +29,16 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PersonDocumentType extends AbstractType
 {
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
-
-    /**
-     * @var ObjectManager
-     */
-    protected $om;
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    /**
-     * the user running this form.
-     *
-     * @var User
-     */
-    protected $user;
+    private CenterResolverDispatcher $centerResolverDispatcher;
 
     private ParameterBagInterface $parameterBag;
 
     private ScopeResolverDispatcher $scopeResolverDispatcher;
 
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
     public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
+        TranslatableStringHelperInterface $translatableStringHelper,
         ScopeResolverDispatcher $scopeResolverDispatcher,
         ParameterBagInterface $parameterBag
     ) {
@@ -96,7 +76,7 @@ class PersonDocumentType extends AbstractType
 
         if ($isScopeConcerned && $this->parameterBag->get('chill_main')['acl']['form_show_scopes']) {
             $builder->add('scope', ScopePickerType::class, [
-                'center' => $options['center'],
+                'center' => $this->centerResolverDispatcher->resolveCenter($document),
                 'role' => $options['role'],
             ]);
         }
@@ -108,8 +88,7 @@ class PersonDocumentType extends AbstractType
             'data_class' => Document::class,
         ]);
 
-        $resolver->setRequired(['role', 'center'])
-            ->setAllowedTypes('role', ['string'])
-            ->setAllowedTypes('center', [\Chill\MainBundle\Entity\Center::class]);
+        $resolver->setRequired(['role'])
+            ->setAllowedTypes('role', ['string']);
     }
 }

From 6edf0bcb3b28f330759e1d3a1a45a5539ba630aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 3 Mar 2022 13:56:26 +0100
Subject: [PATCH 013/174] fix delete links in documents

---
 .../translations/messages.fr.yml              |  2 +-
 .../DocumentAccompanyingCourseController.php  | 34 +++++++++++----
 .../Controller/DocumentPersonController.php   | 38 +++++++++++-----
 .../_delete_form.html.twig                    |  5 ---
 .../delete.html.twig                          | 43 +++++++++++++++++++
 .../AccompanyingCourseDocument/edit.html.twig |  9 +++-
 .../AccompanyingCourseDocument/show.html.twig | 17 +++++---
 .../Resources/views/List/list_item.html.twig  | 32 +++++++++-----
 .../views/PersonDocument/delete.html.twig     | 43 +++++++++++++++++++
 .../views/PersonDocument/edit.html.twig       | 14 +++---
 .../views/PersonDocument/new.html.twig        |  4 +-
 .../views/PersonDocument/show.html.twig       | 22 ++++++----
 .../translations/messages.fr.yml              |  6 +++
 .../Entity/Person/ResidentialAddress.php      |  4 +-
 .../ResidentialAddressRepository.php          | 26 +++++------
 .../Normalizer/PersonJsonNormalizer.php       |  6 ++-
 16 files changed, 226 insertions(+), 79 deletions(-)
 delete mode 100644 src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_delete_form.html.twig
 create mode 100644 src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig
 create mode 100644 src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig

diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 81a34d47d..051497b69 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -76,7 +76,7 @@ activity:
     Insert a document: Insérer un document
     Remove a document: Supprimer le document
     comment: Commentaire
-No documents: Pas de documents
+No documents: Aucun document
 
 #timeline
 '%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"'
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
index 199f88c60..ae8db17f6 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
@@ -21,6 +21,8 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use DateTime;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
@@ -59,21 +61,37 @@ class DocumentAccompanyingCourseController extends AbstractController
     }
 
     /**
-     * @Route("/{id}", name="accompanying_course_document_delete", methods="DELETE")
+     * @Route("/{id}/delete", name="chill_docstore_accompanying_course_document_delete")
      */
     public function delete(Request $request, AccompanyingPeriod $course, AccompanyingCourseDocument $document): Response
     {
         $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::DELETE, $document);
 
-        if ($this->isCsrfTokenValid('delete' . $document->getId(), $request->request->get('_token'))) {
-            $em = $this->getDoctrine()->getManager();
-            $em->remove($document);
-            $em->flush();
+        $form = $this->createForm(FormType::class);
+        $form->add('submit', SubmitType::class, ['label' => 'Delete']);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->getDoctrine()->getManager()->remove($document);
+            $this->getDoctrine()->getManager()->flush();
+
+            $this->addFlash('success', $this->translator->trans('The document is successfully removed'));
+
+            if ($request->query->has('returnPath')) {
+                return $this->redirect($request->query->get('returnPath'));
+            }
+
+            return $this->redirectToRoute('accompanying_course_document_index', ['course' => $course->getId()]);
         }
 
-        return $this->redirectToRoute(
-            'accompanying_course_document_index',
-            ['accompanyingCourse' => $course->getId()]
+        return $this->render(
+            'ChillDocStoreBundle:AccompanyingCourseDocument:delete.html.twig',
+            [
+                'document' => $document,
+                'delete_form' => $form->createView(),
+                'accompanyingCourse' => $course,
+            ]
         );
     }
 
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
index eb9698aee..42e49ad3c 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
@@ -14,6 +14,7 @@ namespace Chill\DocStoreBundle\Controller;
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Form\PersonDocumentType;
 use Chill\DocStoreBundle\Repository\PersonDocumentACLAwareRepositoryInterface;
+use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\Person;
@@ -22,6 +23,8 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use DateTime;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
@@ -64,22 +67,37 @@ class DocumentPersonController extends AbstractController
     }
 
     /**
-     * @Route("/{id}", name="person_document_delete", methods="DELETE")
+     * @Route("/{id}/delete", name="chill_docstore_person_document_delete")
      */
     public function delete(Request $request, Person $person, PersonDocument $document): Response
     {
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-        $this->denyAccessUnlessGranted('CHILL_PERSON_DOCUMENT_DELETE', $document);
+        $this->denyAccessUnlessGranted(PersonDocumentVoter::DELETE, $document);
 
-        if ($this->isCsrfTokenValid('delete' . $document->getId(), $request->request->get('_token'))) {
-            $em = $this->getDoctrine()->getManager();
-            $em->remove($document);
-            $em->flush();
+        $form = $this->createForm(FormType::class);
+        $form->add('submit', SubmitType::class, ['label' => 'Delete']);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->getDoctrine()->getManager()->remove($document);
+            $this->getDoctrine()->getManager()->flush();
+
+            $this->addFlash('success', $this->translator->trans('The document is successfully removed'));
+
+            if ($request->query->has('returnPath')) {
+                return $this->redirect($request->query->get('returnPath'));
+            }
+
+            return $this->redirectToRoute('person_document_index', ['person' => $person->getId()]);
         }
 
-        return $this->redirectToRoute(
-            'person_document_index',
-            ['person' => $person->getId()]
+        return $this->render(
+            'ChillDocStoreBundle:PersonDocument:delete.html.twig',
+            [
+                'document' => $document,
+                'delete_form' => $form->createView(),
+                'person' => $person,
+            ]
         );
     }
 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_delete_form.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_delete_form.html.twig
deleted file mode 100644
index 90ee734e0..000000000
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_delete_form.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-<form method="post" action="{{ path('accompanying_course_document_delete', {'id': document.id, 'course': course.id}) }}" onsubmit="return confirm('Are you sure you want to delete this item?');">
-	<input type="hidden" name="_method" value="DELETE">
-	<input type="hidden" name="_token" value="{{ csrf_token('delete' ~ document.id) }}">
-	<button class="btn btn-delete">{{ 'Delete' | trans }}</button>
-</form>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig
new file mode 100644
index 000000000..a6679829b
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig
@@ -0,0 +1,43 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = '' %}
+
+{% block title %}{{ 'Delete document ?' }}{% endblock %}
+
+{% block docdescription %}
+    <dl class="chill_view_data">
+        <dt>{{ 'Title'|trans }}</dt>
+        <dd>{{ document.title }}</dd>
+
+        {% if document.scope is not null %}
+            <dt>{{ 'Scope' | trans }}</dt>
+            <dd>{{ document.scope.name | localize_translatable_string }}</dd>
+        {% endif %}
+
+        <dt>{{ 'Category'|trans }}</dt>
+        <dd>{{ document.category.name|localize_translatable_string }}</dd>
+
+        <dt>{{ 'Description' | trans }}</dt>
+        <dd>
+            {% if document.description is empty %}
+                <span class="chill-no-data-statement">{{ 'Any description'|trans }}</span>
+            {% else %}
+                <blockquote class="chill-user-quote">
+                    {{ document.description|chill_markdown_to_html }}
+                </blockquote>
+            {% endif %}
+        </dd>
+    </dl>
+{% endblock %}
+
+{% block content %}
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
+    {
+        'title'             : 'Delete document ?'|trans,
+        'display_content'   : block('docdescription'),
+        'confirm_question'  : 'Are you sure you want to remove this document ?'|trans,
+        'cancel_route'      : 'accompanying_course_document_index',
+        'cancel_parameters' : {'course' : accompanyingCourse.id, 'id': document.id},
+        'form'              : delete_form
+    } ) }}
+{% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig
index d7a5325cf..0ca5661fc 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig
@@ -25,8 +25,13 @@
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>
-		<li class="edit">
-			<button class="btn btn-edit">{{ 'Edit'|trans }}</button>
+        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE', document) %}
+            <li class="delete">
+                <a href="{{ chill_return_path_or('chill_docstore_accompanying_course_document_delete', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+            </li>
+        {% endif %}
+        <li class="edit">
+            <button class="btn btn-edit">{{ 'Edit'|trans }}</button>
 		</li>
 	</ul>
 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
index 1e4fdb8e6..45ed3988b 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
@@ -49,12 +49,9 @@
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
-        <li>
-            {{ m.download_button(document.object, document.title) }}
-        </li>
-        {% if chill_document_is_editable(document.object) %}
-            <li>
-                {{ document.object|chill_document_edit_button }}
+        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE', document) %}
+            <li class="delete">
+                <a href="{{ chill_return_path_or('chill_docstore_accompanying_course_document_delete', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-delete"></a>
             </li>
         {% endif %}
         {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
@@ -63,6 +60,14 @@
                    class="btn btn-edit" title="{{ 'Edit attributes' | trans }}"></a>
             </li>
         {% endif %}
+        <li>
+            {{ m.download_button(document.object, document.title) }}
+        </li>
+        {% if chill_document_is_editable(document.object) %}
+            <li>
+                {{ document.object|chill_document_edit_button }}
+            </li>
+        {% endif %}
         {% set workflows_frame = chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) %}
         {% if workflows_frame is not empty %}
             <li>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
index 5ce03091b..8fbc3fa5c 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
@@ -44,6 +44,16 @@
         </div>
         <ul class="item-col record_actions flex-shrink-1">
             {% if document.course is defined %}
+                {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE', document) %}
+                    <li class="delete">
+                        <a href="{{ chill_return_path_or('chill_docstore_accompanying_course_document_delete', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+                    </li>
+                {% endif %}
+                {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
+                    <li>
+                        <a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
+                    </li>
+                {% endif %}
                 {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
                     <li>
                         {{ m.download_button(document.object, document.title) }}
@@ -52,15 +62,20 @@
                         <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
                     </li>
                 {% endif %}
-                {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
-                    <li>
-                        <a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
-                    </li>
-                {% endif %}
                 <li>
                     {{ chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) }}
                 </li>
             {% else %}
+                {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
+                    <li class="delete">
+                        <a href="{{ chill_return_path_or('chill_docstore_person_document_delete', {'person': person.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+                    </li>
+                {% endif %}
+                {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
+                    <li>
+                        <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
+                    </li>
+                {% endif %}
                 {% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
                     <li>
                         {{ m.download_button(document.object, document.title) }}
@@ -69,13 +84,8 @@
                         <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
                     </li>
                 {% endif %}
-                {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
-                    <li>
-                        <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
-                    </li>
-                {% endif %}
             {% endif %}
         </ul>
-        
+
     </div>
 </div>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig
new file mode 100644
index 000000000..e3f6687fd
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig
@@ -0,0 +1,43 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = '' %}
+
+{% block title %}{{ 'Delete document ?' }}{% endblock %}
+
+{% block docdescription %}
+    <dl class="chill_view_data">
+        <dt>{{ 'Title'|trans }}</dt>
+        <dd>{{ document.title }}</dd>
+
+        {% if document.scope is not null %}
+            <dt>{{ 'Scope' | trans }}</dt>
+            <dd>{{ document.scope.name | localize_translatable_string }}</dd>
+        {% endif %}
+
+        <dt>{{ 'Category'|trans }}</dt>
+        <dd>{{ document.category.name|localize_translatable_string }}</dd>
+
+        <dt>{{ 'Description' | trans }}</dt>
+        <dd>
+            {% if document.description is empty %}
+                <span class="chill-no-data-statement">{{ 'Any description'|trans }}</span>
+            {% else %}
+                <blockquote class="chill-user-quote">
+                    {{ document.description|chill_markdown_to_html }}
+                </blockquote>
+            {% endif %}
+        </dd>
+    </dl>
+{% endblock %}
+
+{% block personcontent %}
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
+    {
+        'title'             : 'Delete document ?'|trans,
+        'display_content'   : block('docdescription'),
+        'confirm_question'  : 'Are you sure you want to remove this document ?'|trans,
+        'cancel_route'      : 'person_document_index',
+        'cancel_parameters' : {'person' : person.id, 'id': document.id},
+        'form'              : delete_form
+    } ) }}
+{% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
index 7533f1120..4a9eab8e3 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
@@ -36,20 +36,20 @@
     {{ form_row(form.description) }}
     {{ form_row(form.object, { 'label': 'Document', 'existing': document.object }) }}
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
+            <a href="{{ chill_return_path_or('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
+        {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
+            <li class="delete">
+                <a href="{{ chill_return_path_or('chill_docstore_person_document_delete', {'person': person.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+            </li>
+        {% endif %}
         <li class="edit">
             <button class="btn btn-edit">{{ 'Edit'|trans }}</button>
         </li>
-        {# {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
-            <li class="delete">
-                {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }}
-            </li>
-        {% endif %} #}
     </ul>
 
     {{ form_end(form) }}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
index ad4fcfc81..357120a4e 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
@@ -40,9 +40,9 @@
 	{{ form_row(form.description) }}
 	{{ form_row(form.object, { 'label': 'Document', 'existing': document.object }) }}
 
-	<ul class="record_actions">
+	<ul class="record_actions sticky-form-buttons">
 		<li class="cancel">
-			<a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
+			<a href="{{ chill_return_path_or('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
index 723757425..a29dc0c04 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
@@ -64,13 +64,9 @@
             </a>
         </li>
 
-        <li>
-            {{ m.download_button(document.object, document.title) }}
-        </li>
-
-        {% if chill_document_is_editable(document.object) %}
-            <li>
-                {{ document.object|chill_document_edit_button }}
+        {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
+            <li class="delete">
+                <a href="{{ chill_return_path_or('chill_docstore_person_document_delete', {'person': person.id, 'id': document.id}) }}" class="btn btn-delete"></a>
             </li>
         {% endif %}
 
@@ -82,5 +78,15 @@
             </li>
         {% endif %}
 
-    {# {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }} #}
+        <li>
+            {{ m.download_button(document.object, document.title) }}
+        </li>
+
+        {% if chill_document_is_editable(document.object) %}
+            <li>
+                {{ document.object|chill_document_edit_button }}
+            </li>
+        {% endif %}
+
+        {# {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }} #}
 {% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
index f438731d4..009f4d987 100644
--- a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
@@ -19,6 +19,12 @@ The document is successfully registered: Le document est enregistré
 The document is successfully updated: Le document est mis à jour
 Any description: Aucune description
 
+# delete
+Delete document ?: Supprimer le document ?
+Are you sure you want to remove this document ?: Êtes-vous sûr·e de vouloir supprimer ce document ?
+The document is successfully removed: Le document a été supprimé
+
+
 # dropzone upload
 File too big: Fichier trop volumineux
 Drop your file or click here: Cliquez ici ou faites glissez votre nouveau fichier dans cette zone
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
index cb82f766a..bfa3760fa 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
@@ -18,8 +18,8 @@ use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\Context;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity(repositoryClass=ResidentialAddressRepository::class)
@@ -49,7 +49,7 @@ class ResidentialAddress
      * @ORM\ManyToOne(targetEntity=Person::class)
      * @ORM\JoinColumn(nullable=true)
      * @Groups({"read"})
-     * @Context(normalizationContext={"groups"={"minimal"}})
+     * @Context(normalizationContext={"groups": {"minimal"}})
      */
     private ?Person $hostPerson = null;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
index b5d64a31a..4e6131de0 100644
--- a/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
@@ -32,26 +32,11 @@ class ResidentialAddressRepository extends ServiceEntityRepository
         parent::__construct($registry, ResidentialAddress::class);
     }
 
-    /**
-     * @param Person $person
-     * @param DateTimeImmutable|null $at
-     * @return array|ResidentialAddress[]|null
-     */
-    public function findCurrentResidentialAddressByPerson(Person $person, ?DateTimeImmutable $at = null): array
-    {
-        return $this->buildQueryFindCurrentResidentialAddresses($person, $at)
-            ->select('ra')
-            ->getQuery()
-            ->getResult();
-    }
-
     public function buildQueryFindCurrentResidentialAddresses(Person $person, ?DateTimeImmutable $at = null): QueryBuilder
     {
         $date = null === $at ? new DateTimeImmutable('today') : $at;
         $qb = $this->createQueryBuilder('ra');
 
-
-
         $dateFilter = $qb->expr()->andX(
             $qb->expr()->lte('ra.startDate', ':dateIn'),
             $qb->expr()->orX(
@@ -69,6 +54,17 @@ class ResidentialAddressRepository extends ServiceEntityRepository
         return $qb;
     }
 
+    /**
+     * @return array|ResidentialAddress[]|null
+     */
+    public function findCurrentResidentialAddressByPerson(Person $person, ?DateTimeImmutable $at = null): array
+    {
+        return $this->buildQueryFindCurrentResidentialAddresses($person, $at)
+            ->select('ra')
+            ->getQuery()
+            ->getResult();
+    }
+
     // /**
     //  * @return ResidentialAddress[] Returns an array of ResidentialAddress objects
     //  */
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index b42e30ff6..1901fd50c 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -31,6 +31,8 @@ use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
 use function array_key_exists;
+use function count;
+use function in_array;
 
 /**
  * Serialize a Person entity.
@@ -207,8 +209,8 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
             'gender' => $person->getGender(),
         ];
 
-        if (in_array("minimal", $groups) && 1 === count($groups)) {
-           return $data;
+        if (in_array('minimal', $groups, true) && 1 === count($groups)) {
+            return $data;
         }
 
         return array_merge($data, [

From 34b3c6fa327a40c99c7507ebcd24ca9f753aa18b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 3 Mar 2022 14:15:20 +0100
Subject: [PATCH 014/174] bugfix when position of member is null

---
 .../vuejs/_components/Entity/HouseholdRenderBox.vue       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index 16d0fa2ff..163f49bcf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -87,10 +87,14 @@ export default {
     currentMembers() {
       let members = this.household.members.filter(m => this.household.current_members_id.includes(m.id))
         .sort((a, b) => {
-          if (a.position.ordering < b.position.ordering) {
+
+          const orderA = a.position ? a.position.ordering : 0;
+          const orderB = b.position ? b.position.ordering : 0;
+
+          if (orderA < orderB) {
             return -1;
           }
-          if (a.position.ordering > b.position.ordering) {
+          if (orderA > orderB) {
             return 1;
           }
           if (a.holder && !b.holder) {

From 349db2142defe9cc6845e8ca7e7244997740da37 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 14:39:00 +0100
Subject: [PATCH 015/174] person: add url field to SocialWork Evaluation entity
 + populate with http title values

---
 .../Entity/SocialWork/Evaluation.php          | 18 +++++++++
 .../migrations/Version20220303113855.php      | 38 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220303113855.php

diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
index 1350ae6d8..9349c335e 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
@@ -62,6 +62,12 @@ class Evaluation
      */
     private array $title = [];
 
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private ?string $url = null;
+
     public function __construct()
     {
         $this->socialActions = new ArrayCollection();
@@ -101,6 +107,11 @@ class Evaluation
         return $this->title;
     }
 
+    public function getUrl(): ?string
+    {
+        return $this->url;
+    }
+
     public function removeSocialAction(SocialAction $socialAction): self
     {
         if ($this->socialActions->contains($socialAction)) {
@@ -130,4 +141,11 @@ class Evaluation
 
         return $this;
     }
+
+    public function setUrl(?string $url): self
+    {
+        $this->url = $url;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220303113855.php b/src/Bundle/ChillPersonBundle/migrations/Version20220303113855.php
new file mode 100644
index 000000000..9991d2eca
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220303113855.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add url to SocialWork Evaluation
+ */
+final class Version20220303113855 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add url to SocialWork Evaluation';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_social_work_evaluation ADD url TEXT DEFAULT NULL');
+        $this->addSql("UPDATE chill_person_social_work_evaluation SET url = CASE WHEN title->>'fr' LIKE 'http%' THEN title->>'fr' ELSE null END;");
+    }
+
+    public function down(Schema $schema): void
+    {
+
+        $this->addSql('ALTER TABLE chill_person_social_work_evaluation DROP url');
+    }
+}

From f0e41f839fdcfc44d4660628565c7289ec18c27f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 3 Mar 2022 14:39:20 +0100
Subject: [PATCH 016/174] fix error when context is a string in
 personJsonNormalizer

---
 .../Serializer/Normalizer/PersonJsonNormalizer.php             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index 1901fd50c..1969fffa7 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -189,6 +189,9 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
     public function normalize($person, $format = null, array $context = [])
     {
         $groups = $context[AbstractNormalizer::GROUPS] ?? [];
+        if (is_string($groups)) {
+            $groups = [$groups];
+        }
         $household = $person->getCurrentHousehold();
         $currentResidentialAddresses = $this->residentialAddressRepository->findCurrentResidentialAddressByPerson($person);
 

From bf4a3a2c91f69b23697815398c8ff23ac9f4efa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 3 Mar 2022 15:01:14 +0100
Subject: [PATCH 017/174] add id to docgen normalization fo a person

---
 .../Serializer/Normalizer/PersonDocGenNormalizer.php           | 3 ++-
 .../Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
index 8eae2065d..c6d132992 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
@@ -74,6 +74,7 @@ class PersonDocGenNormalizer implements
 
         $data = [
             'type' => 'person',
+            'id' => $person->getId(),
             'isNull' => false,
             'civility' => $this->normalizer->normalize($person->getCivility(), $format, array_merge($context, ['docgen:expects' => Civility::class])),
             'firstName' => $person->getFirstName(),
@@ -151,7 +152,7 @@ class PersonDocGenNormalizer implements
         $normalizer = new NormalizeNullValueHelper($this->normalizer, 'type', 'person');
 
         $attributes = [
-            'firstName', 'lastName', 'age', 'altNames', 'text',
+            'id', 'firstName', 'lastName', 'age', 'altNames', 'text',
             'civility' => Civility::class,
             'birthdate' => DateTimeInterface::class,
             'deathdate' => DateTimeInterface::class,
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
index 817125422..c19533e08 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
@@ -38,6 +38,7 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
     use ProphecyTrait;
 
     private const BLANK = [
+        'id' => '',
         'firstName' => '',
         'lastName' => '',
         'altNames' => '',

From 9769aa1386aeeea90f9ccc41d501aaca8b47bd02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 3 Mar 2022 15:07:45 +0100
Subject: [PATCH 018/174] fix loading of residential address form type

---
 .../Controller/ResidentialAddressController.php                | 2 +-
 src/Bundle/ChillPersonBundle/Form/ResidentialAddressType.php   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php b/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php
index f77a4150c..bdc6c1b5e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php
@@ -13,7 +13,7 @@ namespace Chill\PersonBundle\Controller;
 
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\ResidentialAddress;
-use Chill\PersonBundle\Form\Type\ResidentialAddressType;
+use Chill\PersonBundle\Form\ResidentialAddressType;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillPersonBundle/Form/ResidentialAddressType.php b/src/Bundle/ChillPersonBundle/Form/ResidentialAddressType.php
index b34395daf..8efcf091a 100644
--- a/src/Bundle/ChillPersonBundle/Form/ResidentialAddressType.php
+++ b/src/Bundle/ChillPersonBundle/Form/ResidentialAddressType.php
@@ -9,11 +9,12 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Form\Type;
+namespace Chill\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\CommentType;
 use Chill\MainBundle\Form\Type\PickAddressType;
 use Chill\PersonBundle\Entity\Person\ResidentialAddress;
+use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
 use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;

From 568a1d95f46544fff7040710359b5fd7ea91a634 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 15:10:05 +0100
Subject: [PATCH 019/174] AccompanyingCourseWorkEdit: add url to vuejs form

---
 .../components/AddEvaluation.vue                     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
index 579d0b306..d2b8c5b46 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
@@ -5,6 +5,11 @@
          <span>{{ evaluation.evaluation.title.fr }}</span>
       </div>
 
+      <div class="item-url mt-3 mb-4" v-if="evaluation.evaluation.url">
+         <i class="fa fa-link fa-lg"></i>
+         <a :href="evaluation.evaluation.url" target="_blank">{{ evaluation.evaluation.url }}</a>
+      </div>
+
       <div>
          <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation"></form-evaluation>
 
@@ -128,4 +133,11 @@ export default {
          }
       }
    }
+   div.item-url {
+      i {
+         color: unset!important;
+         margin-left: 1rem;
+         margin-right: 0.5rem;
+      }
+   }
 </style>

From a88e052eb64f06c4195f9a3b20f319ac291505d3 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 15:12:47 +0100
Subject: [PATCH 020/174] upd CHANGELOG

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bd743078..7de2c188a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] Add url in accompanying period work evaluations entity and form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/476)
+
+
 * [parcours] Toggle emergency/intensity only by referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
 * [docstore] Add an API entrypoint for StoredObject (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
 * [person] Add the possibility of uploading existing documents to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)

From c5eac09478e1b9bed3369182ce351f64420a0366 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 15:17:05 +0100
Subject: [PATCH 021/174] php cs fix on migration

---
 .../migrations/Version20220303113855.php            | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220303113855.php b/src/Bundle/ChillPersonBundle/migrations/Version20220303113855.php
index 9991d2eca..7840cdfce 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220303113855.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220303113855.php
@@ -15,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add url to SocialWork Evaluation
+ * Add url to SocialWork Evaluation.
  */
 final class Version20220303113855 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_social_work_evaluation DROP url');
+    }
+
     public function getDescription(): string
     {
         return 'Add url to SocialWork Evaluation';
@@ -29,10 +34,4 @@ final class Version20220303113855 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_social_work_evaluation ADD url TEXT DEFAULT NULL');
         $this->addSql("UPDATE chill_person_social_work_evaluation SET url = CASE WHEN title->>'fr' LIKE 'http%' THEN title->>'fr' ELSE null END;");
     }
-
-    public function down(Schema $schema): void
-    {
-
-        $this->addSql('ALTER TABLE chill_person_social_work_evaluation DROP url');
-    }
 }

From 4ad65b616d3d828caf428f8282baeb29f498b904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 3 Mar 2022 15:20:21 +0100
Subject: [PATCH 022/174] fix tests for person json normalizer and residential
 address stuff

---
 .../Normalizer/PersonJsonNormalizer.php       |  6 ++-
 .../Normalizer/PersonJsonNormalizerTest.php   | 47 ++++++++++++++++++-
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index 1969fffa7..ae95c9321 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -33,6 +33,7 @@ use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
 use function array_key_exists;
 use function count;
 use function in_array;
+use function is_string;
 
 /**
  * Serialize a Person entity.
@@ -56,11 +57,11 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
     private ResidentialAddressRepository $residentialAddressRepository;
 
     public function __construct(
-        ChillEntityRenderExtension $render,
+        ChillEntityRenderExtension $render, /* TODO: replace by PersonRenderInterface, as sthis is the only one required */
         PersonRepository $repository,
         CenterResolverManagerInterface $centerResolverManager,
         ResidentialAddressRepository $residentialAddressRepository,
-        PhoneNumberHelperInterface $phoneNumberHelper
+        PhoneNumberHelperInterface $phoneNumberHelper /* TODO maybe not necessayr any more */
     ) {
         $this->render = $render;
         $this->repository = $repository;
@@ -189,6 +190,7 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
     public function normalize($person, $format = null, array $context = [])
     {
         $groups = $context[AbstractNormalizer::GROUPS] ?? [];
+
         if (is_string($groups)) {
             $groups = [$groups];
         }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
index 59cc0a564..13fa54178 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
@@ -11,7 +11,15 @@ declare(strict_types=1);
 
 namespace Serializer\Normalizer;
 
+use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
+use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Repository\ResidentialAddressRepository;
+use Chill\PersonBundle\Serializer\Normalizer\PersonJsonNormalizer;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -22,12 +30,27 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
  */
 final class PersonJsonNormalizerTest extends KernelTestCase
 {
-    private NormalizerInterface $normalizer;
+    use ProphecyTrait;
+
+    private PersonJsonNormalizer $normalizer;
 
     protected function setUp(): void
     {
         self::bootKernel();
-        $this->normalizer = self::$container->get(NormalizerInterface::class);
+
+        $residentialAddressRepository = $this->prophesize(ResidentialAddressRepository::class);
+        $residentialAddressRepository
+            ->findCurrentResidentialAddressByPerson(Argument::type(Person::class), Argument::any())
+            ->willReturn([]);
+
+        $this->normalizer = $this->buildPersonJsonNormalizer(
+            self::$container->get(ChillEntityRenderExtension::class),
+            self::$container->get(PersonRepository::class),
+            self::$container->get(CenterResolverManagerInterface::class),
+            $residentialAddressRepository->reveal(),
+            self::$container->get(PhoneNumberHelperInterface::class),
+            self::$container->get(NormalizerInterface::class)
+        );
     }
 
     public function testNormalization()
@@ -37,4 +60,24 @@ final class PersonJsonNormalizerTest extends KernelTestCase
 
         $this->assertIsArray($result);
     }
+
+    private function buildPersonJsonNormalizer(
+        ChillEntityRenderExtension $render,
+        PersonRepository $repository,
+        CenterResolverManagerInterface $centerResolverManager,
+        ResidentialAddressRepository $residentialAddressRepository,
+        PhoneNumberHelperInterface $phoneNumberHelper,
+        NormalizerInterface $normalizer
+    ): PersonJsonNormalizer {
+        $personJsonNormalizer = new PersonJsonNormalizer(
+            $render,
+            $repository,
+            $centerResolverManager,
+            $residentialAddressRepository,
+            $phoneNumberHelper
+        );
+        $personJsonNormalizer->setNormalizer($normalizer);
+
+        return $personJsonNormalizer;
+    }
 }

From e9236875d223129a67a498b7006f35d9a36e59c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 3 Mar 2022 15:44:30 +0100
Subject: [PATCH 023/174] quick fix for phonenumber alt on person

---
 src/Bundle/ChillPersonBundle/Entity/PersonPhone.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
index 400e39c88..f33646f09 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Entity;
 
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
+use libphonenumber\PhoneNumber;
 
 /**
  * Person Phones.
@@ -51,9 +52,9 @@ class PersonPhone
     private Person $person;
 
     /**
-     * @ORM\Column(type="text", length=40, nullable=false)
+     * @ORM\Column(type="phone_number", nullable=false)
      */
-    private string $phonenumber = '';
+    private ?PhoneNumber $phonenumber = null;
 
     /**
      * @ORM\Column(type="text", length=40, nullable=true)
@@ -85,7 +86,7 @@ class PersonPhone
         return $this->person;
     }
 
-    public function getPhonenumber(): string
+    public function getPhonenumber(): ?PhoneNumber
     {
         return $this->phonenumber;
     }
@@ -115,7 +116,7 @@ class PersonPhone
         $this->person = $person;
     }
 
-    public function setPhonenumber(string $phonenumber): void
+    public function setPhonenumber(?PhoneNumber $phonenumber): void
     {
         $this->phonenumber = $phonenumber;
     }

From 892be425807ff901efcd593c764bab132cfd46ab Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 3 Mar 2022 16:28:31 +0100
Subject: [PATCH 024/174] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bd743078..8dd9bbbe2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to
 * [confidential] Fix position of toggle button so it does not cover text nor fall outside of box (no issue)
 * [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474)
 * [template] do not list inactive templates (for doc generator)
+* [household] bugfix if position of member is null, renderbox no longer throws an error (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/480)
 
 ## Test releases
 

From 187c9d82b6cd499bc56547ab8f061042d71b4656 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 16:37:58 +0100
Subject: [PATCH 025/174] assign User to undsipatched acc period: filter users
 by job type

---
 .../public/mod/AccompanyingPeriod/setReferrer.js    | 13 ++++++-------
 .../_components/AccompanyingPeriod/SetReferrer.vue  |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/mod/AccompanyingPeriod/setReferrer.js b/src/Bundle/ChillPersonBundle/Resources/public/mod/AccompanyingPeriod/setReferrer.js
index b73c0afea..939075380 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/mod/AccompanyingPeriod/setReferrer.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/mod/AccompanyingPeriod/setReferrer.js
@@ -19,22 +19,21 @@ import {fetchResults} from 'ChillMainAssets/lib/api/apiMethods.js';
  */
 
 document.querySelectorAll('[data-set-referrer-app]').forEach(function (el) {
-  let
-    periodId = Number.parseInt(el.dataset.setReferrerAccompanyingPeriodId);
-
+  const periodId = Number.parseInt(el.dataset.setReferrerAccompanyingPeriodId);
+  const jobId = Number.parseInt(el.dataset.setReferrerJobId);
   const url = `/api/1.0/person/accompanying-course/${periodId}/referrers-suggested.json`;
 
   fetchResults(url).then(suggested => {
-
+    const filteredSuggested = suggested.filter((s) => s.user_job ? s.user_job.id === jobId : false);
     const app = createApp({
       components: {
         SetReferrer,
       },
       template:
-        '<set-referrer :suggested="suggested" :periodId="periodId" @referrerSet="onReferrerSet"></set-referrer>',
+        '<set-referrer :suggested="filteredSuggested" :periodId="periodId" @referrerSet="onReferrerSet"></set-referrer>',
       data() {
         return {
-          periodId, suggested, original: suggested,
+          periodId, filteredSuggested, original: filteredSuggested,
         }
       },
       methods: {
@@ -56,7 +55,7 @@ document.querySelectorAll('[data-set-referrer-app]').forEach(function (el) {
           label.textContent = ref.text;
           label.classList.remove('chill-no-data-statement');
 
-          this.suggested = this.original.filter(user => user.id !== ref.id);
+          this.filteredSuggested = this.original.filter(user => user.id !== ref.id);
         }
       }
     });
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
index 3d3675c73..38418f305 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
@@ -1,12 +1,12 @@
 <template>
 <ul class="list-suggest add-items" v-if="suggested.length > 0">
-  <li v-for="r in suggested" @click="setReferrer(r)"><span>{{ r.text }}</span></li>
+  <li v-for="(r, i) in suggested" @click="setReferrer(r)" :key="i"><span>{{ r.text }}</span></li>
 </ul>
 </template>
 
 <script>
 
-import {makeFetch} from 'ChillMainAssets/lib/api/apiMethods.js';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods.js';
 
 export default {
   name: "SetReferrer",

From 7b52a10943e4f5e62182ffb4a600f2b4aa7a156d Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 17:21:54 +0100
Subject: [PATCH 026/174] upd CHANGELOG

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a38f2ea47..d760a8b6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
+
+
 * [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)
 * [activity] do not override location if already exist (when validating new activity) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/470)
 * [parcours] Toggle emergency/intensity only by referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)

From 827c85ac56dde4b3ea26415b39b137b1816f83b0 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 3 Mar 2022 20:37:12 +0100
Subject: [PATCH 027/174] fix parcours localisation

---
 CHANGELOG.md                                  |  1 +
 .../components/CourseLocation.vue             | 24 -------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a38f2ea47..23b115a84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ and this project adheres to
 * [confidential] Fix position of toggle button so it does not cover text nor fall outside of box (no issue)
 * [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474)
 * [template] do not list inactive templates (for doc generator)
+* [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index e32f9b05e..42f974dd1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -59,14 +59,6 @@
                   ref="addAddress">
                </add-address>
             </li>
-            <li v-if="isPersonLocation">
-               <button
-                  class="btn btn-remove"
-                  @click="removeAddress"
-                  :title="$t('courselocation.remove_button')">
-                  {{ $t('action.remove') }}
-               </button>
-            </li>
          </ul>
       </div>
 
@@ -180,22 +172,6 @@ export default {
          }
          this.$store.commit('setAddressContext', context);
       },
-      removeAddress() {
-         let payload = {
-            target: this.context.target.name,
-            targetId: this.context.target.id,
-            locationStatusTo: 'none'
-         };
-         //console.log('remove address');
-         this.$store.dispatch('updateLocation', payload)
-            .catch(({name, violations}) => {
-               if (name === 'ValidationException' || name === 'AccessException') {
-                  violations.forEach((violation) => this.$toast.open({message: violation}));
-               } else {
-                  this.$toast.open({message: 'An error occurred'})
-               }
-            });
-      },
       displayErrors() {
          return this.$refs.addAddress.errorMsg;
       },

From 6d3b88aee923abf71e626c16839143da6f3e69d4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 3 Mar 2022 21:09:50 +0100
Subject: [PATCH 028/174] Add current household link in person banner

---
 .../Resources/public/chill/chillperson.scss   | 105 ++++++++++--------
 .../Resources/views/Person/banner.html.twig   |   7 ++
 2 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
index 30eadc7b1..92542f178 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
@@ -37,57 +37,68 @@ div.banner {
                 margin-right: 1em;
             }
         }
+        .household-link {
+            border: 1px solid white;
+            padding: .05rem .3rem;
+            border-radius: 5px;
+            color: white;
+            cursor: pointer;
+            &:hover {
+                background-color: white;
+                color: $chill-person-context
+            }
+        }
     }
 }
 
 div.person-view {
-   figure.person-details {
-      h2 {
-         font-family: 'Open Sans';
-         font-weight: 600;
-         margin-bottom: 0.3em;
-         font-variant: small-caps;
-      }
-      dl {
-         margin-top: 0.3em;
-      }
-      dt {
-         font-family: 'Open Sans';
-         font-weight: 600;
-      }
-      dd {
-         margin-left: 0;
-      }
-      /*
-         a.sc-button { background-color: $black; padding-top: 0.2em; padding-bottom: 0.2em; }
-      */
-   }
-   /* custom fields on the home page */
-   div.custom-fields {
-      figure.person-details {
-         display: flex;
-         flex-flow: row wrap;
-         div.cf_title_box:nth-child(4n+1) h2 {
-            @extend .chill-red !optional;
-         }
-         div.cf_title_box:nth-child(4n+2) h2 {
-            @extend .chill-green !optional;
-         }
-         div.cf_title_box:nth-child(4n+3) h2 {
-            @extend .chill-orange !optional;
-         }
-         div.cf_title_box:nth-child(4n+4) h2 {
-            @extend .chill-blue !optional;
-         }
-         div.cf_title_box:nth-child(2n+1) {
-            width: 50%;
-            margin-right: 40px;
-         }
-         div.cf_title_box:nth-child(2n+2) {
-            width: calc(50% - 40px);
-         }
-      }
-   }
+    figure.person-details {
+        h2 {
+            font-family: 'Open Sans';
+            font-weight: 600;
+            margin-bottom: 0.3em;
+            font-variant: small-caps;
+        }
+        dl {
+            margin-top: 0.3em;
+        }
+        dt {
+            font-family: 'Open Sans';
+            font-weight: 600;
+        }
+        dd {
+            margin-left: 0;
+        }
+        /*
+            a.sc-button { background-color: $black; padding-top: 0.2em; padding-bottom: 0.2em; }
+        */
+    }
+    /* custom fields on the home page */
+    div.custom-fields {
+        figure.person-details {
+            display: flex;
+            flex-flow: row wrap;
+            div.cf_title_box:nth-child(4n+1) h2 {
+                @extend .chill-red !optional;
+            }
+            div.cf_title_box:nth-child(4n+2) h2 {
+                @extend .chill-green !optional;
+            }
+            div.cf_title_box:nth-child(4n+3) h2 {
+                @extend .chill-orange !optional;
+            }
+            div.cf_title_box:nth-child(4n+4) h2 {
+                @extend .chill-blue !optional;
+            }
+            div.cf_title_box:nth-child(2n+1) {
+                width: 50%;
+                margin-right: 40px;
+            }
+            div.cf_title_box:nth-child(2n+2) {
+                width: calc(50% - 40px);
+            }
+        }
+    }
 }
 
 /*
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
index 0e051da2c..8f7d5cc20 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
@@ -58,6 +58,13 @@
                                 }) }}
                             </span>
                         {%- endif -%}
+                        {% if person.getCurrentHousehold is not null %}
+                            <span>
+                                <a class="household-link" href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id' : person.getCurrentHousehold.id } ) }}">
+                                    <i class="fa fa-home"></i>
+                                </a>
+                            </span>
+                        {% endif %}
                     </div>
                 </div>
 

From 9265a1542739c9bfe5a8bb12a3bd5c8845fddce5 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 3 Mar 2022 21:12:00 +0100
Subject: [PATCH 029/174] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a38f2ea47..6cf2f8ed6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ and this project adheres to
 * [confidential] Fix position of toggle button so it does not cover text nor fall outside of box (no issue)
 * [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474)
 * [template] do not list inactive templates (for doc generator)
+* [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
 
 ## Test releases
 

From 3ff92915809e0907eda8d4aa051725b6a01cc748 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 16:37:58 +0100
Subject: [PATCH 030/174] assign User to undsipatched acc period: filter users
 by job type

---
 .../public/mod/AccompanyingPeriod/setReferrer.js    | 13 ++++++-------
 .../_components/AccompanyingPeriod/SetReferrer.vue  |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/mod/AccompanyingPeriod/setReferrer.js b/src/Bundle/ChillPersonBundle/Resources/public/mod/AccompanyingPeriod/setReferrer.js
index b73c0afea..939075380 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/mod/AccompanyingPeriod/setReferrer.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/mod/AccompanyingPeriod/setReferrer.js
@@ -19,22 +19,21 @@ import {fetchResults} from 'ChillMainAssets/lib/api/apiMethods.js';
  */
 
 document.querySelectorAll('[data-set-referrer-app]').forEach(function (el) {
-  let
-    periodId = Number.parseInt(el.dataset.setReferrerAccompanyingPeriodId);
-
+  const periodId = Number.parseInt(el.dataset.setReferrerAccompanyingPeriodId);
+  const jobId = Number.parseInt(el.dataset.setReferrerJobId);
   const url = `/api/1.0/person/accompanying-course/${periodId}/referrers-suggested.json`;
 
   fetchResults(url).then(suggested => {
-
+    const filteredSuggested = suggested.filter((s) => s.user_job ? s.user_job.id === jobId : false);
     const app = createApp({
       components: {
         SetReferrer,
       },
       template:
-        '<set-referrer :suggested="suggested" :periodId="periodId" @referrerSet="onReferrerSet"></set-referrer>',
+        '<set-referrer :suggested="filteredSuggested" :periodId="periodId" @referrerSet="onReferrerSet"></set-referrer>',
       data() {
         return {
-          periodId, suggested, original: suggested,
+          periodId, filteredSuggested, original: filteredSuggested,
         }
       },
       methods: {
@@ -56,7 +55,7 @@ document.querySelectorAll('[data-set-referrer-app]').forEach(function (el) {
           label.textContent = ref.text;
           label.classList.remove('chill-no-data-statement');
 
-          this.suggested = this.original.filter(user => user.id !== ref.id);
+          this.filteredSuggested = this.original.filter(user => user.id !== ref.id);
         }
       }
     });
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
index 3d3675c73..38418f305 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
@@ -1,12 +1,12 @@
 <template>
 <ul class="list-suggest add-items" v-if="suggested.length > 0">
-  <li v-for="r in suggested" @click="setReferrer(r)"><span>{{ r.text }}</span></li>
+  <li v-for="(r, i) in suggested" @click="setReferrer(r)" :key="i"><span>{{ r.text }}</span></li>
 </ul>
 </template>
 
 <script>
 
-import {makeFetch} from 'ChillMainAssets/lib/api/apiMethods.js';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods.js';
 
 export default {
   name: "SetReferrer",

From 1c1dec1f5b735ca04438f7d769a7d492f635c7b9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 17:21:54 +0100
Subject: [PATCH 031/174] upd CHANGELOG

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a38f2ea47..d760a8b6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
+
+
 * [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)
 * [activity] do not override location if already exist (when validating new activity) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/470)
 * [parcours] Toggle emergency/intensity only by referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)

From 84f2e1c72ac7668a8d6c5dc08a23507197afa7d9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 10:34:47 +0100
Subject: [PATCH 032/174] Accompanying Period: set cascade persist on
 pinnedComment

---
 src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index d75ade12b..4d0c4895e 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -257,7 +257,8 @@ class AccompanyingPeriod implements
 
     /**
      * @ORM\ManyToOne(
-     *     targetEntity=Comment::class
+     *     targetEntity=Comment::class,
+     *     cascade={"persist"},
      * )
      * @Groups({"read"})
      */

From 6d46efa61062b1d472c291a740077034f1f9bdbe Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 11:53:27 +0100
Subject: [PATCH 033/174] accompanying course: fix posting of pinned comment

---
 .../vuejs/AccompanyingCourse/store/index.js   | 54 +++++++++++++++----
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index f7fd59b32..849a77289 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -203,9 +203,11 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                //console.log('### mutation: toggleConfidential');
                state.accompanyingCourse.confidential = value;
             },
-            postFirstComment(state, comment) {
-               //console.log('### mutation: postFirstComment', comment);
-               state.accompanyingCourse.pinnedComment = comment;
+            addPinnedComment(state, value) {
+               state.accompanyingCourse.pinnedComment = value;
+            },
+            removePinnedComment(state, value) {
+               state.accompanyingCourse.pinnedComment = null;
             },
             updateSocialIssues(state, value) {
                console.log('updateSocialIssues', value);
@@ -337,6 +339,35 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                      throw error;
                   })
             },
+            /**
+             * Add/remove pinnedComment
+             */
+            removePinnedComment({ commit, dispatch }) {
+               const body = {};
+               const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;
+
+               return makeFetch('DELETE', url, body)
+                  .then((response) => {
+                        commit('removePinnedComment');
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
+            },
+            addPinnedComment({ commit, dispatch }, payload) {
+               const body = payload ? { type: payload.type, content: payload.content } : {};
+               const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;
+
+               return makeFetch('POST', url, body)
+                  .then((response) => {
+                     dispatch('patchFirstComment', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
+            },
             /**
              * Add/remove/display anonymous requestor
              */
@@ -606,18 +637,23 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
 
                return Promise.all(promises);
             },
-            postFirstComment({ commit }, payload) {
-               const url = `/api/1.0/person/accompanying-course/${id}.json`
-               const body = { type: "accompanying_period", pinnedComment: payload }
-
+            patchFirstComment({ commit }, payload) {
+               const url = `/api/1.0/person/accompanying-course/${id}.json`;
+               const body = {
+                  type: "accompanying_period",
+                  pinnedComment: {
+                     type: "accompanying_period_comment",
+                     id: payload.id
+                  }
+               };
                return makeFetch('PATCH', url, body)
                   .then((response) => {
-                     commit('postFirstComment', response.pinnedComment);
+                     commit('addPinnedComment', response.pinnedComment);
                   })
                   .catch((error) => {
                      commit('catchError', error);
                      throw error;
-                  })
+                  });
             },
             updateSocialIssues({ state, commit, dispatch }, { payload, body, method }) {
                const url = `/api/1.0/person/accompanying-course/${id}/socialissue.json`;

From cde6e8f368e969af2886c692e02ecda435ecd293 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 13:01:01 +0100
Subject: [PATCH 034/174] accompanying course: allow PATCH on a comment entity

---
 .../ChillPersonExtension.php                  | 16 ++++++++
 .../AccompanyingCourse/components/Comment.vue | 39 ++++++++++++++++++-
 .../vuejs/AccompanyingCourse/store/index.js   | 17 +++++++-
 3 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index b05da5626..c527010ca 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -415,6 +415,22 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ],
                     ],
                 ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\AccompanyingPeriod\Comment::class,
+                    'name' => 'accompanying_period_comment',
+                    'base_path' => '/api/1.0/person/accompanying-period/comment',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => false,
+                                Request::METHOD_PATCH => true,
+                                Request::METHOD_HEAD => false,
+                                Request::METHOD_DELETE => false,
+                            ],
+                        ],
+                    ],
+                ],
                 [
                     'class' => \Chill\PersonBundle\Entity\AccompanyingPeriod\Resource::class,
                     'name' => 'accompanying_period_resource',
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index a852d71a0..8b3dee5c3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -17,6 +17,7 @@
                v-bind:placeholder="$t('comment.content')"
                :editor="editor"
                v-model="content"
+               @input="onContentChange"
                tag-name="textarea">
             </ckeditor>
 
@@ -82,8 +83,34 @@ export default {
       }
    },
    methods: {
-      submitform() {
-         this.$store.dispatch('postFirstComment', this.formdata)
+      onContentChange() {
+         console.log('content changed');
+         console.log(this.pinnedComment)
+         if (this.pinnedComment) {
+            let body = this.formdata;
+            Object.assign(body, {id: this.pinnedComment.id})
+            this.$store.dispatch('updatePinnedComment', body)
+               .catch(({name, violations}) => {
+                  if (name === 'ValidationException' || name === 'AccessException') {
+                     violations.forEach((violation) => this.$toast.open({message: violation}));
+                  } else {
+                     this.$toast.open({message: 'An error occurred'})
+                  }
+               });
+         } else {
+            this.$store.dispatch('addPinnedComment', this.formdata)
+               .catch(({name, violations}) => {
+                  if (name === 'ValidationException' || name === 'AccessException') {
+                     violations.forEach((violation) => this.$toast.open({message: violation}));
+                  } else {
+                     this.$toast.open({message: 'An error occurred'})
+                  }
+               });
+         }
+      },
+      submitform() { //TODO deprecated, to remove
+         console.log(this.formdata)
+         this.$store.dispatch('addPinnedComment', this.formdata)
             .catch(({name, violations}) => {
                if (name === 'ValidationException' || name === 'AccessException') {
                   violations.forEach((violation) => this.$toast.open({message: violation}));
@@ -91,6 +118,14 @@ export default {
                   this.$toast.open({message: 'An error occurred'})
                }
             });
+         // this.$store.dispatch('postFirstComment', this.formdata)
+         //    .catch(({name, violations}) => {
+         //       if (name === 'ValidationException' || name === 'AccessException') {
+         //          violations.forEach((violation) => this.$toast.open({message: violation}));
+         //       } else {
+         //          this.$toast.open({message: 'An error occurred'})
+         //       }
+         //    });
       },
       removeComment() {
          this.$store.dispatch('postFirstComment', {})
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 849a77289..f27fcfb7f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -348,7 +348,7 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
 
                return makeFetch('DELETE', url, body)
                   .then((response) => {
-                        commit('removePinnedComment');
+                     commit('removePinnedComment');
                   })
                   .catch((error) => {
                      commit('catchError', error);
@@ -368,6 +368,21 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                      throw error;
                   })
             },
+            updatePinnedComment({ commit }, payload) {
+               console.log(payload)
+               const url = `/api/1.0/person/accompanying-period/comment/${payload.id}.json`;
+
+               return makeFetch('PATCH', url, payload)
+                  .then((response) => {
+                     console.log(response)
+                     commit('addPinnedComment', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
+
+            },
             /**
              * Add/remove/display anonymous requestor
              */

From f04118218d553ecc197c23b12d1a528df12fb035 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 13:56:03 +0100
Subject: [PATCH 035/174] accompanying course comment: tentative to delete the
 comment

---
 .../AccompanyingCourse/components/Comment.vue | 50 +++++--------------
 .../vuejs/AccompanyingCourse/store/index.js   |  5 +-
 2 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index 8b3dee5c3..0534551ba 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -14,7 +14,7 @@
 
             <ckeditor
                name="content"
-               v-bind:placeholder="$t('comment.content')"
+               :placeholder="$t('comment.content')"
                :editor="editor"
                v-model="content"
                @input="onContentChange"
@@ -23,16 +23,14 @@
 
             <div v-if="pinnedComment" class="metadata">
                {{ $t('comment.created_by', [
-               pinnedComment.creator.text,
-               $d(pinnedComment.createdAt.datetime, 'long')
-            ]) }}
+                     pinnedComment.creator.text,
+                     $d(pinnedComment.createdAt.datetime, 'long')
+                  ])
+               }}
             </div>
 
-            <div>
+            <!-- <div> //DOES NOT WORk
                <ul class="record_actions">
-                  <li>
-                     <button type="submit" class="btn btn-save">{{ $t('action.save') }}</button>
-                  </li>
                   <li v-if="pinnedComment !== null">
                      <a class="btn btn-delete"
                         @click="removeComment">
@@ -40,7 +38,7 @@
                      </a>
                   </li>
                </ul>
-            </div>
+            </div> -->
 
          </form>
       </div>
@@ -60,7 +58,7 @@ export default {
    data() {
       return {
          editor: ClassicEditor,
-         formdata: {
+         formData: {
             type: "accompanying_period_comment",
             content: ''
          }
@@ -72,7 +70,7 @@ export default {
       },
       content: {
          set(value) {
-            this.formdata.content = value;
+            this.formData.content = value;
          },
          get() {
             return (this.pinnedComment)? this.pinnedComment.content : {};
@@ -87,7 +85,7 @@ export default {
          console.log('content changed');
          console.log(this.pinnedComment)
          if (this.pinnedComment) {
-            let body = this.formdata;
+            let body = this.formData;
             Object.assign(body, {id: this.pinnedComment.id})
             this.$store.dispatch('updatePinnedComment', body)
                .catch(({name, violations}) => {
@@ -98,7 +96,7 @@ export default {
                   }
                });
          } else {
-            this.$store.dispatch('addPinnedComment', this.formdata)
+            this.$store.dispatch('addPinnedComment', this.formData)
                .catch(({name, violations}) => {
                   if (name === 'ValidationException' || name === 'AccessException') {
                      violations.forEach((violation) => this.$toast.open({message: violation}));
@@ -108,27 +106,8 @@ export default {
                });
          }
       },
-      submitform() { //TODO deprecated, to remove
-         console.log(this.formdata)
-         this.$store.dispatch('addPinnedComment', this.formdata)
-            .catch(({name, violations}) => {
-               if (name === 'ValidationException' || name === 'AccessException') {
-                  violations.forEach((violation) => this.$toast.open({message: violation}));
-               } else {
-                  this.$toast.open({message: 'An error occurred'})
-               }
-            });
-         // this.$store.dispatch('postFirstComment', this.formdata)
-         //    .catch(({name, violations}) => {
-         //       if (name === 'ValidationException' || name === 'AccessException') {
-         //          violations.forEach((violation) => this.$toast.open({message: violation}));
-         //       } else {
-         //          this.$toast.open({message: 'An error occurred'})
-         //       }
-         //    });
-      },
       removeComment() {
-         this.$store.dispatch('postFirstComment', {})
+         this.$store.dispatch('removePinnedComment', {})
             .catch(({name, violations}) => {
                if (name === 'ValidationException' || name === 'AccessException') {
                   violations.forEach((violation) => this.$toast.open({message: violation}));
@@ -139,11 +118,6 @@ export default {
       }
    }
 }
-/*
-* TODO
-* - [x] delete button in ul record_actions, but not in form
-* - [ ] display updatedAt => pinnedComment fetch PATCH content changes MUST NOT change object id !!
-*/
 </script>
 
 <style lang="scss">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index f27fcfb7f..dd2588d48 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -342,8 +342,8 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
             /**
              * Add/remove pinnedComment
              */
-            removePinnedComment({ commit, dispatch }) {
-               const body = {};
+            removePinnedComment({ commit }) { //DOES NOT WORK
+               const body = {type: "accompanying_period_comment"};
                const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;
 
                return makeFetch('DELETE', url, body)
@@ -381,7 +381,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                      commit('catchError', error);
                      throw error;
                   })
-
             },
             /**
              * Add/remove/display anonymous requestor

From 6472c554edc3f17a15fa4212637925d2acbc736d Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 14:22:25 +0100
Subject: [PATCH 036/174] accompanying course comment: more tentative to delete
 the comment

---
 src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php   | 1 +
 .../public/vuejs/AccompanyingCourse/components/Comment.vue   | 2 +-
 .../Resources/public/vuejs/AccompanyingCourse/store/index.js | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index 4d0c4895e..bd3211c5d 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -261,6 +261,7 @@ class AccompanyingPeriod implements
      *     cascade={"persist"},
      * )
      * @Groups({"read"})
+     * @ORM\JoinColumn(onDelete="SET NULL")
      */
     private ?Comment $pinnedComment = null;
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index 0534551ba..fde1319d7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -107,7 +107,7 @@ export default {
          }
       },
       removeComment() {
-         this.$store.dispatch('removePinnedComment', {})
+         this.$store.dispatch('removePinnedComment', {id: this.pinnedComment.id})
             .catch(({name, violations}) => {
                if (name === 'ValidationException' || name === 'AccessException') {
                   violations.forEach((violation) => this.$toast.open({message: violation}));
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index dd2588d48..5b196df10 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -342,8 +342,9 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
             /**
              * Add/remove pinnedComment
              */
-            removePinnedComment({ commit }) { //DOES NOT WORK
-               const body = {type: "accompanying_period_comment"};
+            removePinnedComment({ commit }, payload) { //DOES NOT WORK
+
+               const body = {type: "accompanying_period_comment", id: payload.id};
                const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;
 
                return makeFetch('DELETE', url, body)

From 4b692edd7d6da22afd3c4ece196f4bb200d050af Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 15:09:50 +0100
Subject: [PATCH 037/174] accompanying course comment: autosave the comment

---
 .../AccompanyingCourse/components/Comment.vue | 53 ++++++++++---------
 .../vuejs/AccompanyingCourse/js/i18n.js       |  2 +-
 .../vuejs/AccompanyingCourse/store/index.js   |  2 -
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index fde1319d7..ffb848bcb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -24,7 +24,7 @@
             <div v-if="pinnedComment" class="metadata">
                {{ $t('comment.created_by', [
                      pinnedComment.creator.text,
-                     $d(pinnedComment.createdAt.datetime, 'long')
+                     $d(pinnedComment.updatedAt.datetime, 'long')
                   ])
                }}
             </div>
@@ -82,29 +82,34 @@ export default {
    },
    methods: {
       onContentChange() {
-         console.log('content changed');
-         console.log(this.pinnedComment)
-         if (this.pinnedComment) {
-            let body = this.formData;
-            Object.assign(body, {id: this.pinnedComment.id})
-            this.$store.dispatch('updatePinnedComment', body)
-               .catch(({name, violations}) => {
-                  if (name === 'ValidationException' || name === 'AccessException') {
-                     violations.forEach((violation) => this.$toast.open({message: violation}));
-                  } else {
-                     this.$toast.open({message: 'An error occurred'})
-                  }
-               });
-         } else {
-            this.$store.dispatch('addPinnedComment', this.formData)
-               .catch(({name, violations}) => {
-                  if (name === 'ValidationException' || name === 'AccessException') {
-                     violations.forEach((violation) => this.$toast.open({message: violation}));
-                  } else {
-                     this.$toast.open({message: 'An error occurred'})
-                  }
-               });
-         }
+         let lastRecordedContent = this.formData.content;
+         setTimeout(() => {
+            if (lastRecordedContent === this.formData.content) {
+               if (this.pinnedComment) {
+                  let body = this.formData;
+                  Object.assign(body, {id: this.pinnedComment.id});
+
+                  this.$store.dispatch('updatePinnedComment', body)
+                     .catch(({name, violations}) => {
+                        if (name === 'ValidationException' || name === 'AccessException') {
+                           violations.forEach((violation) => this.$toast.open({message: violation}));
+                        } else {
+                           this.$toast.open({message: 'An error occurred'})
+                        }
+                     });
+               } else {
+                  this.$store.dispatch('addPinnedComment', this.formData)
+                     .catch(({name, violations}) => {
+                        if (name === 'ValidationException' || name === 'AccessException') {
+                           violations.forEach((violation) => this.$toast.open({message: violation}));
+                        } else {
+                           this.$toast.open({message: 'An error occurred'})
+                        }
+                     });
+               }
+               lastRecordedContent = null;
+            }
+         }, 3000);
       },
       removeComment() {
          this.$store.dispatch('removePinnedComment', {id: this.pinnedComment.id})
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 5f0321c70..f1e2de958 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -122,7 +122,7 @@ const appMessages = {
          title: "Observations",
          label: "Ajout d'une note",
          content: "Rédigez une première note…",
-         created_by: "créé par {0}, le {1}"
+         created_by: "créé par {0}, mis à jour le {1}"
       },
       confirm: {
          title: "Confirmation",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 5b196df10..bfb6412ff 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -370,12 +370,10 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                   })
             },
             updatePinnedComment({ commit }, payload) {
-               console.log(payload)
                const url = `/api/1.0/person/accompanying-period/comment/${payload.id}.json`;
 
                return makeFetch('PATCH', url, payload)
                   .then((response) => {
-                     console.log(response)
                      commit('addPinnedComment', response);
                   })
                   .catch((error) => {

From def90893deff1adfc59d7368ac51b86fd2df6391 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 15:12:11 +0100
Subject: [PATCH 038/174] upd CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d760a8b6a..8fda3903f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [parcours] autosave of the pinned comment for draft accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/477)
 * [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
 
 

From d0772fc306d4f9e95774b3631fa3ac6fcfdd0897 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 4 Mar 2022 17:08:41 +0100
Subject: [PATCH 039/174] Add email to twig personRenderBox

---
 CHANGELOG.md                                         |  1 +
 .../Resources/views/Entity/person.html.twig          | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a38f2ea47..380cc6afe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ and this project adheres to
 * [confidential] Fix position of toggle button so it does not cover text nor fall outside of box (no issue)
 * [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474)
 * [template] do not list inactive templates (for doc generator)
+* [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index 9ffdbfae6..e7eac0b34 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -167,6 +167,18 @@
                     <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                 </li>
             {% endif %}
+            {% if person.email is not null %}
+                <li>
+                    <i class="fa fa-li fa-envelope-o"></i><a href="{{ 'mailto:' ~ person.email }}">
+                        {{ person.email }}
+                    </a>
+                </li>
+            {% else %}
+                <li>
+                    <i class="fa fa-li fa-envelope-o"></i>
+                    <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                </li>
+            {% endif %}
             {% if options['addCenter'] and person|chill_resolve_center|length > 0 %}
                 <li>
                     <i class="fa fa-li fa-long-arrow-right"></i>

From 72795240b930e6a0f89b0d2841393459062b4642 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 3 Mar 2022 21:09:50 +0100
Subject: [PATCH 040/174] Add current household link in person banner

---
 .../Resources/public/chill/chillperson.scss   | 105 ++++++++++--------
 .../Resources/views/Person/banner.html.twig   |   7 ++
 2 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
index 30eadc7b1..92542f178 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
@@ -37,57 +37,68 @@ div.banner {
                 margin-right: 1em;
             }
         }
+        .household-link {
+            border: 1px solid white;
+            padding: .05rem .3rem;
+            border-radius: 5px;
+            color: white;
+            cursor: pointer;
+            &:hover {
+                background-color: white;
+                color: $chill-person-context
+            }
+        }
     }
 }
 
 div.person-view {
-   figure.person-details {
-      h2 {
-         font-family: 'Open Sans';
-         font-weight: 600;
-         margin-bottom: 0.3em;
-         font-variant: small-caps;
-      }
-      dl {
-         margin-top: 0.3em;
-      }
-      dt {
-         font-family: 'Open Sans';
-         font-weight: 600;
-      }
-      dd {
-         margin-left: 0;
-      }
-      /*
-         a.sc-button { background-color: $black; padding-top: 0.2em; padding-bottom: 0.2em; }
-      */
-   }
-   /* custom fields on the home page */
-   div.custom-fields {
-      figure.person-details {
-         display: flex;
-         flex-flow: row wrap;
-         div.cf_title_box:nth-child(4n+1) h2 {
-            @extend .chill-red !optional;
-         }
-         div.cf_title_box:nth-child(4n+2) h2 {
-            @extend .chill-green !optional;
-         }
-         div.cf_title_box:nth-child(4n+3) h2 {
-            @extend .chill-orange !optional;
-         }
-         div.cf_title_box:nth-child(4n+4) h2 {
-            @extend .chill-blue !optional;
-         }
-         div.cf_title_box:nth-child(2n+1) {
-            width: 50%;
-            margin-right: 40px;
-         }
-         div.cf_title_box:nth-child(2n+2) {
-            width: calc(50% - 40px);
-         }
-      }
-   }
+    figure.person-details {
+        h2 {
+            font-family: 'Open Sans';
+            font-weight: 600;
+            margin-bottom: 0.3em;
+            font-variant: small-caps;
+        }
+        dl {
+            margin-top: 0.3em;
+        }
+        dt {
+            font-family: 'Open Sans';
+            font-weight: 600;
+        }
+        dd {
+            margin-left: 0;
+        }
+        /*
+            a.sc-button { background-color: $black; padding-top: 0.2em; padding-bottom: 0.2em; }
+        */
+    }
+    /* custom fields on the home page */
+    div.custom-fields {
+        figure.person-details {
+            display: flex;
+            flex-flow: row wrap;
+            div.cf_title_box:nth-child(4n+1) h2 {
+                @extend .chill-red !optional;
+            }
+            div.cf_title_box:nth-child(4n+2) h2 {
+                @extend .chill-green !optional;
+            }
+            div.cf_title_box:nth-child(4n+3) h2 {
+                @extend .chill-orange !optional;
+            }
+            div.cf_title_box:nth-child(4n+4) h2 {
+                @extend .chill-blue !optional;
+            }
+            div.cf_title_box:nth-child(2n+1) {
+                width: 50%;
+                margin-right: 40px;
+            }
+            div.cf_title_box:nth-child(2n+2) {
+                width: calc(50% - 40px);
+            }
+        }
+    }
 }
 
 /*
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
index 0e051da2c..8f7d5cc20 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
@@ -58,6 +58,13 @@
                                 }) }}
                             </span>
                         {%- endif -%}
+                        {% if person.getCurrentHousehold is not null %}
+                            <span>
+                                <a class="household-link" href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id' : person.getCurrentHousehold.id } ) }}">
+                                    <i class="fa fa-home"></i>
+                                </a>
+                            </span>
+                        {% endif %}
                     </div>
                 </div>
 

From 56058138264c27a670666d42e217074a6d11c361 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 3 Mar 2022 21:12:00 +0100
Subject: [PATCH 041/174] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 380cc6afe..157116689 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ and this project adheres to
 * [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474)
 * [template] do not list inactive templates (for doc generator)
 * [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
+* [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
 
 ## Test releases
 

From 44ed2e44e0e9d446972032cc51c96618d5316693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Sun, 6 Mar 2022 22:10:54 +0100
Subject: [PATCH 042/174] another way to fix phonenumber and telephone in third
 party / OnTheFly

---
 .../Serializer/Normalizer/PhonenumberNormalizer.php       | 4 ++++
 .../components/Resources/ResourceItem.vue                 | 4 +++-
 .../vuejs/_components/Entity/ThirdPartyRenderBox.vue      | 8 ++++----
 .../public/vuejs/_components/OnTheFly/ThirdParty.vue      | 2 +-
 .../Serializer/Normalizer/ThirdPartyNormalizer.php        | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index cb59e6421..3562c1361 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -40,6 +40,10 @@ class PhonenumberNormalizer implements NormalizerInterface, DenormalizerInterfac
      */
     public function denormalize($data, $type, $format = null, array $context = [])
     {
+        if ('' === trim($data)) {
+            return null;
+        }
+
         try {
             return $this->phoneNumberUtil->parse($data, $this->defaultCarrierCode);
         } catch (NumberParseException $e) {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index 8d897da13..37321e0bb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -170,7 +170,9 @@ export default {
             console.log('data', payload.data)
             body.name = payload.data.name;
             body.email = payload.data.email;
-            body.telephone = payload.data.phonenumber;
+            body.telephone = payload.data.telephone;
+            body.civility = payload.data.civility;
+            body.profession = payload.data.profession;
             body.address = payload.data.address ? { id: payload.data.address.address_id } :  null;
 
             makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 1555ec66a..bcdbf5e55 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -61,9 +61,9 @@
                                 <i class="fa fa-li fa-map-marker"></i>
                                 <address-render-box :address="thirdparty.address" :isMultiline="isMultiline"></address-render-box>
                                 </li>
-                                <li v-if="thirdparty.phonenumber">
+                                <li v-if="thirdparty.telephone">
                                 <i class="fa fa-li fa-mobile"></i>
-                                <a :href="'tel: ' + thirdparty.phonenumber">{{ thirdparty.phonenumber }}</a>
+                                <a :href="'tel: ' + thirdparty.telephone">{{ thirdparty.telephone }}</a>
                                 </li>
                                 <li v-if="thirdparty.email">
                                 <i class="fa fa-li fa-envelope-o"></i>
@@ -78,9 +78,9 @@
                         <i class="fa fa-li fa-map-marker"></i>
                         <address-render-box :address="thirdparty.address" :isMultiline="isMultiline"></address-render-box>
                     </li>
-                    <li v-if="thirdparty.phonenumber">
+                    <li v-if="thirdparty.telephone">
                         <i class="fa fa-li fa-mobile"></i>
-                        <a :href="'tel: ' + thirdparty.phonenumber">{{ thirdparty.phonenumber }}</a>
+                        <a :href="'tel: ' + thirdparty.telephone">{{ thirdparty.telephone }}</a>
                     </li>
                     <li v-if="thirdparty.email">
                         <i class="fa fa-li fa-envelope-o"></i>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 40efa9bfb..8de41b989 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -118,7 +118,7 @@
       <div class="input-group mb-3">
          <span class="input-group-text" id="phonenumber"><i class="fa fa-fw fa-phone"></i></span>
          <input class="form-control form-control-lg"
-            v-model="thirdparty.phonenumber"
+            v-model="thirdparty.telephone"
             v-bind:placeholder="$t('thirdparty.phonenumber')"
             v-bind:aria-label="$t('thirdparty.phonenumber')"
             aria-describedby="phonenumber" />
diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index 65bc15ba0..8e4775aad 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -62,7 +62,7 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
             }, $thirdParty->getTypesAndCategories()),
             'profession' => $this->normalizer->normalize($thirdParty->getProfession(), $format, $context),
             'address' => $this->normalizer->normalize($thirdParty->getAddress(), $format, ['address_rendering' => 'short']),
-            'phonenumber' => $this->normalizer->normalize($thirdParty->getTelephone()),
+            'telephone' => $this->normalizer->normalize($thirdParty->getTelephone()),
             'email' => $thirdParty->getEmail(),
             'isChild' => $thirdParty->isChild(),
             'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),

From 03471a74fedc0ac451d8ceb395e14308df1bf509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Sun, 6 Mar 2022 22:28:33 +0100
Subject: [PATCH 043/174] fix creating alt phonenumber

---
 .../Phonenumber/PhoneNumberHelperInterface.php      |  2 +-
 .../Phonenumber/PhonenumberHelper.php               | 13 +++++++++++--
 src/Bundle/ChillPersonBundle/Entity/PersonPhone.php |  3 ++-
 src/Bundle/ChillPersonBundle/Form/PersonType.php    |  3 ++-
 .../ChillPersonBundle/Form/Type/PersonPhoneType.php |  3 ++-
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php b/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
index eeab9c38d..1ed67d967 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
@@ -27,7 +27,7 @@ interface PhoneNumberHelperInterface
     /**
      * Get type (mobile, landline, ...) for phone number.
      */
-    public function getType(string $phonenumber): string;
+    public function getType(PhoneNumber $phonenumber): string;
 
     /**
      * Return true if the validation is configured and available.
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
index c73b3dc95..8fdaf2596 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
@@ -17,6 +17,7 @@ use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\ServerException;
 use libphonenumber\NumberParseException;
 use libphonenumber\PhoneNumber;
+use libphonenumber\PhoneNumberType;
 use libphonenumber\PhoneNumberUtil;
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerInterface;
@@ -86,9 +87,17 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
     /**
      * Get type (mobile, landline, ...) for phone number.
      */
-    public function getType(string $phonenumber): string
+    public function getType(PhoneNumber $phonenumber): string
     {
-        return $this->performTwilioLookup($phonenumber) ?? 'unknown';
+        switch ($this->phoneNumberUtil->getNumberType($phonenumber)) {
+            case PhoneNumberType::MOBILE:
+                return 'mobile';
+            case PhoneNumberType::FIXED_LINE:
+            case PhoneNumberType::VOIP:
+                return 'landline';
+            default:
+                return 'landline';
+        }
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
index f33646f09..7d0bce1ff 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
@@ -98,7 +98,8 @@ class PersonPhone
 
     public function isEmpty(): bool
     {
-        return empty($this->getDescription()) && empty($this->getPhonenumber());
+        return ("" === $this->getDescription() || null === $this->getDescription())
+            && null === $this->getPhonenumber();
     }
 
     public function setDate(DateTime $date): void
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonType.php b/src/Bundle/ChillPersonBundle/Form/PersonType.php
index acc65c6ac..68ebd3ef4 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonType.php
@@ -27,6 +27,7 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonPhone;
 use Chill\PersonBundle\Form\Type\GenderType;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
+use Chill\PersonBundle\Form\Type\PersonPhoneType;
 use Chill\PersonBundle\Form\Type\Select2MaritalStatusType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
@@ -158,7 +159,7 @@ class PersonType extends AbstractType
         }
 
         $builder->add('otherPhoneNumbers', ChillCollectionType::class, [
-            'entry_type' => ChillPhoneNumberType::class,
+            'entry_type' => PersonPhoneType::class,
             'button_add_label' => 'Add new phone',
             'button_remove_label' => 'Remove phone',
             'required' => false,
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php b/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
index 00243349f..1910d4605 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form\Type;
 
+use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Phonenumber\PhonenumberHelper;
 use Chill\PersonBundle\Entity\PersonPhone;
 use Doctrine\ORM\EntityManagerInterface;
@@ -36,7 +37,7 @@ class PersonPhoneType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('phonenumber', TelType::class, [
+        $builder->add('phonenumber', ChillPhoneNumberType::class, [
             'label' => 'Other phonenumber',
             'required' => true,
         ]);

From 7afada5dad29d34a981baf5c60ff8955e6b3a2ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Sun, 6 Mar 2022 22:36:38 +0100
Subject: [PATCH 044/174] fix cs

---
 src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php | 2 ++
 src/Bundle/ChillPersonBundle/Entity/PersonPhone.php          | 2 +-
 src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php   | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
index 8fdaf2596..22f580d78 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
@@ -92,9 +92,11 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
         switch ($this->phoneNumberUtil->getNumberType($phonenumber)) {
             case PhoneNumberType::MOBILE:
                 return 'mobile';
+
             case PhoneNumberType::FIXED_LINE:
             case PhoneNumberType::VOIP:
                 return 'landline';
+
             default:
                 return 'landline';
         }
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
index 7d0bce1ff..7f0e28ddb 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
@@ -98,7 +98,7 @@ class PersonPhone
 
     public function isEmpty(): bool
     {
-        return ("" === $this->getDescription() || null === $this->getDescription())
+        return ('' === $this->getDescription() || null === $this->getDescription())
             && null === $this->getPhonenumber();
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php b/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
index 1910d4605..3b1de28c7 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Phonenumber\PhonenumberHelper;
 use Chill\PersonBundle\Entity\PersonPhone;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\TelType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;

From b2a61071bf7628a92710a2cafb7324e92e44de30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 7 Mar 2022 00:14:22 +0100
Subject: [PATCH 045/174] create voter which blocks deletion if a workflow
 exists

---
 ...ompanyingCourseDocumentWorkflowHandler.php | 25 +++++++
 .../ChillMainExtension.php                    |  7 ++
 .../Workflow/EntityWorkflowRepository.php     | 24 +++++++
 .../WorkflowEntityDeletionVoter.php           | 65 +++++++++++++++++++
 .../EntityWorkflowHandlerInterface.php        |  9 +++
 .../config/services/security.yaml             |  6 ++
 .../AccompanyingCourseWork/_item.html.twig    | 12 ++--
 .../AccompanyingPeriodWorkVoter.php           |  5 +-
 ...dWorkEvaluationDocumentWorkflowHandler.php | 24 +++++++
 ...ingPeriodWorkEvaluationWorkflowHandler.php | 25 +++++++
 .../AccompanyingPeriodWorkWorkflowHandler.php | 31 +++++++++
 11 files changed, 227 insertions(+), 6 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php

diff --git a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
index e3cc9c408..3d7b95c61 100644
--- a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\DocStoreBundle\Workflow;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
+use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
@@ -36,6 +37,13 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
         $this->translator = $translator;
     }
 
+    public function getDeletionRoles(): array
+    {
+        return [
+            AccompanyingCourseDocumentVoter::DELETE,
+        ];
+    }
+
     public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
     {
         $course = $this->getRelatedEntity($entityWorkflow)
@@ -66,6 +74,18 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
         return $this->repository->find($entityWorkflow->getRelatedEntityId());
     }
 
+    /**
+     * @param AccompanyingCourseDocument $object
+     *
+     * @return array[]
+     */
+    public function getRelatedObjects(object $object): array
+    {
+        return [
+            ['entityClass' => AccompanyingCourseDocument::class, 'entityId' => $object->getId()],
+        ];
+    }
+
     public function getRoleShow(EntityWorkflow $entityWorkflow): ?string
     {
         return null;
@@ -84,6 +104,11 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
         ];
     }
 
+    public function isObjectSupported(object $object): bool
+    {
+        return $object instanceof AccompanyingCourseDocument;
+    }
+
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
         return $entityWorkflow->getRelatedEntityClass() === AccompanyingCourseDocument::class;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 5ad7348ee..09668f0e3 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -256,6 +256,13 @@ class ChillMainExtension extends Extension implements
             'channels' => ['chill'],
         ]);
 
+        $container->prependExtensionConfig('security', [
+            'access_decision_manager' => [
+                'strategy' => 'unanimous',
+                'allow_if_all_abstain' => false,
+            ],
+        ]);
+
         //add crud api
         $this->prependCruds($container);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
index ab58801fc..a73da74b0 100644
--- a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
@@ -55,6 +55,30 @@ class EntityWorkflowRepository implements ObjectRepository
         return (int) $qb->getQuery()->getSingleScalarResult();
     }
 
+    public function countRelatedWorkflows(array $relateds): int
+    {
+        $qb = $this->repository->createQueryBuilder('w');
+
+        $orX = $qb->expr()->orX();
+        $i = 0;
+
+        foreach ($relateds as $related) {
+            $orX->add(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('w.relatedEntityClass', ':entity_class_' . $i),
+                    $qb->expr()->eq('w.relatedEntityId', ':entity_id_' . $i)
+                )
+            );
+            $qb
+                ->setParameter('entity_class_' . $i, $related['entityClass'])
+                ->setParameter('entity_id_' . $i, $related['entityId']);
+            ++$i;
+        }
+        $qb->where($orX);
+
+        return $qb->select('COUNT(w)')->getQuery()->getSingleScalarResult();
+    }
+
     public function find($id): ?EntityWorkflow
     {
         return $this->repository->find($id);
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
new file mode 100644
index 000000000..079c43c3b
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Security\Authorization;
+
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
+use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
+use RuntimeException;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\Voter\Voter;
+use function in_array;
+use function is_object;
+
+class WorkflowEntityDeletionVoter extends Voter
+{
+    private EntityWorkflowRepository $entityWorkflowRepository;
+
+    /**
+     * @var iterable|EntityWorkflowHandlerInterface[]
+     */
+    private iterable $handlers;
+
+    public function __construct($handlers, EntityWorkflowRepository $entityWorkflowRepository)
+    {
+        $this->handlers = $handlers;
+        $this->entityWorkflowRepository = $entityWorkflowRepository;
+    }
+
+    protected function supports($attribute, $subject)
+    {
+        if (!is_object($subject)) {
+            return false;
+        }
+
+        foreach ($this->handlers as $handler) {
+            if ($handler->isObjectSupported($subject)
+                && in_array($attribute, $handler->getDeletionRoles($subject), true)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
+    {
+        foreach ($this->handlers as $handler) {
+            if ($handler->isObjectSupported($subject)) {
+                return 0 === $this->entityWorkflowRepository->countRelatedWorkflows(
+                    $handler->getRelatedObjects($subject)
+                );
+            }
+        }
+
+        throw new RuntimeException('no handlers found');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
index 93ba4351e..b63546742 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
@@ -15,12 +15,19 @@ use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 
 interface EntityWorkflowHandlerInterface
 {
+    /**
+     * @return array|string[]
+     */
+    public function getDeletionRoles(): array;
+
     public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array;
 
     public function getEntityTitle(EntityWorkflow $entityWorkflow, array $options = []): string;
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?object;
 
+    public function getRelatedObjects(object $object): array;
+
     /**
      * Return a string representing the role required for seeing the workflow.
      *
@@ -33,6 +40,8 @@ interface EntityWorkflowHandlerInterface
 
     public function getTemplateData(EntityWorkflow $entityWorkflow, array $options = []): array;
 
+    public function isObjectSupported(object $object): bool;
+
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool;
 
     public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool;
diff --git a/src/Bundle/ChillMainBundle/config/services/security.yaml b/src/Bundle/ChillMainBundle/config/services/security.yaml
index b884a92fc..3347871e3 100644
--- a/src/Bundle/ChillMainBundle/config/services/security.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/security.yaml
@@ -75,3 +75,9 @@ services:
             $locker: '@Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker'
         tags:
             - { name: security.voter }
+
+    Chill\MainBundle\Security\Authorization\WorkflowEntityDeletionVoter:
+        autoconfigure: true
+        autowire: true
+        arguments:
+            $handlers: !tagged_iterator chill_main.workflow_handler
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 5af04c843..d7e4f4e96 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -130,11 +130,13 @@
                    href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
                 ></a>
             </li>
-            <li>
-                <a class="btn btn-delete" title="{{ 'Delete'|trans }}"
-                   href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
-                ></a>
-            </li>
+            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE', w) %}
+                <li>
+                    <a class="btn btn-delete" title="{{ 'Delete'|trans }}"
+                       href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
+                    ></a>
+                </li>
+            {% endif %}
         </ul>
         {% endif %}
     </div>
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
index 7193c524e..24df2bbc5 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
@@ -24,6 +24,8 @@ class AccompanyingPeriodWorkVoter extends Voter
 {
     public const CREATE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE';
 
+    public const DELETE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE';
+
     public const SEE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE';
 
     public const UPDATE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE';
@@ -60,6 +62,7 @@ class AccompanyingPeriodWorkVoter extends Voter
 
                 case self::CREATE:
                 case self::UPDATE:
+                case self::DELETE:
                     return $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod());
 
                 default:
@@ -86,6 +89,6 @@ class AccompanyingPeriodWorkVoter extends Voter
 
     private function getRoles(): array
     {
-        return [self::SEE, self::CREATE, self::UPDATE];
+        return [self::SEE, self::CREATE, self::UPDATE, self::DELETE];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index eac460ee5..1e02d0465 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -37,6 +37,13 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
         $this->translator = $translator;
     }
 
+    public function getDeletionRoles(): array
+    {
+        return [
+            '_',
+        ];
+    }
+
     public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
     {
         $doc = $this->getRelatedEntity($entityWorkflow);
@@ -63,6 +70,18 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
         return $this->repository->find($entityWorkflow->getRelatedEntityId());
     }
 
+    /**
+     * @param AccompanyingPeriodWorkEvaluationDocument $object
+     *
+     * @return array[]
+     */
+    public function getRelatedObjects(object $object): array
+    {
+        return [
+            ['entityClass' => AccompanyingPeriodWorkEvaluationDocument::class, $object->getId()],
+        ];
+    }
+
     public function getRoleShow(EntityWorkflow $entityWorkflow): ?string
     {
         return AccompanyingPeriodWorkEvaluationDocumentVoter::SEE;
@@ -84,6 +103,11 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
         ];
     }
 
+    public function isObjectSupported(object $object): bool
+    {
+        return $object instanceof AccompanyingPeriodWorkEvaluationDocument;
+    }
+
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
         return $entityWorkflow->getRelatedEntityClass() === AccompanyingPeriodWorkEvaluationDocument::class;
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
index 5af305ac5..7bbf54eef 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkEvaluationVoter;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -37,6 +38,11 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
         $this->translator = $translator;
     }
 
+    public function getDeletionRoles(): array
+    {
+        return ['_'];
+    }
+
     public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
     {
         $evaluation = $this->getRelatedEntity($entityWorkflow);
@@ -61,6 +67,20 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
         return $this->repository->find($entityWorkflow->getRelatedEntityId());
     }
 
+    /**
+     * @param AccompanyingPeriodWorkEvaluation $object
+     */
+    public function getRelatedObjects(object $object): array
+    {
+        $relateds[] = ['entityClass' => AccompanyingPeriodWorkEvaluation::class, 'entityId' => $object->getId()];
+
+        foreach ($object->getDocuments() as $doc) {
+            $relateds[] = ['entityClass' => AccompanyingPeriodWorkEvaluationDocument::class, 'entityId' => $doc->getId()];
+        }
+
+        return $relateds;
+    }
+
     public function getRoleShow(EntityWorkflow $entityWorkflow): ?string
     {
         return AccompanyingPeriodWorkEvaluationVoter::SEE;
@@ -79,6 +99,11 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
         ];
     }
 
+    public function isObjectSupported(object $object): bool
+    {
+        return $object instanceof AccompanyingPeriodWorkEvaluation;
+    }
+
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
         return $entityWorkflow->getRelatedEntityClass() === AccompanyingPeriodWorkEvaluation::class;
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
index 1385cb841..90e7b4e46 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
@@ -15,7 +15,10 @@ use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInterface
@@ -36,6 +39,11 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
         $this->translator = $translator;
     }
 
+    public function getDeletionRoles(): array
+    {
+        return [AccompanyingPeriodWorkVoter::DELETE];
+    }
+
     public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
     {
         return [
@@ -58,6 +66,24 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
         return $this->repository->find($entityWorkflow->getRelatedEntityId());
     }
 
+    /**
+     * @param AccompanyingPeriodWork $object
+     */
+    public function getRelatedObjects(object $object): array
+    {
+        $relateds[] = ['entityClass' => AccompanyingPeriodWork::class, 'entityId' => $object->getId()];
+
+        foreach ($object->getAccompanyingPeriodWorkEvaluations() as $evaluation) {
+            $relateds[] = ['entityClass' => AccompanyingPeriodWorkEvaluation::class, 'entityId' => $evaluation->getId()];
+
+            foreach ($evaluation->getDocuments() as $doc) {
+                $relateds[] = ['entityClass' => AccompanyingPeriodWorkEvaluationDocument::class, 'entityId' => $doc->getId()];
+            }
+        }
+
+        return $relateds;
+    }
+
     public function getRoleShow(EntityWorkflow $entityWorkflow): ?string
     {
         return null;
@@ -76,6 +102,11 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
         ];
     }
 
+    public function isObjectSupported(object $object): bool
+    {
+        return $object instanceof AccompanyingPeriodWork;
+    }
+
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
         return $entityWorkflow->getRelatedEntityClass() === AccompanyingPeriodWork::class;

From efbd9b01851f16b5b1faf6b977d012cf723e6221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 7 Mar 2022 00:29:11 +0100
Subject: [PATCH 046/174] do not allow to remove doc or evaluations if workflow
 is associated

---
 .../components/AddEvaluation.vue                  | 15 ++++++++++++++-
 .../components/FormEvaluation.vue                 |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
index d2b8c5b46..8ea3ecec2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
@@ -26,7 +26,7 @@
              ></list-workflow-modal>
 
            </li>
-            <li>
+            <li v-if="canDelete">
                <a class="btn btn-delete" @click="modal.showModal = true" :title="$t('action.delete')"></a>
             </li>
          </ul>
@@ -98,6 +98,19 @@ export default {
       pickedEvaluations() {
          return this.$store.state.evaluationsPicked;
       },
+      canDelete() {
+        if (this.evaluation.workflows.length > 0) {
+          return false;
+        }
+
+         for (let doc of this.evaluation.documents) {
+           if (doc.workflows.length > 0) {
+             return false;
+           }
+         }
+
+         return true;
+      },
    },
    methods: {
       removeEvaluation(e) {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index b077cfefa..24e1c202f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -101,7 +101,7 @@
                    <li>
                      <a :href="buildEditLink(d.storedObject)" class="btn btn-wopilink"></a>
                    </li>
-                   <li>
+                   <li v-if="d.workflows.length === 0">
                      <a class="btn btn-delete" @click="removeDocument(d)">
                      </a>
                    </li>

From 9b06ccc3e6466fe4f315ee9c6b21af8f4c3735e8 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 7 Mar 2022 11:13:11 +0100
Subject: [PATCH 047/174] user admin: use flex-table and flex-bloc in twig

---
 .../Resources/views/User/index.html.twig      | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index 53bd89482..a1f55e7d3 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -1,60 +1,60 @@
 {% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
 
 {% block admin_content -%}
-    {% embed '@ChillMain/CRUD/_index.html.twig' %}
-        {% block table_entities_thead_tr %}
-            <th>{{ 'crud.admin_user.index.is_active'|trans }}</th>
-            <th>{{ 'crud.admin_user.index.usernames'|trans }}</th>
-            <th>{{ 'crud.admin_user.index.mains'|trans }}</th>
-            <th>&nbsp;</th>
-        {% endblock %}
-        {% block table_entities_tbody %}
-            {% for entity in entities %}
-            <tr data-username="{{ entity.username|e('html_attr') }}">
-                <td>
+
+    <h1>{{"Users"|trans}}</h1>
+    {% for entity in entities %}
+    <div class="flex-table">
+        <div class="item-bloc">
+            <div class="item-row">
+                <div class="item-col">
+                    {{ entity.label }}
                     {% if entity.isEnabled %}
                         <i class="fa fa-check chill-green"></i>
                     {% else %}
                         <i class="fa fa-times chill-red"></i>
                     {% endif %}
-                </td>
-                <td>
-                    {{ entity.username }}
-                    <br/>
-                    {{ entity.label }}
-                    <br/>
-                    {{ entity.email }}
-                </td>
-                <td>
+                </div>
+                <div class="item-col"><i>{{ entity.email }}</i></div>
+            </div>
+            <div class="item-row">
+                <div class="item-col">
+                    login: {{ entity.username|e('html_attr') }}
+                </div>
+                <div class="item-col">
                     {% if entity.userJob %}
-                    {{ entity.userJob.label|localize_translatable_string }}
-                    <br/>
+                        {{ entity.userJob.label|localize_translatable_string }}
                     {% endif %}
+                </div>
+            </div>
+            <div class="item-row">
+                <div class="item-col">
                     {% if entity.mainScope %}
-                    {{ entity.mainScope.name|localize_translatable_string }}
-                    <br/>
+                        {{ entity.mainScope.name|localize_translatable_string }}
                     {% endif %}
                     {% if entity.mainCenter %}
-                    {{ entity.mainCenter.name }}
+                        , {{ entity.mainCenter.name }}
                     {% endif %}
-                </td>
-                <td>
-                    <ul class="record_actions">
+                </div>
+            </div>
+            <div class="item-row">
+               <ul class="record_actions">
+                    <li>
+                        <a class="btn btn-edit" href="{{ path('chill_crud_admin_user_edit', { 'id': entity.id }) }}"></a>
+                    </li>
+                    <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>
+                    {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
                         <li>
-                            <a class="btn btn-edit" href="{{ path('chill_crud_admin_user_edit', { 'id': entity.id }) }}"></a>
+                            <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>
                         </li>
-                        <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>
-                        {% 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>
-                            </li>
-                        {% endif %}
-                    </ul>
-                </td>
-            </tr>
-            {% endfor %}
-        {% endblock %}
-    {% endembed %}
-{% endblock %}
+                    {% endif %}
+                </ul>
+            </div>
+        </div>
+
+    </div>
+    {% endfor %}
+
+{% endblock %}
\ No newline at end of file

From 388b666b5df010da79123963cd07c97dcb091cef Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 7 Mar 2022 14:36:44 +0100
Subject: [PATCH 048/174] person badge changed to include onTheFly + changelog
 updated

---
 CHANGELOG.md                                               | 1 +
 .../Resources/views/ResidentialAddress/list.html.twig      | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5be67840f..a51ba5266 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ and this project adheres to
 * [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478)
 * [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
 * [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
+* [address] person badge in address history changed to open OnTheFly with all person info (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/489)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
index 4cba32e47..64e5d3813 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
@@ -49,7 +49,12 @@
                                         <li>
                                             <i class="fa fa-li fa-home"></i>
                                             <span class="item-key">{{ "Address of"|trans}} </span>
-                                            <span class="chill-entity entity-person badge-person">{{ a.hostPerson|chill_entity_render_box }}</span>
+                                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                                    action: 'show', displayBadge: true,
+                                                    targetEntity: { name: 'person', id: a.hostPerson.id },
+                                                    buttonText: a.hostPerson|chill_entity_render_string,
+                                                    isDead: a.hostPerson.deathdate is not null
+                                                } %}
                                         </li>
                                         <li>
                                             {% set address_date = date(a.startDate|date("m/d/Y")) %}

From 17e83deb55f7e652acaaec5c5031e655fa539345 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 8 Mar 2022 09:46:41 +0100
Subject: [PATCH 049/174] User admin: put pagination

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

diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index a1f55e7d3..5a558b6a0 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -57,4 +57,6 @@
     </div>
     {% endfor %}
 
+    {{ chill_pagination(paginator) }}
+
 {% endblock %}
\ No newline at end of file

From 1860478aea1d54093106f35780bfb47a03839c7b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 8 Mar 2022 09:48:17 +0100
Subject: [PATCH 050/174] finding solution for toggle button position

---
 .../Resources/public/module/blur/blur.scss    | 37 ++++++-------------
 .../public/vuejs/_components/Confidential.vue | 14 +++----
 .../Resources/views/Entity/address.html.twig  |  6 +--
 .../Resources/public/chill/chillperson.scss   |  2 +
 .../components/Requestor.vue                  |  5 ++-
 5 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
index a53ea69d9..ba5d38edf 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
@@ -1,37 +1,22 @@
 .confidential {
     display: flex;
     position: relative;
-}
-.toggle-far-twig {
-    i {
-        bottom: 0px;
-        right: -30px;
-    }
+    margin-right: 20px
+    // margin-left 20px;
 }
 
-.toggle-close-twig {
-    i {
-        bottom: 0px;
-        right: -5px;
-    }
+.toggle-container {
+    position: absolute;
+    width: 100%;
+    top: 0;
+    left: 0;
+    cursor: pointer;
+    z-index: 5;
+    padding-right: 1rem;
 }
 .toggle{
-    margin-left: 30px;
-    margin-top: 5px;
-    cursor: pointer;
     position: absolute;
-    z-index: 5;
-    right: -30px
-}
-
-.toggle-far {
-    bottom: 0px;
-    right: 20px !important;
-}
-
-.toggle-close {
-    bottom: 125px;
-    right: 15px !important;
+    right: 4px;
 }
 
 .blur {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index f5a555520..af488cf0c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -3,8 +3,8 @@
         <div :class="{ 'blur': isBlurred }">
             <slot name="confidential-content"></slot>
         </div>
-        <div>
-            <i class="fa fa-eye toggle" :class="positionBtn" aria-hidden="true" @click="toggleBlur"></i>
+        <div class="toggle-container">
+            <i class="fa fa-eye toggle" :class="{ toggleIcon }" aria-hidden="true" @click="toggleBlur"></i>
         </div>
     </div>
 </template>
@@ -12,28 +12,24 @@
 <script>
 export default {
     name: "Confidential",
-    props: ['positionBtnFar'],
     data() {
         return {
             isBlurred: true,
+            toggleIcon: 'fa-eye',
         };
     },
     methods : {
         toggleBlur() {
             console.log(this.positionBtnFar);
             this.isBlurred = !this.isBlurred;
+            this.toggleIcon = this.isBlurred ? 'fa-eye' : 'fa-eye-slash';
         },
     },
-    computed: {
-        positionBtn() {
-            return this.positionBtnFar ? 'toggle-far' : 'toggle-close'
-        }
-    }
 }
 </script>
 
 <style scoped lang='scss'>
     .confidential{
-        align-items: center;
+        align-content: center;
     }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index 54a0b86b7..3dfc27d2f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -59,7 +59,7 @@
     must be shown in such list
 #}
 {%- if render == 'list' -%}
-    <li class="chill-entity entity-address {% if address.confidential %} confidential toggle-far-twig {% endif %}">
+    <li class="chill-entity entity-address {% if address.confidential %} confidential {% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-li fa-map-marker"></i>
         {% endif %}
@@ -68,7 +68,7 @@
 {%- endif -%}
 
 {%- if render == 'inline' -%}
-    <span class="chill-entity entity-address {% if address.confidential %} confidential toggle-far-twig {% endif %}">
+    <span class="chill-entity entity-address {% if address.confidential %} confidential {% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-fw fa-map-marker"></i>
         {% endif %}
@@ -77,7 +77,7 @@
 {%- endif -%}
 
 {%- if render == 'bloc' -%}
-    <div class="chill-entity entity-address {% if address.confidential %} confidential toggle-close-twig {% endif %}">
+    <div class="chill-entity entity-address {% if address.confidential %} confidential {% endif %}">
         {% if options['has_no_address'] == true and address.isNoAddress == true %}
             {% if address.postCode is not empty %}
             <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
index 92542f178..fba0516a7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
@@ -33,6 +33,8 @@ div.banner {
         padding-top: 1em;
         padding-bottom: 1em;
         div.contact {
+            display: flex;
+            align-content: center;
             & > * {
                 margin-right: 1em;
             }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 713693605..7cf0dcecc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -9,7 +9,7 @@
          <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
-      <confidential :positionBtn="false" v-if="accompanyingCourse.requestor.type === 'thirdparty'">
+      <confidential v-if="accompanyingCourse.requestor.type === 'thirdparty'">
          <template v-slot:confidential-content>
             <third-party-render-box
                :thirdparty="accompanyingCourse.requestor"
@@ -33,7 +33,7 @@
          </template>
       </confidential>
 
-      <confidential :positionBtnFar="false" v-else-if="accompanyingCourse.requestor.type === 'person'">
+      <confidential v-else-if="accompanyingCourse.requestor.type === 'person'">
          <template v-slot:confidential-content>
             <person-render-box render="bloc"
                :person="accompanyingCourse.requestor"
@@ -339,5 +339,6 @@ div.flex-table {
 
 .confidential {
    display: block;
+   margin-right: 0px !important;
 }
 </style>

From d18ab5cf49d55ca37445efe10e011d6fb13fd926 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 8 Mar 2022 11:00:31 +0100
Subject: [PATCH 051/174] fix display of email in person renderbox if null or
 empty string

---
 .../ChillPersonBundle/Resources/views/Entity/person.html.twig   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index e7eac0b34..969b3eac5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -167,7 +167,7 @@
                     <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                 </li>
             {% endif %}
-            {% if person.email is not null %}
+            {% if person.email is not empty %}
                 <li>
                     <i class="fa fa-li fa-envelope-o"></i><a href="{{ 'mailto:' ~ person.email }}">
                         {{ person.email }}

From 50a2de1559b6636476473658be753dd650cc61b5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 8 Mar 2022 11:20:06 +0100
Subject: [PATCH 052/174] order accompanying course by openingDate for Person

---
 .../Controller/AccompanyingPeriodController.php               | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
index bb0081c27..c34702ad1 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
@@ -222,6 +222,10 @@ class AccompanyingPeriodController extends AbstractController
         $accompanyingPeriodsRaw = $this->accompanyingPeriodACLAwareRepository
             ->findByPerson($person, AccompanyingPeriodVoter::SEE);
 
+        usort($accompanyingPeriodsRaw, static function ($a, $b) {
+            return $b->getOpeningDate() > $a->getOpeningDate();
+        });
+
         // filter visible or not visible
         $accompanyingPeriods = array_filter($accompanyingPeriodsRaw, function (AccompanyingPeriod $ap) {
             return $this->isGranted(AccompanyingPeriodVoter::SEE, $ap);

From dc5ff53a578f9d27394e2ef0b6d38d92f3dd7225 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 8 Mar 2022 11:21:59 +0100
Subject: [PATCH 053/174] order accompanying course by openingDate for
 Household

---
 .../ChillPersonBundle/Controller/HouseholdController.php      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
index 07fa34b5a..0a8b7eea1 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
@@ -78,6 +78,10 @@ class HouseholdController extends AbstractController
             }
         }
 
+        usort($accompanyingPeriods, static function ($a, $b) {
+            return $b->getOpeningDate() > $a->getOpeningDate();
+        });
+
         $oldMembers = $household->getNonCurrentMembers();
         $accompanyingPeriodsOld = [];
 

From db95e935d91e7bc195a973ec91d9865f2089dfa5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 8 Mar 2022 11:37:08 +0100
Subject: [PATCH 054/174] order accompanying period by opening date in search
 person

---
 src/Bundle/ChillPersonBundle/Entity/Person.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index fab4b2845..7297754bd 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -109,6 +109,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
      *     mappedBy="person",
      * cascade={"persist", "remove", "merge", "detach"})
+     * @ORM\OrderBy({"startDate" = "DESC"})
      */
     private $accompanyingPeriodParticipations;
 

From b68b43118b48fc60456fee3d658fc794dd1dabf8 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 8 Mar 2022 11:38:40 +0100
Subject: [PATCH 055/174] update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5be67840f..cb821031d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] order accompanying period by opening date in search persons, person and household period lists (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/493)
+
 * [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
 * [person] Add url in accompanying period work evaluations entity and form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/476)
 * [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)

From ec99bc95fa47ca7d0e5d96686e59ecd071404683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 8 Mar 2022 11:25:22 +0100
Subject: [PATCH 056/174] add itemMeta variable for course list

---
 .../views/AccompanyingPeriod/_list_item.html.twig | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
index 11517def2..65e514b14 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
@@ -117,12 +117,15 @@
         </div>
     {% endif %}
     <div class="item-row separator">
-        <div class="item-col item-meta">
-            {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', period.id) %}
-            {% if notif_counter.total > 0 %}
-                {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', period.id) }}
-            {% endif %}
-        </div>
+        {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', period.id) %}
+        {% if notif_counter.total > 0 %}
+            <div class="item-col item-meta">
+                    {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', period.id) }}
+            </div>
+        {% endif %}
+        {% if itemMeta is defined %}
+            {{ itemMeta }}
+        {% endif %}
         <div class="item-col">
             {% if recordAction is defined %}
                 <ul class="record_actions">

From e4ae495a3f2554196f0cdb24ef1225a42b0179d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 8 Mar 2022 11:38:28 +0100
Subject: [PATCH 057/174] add empty lines on addresses when address is empty

---
 .../ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
index 78e8729be..ccb48c160 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
@@ -113,6 +113,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
                 [
                     'postcode' => $helper->normalize(self::NULL_POSTCODE_COUNTRY, $format, $context),
                     'country' => $helper->normalize(self::NULL_POSTCODE_COUNTRY, $format, $context),
+                    'lines' => [],
                 ]
             );
         }

From 23e61ac6a7002388aee51b25b4b73920b2b9b4ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 8 Mar 2022 11:43:31 +0100
Subject: [PATCH 058/174] fixes stan errors

---
 phpstan-types.neon                                           | 5 -----
 .../AccompanyingPeriodWorkEvaluationWorkflowHandler.php      | 1 +
 .../Workflow/AccompanyingPeriodWorkWorkflowHandler.php       | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/phpstan-types.neon b/phpstan-types.neon
index ed2de3c91..ddde5cc03 100644
--- a/phpstan-types.neon
+++ b/phpstan-types.neon
@@ -350,11 +350,6 @@ parameters:
 			count: 6
 			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
 
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
index 7bbf54eef..ddd6ded38 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
@@ -72,6 +72,7 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
      */
     public function getRelatedObjects(object $object): array
     {
+        $relateds = [];
         $relateds[] = ['entityClass' => AccompanyingPeriodWorkEvaluation::class, 'entityId' => $object->getId()];
 
         foreach ($object->getDocuments() as $doc) {
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
index 90e7b4e46..3fda24c4f 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
@@ -71,6 +71,7 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
      */
     public function getRelatedObjects(object $object): array
     {
+        $relateds = [];
         $relateds[] = ['entityClass' => AccompanyingPeriodWork::class, 'entityId' => $object->getId()];
 
         foreach ($object->getAccompanyingPeriodWorkEvaluations() as $evaluation) {

From af3b761208f39c3f5f29a12aa512c80e21ac8403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 8 Mar 2022 14:41:25 +0100
Subject: [PATCH 059/174] evaluationWorkDocument: fill title with document is
 generated

---
 .../DocGenerator/AccompanyingPeriodWorkEvaluationContext.php   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index 918b68dc1..90712c64d 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -179,7 +179,8 @@ class AccompanyingPeriodWorkEvaluationContext implements
         $doc = new AccompanyingPeriodWorkEvaluationDocument();
         $doc->setStoredObject($storedObject)
             ->setAccompanyingPeriodWorkEvaluation($entity)
-            ->setTemplate($template);
+            ->setTemplate($template)
+            ->setTitle($this->translatableStringHelper->localize($template->getName()));
         $this->em->persist($doc);
     }
 }

From ee82bd28670a2ec3eadae5aabed7a650d77577a2 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 8 Mar 2022 16:03:59 +0100
Subject: [PATCH 060/174] change personne to usager and & to ET

---
 CHANGELOG.md                                              | 1 +
 src/Bundle/ChillPersonBundle/translations/messages.fr.yml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5be67840f..b991e2444 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ and this project adheres to
 * [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478)
 * [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
 * [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
+* [person] Change 'personne' with 'usager' and '&' with 'ET' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/499)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index ba990125c..e4265fca0 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -124,8 +124,8 @@ address_country_code: Code pays
 
 'Alreay existing person': 'Dossiers déjà encodés'
 'Add the person': 'Ajouter la personne'
-'Add the person and create an accompanying period': "Créer la personne & créer une période d'accompagnement"
-'Add the person and create a household': "Créer la personne & créer un ménage"
+'Add the person and create an accompanying period': "Créer l'usager ET créer une période d'accompagnement"
+'Add the person and create a household': "Créer l'usager' ET créer un ménage"
 Show person: Voir le dossier de la personne
 'Confirm the creation': 'Confirmer la création'
 'You will create this person': 'Vous allez créer le dossier suivant'

From 13d579dc3376fef6f925cacc05f56757bf99e192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 8 Mar 2022 17:06:12 +0100
Subject: [PATCH 061/174] add 'for' in macro workflow breadcrumb

---
 .../ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php  | 2 +-
 .../Resources/views/Workflow/macro_breadcrumb.html.twig     | 6 ++++++
 src/Bundle/ChillMainBundle/translations/messages.fr.yml     | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
index 9de76e039..b978173d9 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
@@ -192,7 +192,7 @@ class EntityWorkflowStep
      * You should **not** rely on this method to get all users which are able to
      * apply a transition on this step. Use @see{EntityWorkflowStep::getAllDestUser} instead.
      */
-    public function getDestUser(): collection
+    public function getDestUser(): Collection
     {
         return $this->destUser;
     }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
index 6fb3fe2ff..a62f37e0a 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
@@ -9,6 +9,12 @@
                 <span class="item-key">{{ 'Le'|trans ~ ' : ' }}</span>
                 <b>{{ step.previous.transitionAt|format_datetime('short', 'short') }}</b>
             </li>
+            <li>
+                <span class="item-key">{{ 'workflow.For'|trans ~ ' : ' }}</span>
+                <b>
+                    {% for d in step.destUser %}{{ d|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
+                </b>
+            </li>
         {% else %}
             <li>
                 <span class="item-key">{{ 'workflow.Created by'|trans ~ ' : ' }}</span>
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index e907f187f..685a0c373 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -413,6 +413,7 @@ workflow:
     Previous workflow without reaction help: Liste des workflows où vous avez été cité comme pouvant réagir à une étape, mais où un autre utilisateur a exécuté une action avant vous.
     Previous transitionned: Anciens workflows
     Previous workflow transitionned help: Workflows où vous avez exécuté une action.
+    For: Pour
 
 
 Subscribe final: Recevoir une notification à l'étape finale

From b8d9d59d76dd51aa3299cad7213157a100f25a5a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 09:19:29 +0100
Subject: [PATCH 062/174] condition added to display thirdparty centers or not

---
 CHANGELOG.md                                  |  1 +
 .../Controller/ThirdPartyController.php       | 29 ++++++++++---------
 .../Resources/views/ThirdParty/view.html.twig | 29 ++++++++++---------
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b991e2444..296f232b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ and this project adheres to
 * [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
 * [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
 * [person] Change 'personne' with 'usager' and '&' with 'ET' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/499)
+* [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
index 61797a22c..637ce68e4 100644
--- a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
@@ -20,6 +20,7 @@ use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyACLAwareRepositoryInterface;
 use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
 use LogicException;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -31,37 +32,39 @@ use function array_merge;
 
 final class ThirdPartyController extends CRUDController
 {
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    protected AuthorizationHelper $authorizationHelper;
 
-    /**
-     * @var PaginatorFactory
-     */
-    protected $paginatorFactory;
+    protected PaginatorFactory $paginatorFactory;
 
     protected RequestStack $requestStack;
 
     protected ThirdPartyACLAwareRepositoryInterface $thirdPartyACLAwareRepository;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
+
+    private bool $askCenter;
 
     public function __construct(
         AuthorizationHelper $authorizationHelper,
         TranslatorInterface $translator,
         PaginatorFactory $paginatorFactory,
         RequestStack $requestStack,
-        ThirdPartyACLAwareRepositoryInterface $thirdPartyACLAwareRepository
+        ThirdPartyACLAwareRepositoryInterface $thirdPartyACLAwareRepository,
+        ParameterBagInterface $parameterBag
     ) {
         $this->authorizationHelper = $authorizationHelper;
         $this->translator = $translator;
         $this->paginatorFactory = $paginatorFactory;
         $this->requestStack = $requestStack;
         $this->thirdPartyACLAwareRepository = $thirdPartyACLAwareRepository;
+        $this->askCenter = $parameterBag->get('chill_main')['acl']['form_show_centers'];
+    }
+
+    public function generateTemplateParameter(string $action, $entity, Request $request, array $defaultTemplateParameters = [])
+    {
+        $defaultTemplateParameters['askCenter'] = $this->askCenter;
+
+        return $defaultTemplateParameters;
     }
 
     protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
index 5a6a75225..c4f2bcfbd 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
@@ -13,7 +13,7 @@
                 <h1>
                     {{ title_ }}
                     <span class="badge bg-{{ thirdParty.active ? 'success' : 'danger' }} float-end"
-                          title="{{ (thirdParty.active ? 'shown to users' : 'not shown to users')|trans }}">
+                        title="{{ (thirdParty.active ? 'shown to users' : 'not shown to users')|trans }}">
                         {{ (thirdParty.active ? 'Active' : 'Inactive')|trans }}
                     </span>
                 </h1>
@@ -123,19 +123,20 @@
                         </dd>
                     {% endif %}
 
-                    <dt>{{ 'Centers'|trans }}</dt>
-                    <dd>
-                        {% set centers = thirdParty|chill_resolve_center %}
-                        {% if centers is iterable %}
-                            {{ 'The party is visible in those centers'|trans }}&nbsp;:
-                            {{ centers|join(', ') }}
-                        {% elseif centers is null %}
-                            {{ 'The party is not visible in any center'|trans }}
-                        {% else %}
-                            {{ 'The party is visible in those centers'|trans }}&nbsp;: {{ centers }}
-                        {% endif %}
-                    </dd>
-
+                    {% if askCenter %}
+                        <dt>{{ 'Centers'|trans }}</dt>
+                        <dd>
+                            {% set centers = thirdParty|chill_resolve_center %}
+                            {% if centers is iterable %}
+                                {{ 'The party is visible in those centers'|trans }}&nbsp;:
+                                {{ centers|join(', ') }}
+                            {% elseif centers is null %}
+                                {{ 'The party is not visible in any center'|trans }}
+                            {% else %}
+                                {{ 'The party is visible in those centers'|trans }}&nbsp;: {{ centers }}
+                            {% endif %}
+                        </dd>
+                    {% endif %}
                 </dl>
             {% endblock %}
             {% block content_form_actions_delete %}{% endblock %}

From b02739cc3c04c9f158efb325e834e1b5b73f6ec7 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 09:35:47 +0100
Subject: [PATCH 063/174] phonenumber placeholder removed

---
 CHANGELOG.md                                   |  1 +
 .../Form/Type/ChillPhoneNumberType.php         | 18 +-----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 296f232b7..3f0f00749 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ and this project adheres to
 * [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
 * [person] Change 'personne' with 'usager' and '&' with 'ET' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/499)
 * [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
+* [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php
index 547782943..2580058e8 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php
@@ -16,9 +16,7 @@ use libphonenumber\PhoneNumberUtil;
 use Misd\PhoneNumberBundle\Form\Type\PhoneNumberType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use function array_key_exists;
 
 class ChillPhoneNumberType extends AbstractType
 {
@@ -37,21 +35,7 @@ class ChillPhoneNumberType extends AbstractType
         $resolver
             ->setDefault('default_region', $this->defaultCarrierCode)
             ->setDefault('format', PhoneNumberFormat::NATIONAL)
-            ->setDefault('type', \libphonenumber\PhoneNumberType::FIXED_LINE_OR_MOBILE)
-            ->setNormalizer('attr', function (Options $options, $value) {
-                if (array_key_exists('placeholder', $value)) {
-                    return $value;
-                }
-
-                $examplePhoneNumber = $this->phoneNumberUtil->getExampleNumberForType($this->defaultCarrierCode, $options['type']);
-
-                return array_merge(
-                    $value,
-                    [
-                        'placeholder' => PhoneNumberUtil::getInstance()->format($examplePhoneNumber, $options['format']),
-                    ]
-                );
-            });
+            ->setDefault('type', \libphonenumber\PhoneNumberType::FIXED_LINE_OR_MOBILE);
     }
 
     public function getParent()

From 6f58a9a8bbed28f19668656b23698149354d3a74 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 11:06:00 +0100
Subject: [PATCH 064/174] separate create page

---
 .../Controller/PersonResourceController.php   | 18 ++++++++--
 .../views/PersonResource/create.html.twig     | 34 ++++++++++++-------
 .../views/PersonResource/list.html.twig       | 12 +++++--
 .../ChillPersonBundle/config/routes.yaml      |  4 +++
 4 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
index 210b507e5..004961594 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
@@ -133,6 +133,19 @@ final class PersonResourceController extends AbstractController
         $personResources = [];
         $personResources = $this->personResourceRepository->findBy(['personOwner' => $personOwner->getId()]);
 
+        return $this->render(
+            'ChillPersonBundle:PersonResource:list.html.twig',
+            [
+                'person' => $personOwner,
+                'personResources' => $personResources,
+            ]
+        );
+    }
+
+    public function newAction(Request $request, $person_id)
+    {
+        $personOwner = $this->personRepository->find($person_id);
+
         $form = $this->createForm(PersonResourceType::class);
 
         $form->handleRequest($request);
@@ -165,11 +178,10 @@ final class PersonResourceController extends AbstractController
         }
 
         return $this->render(
-            'ChillPersonBundle:PersonResource:list.html.twig',
+            'ChillPersonBundle:PersonResource:create.html.twig',
             [
-                'person' => $personOwner,
-                'personResources' => $personResources,
                 'form' => $form->createView(),
+                'person' => $personOwner,
             ]
         );
     }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
index 8fea0bd70..e64d76362 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
@@ -1,15 +1,25 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_person_resource_list' %}
+
+{% block title %}{{ 'Person resources'|trans|capitalize ~ ' ' ~ person|chill_entity_render_string }}{% endblock %}
+
+{% block js %}
+    {{ encore_entry_script_tags('page_person_resource_showhide_input') }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('page_person_resource_showhide_input') }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block personcontent %}
+
+<h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
+
 <div class="col-md col-xxl">
-    <div id="collapseForm" class="{% if not form.vars.submitted %}collapse{% endif %}">
         <h3 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h3>
         {% include "@ChillPerson/PersonResource/form.html.twig" %}
-    </div>
-
-    <ul class="record_actions sticky-form-buttons">
-        <li>
-            <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
-                {{ 'Add a person resource'|trans }}
-            </button>
-        </li>
-    </ul>
-
-</div>
\ No newline at end of file
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index 1d480614f..6ccf1a0eb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -85,8 +85,14 @@
     <p class="chill-no-data-statement">{{ 'There are no available resources'|trans }}</p>
 {% endif %}
 
-<h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
-
-{% include "@ChillPerson/PersonResource/create.html.twig" %}
+{% if is_granted('CHILL_PERSON_UPDATE', person) %}
+<ul class="record_actions sticky-form-buttons">
+    <li>
+        <a href="{{ chill_path_add_return_path('chill_person_resource_new', {'person_id': person.id,}) }}"
+                class="btn btn-sm btn-new"
+                title="{{ 'Create'|trans }}">{{ 'Add a person resource'|trans }}</a>
+    </li>
+</ul>
+{% endif %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/config/routes.yaml b/src/Bundle/ChillPersonBundle/config/routes.yaml
index 13d1c1227..1836826c5 100644
--- a/src/Bundle/ChillPersonBundle/config/routes.yaml
+++ b/src/Bundle/ChillPersonBundle/config/routes.yaml
@@ -59,6 +59,10 @@ chill_person_resource_list:
     path: /{_locale}/person/{person_id}/resources/list
     controller: Chill\PersonBundle\Controller\PersonResourceController::listAction
 
+chill_person_resource_new:
+    path: /{_locale}/person/{person_id}/resources/new
+    controller: Chill\PersonBundle\Controller\PersonResourceController::newAction
+
 chill_person_resource_edit:
     path: /{_locale}/person/{person_id}/resources/{resource_id}/edit
     controller: Chill\PersonBundle\Controller\PersonResourceController::editAction

From 85552778271592727180423f04fa256d7e31ab1d Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 11:06:10 +0100
Subject: [PATCH 065/174] changelog updated

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f0f00749..e26caae71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ and this project adheres to
 * [person] Change 'personne' with 'usager' and '&' with 'ET' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/499)
 * [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
 * [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
+* [person_resource] separate create page created to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/504)
 
 ## Test releases
 

From aefd09693bca3b32f3876bd775235e5f03048ac1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 12:10:33 +0100
Subject: [PATCH 066/174] position of toggle button improved (differentation
 between twig and vue) + fix fa-eye-slash in vue component

---
 .../Resources/public/module/blur/blur.scss               | 6 +++++-
 .../Resources/public/module/blur/index.js                | 9 +++++----
 .../Resources/public/vuejs/_components/Confidential.vue  | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
index ba5d38edf..9f2ef7bbe 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
@@ -2,7 +2,6 @@
     display: flex;
     position: relative;
     margin-right: 20px
-    // margin-left 20px;
 }
 
 .toggle-container {
@@ -17,6 +16,11 @@
 .toggle{
     position: absolute;
     right: 4px;
+    &-twig {
+        position: absolute;
+        right: -25px;
+        bottom: 20px;
+    }
 }
 
 .blur {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
index 1d66d25e6..3245512e9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
@@ -2,18 +2,19 @@ require('./blur.scss');
 
 document.querySelectorAll('.confidential').forEach(function (el) {
     let i = document.createElement('i');
-    const classes = ['fa', 'fa-eye', 'toggle'];
+    const classes = ['fa', 'fa-eye-slash', 'toggle-twig'];
     i.classList.add(...classes);
     el.appendChild(i);
+
     const toggleBlur = function(e) {
         for (let child of el.children) {
-            if (!child.classList.contains('toggle')) {
+            if (!child.classList.contains('toggle-twig')) {
                 child.classList.toggle('blur');
             }
         }
-        i.classList.toggle('fa-eye');
         i.classList.toggle('fa-eye-slash');
+        i.classList.toggle('fa-eye');
     }
     i.addEventListener('click', toggleBlur);
     toggleBlur();
-});
+});
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index af488cf0c..837440524 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -4,7 +4,7 @@
             <slot name="confidential-content"></slot>
         </div>
         <div class="toggle-container">
-            <i class="fa fa-eye toggle" :class="{ toggleIcon }" aria-hidden="true" @click="toggleBlur"></i>
+            <i class="fa toggle" :class="toggleIcon" aria-hidden="true" @click="toggleBlur"></i>
         </div>
     </div>
 </template>

From d6933fce35d45b5b6fcca2b13455797e3fde33aa Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 13:35:55 +0100
Subject: [PATCH 067/174] add contact button color changed

---
 CHANGELOG.md                                                  | 1 +
 .../ChillMainBundle/Resources/public/chill/scss/buttons.scss  | 2 +-
 .../public/vuejs/_components/Entity/ThirdPartyRenderBox.vue   | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f0f00749..885068bc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ and this project adheres to
 * [person] Change 'personne' with 'usager' and '&' with 'ET' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/499)
 * [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
 * [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
+* [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
index 3a9b6df80..248b32cfc 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
@@ -25,7 +25,7 @@ $chill-theme-buttons: (
    "notify":        $chill-blue,
    "search":        $gray-300,
    "unlink":        $chill-red,
-   "tpchild":       $chill-pink,
+   "tpchild":       $chill-green,
 );
 
 @each $button, $color in $chill-theme-buttons {
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index bcdbf5e55..662911714 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -36,7 +36,7 @@
                 <ul class="list-content fa-ul">
                     <li v-if="getProfession.length > 0">
                         <i class="fa fa-li fa-id-card"></i>
-                        <p><span v-for="p in getProfession" :key="p" class="list-item">{{ p[0].toUpperCase() + p.slice(1).toLowerCase() }}</span></p>
+                        <p><span v-for="p in getProfession" :key="p" class="list-item list-professions">{{ p[0].toUpperCase() + p.slice(1).toLowerCase() }}</span></p>
                     </li>
                     <li v-if="hasParent">
                         <i class="fa fa-li fa-hand-o-right"></i>
@@ -165,7 +165,7 @@ export default {
     }
 }
 
-.list-item {
+.list-professions {
     &::after {
         content: " | ";
     }

From 4b899d337adceb5fd830815f812af1bda0c9580a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 13:36:26 +0100
Subject: [PATCH 068/174] changelog updated

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5be67840f..65f0d4528 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,7 @@ and this project adheres to
 * [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478)
 * [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
 * [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
-
+* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
 ## Test releases
 
 ### test release 2022-02-21

From e28da7e99b5cb4aef0350686caf5d51f8bba6f93 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 14:06:18 +0100
Subject: [PATCH 069/174] create-edit composition placed in separate page to
 avoid confusion

---
 .../HouseholdCompositionController.php        | 47 ++++++++++++-------
 .../HouseholdComposition/create.html.twig     | 26 ++++++++++
 .../HouseholdComposition/index.html.twig      | 35 +++++---------
 .../translations/messages.fr.yml              |  1 +
 4 files changed, 68 insertions(+), 41 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
index 22e92eb02..7064a083d 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
@@ -129,23 +129,10 @@ class HouseholdCompositionController extends AbstractController
     }
 
     /**
-     * @Route("/{_locale}/person/household/{id}/composition/index", name="chill_person_household_composition_index")
+     * @Route("/{_locale}/person/household/{id}/composition/new", name="chill_person_household_composition_new")
      */
-    public function index(Household $household, Request $request): Response
+    public function newAction(Household $household, Request $request): Response
     {
-        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
-            throw new AccessDeniedException('not allowed to edit an household');
-        }
-
-        $count = $this->householdCompositionRepository->countByHousehold($household);
-        $paginator = $this->paginatorFactory->create($count);
-        $compositions = $this->householdCompositionRepository->findByHousehold(
-            $household,
-            ['startDate' => 'DESC', 'id' => 'DESC'],
-            $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber()
-        );
-
         if ($this->security->isGranted(HouseholdVoter::EDIT, $household)) {
             $isEdit = $request->query->has('edit');
 
@@ -195,14 +182,40 @@ class HouseholdCompositionController extends AbstractController
         }
 
         return new Response($this->engine->render(
-            '@ChillPerson/HouseholdComposition/index.html.twig',
+            '@ChillPerson/HouseholdComposition/create.html.twig',
             [
                 'household' => $household,
-                'compositions' => $compositions,
                 'form' => isset($form) ? $form->createView() : null,
                 'isPosted' => isset($form) ? $form->isSubmitted() : false,
                 'editId' => $request->query->getInt('edit', -1),
             ]
         ));
     }
+
+    /**
+     * @Route("/{_locale}/person/household/{id}/composition/index", name="chill_person_household_composition_index")
+     */
+    public function index(Household $household, Request $request): Response
+    {
+        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
+            throw new AccessDeniedException('not allowed to edit a household');
+        }
+
+        $count = $this->householdCompositionRepository->countByHousehold($household);
+        $paginator = $this->paginatorFactory->create($count);
+        $compositions = $this->householdCompositionRepository->findByHousehold(
+            $household,
+            ['startDate' => 'DESC', 'id' => 'DESC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+
+        return new Response($this->engine->render(
+            '@ChillPerson/HouseholdComposition/index.html.twig',
+            [
+                'household' => $household,
+                'compositions' => $compositions
+            ]
+        ));
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig
new file mode 100644
index 000000000..334832a63
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig
@@ -0,0 +1,26 @@
+{% extends '@ChillPerson/Household/layout.html.twig' %}
+
+{% block title 'household_composition.create'|trans %}
+
+{% block block_post_menu %}
+    <div class="post-menu"></div>
+{% endblock %}
+
+{% block content %}
+
+<h1>{{ 'household_composition.Create'|trans }}</h1>
+
+    <div>
+        {{ form_start(form) }}
+
+        {{ form_widget(form) }}
+
+        <ul class="record_actions">
+            <li>
+                <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
+            </li>
+        </ul>
+        {{ form_end(form) }}
+    </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
index 7ff72b2cd..cce83e64c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
@@ -15,7 +15,7 @@
     {% else %}
         <div class="flex-table">
             {% for c in compositions %}
-                {% if c.id != editId %}
+                {# {% if c.id != editId %} #}
                     <div class="item-bloc">
                         <div class="item-row">
                             <div class="item-col">
@@ -42,7 +42,7 @@
                             <div class="item-row">
                                 <ul class="record_actions">
                                     <li>
-                                        <a href="{{ path('chill_person_household_composition_index', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
+                                        <a href="{{ path('chill_person_household_composition_new', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
                                     </li>
                                     <li>
                                         <a href="{{ chill_path_add_return_path('chill_person_household_composition_delete', {'composition_id': c.id,
@@ -54,7 +54,7 @@
                             </div>
                         {% endif %}
                     </div>
-                {% else %}
+                {# {% else %}
                     {{ form_start(form) }}
 
                     {{ form_widget(form) }}
@@ -68,32 +68,19 @@
                         </li>
                     </ul>
                     {{ form_end(form) }}
-                {% endif %}
+                {% endif %} #}
             {% endfor %}
         </div>
     {% endif %}
 
-    <div id="collapseForm" class="{% if not isPosted %}collapse{% endif %}">
-        {{ form_start(form) }}
-
-        {{ form_widget(form) }}
-
-        <ul class="record_actions">
-           <li>
-               <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-           </li>
-        </ul>
-        {{ form_end(form) }}
-    </div>
-
-    {% if editId == -1 %}
+    {# {% if editId == -1 %} #}
         <ul class="record_actions sticky-form-buttons">
-                <li>
-                    <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
-                        {{ 'Create'|trans }}
-                    </button>
-                </li>
+            <li>
+                <a href="{{ chill_path_add_return_path('chill_person_household_composition_new', {'id': household.id,}) }}"
+                        class="btn btn-sm btn-new"
+                        title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
+            </li>
         </ul>
-    {% endif %}
+    {# {% endif %} #}
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index e4265fca0..bc238570d 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -566,6 +566,7 @@ household_composition:
     Currently no composition: Aucune composition familiale renseignée.
     Add a composition: Ajouter une composition familiale
     Update composition: Modifier la composition familiale
+    Create: Créér une nouvelle composition familiale
 
 # docgen
 Linked evaluations: Évaluations associées

From fb1552f6b709c8a0602eb5b6e4492248b96a2ca3 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 14:07:41 +0100
Subject: [PATCH 070/174] update changelog and csfixes

---
 CHANGELOG.md                                  |  1 +
 .../HouseholdCompositionController.php        | 54 +++++++++----------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 885068bc0..6fe2e95ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ and this project adheres to
 * [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
 * [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
 * [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
+* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
index 7064a083d..1144688fe 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
@@ -128,6 +128,33 @@ class HouseholdCompositionController extends AbstractController
         );
     }
 
+    /**
+     * @Route("/{_locale}/person/household/{id}/composition/index", name="chill_person_household_composition_index")
+     */
+    public function index(Household $household, Request $request): Response
+    {
+        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
+            throw new AccessDeniedException('not allowed to edit a household');
+        }
+
+        $count = $this->householdCompositionRepository->countByHousehold($household);
+        $paginator = $this->paginatorFactory->create($count);
+        $compositions = $this->householdCompositionRepository->findByHousehold(
+            $household,
+            ['startDate' => 'DESC', 'id' => 'DESC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+
+        return new Response($this->engine->render(
+            '@ChillPerson/HouseholdComposition/index.html.twig',
+            [
+                'household' => $household,
+                'compositions' => $compositions,
+            ]
+        ));
+    }
+
     /**
      * @Route("/{_locale}/person/household/{id}/composition/new", name="chill_person_household_composition_new")
      */
@@ -191,31 +218,4 @@ class HouseholdCompositionController extends AbstractController
             ]
         ));
     }
-
-    /**
-     * @Route("/{_locale}/person/household/{id}/composition/index", name="chill_person_household_composition_index")
-     */
-    public function index(Household $household, Request $request): Response
-    {
-        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
-            throw new AccessDeniedException('not allowed to edit a household');
-        }
-
-        $count = $this->householdCompositionRepository->countByHousehold($household);
-        $paginator = $this->paginatorFactory->create($count);
-        $compositions = $this->householdCompositionRepository->findByHousehold(
-            $household,
-            ['startDate' => 'DESC', 'id' => 'DESC'],
-            $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber()
-        );
-
-        return new Response($this->engine->render(
-            '@ChillPerson/HouseholdComposition/index.html.twig',
-            [
-                'household' => $household,
-                'compositions' => $compositions
-            ]
-        ));
-    }
 }

From c611f35cd61f7d50c5b5603680902c7f5780192a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 8 Mar 2022 09:48:17 +0100
Subject: [PATCH 071/174] finding solution for toggle button position

---
 .../Resources/public/module/blur/blur.scss    | 37 ++++++-------------
 .../public/vuejs/_components/Confidential.vue | 14 +++----
 .../Resources/views/Entity/address.html.twig  |  6 +--
 .../Resources/public/chill/chillperson.scss   |  2 +
 .../components/Requestor.vue                  |  5 ++-
 5 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
index a53ea69d9..ba5d38edf 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
@@ -1,37 +1,22 @@
 .confidential {
     display: flex;
     position: relative;
-}
-.toggle-far-twig {
-    i {
-        bottom: 0px;
-        right: -30px;
-    }
+    margin-right: 20px
+    // margin-left 20px;
 }
 
-.toggle-close-twig {
-    i {
-        bottom: 0px;
-        right: -5px;
-    }
+.toggle-container {
+    position: absolute;
+    width: 100%;
+    top: 0;
+    left: 0;
+    cursor: pointer;
+    z-index: 5;
+    padding-right: 1rem;
 }
 .toggle{
-    margin-left: 30px;
-    margin-top: 5px;
-    cursor: pointer;
     position: absolute;
-    z-index: 5;
-    right: -30px
-}
-
-.toggle-far {
-    bottom: 0px;
-    right: 20px !important;
-}
-
-.toggle-close {
-    bottom: 125px;
-    right: 15px !important;
+    right: 4px;
 }
 
 .blur {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index f5a555520..af488cf0c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -3,8 +3,8 @@
         <div :class="{ 'blur': isBlurred }">
             <slot name="confidential-content"></slot>
         </div>
-        <div>
-            <i class="fa fa-eye toggle" :class="positionBtn" aria-hidden="true" @click="toggleBlur"></i>
+        <div class="toggle-container">
+            <i class="fa fa-eye toggle" :class="{ toggleIcon }" aria-hidden="true" @click="toggleBlur"></i>
         </div>
     </div>
 </template>
@@ -12,28 +12,24 @@
 <script>
 export default {
     name: "Confidential",
-    props: ['positionBtnFar'],
     data() {
         return {
             isBlurred: true,
+            toggleIcon: 'fa-eye',
         };
     },
     methods : {
         toggleBlur() {
             console.log(this.positionBtnFar);
             this.isBlurred = !this.isBlurred;
+            this.toggleIcon = this.isBlurred ? 'fa-eye' : 'fa-eye-slash';
         },
     },
-    computed: {
-        positionBtn() {
-            return this.positionBtnFar ? 'toggle-far' : 'toggle-close'
-        }
-    }
 }
 </script>
 
 <style scoped lang='scss'>
     .confidential{
-        align-items: center;
+        align-content: center;
     }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index 54a0b86b7..3dfc27d2f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -59,7 +59,7 @@
     must be shown in such list
 #}
 {%- if render == 'list' -%}
-    <li class="chill-entity entity-address {% if address.confidential %} confidential toggle-far-twig {% endif %}">
+    <li class="chill-entity entity-address {% if address.confidential %} confidential {% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-li fa-map-marker"></i>
         {% endif %}
@@ -68,7 +68,7 @@
 {%- endif -%}
 
 {%- if render == 'inline' -%}
-    <span class="chill-entity entity-address {% if address.confidential %} confidential toggle-far-twig {% endif %}">
+    <span class="chill-entity entity-address {% if address.confidential %} confidential {% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-fw fa-map-marker"></i>
         {% endif %}
@@ -77,7 +77,7 @@
 {%- endif -%}
 
 {%- if render == 'bloc' -%}
-    <div class="chill-entity entity-address {% if address.confidential %} confidential toggle-close-twig {% endif %}">
+    <div class="chill-entity entity-address {% if address.confidential %} confidential {% endif %}">
         {% if options['has_no_address'] == true and address.isNoAddress == true %}
             {% if address.postCode is not empty %}
             <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
index 92542f178..fba0516a7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
@@ -33,6 +33,8 @@ div.banner {
         padding-top: 1em;
         padding-bottom: 1em;
         div.contact {
+            display: flex;
+            align-content: center;
             & > * {
                 margin-right: 1em;
             }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 713693605..7cf0dcecc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -9,7 +9,7 @@
          <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
-      <confidential :positionBtn="false" v-if="accompanyingCourse.requestor.type === 'thirdparty'">
+      <confidential v-if="accompanyingCourse.requestor.type === 'thirdparty'">
          <template v-slot:confidential-content>
             <third-party-render-box
                :thirdparty="accompanyingCourse.requestor"
@@ -33,7 +33,7 @@
          </template>
       </confidential>
 
-      <confidential :positionBtnFar="false" v-else-if="accompanyingCourse.requestor.type === 'person'">
+      <confidential v-else-if="accompanyingCourse.requestor.type === 'person'">
          <template v-slot:confidential-content>
             <person-render-box render="bloc"
                :person="accompanyingCourse.requestor"
@@ -339,5 +339,6 @@ div.flex-table {
 
 .confidential {
    display: block;
+   margin-right: 0px !important;
 }
 </style>

From 3d1ded8b1cd7b4aed296cdf63fda210efb2c5f12 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 12:10:33 +0100
Subject: [PATCH 072/174] position of toggle button improved (differentation
 between twig and vue) + fix fa-eye-slash in vue component

---
 .../Resources/public/module/blur/blur.scss               | 6 +++++-
 .../Resources/public/module/blur/index.js                | 9 +++++----
 .../Resources/public/vuejs/_components/Confidential.vue  | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
index ba5d38edf..9f2ef7bbe 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
@@ -2,7 +2,6 @@
     display: flex;
     position: relative;
     margin-right: 20px
-    // margin-left 20px;
 }
 
 .toggle-container {
@@ -17,6 +16,11 @@
 .toggle{
     position: absolute;
     right: 4px;
+    &-twig {
+        position: absolute;
+        right: -25px;
+        bottom: 20px;
+    }
 }
 
 .blur {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
index 1d66d25e6..3245512e9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
@@ -2,18 +2,19 @@ require('./blur.scss');
 
 document.querySelectorAll('.confidential').forEach(function (el) {
     let i = document.createElement('i');
-    const classes = ['fa', 'fa-eye', 'toggle'];
+    const classes = ['fa', 'fa-eye-slash', 'toggle-twig'];
     i.classList.add(...classes);
     el.appendChild(i);
+
     const toggleBlur = function(e) {
         for (let child of el.children) {
-            if (!child.classList.contains('toggle')) {
+            if (!child.classList.contains('toggle-twig')) {
                 child.classList.toggle('blur');
             }
         }
-        i.classList.toggle('fa-eye');
         i.classList.toggle('fa-eye-slash');
+        i.classList.toggle('fa-eye');
     }
     i.addEventListener('click', toggleBlur);
     toggleBlur();
-});
+});
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index af488cf0c..837440524 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -4,7 +4,7 @@
             <slot name="confidential-content"></slot>
         </div>
         <div class="toggle-container">
-            <i class="fa fa-eye toggle" :class="{ toggleIcon }" aria-hidden="true" @click="toggleBlur"></i>
+            <i class="fa toggle" :class="toggleIcon" aria-hidden="true" @click="toggleBlur"></i>
         </div>
     </div>
 </template>

From 8ff80ac65e3a1663a6833b559f98f3eccf07ac4b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 13:36:26 +0100
Subject: [PATCH 073/174] changelog updated

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 885068bc0..9c30ef9ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,7 +37,7 @@ and this project adheres to
 * [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
 * [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
 * [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
-
+* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
 ## Test releases
 
 ### test release 2022-02-21

From 492c22d1b7582e0d4e70c87d0da37daad1f33cfe Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 08:40:11 +0100
Subject: [PATCH 074/174] AccompanyingPeriodWork: add referrers field

---
 .../AccompanyingPeriodWork.php                | 34 ++++++++++++++++
 .../migrations/Version20220310063629.php      | 40 +++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index ed00c8611..f9f9f46e1 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -142,6 +142,15 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
      */
     private Collection $persons;
 
+    /**
+     * @ORM\ManyToMany(targetEntity=User::class)
+     * @ORM\JoinTable(name="chill_person_accompanying_period_work_referrer")
+     * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
+     * @Serializer\Groups({"accompanying_period_work:edit"})
+     * @Serializer\Groups({"accompanying_period_work:create"})
+     */
+    private Collection $referrers;
+
     /**
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="accompanyingPeriodWorks")
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_result")
@@ -196,6 +205,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         $this->thirdParties = new ArrayCollection();
         $this->persons = new ArrayCollection();
         $this->accompanyingPeriodWorkEvaluations = new ArrayCollection();
+        $this->referrers = new ArrayCollection();
     }
 
     public function addAccompanyingPeriodWorkEvaluation(AccompanyingPeriodWorkEvaluation $evaluation): self
@@ -497,4 +507,28 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
         return $this;
     }
+
+    /**
+     * @return Collection|User[]
+     */
+    public function getReferrers(): Collection
+    {
+        return $this->referrers;
+    }
+
+    public function addReferrer(User $referrer): self
+    {
+        if (!$this->referrers->contains($referrer)) {
+            $this->referrers[] = $referrer;
+        }
+
+        return $this;
+    }
+
+    public function removeReferrer(User $referrer): self
+    {
+        $this->referrers->removeElement($referrer);
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php b/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
new file mode 100644
index 000000000..0d56ff4b1
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add referrers to AccompanyingPeriodWork
+ */
+final class Version20220310063629 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add referrers to AccompanyingPeriodWork';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE chill_person_accompanying_period_work_referrer (accompanyingperiodwork_id INT NOT NULL, user_id INT NOT NULL, PRIMARY KEY(accompanyingperiodwork_id, user_id))');
+        $this->addSql('CREATE INDEX IDX_3619F5EBB99F6060 ON chill_person_accompanying_period_work_referrer (accompanyingperiodwork_id)');
+        $this->addSql('CREATE INDEX IDX_3619F5EBA76ED395 ON chill_person_accompanying_period_work_referrer (user_id)');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EBB99F6060 FOREIGN KEY (accompanyingperiodwork_id) REFERENCES chill_person_accompanying_period_work (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EBA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TABLE chill_person_accompanying_period_work_referrer');
+    }
+}

From 55a65ee6e9b20516868ef3a406062cbb376959d9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 10:32:20 +0100
Subject: [PATCH 075/174] accompanyingPeriodWork: add referrer in vuejs form

---
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  | 75 ++++++++++++++++++-
 .../vuejs/AccompanyingCourseWorkEdit/store.js | 18 ++++-
 2 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index a0d88d1bf..1f895708b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -151,6 +151,40 @@
          </ul>
       </div>
 
+      <div id="referrers" class="action-row">
+         <h3>{{ $t('referrers') }}</h3>
+
+         <div v-if="!hasReferrers">
+            <p class="chill-no-data-statement">{{ $t('no_referrers') }}</p>
+         </div>
+
+         <div v-else>
+            <div class="flex-bloc mb-3">
+                  <div v-for="u in referrers" :key="u.id" class="referrer">
+                     <span class="badge-user">
+                        {{ u.text }}
+                     </span>
+                     <span class="referrer-close-btn">
+                        <button :title="$t('remove_referrer')" class="btn btn-sm btn-remove" @click="removeReferrer(u)" />
+                     </span>
+                  </div>
+            </div>
+         </div>
+
+         <ul class="record_actions">
+            <li class="add-persons">
+               <add-persons
+                  ref="referrerPicker"
+                  :key="referrerPicker.key"
+                  :buttonTitle="$t('add_referrers')"
+                  :modalTitle="$t('choose_referrers')"
+                  :options="referrerPicker.options"
+                  @addNewPersons="addReferrers">
+               </add-persons>
+            </li>
+         </ul>
+      </div>
+
       <div id="handlingThirdParty" class="action-row">
          <h3>{{ $t('handling_thirdparty') }}</h3>
 
@@ -289,7 +323,6 @@ import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vu
 import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
 import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
 
-
 const i18n = {
    messages: {
       fr: {
@@ -322,6 +355,10 @@ const i18n = {
          available_evaluations_text: "Évaluations disponibles pour ajout :",
          no_evaluations_available: "Aucune évaluation disponible",
          no_goals_available: "Aucun objectif disponible",
+         referrers: "Agents traitants",
+         no_referrers: "Aucun agent traitant",
+         choose_referrers: "Choisir des agents traitants",
+         remove_referrer: "Enlever l'agent"
       }
    }
 };
@@ -370,6 +407,17 @@ export default {
                }
             },
          },
+         referrerPicker: {
+            key: 'referrer',
+            options: {
+               type: ['user'],
+               priority: null,
+               uniq: false,
+               button: {
+                  display: false
+               }
+            },
+         },
       };
    },
   computed: {
@@ -381,6 +429,7 @@ export default {
          'personsReachables',
          'handlingThirdParty',
          'thirdParties',
+         'referrers',
          'isPosting',
          'errors',
          'templatesAvailablesForAction',
@@ -389,6 +438,7 @@ export default {
          'hasResultsForAction',
          'hasHandlingThirdParty',
          'hasThirdParties',
+         'hasReferrers'
       ]),
       startDate: {
          get() {
@@ -465,6 +515,14 @@ export default {
       removeThirdParty(t) {
          this.$store.commit('removeThirdParty', t);
       },
+      addReferrers({selected, modal}) {
+         this.$store.commit('addReferrers', selected.map(r => r.result));
+         this.$refs.referrerPicker.resetSearch();
+         modal.showModal = false;
+      },
+      removeReferrer(u) {
+         this.$store.commit('removeReferrer', u);
+      },
       goToGenerateWorkflow({link}) {
         console.log('save before leave to generate workflow')
         const callback = (data) => {
@@ -521,6 +579,7 @@ div#workEditor {
       "objectives objectives"
       "evaluations evaluations"
       "persons persons"
+      "referrers referrers"
       "handling handling"
       "tparties tparties"
       "errors errors";
@@ -543,6 +602,8 @@ div#workEditor {
       grid-area: handling; }
    #thirdParties {
       grid-area: tparties; }
+   #referrers {
+      grid-area: referrers; }
    #errors {
       grid-area: errors; }
 
@@ -657,5 +718,17 @@ div#workEditor {
    }
 }
 
+.referrer {
+   margin-bottom: 0.4rem;
+   .referrer-close-btn {
+      margin-left: 0.4rem;
+      margin-right: 0.4rem;
+      button {
+         height: 1.45rem;
+         min-width: 1.45rem;
+         font-size: 0.4rem;
+      }
+   }
+}
 
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 7f96843e5..f53c9d246 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -31,6 +31,7 @@ const store = createStore({
       .map(p => p.person),
     handlingThirdParty: window.accompanyingCourseWork.handlingThierParty,
     thirdParties: window.accompanyingCourseWork.thirdParties,
+    referrers: window.accompanyingCourseWork.referrers,
     isPosting: false,
     errors: [],
   },
@@ -54,6 +55,9 @@ const store = createStore({
     hasHandlingThirdParty(state) {
       return state.handlingThirdParty !== null;
     },
+    hasReferrers(state) {
+      return state.referrers.length > 0;
+    },
     hasThirdParties(state) {
       return state.thirdParties.length > 0;
     },
@@ -82,6 +86,7 @@ const store = createStore({
         },
         results: state.resultsPicked.map(r => ({id: r.id, type: r.type})),
         thirdParties: state.thirdParties.map(t => ({id: t.id, type: t.type})),
+        referrers: state.referrers.map(t => ({id: t.id, type: t.type})),
         goals: state.goalsPicked.map(g => {
           let o = {
             type: g.type,
@@ -302,6 +307,18 @@ const store = createStore({
       state.thirdParties = state.thirdParties
         .filter(t => t.id !== thirdParty.id);
     },
+    addReferrers(state, referrers) {
+      let ids = state.referrers.map(t => t.id);
+      let unexistings = referrers.filter(t => !ids.includes(t.id));
+
+      for (let i in unexistings) {
+        state.referrers.push(unexistings[i]);
+      }
+    },
+    removeReferrer(state, user) {
+      state.referrers = state.referrers
+        .filter(u => u.id !== user.id);
+    },
     setErrors(state, errors) {
       state.errors = errors;
     },
@@ -315,7 +332,6 @@ const store = createStore({
   },
   actions: {
     updateThirdParty({ commit }, payload) {
-      console.log(payload);
       commit('updateThirdParty', payload);
     },
     getReachablesGoalsForAction({ getters, commit, dispatch }) {

From da650fa1f2df82f77d9f7eb04e474b53fa4e7d8a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 10:53:40 +0100
Subject: [PATCH 076/174] AccompanyingPeriodWork: add doctrine event listener
 to add logged user to referrers collection

---
 .../AccompanyingPeriodWorkEventListener.php   | 31 +++++++++++++++++++
 .../services/doctrineEventListener.yaml       | 10 ++++++
 2 files changed, 41 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php

diff --git a/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
new file mode 100644
index 000000000..ab767802f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\EventListener;
+
+use Symfony\Component\Security\Core\Security;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+
+class AccompanyingPeriodWorkEventListener
+{
+
+    private Security $security;
+
+    public function __construct(Security $security)
+    {
+        $this->security = $security;
+    }
+
+    public function prePersistAccompanyingPeriodWork(AccompanyingPeriodWork $work): void
+    {
+        $work->addReferrer($this->security->getUser());
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/config/services/doctrineEventListener.yaml b/src/Bundle/ChillPersonBundle/config/services/doctrineEventListener.yaml
index f75243d02..dbf6fc16d 100644
--- a/src/Bundle/ChillPersonBundle/config/services/doctrineEventListener.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/doctrineEventListener.yaml
@@ -12,3 +12,13 @@ services:
         event: 'prePersist'
         entity: 'Chill\PersonBundle\Entity\PersonAltName'
         method: 'prePersistAltName'
+
+  Chill\PersonBundle\EventListener\AccompanyingPeriodWorkEventListener:
+    autoconfigure: true
+    autowire: true
+    tags:
+      -
+        name: 'doctrine.orm.entity_listener'
+        event: 'prePersist'
+        entity: 'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork'
+        method: 'prePersistAccompanyingPeriodWork'
\ No newline at end of file

From 2628e58ea0476e90e3850143398fe413c15bd6a6 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 10 Mar 2022 12:28:17 +0100
Subject: [PATCH 077/174] document title added + concerned users

---
 .../Workflow/_evaluation_document.html.twig   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index 488f31661..addc619f7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -1,5 +1,10 @@
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc evaluation-item bg-chill-llight-gray">
+        <div class="item-row mb-2">
+            {% for d in evaluation.documents %}
+                <h1>{{ d.title }}</h1>
+            {% endfor %}
+        </div>
         <div class="item-row mb-2">
             <h2 class="badge-title">
                 <span class="title_label"></span>
@@ -20,6 +25,24 @@
                 </span>
             </h2>
         </div>
+        <div class="item-row mb-2">
+            <div class="item-col" style="width: 17%;">
+                <h4 class="title_label">
+                    {{ 'Participants'|trans }}
+                </h4>
+            </div>
+            <div class="item-col list">
+                {% for p in evaluation.accompanyingPeriodWork.persons %}
+                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                        targetEntity: { name: 'person', id: p.id },
+                        action: 'show',
+                        displayBadge: true,
+                        buttonText: p|chill_entity_render_string,
+                        isDead: p.deathdate is not null
+                    } %}
+                {% endfor %}
+            </div>
+        </div>
         <div class="item-row column">
             <table class="obj-res-eval my-3" style="font-size: 110% !important;">
                 <thead>

From bf2d9acc5a67991c9a0df240de68f32b900c470b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 10 Mar 2022 14:03:37 +0100
Subject: [PATCH 078/174] correction of template, display title linked to
 workflow doc

---
 .../Resources/views/Workflow/_evaluation_document.html.twig   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index addc619f7..bd37226cc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -1,9 +1,7 @@
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc evaluation-item bg-chill-llight-gray">
         <div class="item-row mb-2">
-            {% for d in evaluation.documents %}
-                <h1>{{ d.title }}</h1>
-            {% endfor %}
+                <h1>{{ doc.title }}</h1>
         </div>
         <div class="item-row mb-2">
             <h2 class="badge-title">

From f2edc1ef0cad3a2f89e206e0195f8c285063ad9f Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 14:23:00 +0100
Subject: [PATCH 079/174] set constrint ondelete for comment in
 AccompanyingPeriod

---
 .../migrations/Version20220310124318.php      | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php

diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php b/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
new file mode 100644
index 000000000..6b58b24a3
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Change constraint on pinnedComment in Accompanying period
+ */
+final class Version20220310124318 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT fk_e260a868b0804e90');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT fk_e260a868b0804e90 FOREIGN KEY (pinnedcomment_id) REFERENCES chill_person_accompanying_period_comment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Change constraint on pinnedComment in Accompanying period';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A868B0804E90');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A868B0804E90 FOREIGN KEY (pinnedComment_id) REFERENCES chill_person_accompanying_period_comment (id) ON DELETE SET NULL NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+}

From 9284a4bc29e22a8a81c340026e364e910f37b1e5 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 10 Mar 2022 14:30:19 +0100
Subject: [PATCH 080/174] ACL added and buttons to download and edit document

---
 .../views/Workflow/_evaluation_document.html.twig   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index bd37226cc..398b5221e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -1,7 +1,9 @@
+{%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
+
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc evaluation-item bg-chill-llight-gray">
         <div class="item-row mb-2">
-                <h1>{{ doc.title }}</h1>
+            <h1>{{ doc.title }}</h1>git st
         </div>
         <div class="item-row mb-2">
             <h2 class="badge-title">
@@ -113,12 +115,19 @@
 </div>
 
 {% if display_action is defined and display_action == true %}
-    {# TODO add acl #}
+    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', evaluation.accompanyingPeriodWork) %}
     <ul class="record_actions">
+        <li>{{ m.download_button(doc.storedObject, doc.title) }}</li>
+        {# {% if chill_document_is_editable(doc.storedObject) %} #}
+            <li>
+                {{ doc.storedObject|chill_document_edit_button }}
+            </li>
+        {# {% endif %} #}
         <li>
             <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
                 {{ 'Show'|trans }}
             </a>
         </li>
     </ul>
+    {% endif %}
 {% endif %}

From 0a2730540e7e01179bcaeb0f16dac2394c370581 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 10 Mar 2022 14:45:43 +0100
Subject: [PATCH 081/174] lost text removed plus condition to editing file
 uncommented

---
 .../Resources/views/Workflow/_evaluation_document.html.twig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index 398b5221e..2e05a6648 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -3,7 +3,7 @@
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc evaluation-item bg-chill-llight-gray">
         <div class="item-row mb-2">
-            <h1>{{ doc.title }}</h1>git st
+            <h1>{{ doc.title }}</h1>
         </div>
         <div class="item-row mb-2">
             <h2 class="badge-title">
@@ -118,11 +118,11 @@
     {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', evaluation.accompanyingPeriodWork) %}
     <ul class="record_actions">
         <li>{{ m.download_button(doc.storedObject, doc.title) }}</li>
-        {# {% if chill_document_is_editable(doc.storedObject) %} #}
+        {% if chill_document_is_editable(doc.storedObject) %}
             <li>
                 {{ doc.storedObject|chill_document_edit_button }}
             </li>
-        {# {% endif %} #}
+        {% endif %}
         <li>
             <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
                 {{ 'Show'|trans }}

From 137eb184d032fab85af030cd3f721c1b179b5809 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 16:18:59 +0100
Subject: [PATCH 082/174] accompanying period work: display referrers in the
 list of work

---
 .../Resources/views/AccompanyingCourseWork/_item.html.twig | 7 +++++--
 src/Bundle/ChillPersonBundle/translations/messages.fr.yml  | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index d7e4f4e96..6287b158d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -28,11 +28,14 @@
             {% if w.createdBy %}
                 <div class="wl-row">
                     <div class="wl-col title">
-                        <h3>{{ 'Referrer'|trans }}</h3>
+                        <h3>{{ 'Referrers'|trans }}</h3>
                     </div>
                     <div class="wl-col list">
                         <p class="wl-item">
-                            {{ w.createdBy|chill_entity_render_box }}
+                            {% for u in w.referrers %}
+                                {{ u|chill_entity_render_box }}
+                                {% if not loop.last %}, {% endif %}
+                            {% endfor %}
                         </p>
                     </div>
                 </div>
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index e4265fca0..be008e276 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -213,6 +213,7 @@ No requestor: Pas de demandeur
 No resources: "Pas d'interlocuteurs privilégiés"
 Persons associated: Usagers concernés
 Referrer: Référent
+Referrers: Référents
 Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur ménage dès que possible.
 Add to household now: Ajouter à un ménage
 Any resource for this accompanying course: Aucun interlocuteur privilégié pour ce parcours

From 690a443bdbb361d5a69f895edbd9c371b40aecd3 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 16:25:05 +0100
Subject: [PATCH 083/174] fix code style for AccompanyingPeriodWork - referrers

---
 .../AccompanyingPeriodWork.php                | 48 +++++++++----------
 .../AccompanyingPeriodWorkEventListener.php   |  3 +-
 .../migrations/Version20220310063629.php      | 12 ++---
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index f9f9f46e1..95ec008d9 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -237,6 +237,15 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
+    public function addReferrer(User $referrer): self
+    {
+        if (!$this->referrers->contains($referrer)) {
+            $this->referrers[] = $referrer;
+        }
+
+        return $this;
+    }
+
     public function addResult(Result $result): self
     {
         if (!$this->results->contains($result)) {
@@ -318,6 +327,14 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->persons;
     }
 
+    /**
+     * @return Collection|User[]
+     */
+    public function getReferrers(): Collection
+    {
+        return $this->referrers;
+    }
+
     /**
      * @return Collection|Result[]
      */
@@ -392,6 +409,13 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
+    public function removeReferrer(User $referrer): self
+    {
+        $this->referrers->removeElement($referrer);
+
+        return $this;
+    }
+
     public function removeResult(Result $result): self
     {
         $this->results->removeElement($result);
@@ -507,28 +531,4 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
         return $this;
     }
-
-    /**
-     * @return Collection|User[]
-     */
-    public function getReferrers(): Collection
-    {
-        return $this->referrers;
-    }
-
-    public function addReferrer(User $referrer): self
-    {
-        if (!$this->referrers->contains($referrer)) {
-            $this->referrers[] = $referrer;
-        }
-
-        return $this;
-    }
-
-    public function removeReferrer(User $referrer): self
-    {
-        $this->referrers->removeElement($referrer);
-
-        return $this;
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
index ab767802f..c9b11ea71 100644
--- a/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
+++ b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
@@ -11,12 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\EventListener;
 
-use Symfony\Component\Security\Core\Security;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Symfony\Component\Security\Core\Security;
 
 class AccompanyingPeriodWorkEventListener
 {
-
     private Security $security;
 
     public function __construct(Security $security)
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php b/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
index 0d56ff4b1..2b4c171a2 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
@@ -15,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add referrers to AccompanyingPeriodWork
+ * Add referrers to AccompanyingPeriodWork.
  */
 final class Version20220310063629 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TABLE chill_person_accompanying_period_work_referrer');
+    }
+
     public function getDescription(): string
     {
         return 'Add referrers to AccompanyingPeriodWork';
@@ -32,9 +37,4 @@ final class Version20220310063629 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EBB99F6060 FOREIGN KEY (accompanyingperiodwork_id) REFERENCES chill_person_accompanying_period_work (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EBA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP TABLE chill_person_accompanying_period_work_referrer');
-    }
 }

From ba668d3b9df92d6d0f0ab9170187aec69c94e6be Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 16:27:03 +0100
Subject: [PATCH 084/174] upd CHANGELOG

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 885068bc0..c0fc082df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] AccompanyingPeriodWork: add referrers to work, add doctrine event listener to add logged user to referrers collection and display a referrers list in work list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/502)
+
+
 * [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
 * [person] Add url in accompanying period work evaluations entity and form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/476)
 * [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)

From 16a0dc462182e2b3efec9543282a61b789b80711 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 16:46:10 +0100
Subject: [PATCH 085/174] fix role for AccPeriod Comment API

---
 .../DependencyInjection/ChillPersonExtension.php              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index c527010ca..1f85e4ad0 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\DependencyInjection\MissingBundleException;
 use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 use Chill\PersonBundle\Controller\HouseholdCompositionTypeApiController;
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodCommentVoter;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodResourceVoter;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
@@ -428,6 +429,9 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                                 Request::METHOD_HEAD => false,
                                 Request::METHOD_DELETE => false,
                             ],
+                            'roles' => [
+                                Request::METHOD_PATCH => AccompanyingPeriodCommentVoter::EDIT,
+                            ],
                         ],
                     ],
                 ],

From ded2ac7d487bac87407ec900551049dfe32e26c5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 17:01:52 +0100
Subject: [PATCH 086/174] accompanyiing period comment: fix removing of comment

---
 .../vuejs/AccompanyingCourse/components/Comment.vue | 13 +++++++------
 .../public/vuejs/AccompanyingCourse/store/index.js  |  3 +--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index ffb848bcb..5ae646570 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -29,7 +29,7 @@
                }}
             </div>
 
-            <!-- <div> //DOES NOT WORk
+            <div>
                <ul class="record_actions">
                   <li v-if="pinnedComment !== null">
                      <a class="btn btn-delete"
@@ -38,7 +38,7 @@
                      </a>
                   </li>
                </ul>
-            </div> -->
+            </div>
 
          </form>
       </div>
@@ -49,6 +49,7 @@
 <script>
 import CKEditor from '@ckeditor/ckeditor5-vue';
 import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+import { mapState } from "vuex";
 
 export default {
    name: "Comment",
@@ -65,15 +66,15 @@ export default {
       }
    },
    computed: {
-      pinnedComment() {
-         return this.$store.state.accompanyingCourse.pinnedComment;
-      },
+      ...mapState({
+         pinnedComment: state => state.accompanyingCourse.pinnedComment,
+      }),
       content: {
          set(value) {
             this.formData.content = value;
          },
          get() {
-            return (this.pinnedComment)? this.pinnedComment.content : {};
+            return this.pinnedComment ? this.pinnedComment.content : '';
          }
       },
       errors() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index bfb6412ff..4e51b608f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -342,8 +342,7 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
             /**
              * Add/remove pinnedComment
              */
-            removePinnedComment({ commit }, payload) { //DOES NOT WORK
-
+            removePinnedComment({ commit }, payload) {
                const body = {type: "accompanying_period_comment", id: payload.id};
                const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;
 

From a8b6609dbf9a0a13fa013e3679f207a7a90b45b8 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 18:12:42 +0100
Subject: [PATCH 087/174] comment in accompanying course: add loader + fix when
 resetting to empty string

---
 .../AccompanyingCourse/components/Comment.vue | 76 ++++++++++++-------
 1 file changed, 47 insertions(+), 29 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index 5ae646570..3fa555ec4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -21,12 +21,17 @@
                tag-name="textarea">
             </ckeditor>
 
-            <div v-if="pinnedComment" class="metadata">
-               {{ $t('comment.created_by', [
-                     pinnedComment.creator.text,
-                     $d(pinnedComment.updatedAt.datetime, 'long')
-                  ])
-               }}
+            <div class="sub-comment">
+               <div v-if="pinnedComment" class="metadata">
+                  {{ $t('comment.created_by', [
+                        pinnedComment.creator.text,
+                        $d(pinnedComment.updatedAt.datetime, 'long')
+                     ])
+                  }}
+               </div>
+               <div class="loading">
+                  <i v-if="loading" class="fa fa-circle-o-notch fa-spin" :title="$t('loading')"></i>
+               </div>
             </div>
 
             <div>
@@ -62,7 +67,8 @@ export default {
          formData: {
             type: "accompanying_period_comment",
             content: ''
-         }
+         },
+         loading: false
       }
    },
    computed: {
@@ -83,33 +89,37 @@ export default {
    },
    methods: {
       onContentChange() {
+         this.loading = true;
          let lastRecordedContent = this.formData.content;
          setTimeout(() => {
-            if (lastRecordedContent === this.formData.content) {
-               if (this.pinnedComment) {
-                  let body = this.formData;
-                  Object.assign(body, {id: this.pinnedComment.id});
+            if (this.formData.content !== '') {
+               if (lastRecordedContent === this.formData.content) {
+                  if (this.pinnedComment) {
+                     let body = this.formData;
+                     Object.assign(body, {id: this.pinnedComment.id});
 
-                  this.$store.dispatch('updatePinnedComment', body)
-                     .catch(({name, violations}) => {
-                        if (name === 'ValidationException' || name === 'AccessException') {
-                           violations.forEach((violation) => this.$toast.open({message: violation}));
-                        } else {
-                           this.$toast.open({message: 'An error occurred'})
-                        }
-                     });
-               } else {
-                  this.$store.dispatch('addPinnedComment', this.formData)
-                     .catch(({name, violations}) => {
-                        if (name === 'ValidationException' || name === 'AccessException') {
-                           violations.forEach((violation) => this.$toast.open({message: violation}));
-                        } else {
-                           this.$toast.open({message: 'An error occurred'})
-                        }
-                     });
+                     this.$store.dispatch('updatePinnedComment', body)
+                        .catch(({name, violations}) => {
+                           if (name === 'ValidationException' || name === 'AccessException') {
+                              violations.forEach((violation) => this.$toast.open({message: violation}));
+                           } else {
+                              this.$toast.open({message: 'An error occurred'})
+                           }
+                        });
+                  } else {
+                     this.$store.dispatch('addPinnedComment', this.formData)
+                        .catch(({name, violations}) => {
+                           if (name === 'ValidationException' || name === 'AccessException') {
+                              violations.forEach((violation) => this.$toast.open({message: violation}));
+                           } else {
+                              this.$toast.open({message: 'An error occurred'})
+                           }
+                        });
+                  }
+                  lastRecordedContent = null;
                }
-               lastRecordedContent = null;
             }
+            this.loading = false;
          }, 3000);
       },
       removeComment() {
@@ -130,4 +140,12 @@ export default {
 div.ck-editor.ck-reset {
    margin: 0.6em 0;
 }
+div.sub-comment {
+   display: flex;
+   justify-content: space-between;
+   div.loading {
+      margin-right: 6px;
+      margin-left: 6px;
+   }
+}
 </style>

From fc1fe7c2774914074ae8c830a1acb4400e7b6e98 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 18:14:57 +0100
Subject: [PATCH 088/174] php cs fix

---
 .../ChillPersonBundle/migrations/Version20220310124318.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php b/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
index 6b58b24a3..211a2e68a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
@@ -15,7 +15,7 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Change constraint on pinnedComment in Accompanying period
+ * Change constraint on pinnedComment in Accompanying period.
  */
 final class Version20220310124318 extends AbstractMigration
 {

From 99f8aeb6cd011c3c0a115e7a999ab39e93a4c249 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 10:01:20 +0100
Subject: [PATCH 089/174] AccompanyingPeriodWorkEvaluation: fix circular
 reference when serialising

---
 .../AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index 07c9f526c..de8b2a234 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -39,7 +39,6 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
      *     targetEntity=AccompanyingPeriodWork::class,
      *     inversedBy="accompanyingPeriodWorkEvaluations"
      * )
-     * @Serializer\Groups({"read:evaluation:include-work"})
      * @Serializer\Context(normalizationContext={"groups": {"read:accompanyingPeriodWork:light"}}, groups={"read:evaluation:include-work"})
      */
     private ?AccompanyingPeriodWork $accompanyingPeriodWork = null;

From ee8f331de497665f250ee6ac1cff3b2e86449038 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 10:18:14 +0100
Subject: [PATCH 090/174] Revert "AccompanyingPeriodWorkEvaluation: fix
 circular reference when serialising"

This reverts commit 99f8aeb6cd011c3c0a115e7a999ab39e93a4c249.
---
 .../AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index de8b2a234..07c9f526c 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -39,6 +39,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
      *     targetEntity=AccompanyingPeriodWork::class,
      *     inversedBy="accompanyingPeriodWorkEvaluations"
      * )
+     * @Serializer\Groups({"read:evaluation:include-work"})
      * @Serializer\Context(normalizationContext={"groups": {"read:accompanyingPeriodWork:light"}}, groups={"read:evaluation:include-work"})
      */
     private ?AccompanyingPeriodWork $accompanyingPeriodWork = null;

From 44e93dd5f8bb9c01cde749294285a81949f268a0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 10:20:42 +0100
Subject: [PATCH 091/174] AccompanyingPeriodWorkEvaluation: fix circular
 reference when serialising

---
 .../AccompanyingPeriodWorkEvaluationNormalizer.php          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
index fc9b6003a..e8febcf5d 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Serializer\Normalizer;
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
@@ -46,7 +47,10 @@ class AccompanyingPeriodWorkEvaluationNormalizer implements ContextAwareNormaliz
     {
         $initial = $this->normalizer->normalize($object, $format, array_merge(
             $context,
-            [self::IGNORE_EVALUATION => spl_object_hash($object)]
+            [self::IGNORE_EVALUATION => spl_object_hash($object)],
+            [AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => static function ($object, $format, $context) {
+                return $object->getId();
+            }]
         ));
 
         // due to bug: https://api-platform.com/docs/core/serialization/#collection-relation

From f9e8bf4f2d9ff5a5a738a3941a6a0da462f85432 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 10:22:09 +0100
Subject: [PATCH 092/174] upd CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 885068bc0..38f300662 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] AccompanyingPeriodWorkEvaluation: fix circular reference when serialising (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/495)
+
 * [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
 * [person] Add url in accompanying period work evaluations entity and form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/476)
 * [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)

From 13f0b8610c00f1c86bae54829fffafabcd092994 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 16:37:26 +0100
Subject: [PATCH 093/174] quick fix: missing translation in Task

---
 src/Bundle/ChillTaskBundle/translations/messages.fr.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillTaskBundle/translations/messages.fr.yml b/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
index 5633c0219..a2a57708f 100644
--- a/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
@@ -46,6 +46,7 @@ User: Utilisateur
 "Associated tasks": "Tâches associées"
 "My tasks": "Mes tâches"
 "Tasks for this accompanying period": "Tâches pour ce parcours d'accompagnement"
+"Tasks for {{ name }}": "Tâches pour {{ name }}"
 "No description": "Pas de description"
 "No dates specified": "Dates non spécifiées"
 "No one assignee": "Aucune personne assignée"

From dbe186547f1c61a06db779491dc40bfd2e99705f Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Sun, 13 Mar 2022 22:31:26 +0100
Subject: [PATCH 094/174] AccompanyingCourseWorkEdit: replace document by a new
 one

---
 .../components/FormEvaluation.vue             | 25 ++++++++++++++++++-
 .../vuejs/AccompanyingCourseWorkEdit/store.js | 17 +++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 24e1c202f..2e31c0669 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -84,6 +84,8 @@
                   <p v-if="d.createdBy" class="createdBy">Créé par {{ d.createdBy.text }}<br/>
                   Le {{ $d(ISOToDatetime(d.createdAt.datetime), 'long') }}</p>
                </div>
+            </div>
+            <div class="item-row">
                <div class="item-col">
                  <ul class="record_actions" >
                    <li v-if="d.workflows_availables.length > 0">
@@ -98,6 +100,14 @@
                          @go-to-generate-workflow="goToGenerateWorkflowEvaluationDocument"
                      ></list-workflow-modal>
                    </li>
+                   <li>
+                     <add-async-upload
+                        :buttonTitle="$t('replace')"
+                        :options="asyncUploadOptions"
+                        @addDocument="(arg) => replaceDocument(d, arg)"
+                     >
+                     </add-async-upload>
+                   </li>
                    <li>
                      <a :href="buildEditLink(d.storedObject)" class="btn btn-wopilink"></a>
                    </li>
@@ -176,7 +186,8 @@ const i18n = {
          document_upload: "Téléverser un document",
          document_title: "Titre du document",
          template_title: "Nom du template",
-         browse: "Ajouter un document"
+         browse: "Ajouter un document",
+         replace: "Remplacer"
       }
    }
 };
@@ -285,6 +296,18 @@ export default {
          };
          this.$store.commit('addDocument', {key: this.evaluation.key, document: document});
       },
+      replaceDocument(oldDocument, storedObject) {
+
+         console.log(oldDocument);
+         console.log(storedObject);
+         //console.log(oldDocument) how to get the old document?
+         let document = {
+            type: 'accompanying_period_work_evaluation_document',
+            storedObject: storedObject,
+            title: oldDocument.title
+         };
+         this.$store.commit('replaceDocument', {key: this.evaluation.key, document: document, oldDocument: oldDocument});
+      },
       removeDocument(document) {
          if (window.confirm("Êtes-vous sûr·e de vouloir supprimer le document qui a pour titre \"" + document.title +"\" ?")) {
            this.$store.commit('removeDocument', {key: this.evaluation.key, document: document});
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 7f96843e5..18d6847f1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -221,6 +221,20 @@ const store = createStore({
 
       evaluations.documents = evaluations.documents.filter(d => d.key !== document.key);
     },
+    replaceDocument(state, payload) {
+      console.log('payload', payload)
+      console.log(state.evaluationsPicked)
+      let evaluations = state.evaluationsPicked.find(e => e.key === payload.key);
+      console.log(evaluations)
+      if (evaluations === undefined) {
+        return;
+      }
+
+      //Add document with map
+      evaluations.documents = evaluations.documents.map(d => d.key === payload.oldDocument.key ? payload.document : d); //TODO no key on documents!
+      console.log(evaluations)
+
+    },
     addEvaluation(state, evaluation) {
       let e = {
         type: "accompanying_period_work_evaluation",
@@ -408,6 +422,9 @@ const store = createStore({
     removeDocument({commit}, payload) {
       commit('removeDocument', payload);
     },
+    replaceDocument({commit}, payload) {
+      commit('replaceDocument', payload);
+    },
     submit({ getters, state, commit }, callback) {
       let
         payload = getters.buildPayload,

From 6eac6044cd6a69147abe51149db24ef68eb912f4 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 14 Mar 2022 10:42:16 +0100
Subject: [PATCH 095/174] AccompanyingCourseWorkEdit: replace document by a new
 one (working now)

---
 .../components/FormEvaluation.vue             |  4 ---
 .../vuejs/AccompanyingCourseWorkEdit/store.js | 25 ++++++++++---------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 2e31c0669..7fe9bd278 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -297,10 +297,6 @@ export default {
          this.$store.commit('addDocument', {key: this.evaluation.key, document: document});
       },
       replaceDocument(oldDocument, storedObject) {
-
-         console.log(oldDocument);
-         console.log(storedObject);
-         //console.log(oldDocument) how to get the old document?
          let document = {
             type: 'accompanying_period_work_evaluation_document',
             storedObject: storedObject,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 18d6847f1..893d3663a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -213,27 +213,28 @@ const store = createStore({
         }));
     },
     removeDocument(state, {key, document}) {
-      let evaluations = state.evaluationsPicked.find(e => e.key === key);
+      let evaluation = state.evaluationsPicked.find(e => e.key === key);
 
-      if (evaluations === undefined) {
+      if (evaluation === undefined) {
         return;
       }
 
-      evaluations.documents = evaluations.documents.filter(d => d.key !== document.key);
+      evaluation.documents = evaluation.documents.filter(d => d.key !== document.key);
     },
     replaceDocument(state, payload) {
-      console.log('payload', payload)
-      console.log(state.evaluationsPicked)
-      let evaluations = state.evaluationsPicked.find(e => e.key === payload.key);
-      console.log(evaluations)
-      if (evaluations === undefined) {
+      let evaluation = state.evaluationsPicked.find(e => e.key === payload.key);
+      if (evaluation === undefined) {
         return;
       }
 
-      //Add document with map
-      evaluations.documents = evaluations.documents.map(d => d.key === payload.oldDocument.key ? payload.document : d); //TODO no key on documents!
-      console.log(evaluations)
-
+      let newDocument = Object.assign(
+        payload.document, {
+          key: evaluation.documents.length + 1,
+          workflows_availables: state.work.workflows_availables_evaluation_documents,
+          workflows: [],
+        }
+      );
+      evaluation.documents = evaluation.documents.map(d => d.id === payload.oldDocument.id ? newDocument : d);
     },
     addEvaluation(state, evaluation) {
       let e = {

From 9f0ab5aee74c21d9138539b7259452e0ef60f4c1 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 14 Mar 2022 10:43:28 +0100
Subject: [PATCH 096/174] upd CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 885068bc0..fa50b6389 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] AccompanyingCourseWorkEdit: replace document by a new one (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/511)
+
 * [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
 * [person] Add url in accompanying period work evaluations entity and form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/476)
 * [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)

From bd79391efcb264b8895b0f3c6201a7e7c0a3ef9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 13:04:29 +0100
Subject: [PATCH 097/174] fix autosave of comment

---
 .../Resources/public/lib/api/apiMethods.js    | 13 ++-
 .../AccompanyingCourse/components/Comment.vue | 85 ++++++++---------
 .../vuejs/AccompanyingCourse/store/index.js   | 91 ++++++++++++++++---
 3 files changed, 131 insertions(+), 58 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js
index 67f3e2f42..75f1a21c8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js
@@ -1,17 +1,22 @@
 /**
  * Generic api method that can be adapted to any fetch request
  */
-const makeFetch = (method, url, body) => {
-    return fetch(url, {
+const makeFetch = (method, url, body, options) => {
+    let opts = {
         method: method,
         headers: {
             'Content-Type': 'application/json;charset=utf-8'
         },
         body: (body !== null) ? JSON.stringify(body) : null
-    })
+    };
+
+    if (typeof options !== 'undefined') {
+        opts = Object.assign(opts, options);
+    }
+
+    return fetch(url, opts)
     .then(response => {
         if (response.ok) {
-            console.log('200 error')
             return response.json();
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index 3fa555ec4..8ae7dfff4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -17,12 +17,11 @@
                :placeholder="$t('comment.content')"
                :editor="editor"
                v-model="content"
-               @input="onContentChange"
                tag-name="textarea">
             </ckeditor>
 
             <div class="sub-comment">
-               <div v-if="pinnedComment" class="metadata">
+               <div v-if="pinnedComment !== null && typeof pinnedComment.creator !== 'undefined'" class="metadata">
                   {{ $t('comment.created_by', [
                         pinnedComment.creator.text,
                         $d(pinnedComment.updatedAt.datetime, 'long')
@@ -64,11 +63,8 @@ export default {
    data() {
       return {
          editor: ClassicEditor,
-         formData: {
-            type: "accompanying_period_comment",
-            content: ''
-         },
-         loading: false
+         loading: false,
+         lastRecordedContent: null,
       }
    },
    computed: {
@@ -77,10 +73,48 @@ export default {
       }),
       content: {
          set(value) {
-            this.formData.content = value;
+           console.log('new comment value', value);
+            console.log('previous value', this.lastRecordedContent);
+            this.lastRecordedContent = value;
+
+           setTimeout(() => {
+               console.log('performing test on ', value);
+               if (this.lastRecordedContent === value) {
+                 this.loading = true;
+                 if (value !== '') {
+                   this.$store.dispatch('updatePinnedComment', value)
+                       .then(() => {
+                         this.loading = false;
+                       })
+                       .catch(({name, violations}) => {
+                         if (name === 'ValidationException' || name === 'AccessException') {
+                           violations.forEach((violation) => this.$toast.open({message: violation}));
+                         } else {
+                           this.$toast.open({message: 'An error occurred'})
+                         }
+                       });
+                 } else {
+                   if (this.$store.state.accompanyingCourse.pinnedComment !== null) {
+                     this.$store.dispatch('removePinnedComment', {id: this.pinnedComment.id})
+                         .then(() => {
+                           this.loading = false;
+                           this.lastRecoredContent = null;
+                         })
+                         .catch(({name, violations}) => {
+                           if (name === 'ValidationException' || name === 'AccessException') {
+                             violations.forEach((violation) => this.$toast.open({message: violation}));
+                           } else {
+                             this.$toast.open({message: 'An error occurred'})
+                           }
+                         });
+                   }
+                 }
+               }
+           }, 3000);
+
          },
-         get() {
-            return this.pinnedComment ? this.pinnedComment.content : '';
+        get() {
+          return this.pinnedComment ? this.pinnedComment.content : '';
          }
       },
       errors() {
@@ -89,38 +123,7 @@ export default {
    },
    methods: {
       onContentChange() {
-         this.loading = true;
          let lastRecordedContent = this.formData.content;
-         setTimeout(() => {
-            if (this.formData.content !== '') {
-               if (lastRecordedContent === this.formData.content) {
-                  if (this.pinnedComment) {
-                     let body = this.formData;
-                     Object.assign(body, {id: this.pinnedComment.id});
-
-                     this.$store.dispatch('updatePinnedComment', body)
-                        .catch(({name, violations}) => {
-                           if (name === 'ValidationException' || name === 'AccessException') {
-                              violations.forEach((violation) => this.$toast.open({message: violation}));
-                           } else {
-                              this.$toast.open({message: 'An error occurred'})
-                           }
-                        });
-                  } else {
-                     this.$store.dispatch('addPinnedComment', this.formData)
-                        .catch(({name, violations}) => {
-                           if (name === 'ValidationException' || name === 'AccessException') {
-                              violations.forEach((violation) => this.$toast.open({message: violation}));
-                           } else {
-                              this.$toast.open({message: 'An error occurred'})
-                           }
-                        });
-                  }
-                  lastRecordedContent = null;
-               }
-            }
-            this.loading = false;
-         }, 3000);
       },
       removeComment() {
          this.$store.dispatch('removePinnedComment', {id: this.pinnedComment.id})
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 4e51b608f..06a3606ab 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -42,7 +42,11 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
             referrersSuggested: [],
             // all the users available
             users: [],
-            permissions: {}
+            permissions: {},
+            // controller for updating comment
+            updateCommentAbortController: null,
+            // waiting response for inserting first comment
+            postFirstPinnedCommentResponse: null,
          },
          getters: {
             isParticipationValid(state) {
@@ -203,12 +207,36 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                //console.log('### mutation: toggleConfidential');
                state.accompanyingCourse.confidential = value;
             },
-            addPinnedComment(state, value) {
-               state.accompanyingCourse.pinnedComment = value;
+            setPinnedComment(state, content) {
+               if (null === state.accompanyingCourse.pinnedComment) {
+                  state.accompanyingCourse.pinnedComment = {
+                     id: -1,
+                     content,
+                     type: "accompanying_period_comment",
+                  };
+               } else {
+                  state.accompanyingCourse.pinnedComment.content = content;
+               }
+            },
+            setPinnedCommentDetails(state, value) {
+               state.accompanyingCourse.pinnedComment.id = value.id;
+               if (typeof value.creator !== 'undefined') {
+                  state.accompanyingCourse.pinnedComment.creator = value.creator;
+                  state.accompanyingCourse.pinnedComment.updatedBy = value.updatedBy;
+                  state.accompanyingCourse.pinnedComment.updatedAt = value.updatedAt;
+                  state.accompanyingCourse.pinnedComment.createdAt = value.createdAt;
+
+               }
             },
             removePinnedComment(state, value) {
                state.accompanyingCourse.pinnedComment = null;
             },
+            setPinCommentAbortController(state, value) {
+               state.updateCommentAbortController = value;
+            },
+            setPostFirstPinnedCommentResponse(state, value) {
+               state.postFirstPinnedCommentResponse = value;
+            },
             updateSocialIssues(state, value) {
                console.log('updateSocialIssues', value);
                state.accompanyingCourse.socialIssues = value;
@@ -355,28 +383,68 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                      throw error;
                   })
             },
-            addPinnedComment({ commit, dispatch }, payload) {
-               const body = payload ? { type: payload.type, content: payload.content } : {};
+            /**
+             * internal method to insert a new comment
+             *
+             * @param commit
+             * @param dispatch
+             * @param content
+             * @returns {*}
+             */
+            addPinnedComment({ commit, dispatch }, content) {
                const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;
 
-               return makeFetch('POST', url, body)
+               return makeFetch('POST', url, {type: "accompanying_period_comment", content})
                   .then((response) => {
-                     dispatch('patchFirstComment', response);
+                     commit('setPinnedCommentDetails', response);
+                     return dispatch('patchFirstComment', response);
                   })
                   .catch((error) => {
                      commit('catchError', error);
                      throw error;
                   })
             },
-            updatePinnedComment({ commit }, payload) {
+            updatePinnedComment({ commit, state, dispatch }, content) {
+               commit('setPinnedComment', content);
+               if (state.accompanyingCourse.pinnedComment.id === -1 && state.postFirstPinnedCommentResponse === null) {
+                  let r = dispatch('addPinnedComment', content).then(() => {
+                     commit('setPostFirstPinnedCommentResponse', null);
+                  });
+                  commit('setPostFirstPinnedCommentResponse', r);
+               } else {
+                  (state.postFirstPinnedCommentResponse === null ? Promise.resolve() : state.postFirstPinnedCommentResponse).then(() => {
+                     dispatch('updateExistingPinnedComment', content);
+                  });
+               }
+            },
+            /**
+             * internal method to patch an existing comment
+             *
+             * @param commit
+             * @param state
+             * @param comment
+             * @returns {*}
+             */
+            updateExistingPinnedComment({ commit, state }, content) {
+               const payload = {type: "accompanying_period_comment",  content, id: state.accompanyingCourse.pinnedComment.id};
                const url = `/api/1.0/person/accompanying-period/comment/${payload.id}.json`;
 
-               return makeFetch('PATCH', url, payload)
+               if (state.updateCommentAbortController !== null) {
+                  state.updateCommentAbortController.abort();
+                  commit('setPinCommentAbortController', null);
+               }
+
+               let controller = new AbortController();
+               commit('setPinCommentAbortController', controller);
+
+               return makeFetch('PATCH', url, payload, { signal: controller.signal })
                   .then((response) => {
-                     commit('addPinnedComment', response);
+                     commit('setPinCommentAbortController', null);
+                     commit('setPinnedCommentDetails', response);
                   })
                   .catch((error) => {
                      commit('catchError', error);
+                     commit('setPinCommentAbortController', null);
                      throw error;
                   })
             },
@@ -659,9 +727,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                   }
                };
                return makeFetch('PATCH', url, body)
-                  .then((response) => {
-                     commit('addPinnedComment', response.pinnedComment);
-                  })
                   .catch((error) => {
                      commit('catchError', error);
                      throw error;

From a2f8f7ae43d111cf284c0f1d1dc4a1d865a4c9f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 13:18:41 +0100
Subject: [PATCH 098/174] add badge on third party in residential address list

---
 .../Resources/views/ResidentialAddress/list.html.twig      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
index 64e5d3813..b568703da 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
@@ -67,7 +67,12 @@
                                         <li>
                                             <i class="fa fa-li fa-home"></i>
                                             <span class="item-key">{{ "Address of"|trans}}</span>
-                                            <span class="chill-entity entity-person badge-thirdparty">{{ a.hostThirdParty|chill_entity_render_box }}</span>
+                                            {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                                action: 'show', displayBadge: true,
+                                                targetEntity: { name: 'thirdparty', id: a.hostThirdParty.id },
+                                                buttonText: a.hostThirdParty|chill_entity_render_string,
+                                                isDead: false,
+                                            } %}
                                         </li>
                                         <li>
                                             {% if a.hostThirdParty.address is not null %}

From e9cacbb74a8cc65e1f46625ff3dde7a8ccee6cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 13:26:07 +0100
Subject: [PATCH 099/174] add comment for future refactorisation

---
 src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
index 1dbc85dee..b1489bfb6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
@@ -22,6 +22,7 @@ const fetchCountries = () => {
 */
 const fetchCities = (country) => {
    //console.log('<<< fetching cities for', country);
+    // warning: do not use fetchResults (in apiMethods): we need only a **part** of the results in the db
    const url = `/api/1.0/main/postal-code.json?item_per_page=1000&country=${country.id}`;
    return fetch(url)
       .then(response => {

From 873258fc84aaf04d397e3bf05523c9aecab31ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 13:35:03 +0100
Subject: [PATCH 100/174] update button person ressource creation

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

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index 6ccf1a0eb..48773c236 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -89,8 +89,8 @@
 <ul class="record_actions sticky-form-buttons">
     <li>
         <a href="{{ chill_path_add_return_path('chill_person_resource_new', {'person_id': person.id,}) }}"
-                class="btn btn-sm btn-new"
-                title="{{ 'Create'|trans }}">{{ 'Add a person resource'|trans }}</a>
+                class="btn btn-new"
+                title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
     </li>
 </ul>
 {% endif %}

From 28509f651d1ebdb388db621207f272f979976fd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 13:39:33 +0100
Subject: [PATCH 101/174] fix button and acl in household composition list

---
 .../HouseholdComposition/index.html.twig      | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
index cce83e64c..7d3adc04a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
@@ -54,33 +54,18 @@
                             </div>
                         {% endif %}
                     </div>
-                {# {% else %}
-                    {{ form_start(form) }}
-
-                    {{ form_widget(form) }}
-
-                    <ul class="record_actions">
-                        <li class="cancel" style="margin-right: auto;">
-                            <a class="btn btn-cancel" href="{{ path('chill_person_household_composition_index', {'id': c.household.id}) }}">{{ 'Cancel'|trans }}</a>
-                        </li>
-                        <li>
-                            <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-                        </li>
-                    </ul>
-                    {{ form_end(form) }}
-                {% endif %} #}
             {% endfor %}
         </div>
     {% endif %}
 
-    {# {% if editId == -1 %} #}
+    {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
         <ul class="record_actions sticky-form-buttons">
             <li>
                 <a href="{{ chill_path_add_return_path('chill_person_household_composition_new', {'id': household.id,}) }}"
-                        class="btn btn-sm btn-new"
+                        class="btn btn-new"
                         title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
             </li>
         </ul>
-    {# {% endif %} #}
+    {% endif %}
 </div>
 {% endblock %}

From 5c68879509afa3f8ffa708ef0a38826f575c38b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 13:41:11 +0100
Subject: [PATCH 102/174] fix doctrine annotation to make it comply with cs

---
 src/Bundle/ChillPersonBundle/Entity/Person.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 7297754bd..fd07b0489 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -109,7 +109,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
      *     mappedBy="person",
      * cascade={"persist", "remove", "merge", "detach"})
-     * @ORM\OrderBy({"startDate" = "DESC"})
+     * @ORM\OrderBy({"startDate": "DESC"})
      */
     private $accompanyingPeriodParticipations;
 

From 1beae4d7135b67ebcf32b2edc41132d4b754e291 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 14 Mar 2022 14:42:04 +0100
Subject: [PATCH 103/174] AccompanyingCourseWorkEdit: download existing
 documents

---
 .../Entity/StoredObject.php                   |  4 +-
 .../public/module/async_upload/downloader.js  |  3 +-
 .../public/module/async_upload/uploader.js    |  4 +-
 .../_components/AddAsyncUploadDownloader.vue  | 45 +++++++++++++++++++
 .../components/FormEvaluation.vue             | 13 +++++-
 5 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUploadDownloader.vue

diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index c512dba73..78387e7fe 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -61,13 +61,13 @@ class StoredObject implements AsyncFileInterface, Document
     /**
      * @var int[]
      * @ORM\Column(type="json", name="iv")
-     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"read", "write"})
      */
     private array $iv = [];
 
     /**
      * @ORM\Column(type="json", name="key")
-     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"read", "write"})
      */
     private array $keyInfos = [];
 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js
index 4c82a8e4b..0e889c373 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js
@@ -73,6 +73,7 @@ var download = (button) => {
             button.type = mimeType;
             button.textContent = labelReady;
             if (hasFilename) {
+
                 button.download = filename;
                 if (extension !== false) {
                     button.download = button.download + '.' + extension;
@@ -92,4 +93,4 @@ window.addEventListener('load', function(e) {
     initializeButtons(e.target);
 });
 
-module.exports = initializeButtons;
+export { initializeButtons, download };
\ No newline at end of file
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js
index 35871245b..5def6a0b2 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js
@@ -1,6 +1,6 @@
 var algo = 'AES-CBC';
 import Dropzone from 'dropzone';
-var initializeDownload = require('./downloader.js');
+import { initializeButtons } from './downloader.js';
 
 
 /**
@@ -359,7 +359,7 @@ var insertDownloadButton = (zone, zoneData) => {
 
     addBelowButton(newButton, zone, zoneData);
     //zone.appendChild(newButton);
-    initializeDownload(zone);
+    initializeButtons(zone);
 };
 
 window.addEventListener('load', function(e) {
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUploadDownloader.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUploadDownloader.vue
new file mode 100644
index 000000000..781c47d6f
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUploadDownloader.vue
@@ -0,0 +1,45 @@
+<template>
+  <a
+    class="btn btn-download"
+    :title="$t(buttonTitle)"
+    :data-key=JSON.stringify(storedObject.keyInfos)
+    :data-iv=JSON.stringify(storedObject.iv)
+    :data-mime-type=storedObject.type
+    :data-label-preparing="$t('dataLabelPreparing')"
+    :data-label-ready="$t('dataLabelReady')"
+    :data-temp-url-get-generator="url"
+    @click.once="downloadDocument">
+  </a>
+</template>
+
+<script>
+import { download } from '../../module/async_upload/downloader';
+
+const i18n = {
+  messages: {
+    fr: {
+      dataLabelPreparing: "Chargement...",
+      dataLabelReady: "",
+    }
+  }
+};
+
+export default {
+  name: "AddAsyncUploadDownloader",
+  i18n,
+  props: [
+   'buttonTitle',
+   'storedObject'
+  ],
+  computed: {
+    url() {
+      return `/asyncupload/temp_url/generate/GET?object_name=${this.storedObject.filename}`;
+    }
+  },
+  methods: {
+    downloadDocument(e) {
+      download(e.target);
+    }
+  }
+}
+</script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 7fe9bd278..ec412842e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -108,6 +108,14 @@
                      >
                      </add-async-upload>
                    </li>
+                   <li>
+                     <add-async-upload-downloader
+                        :buttonTitle="$t('download')"
+                        :storedObject="d.storedObject"
+                     >
+                     </add-async-upload-downloader>
+
+                   </li>
                    <li>
                      <a :href="buildEditLink(d.storedObject)" class="btn btn-wopilink"></a>
                    </li>
@@ -162,6 +170,7 @@ import { mapGetters, mapState } from 'vuex';
 import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
 import {buildLink} from 'ChillDocGeneratorAssets/lib/document-generator';
 import AddAsyncUpload from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUpload.vue';
+import AddAsyncUploadDownloader from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUploadDownloader.vue';
 import ListWorkflowModal from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue';
 import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
 
@@ -187,7 +196,8 @@ const i18n = {
          document_title: "Titre du document",
          template_title: "Nom du template",
          browse: "Ajouter un document",
-         replace: "Remplacer"
+         replace: "Remplacer",
+         download: "Télécharger le fichier existant"
       }
    }
 };
@@ -199,6 +209,7 @@ export default {
       ckeditor: CKEditor.component,
       PickTemplate,
       AddAsyncUpload,
+      AddAsyncUploadDownloader,
       ListWorkflowModal,
    },
    i18n,

From 369397bf4f6649e47bed54e32d2273cff583aed0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 14 Mar 2022 14:42:53 +0100
Subject: [PATCH 104/174] upd CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa50b6389..13ae858ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] AccompanyingCourseWorkEdit: download existing documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/512)
 * [person] AccompanyingCourseWorkEdit: replace document by a new one (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/511)
 
 * [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)

From 82052f5d70b557b6c1438c1eaaa3328b6bf0dce0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 14 Mar 2022 15:13:21 +0100
Subject: [PATCH 105/174] AccompanyingCourseWorkEdit: fix setting title of
 document with a fresh upload

---
 .../components/FormEvaluation.vue                          | 6 ++++--
 .../public/vuejs/AccompanyingCourseWorkEdit/store.js       | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index ec412842e..2b380a7ec 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -65,7 +65,7 @@
        <h5>{{ $t('Documents') }} :</h5>
 
        <div class="flex-table">
-         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.key">
+         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id">
            <div class="item-row">
                <div class="input-group input-group-lg mb-3">
                   <div>
@@ -75,6 +75,7 @@
                          type="text"
                          :value="d.title"
                          :id="d.id"
+                         :data-key="i"
                          @input="onInputDocumentTitle"/>
                   </div>
                </div>
@@ -296,8 +297,9 @@ export default {
       },
       onInputDocumentTitle(event) {
          const id = Number(event.target.id);
+         const key = Number(event.target.dataset.key) + 1;
          const title = event.target.value;
-         this.$store.commit('updateDocumentTitle', {id: id, evaluationKey: this.evaluation.key, title: title});
+         this.$store.commit('updateDocumentTitle', {id: id, key: key, evaluationKey: this.evaluation.key, title: title});
       },
       addDocument(storedObject) {
          let document = {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 893d3663a..2ea9b48e0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -324,8 +324,13 @@ const store = createStore({
       state.isPosting = st;
     },
     updateDocumentTitle(state, payload) {
-      state.evaluationsPicked.find(e => e.key === payload.evaluationKey)
+      if (payload.id === 0) {
+        state.evaluationsPicked.find(e => e.key === payload.evaluationKey)
+          .documents.find(d => d.key === payload.key).title = payload.title;
+      } else {
+        state.evaluationsPicked.find(e => e.key === payload.evaluationKey)
           .documents.find(d => d.id === payload.id).title = payload.title;
+      }
     }
   },
   actions: {

From 90bebbad7de90779ae13e629dd6ba3e6c8339159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 21:27:21 +0100
Subject: [PATCH 106/174] fix normalization for docgen

---
 src/Bundle/ChillMainBundle/Entity/UserJob.php |  1 +
 .../Normalizer/PhonenumberNormalizer.php      | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/UserJob.php b/src/Bundle/ChillMainBundle/Entity/UserJob.php
index 5f0bea45d..99db5d4f1 100644
--- a/src/Bundle/ChillMainBundle/Entity/UserJob.php
+++ b/src/Bundle/ChillMainBundle/Entity/UserJob.php
@@ -40,6 +40,7 @@ class UserJob
      * @var array|string[]A
      * @ORM\Column(name="label", type="json")
      * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     protected array $label = [];
 
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index 3562c1361..677199ad4 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -16,10 +16,11 @@ use libphonenumber\PhoneNumber;
 use libphonenumber\PhoneNumberUtil;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-class PhonenumberNormalizer implements NormalizerInterface, DenormalizerInterface
+class PhonenumberNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
     private string $defaultCarrierCode;
 
@@ -53,6 +54,10 @@ class PhonenumberNormalizer implements NormalizerInterface, DenormalizerInterfac
 
     public function normalize($object, ?string $format = null, array $context = []): string
     {
+        if ($format === 'docgen' && null === $object) {
+            return '';
+        }
+
         return $this->phoneNumberUtil->formatOutOfCountryCallingNumber($object, $this->defaultCarrierCode);
     }
 
@@ -61,8 +66,18 @@ class PhonenumberNormalizer implements NormalizerInterface, DenormalizerInterfac
         return 'libphonenumber\PhoneNumber' === $type;
     }
 
-    public function supportsNormalization($data, ?string $format = null)
+    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
     {
-        return $data instanceof PhoneNumber;
+        if ($data instanceof PhoneNumber && $format === 'json') {
+            return true;
+        }
+
+        if ($format === 'docgen' && (
+            $data instanceof PhoneNumber || PhoneNumber::class === ($context['docgen:expects'] ?? null)
+            )) {
+            return true;
+        }
+
+        return false;
     }
 }

From f51279e83e1486bcbb0ba167063d59075428d63f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 21:46:01 +0100
Subject: [PATCH 107/174] fix saving maxDate when denormalizing object

---
 .../AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index 07c9f526c..ed3200370 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -124,6 +124,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?DateTimeImmutable $maxDate = null;

From d04f5a527bc56ddeeedebddec2e95eb8f6b12b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 21:46:21 +0100
Subject: [PATCH 108/174] remove link to action on homepage, in evaluation list

---
 .../Resources/public/vuejs/HomepageWidget/MyEvaluations.vue  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
index 7cd40f45a..a872a2f43 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
@@ -42,9 +42,6 @@
                   <a class="btn btn-sm btn-show" :href="getUrl(e)">
                      {{ $t('show_entity', { entity: $t('the_evaluation') }) }}
                   </a>
-                  <a class="btn btn-sm btn-update" :href="getUrl(e.accompanyingPeriodWork)">
-                     {{ $t('show_entity', { entity: $t('the_action') }) }}
-                  </a>
                   <a class="btn btn-sm btn-show" :href="getUrl(e.accompanyingPeriodWork.accompanyingPeriod)">
                      {{ $t('show_entity', { entity: $t('the_course') }) }}
                   </a>
@@ -102,4 +99,4 @@ export default {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>

From 387b7c2fbd04d26a49f4143586928accebc4094d Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 16 Mar 2022 11:36:46 +0100
Subject: [PATCH 109/174] first commit

---
 .../UserAccompanyingPeriodController.php      | 65 ++++++++++++++++++-
 .../AccompanyingPeriodRepository.php          | 10 +++
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
index 321f212d5..774b272c5 100644
--- a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
@@ -11,11 +11,17 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Controller;
 
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
+use Doctrine\ORM\EntityRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Security;
 
 class UserAccompanyingPeriodController extends AbstractController
 {
@@ -23,10 +29,13 @@ class UserAccompanyingPeriodController extends AbstractController
 
     private PaginatorFactory $paginatorFactory;
 
-    public function __construct(AccompanyingPeriodRepository $accompanyingPeriodRepository, PaginatorFactory $paginatorFactory)
+    private Security $security;
+
+    public function __construct(AccompanyingPeriodRepository $accompanyingPeriodRepository, PaginatorFactory $paginatorFactory, Security $security)
     {
         $this->accompanyingPeriodRepository = $accompanyingPeriodRepository;
         $this->paginatorFactory = $paginatorFactory;
+        $this->security = $security;
     }
 
     /**
@@ -68,4 +77,58 @@ class UserAccompanyingPeriodController extends AbstractController
             'pagination' => $pagination,
         ]);
     }
+
+    /**
+     * @Route("/{_locale}/person/accompanying-periods/my/drafts", name="chill_person_accompanying_period_draft_user")
+     */
+    public function listConfirmedAction(Request $request)
+    {
+        if (!$this->security->isGranted('ROLE_USER') || !$this->security->getUser() instanceof User) {
+            throw new AccessDeniedException();
+        }
+
+        $form = $this->buildUserSelectionForm();
+
+        $form->handleRequest($request);
+        if ($form->isSubmitted() && $form->isValid()) {
+            $user = $_POST['user'];
+
+            $periods = $this->getDoctrine()->getRepository(AccompanyingPeriod::class)->findConfirmedByUser($user);
+
+            return $this->render('@ChillPerson/AccompanyingPeriod/user_reassign_periods_list.html.twig', [
+                'accompanyingPeriods' => $periods,
+            ]);
+        }
+
+        return $this->render('@ChillPerson/AccompanyingPeriod/user_reassign_periods_list.html.twig', [
+            'form' => $form
+        ]);
+    }
+
+    private function buildUserSelectionForm(): FormInterface
+    {
+        $data = [
+            'users' => [],
+        ];
+
+        $builder = $this->formFactory->createBuilder(FormType::class, $data, [
+            'method' => 'get', 'csrf_protection' => false]);
+
+        $builder
+            ->add('users', EntityType::class, [
+                'class' => User::class,
+                'query_builder' => function (EntityRepository $er) {
+                    $qb = $er->createQueryBuilder('u');
+                    return $qb;
+                },
+                'choice_label' => function(User $u) {
+                    return $u->getUsername();
+                },
+                'multiple' => false,
+                'label' => 'User',
+                'required' => false,
+            ]);
+
+        return $builder->getForm();
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
index 122b658bd..ab7006fd8 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
@@ -78,6 +78,16 @@ final class AccompanyingPeriodRepository implements ObjectRepository
             ->getResult();
     }
 
+    public function findConfirmedByUser(User $user)
+    {
+        $qb = $this->createQueryBuilder('ap');
+        $qb->where($qb->expr()->eq('ap.user', ':user'))
+            ->andWhere('ap.step', 'CONFIRMED')
+            ->setParameter('user', $user);
+
+        return $qb;
+    }
+
     public function findOneBy(array $criteria): ?AccompanyingPeriod
     {
         return $this->findOneBy($criteria);

From 1e63d0076742fed283dc9475ad4bddf7b8588370 Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc.ducobu@champs-libres.coop>
Date: Wed, 16 Mar 2022 16:26:18 +0100
Subject: [PATCH 110/174] Fix pbm importing CP from France on 4 digits

---
 .../ChillMainBundle/Command/LoadPostalCodesCommand.php     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index a3b1c1a26..5d577a0b4 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -118,6 +118,13 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
+        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+            // CP in FRANCE are on 5 digit
+            // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
+            // add a zero if CP from FR and on 4 digit
+            $row[0] = '0'.$row[0];
+        }
+
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
             $output->writeln('handling row: ' . $row[0] . ' | ' . $row[1] . ' | ' . $row[2]);
         }

From 97731b0a9b6a1b926fdbb963e4bea993eb5d7bf8 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 17 Mar 2022 12:28:00 +0100
Subject: [PATCH 111/174] controller + template made to list confirmed parcours
 for a specific user

---
 .../Repository/UserRepository.php             |   5 +
 .../ReassignAccompanyingPeriodController.php  | 108 ++++++++++++++++++
 .../UserAccompanyingPeriodController.php      |  65 +----------
 .../AccompanyingPeriodACLAwareRepository.php  |  23 ++++
 .../reassign_list.html.twig                   |  80 +++++++++++++
 .../config/services/controller.yaml           |   5 +
 6 files changed, 222 insertions(+), 64 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig

diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepository.php b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
index fc3a6e187..56a82de3d 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
@@ -32,6 +32,11 @@ final class UserRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(User::class);
     }
 
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
     public function countBy(array $criteria): int
     {
         return $this->repository->count($criteria);
diff --git a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
new file mode 100644
index 000000000..66a460199
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Repository\UserRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Templating\EngineInterface;
+
+class ReassignAccompanyingPeriodController extends AbstractController
+{
+    private AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository;
+
+    private EngineInterface $engine;
+
+    private FormFactoryInterface $formFactory;
+
+    private PaginatorFactory $paginatorFactory;
+
+    private Security $security;
+
+    private UserRepository $userRepository;
+
+    public function __construct(AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository, UserRepository $userRepository, EngineInterface $engine, FormFactoryInterface $formFactory, PaginatorFactory $paginatorFactory, Security $security)
+    {
+        $this->accompanyingPeriodACLAwareRepository = $accompanyingPeriodACLAwareRepository;
+        $this->engine = $engine;
+        $this->formFactory = $formFactory;
+        $this->paginatorFactory = $paginatorFactory;
+        $this->security = $security;
+        $this->userRepository = $userRepository;
+    }
+
+    /**
+     * @Route("/{_locale}/person/accompanying-periods/reassign", name="chill_course_list_reassign")
+     */
+    public function listAction(Request $request): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER') || !$this->security->getUser() instanceof User) {
+            throw new AccessDeniedException();
+        }
+
+        $form = $this->buildFilterForm();
+
+        $form->handleRequest($request);
+
+        // $total = $this->accompanyingPeriodACLAwareRepository->countByUserConfirmed(
+        //     $form['jobs']->getData(),
+        //     $form['services']->getData(),
+        //     $form['locations']->getData(),
+        // );
+        // $paginator = $this->paginatorFactory->create($total);
+        $periods = $this->accompanyingPeriodACLAwareRepository
+            ->findByUserConfirmed(
+                $form['user']->getData(),
+                1,
+                1
+            );
+
+        return new Response(
+            $this->engine->render('@ChillPerson/AccompanyingPeriod/reassign_list.html.twig', [
+                // 'paginator' => $paginator,
+                'periods' => $periods,
+                'form' => $form->createView()
+            ])
+        );
+    }
+
+    private function buildFilterForm(): FormInterface
+    {
+        $builder = $this->formFactory->createBuilder(FormType::class, [
+            'method' => 'get', 'csrf_protection' => false]);
+
+        $builder
+            ->add('user', EntityType::class, [
+                'class' => User::class,
+                'query_builder' => function () {
+                    $qb = $this->userRepository->createQueryBuilder('u');
+
+                    $qb->where('u.enabled = true')
+                        ->orderBy('u.username', 'ASC');
+
+                    return $qb;
+                },
+                'choice_label' => function (User $u) {
+                    return $u->getUsername();
+                },
+                'multiple' => false,
+                'label' => 'User',
+                'required' => false,
+            ]);
+
+        return $builder->getForm();
+    }
+
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
index 774b272c5..321f212d5 100644
--- a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
@@ -11,17 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Controller;
 
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
-use Doctrine\ORM\EntityRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\Security\Core\Security;
 
 class UserAccompanyingPeriodController extends AbstractController
 {
@@ -29,13 +23,10 @@ class UserAccompanyingPeriodController extends AbstractController
 
     private PaginatorFactory $paginatorFactory;
 
-    private Security $security;
-
-    public function __construct(AccompanyingPeriodRepository $accompanyingPeriodRepository, PaginatorFactory $paginatorFactory, Security $security)
+    public function __construct(AccompanyingPeriodRepository $accompanyingPeriodRepository, PaginatorFactory $paginatorFactory)
     {
         $this->accompanyingPeriodRepository = $accompanyingPeriodRepository;
         $this->paginatorFactory = $paginatorFactory;
-        $this->security = $security;
     }
 
     /**
@@ -77,58 +68,4 @@ class UserAccompanyingPeriodController extends AbstractController
             'pagination' => $pagination,
         ]);
     }
-
-    /**
-     * @Route("/{_locale}/person/accompanying-periods/my/drafts", name="chill_person_accompanying_period_draft_user")
-     */
-    public function listConfirmedAction(Request $request)
-    {
-        if (!$this->security->isGranted('ROLE_USER') || !$this->security->getUser() instanceof User) {
-            throw new AccessDeniedException();
-        }
-
-        $form = $this->buildUserSelectionForm();
-
-        $form->handleRequest($request);
-        if ($form->isSubmitted() && $form->isValid()) {
-            $user = $_POST['user'];
-
-            $periods = $this->getDoctrine()->getRepository(AccompanyingPeriod::class)->findConfirmedByUser($user);
-
-            return $this->render('@ChillPerson/AccompanyingPeriod/user_reassign_periods_list.html.twig', [
-                'accompanyingPeriods' => $periods,
-            ]);
-        }
-
-        return $this->render('@ChillPerson/AccompanyingPeriod/user_reassign_periods_list.html.twig', [
-            'form' => $form
-        ]);
-    }
-
-    private function buildUserSelectionForm(): FormInterface
-    {
-        $data = [
-            'users' => [],
-        ];
-
-        $builder = $this->formFactory->createBuilder(FormType::class, $data, [
-            'method' => 'get', 'csrf_protection' => false]);
-
-        $builder
-            ->add('users', EntityType::class, [
-                'class' => User::class,
-                'query_builder' => function (EntityRepository $er) {
-                    $qb = $er->createQueryBuilder('u');
-                    return $qb;
-                },
-                'choice_label' => function(User $u) {
-                    return $u->getUsername();
-                },
-                'multiple' => false,
-                'label' => 'User',
-                'required' => false,
-            ]);
-
-        return $builder->getForm();
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
index 6e6c3ca44..735227ced 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Repository;
 
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -92,4 +93,26 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
 
         return $qb->getQuery()->getResult();
     }
+
+    /**
+     * @return array|AccompanyingPeriod[]
+     */
+    public function findByUserConfirmed(?User $user, int $limit, int $offset): array
+    {
+        if (null === $user) {
+            return [];
+        }
+
+        $qb = $this->accompanyingPeriodRepository->createQueryBuilder('ap');
+
+        $qb->where($qb->expr()->eq('ap.user', ':user'))
+            ->andWhere(
+                $qb->expr()->eq('ap.step', ':confirmed')
+            )
+            ->setParameter('user', $user)
+            ->setParameter('confirmed', AccompanyingPeriod::STEP_CONFIRMED);
+
+        return $qb->getQuery()->getResult();
+
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
new file mode 100644
index 000000000..673b8a36d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
@@ -0,0 +1,80 @@
+{% extends 'ChillMainBundle::layout.html.twig' %}
+
+{% block title "Liste de parcours à réassigner" %}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_set_referrer') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_set_referrer') }}
+{% endblock %}
+
+{# {% macro period_meta(period) %}
+    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE', period) %}
+        <div class="item-col item-meta">
+            {% set job_id = null %}
+            {% if period.job is defined %}
+                {% set job_id = period.job.id %}
+            {% endif %}
+            <span
+                data-set-referrer-app="data-set-referrer-app"
+                data-set-referrer-accompanying-period-id="{{ period.id }}"
+                data-set-referrer-job-id="{{ job_id }}"
+            ></span>
+        </div>
+    {% endif %}
+{% endmacro %} #}
+
+{% macro period_actions(period) %}
+    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', period) %}
+    <li>
+        <a href="{{ chill_path_add_return_path('chill_person_accompanying_course_index', {'accompanying_period_id': period.id}) }}" class="btn btn-show"></a>
+    </li>
+    {% endif %}
+{% endmacro %}
+
+{% import _self as m %}
+
+{% block content %}
+    <div class="col-10">
+        <h1>{{ block('title') }}</h1>
+
+        {{ form_start(form) }}
+        <div class="row filter-box" style="padding: 2rem 2rem 2rem 0;">
+            <div class="col-md-6" style="display: flex; justify-content: space-between;">
+                {{ form_label(form.user ) }}
+                {{ form_widget(form.user, {'attr': {'class': 'select2'}}) }}
+            </div>
+        </div>
+
+        <ul class="record_actions">
+            <li>
+                <button type="submit" class="btn btn-save change-icon">
+                    <i class="fa fa-filter"></i> Filtrer
+                </button>
+            </li>
+        </ul>
+
+        {{ form_end(form) }}
+
+        {% if form.user.vars.value is empty %}
+            <p class="chill-no-data-statement">Choisissez un référent pour afficher ses parcours.</p>
+        {% elseif periods|length == 0 and form.user.vars.value is not empty %}
+            <p class="chill-no-data-statement">Aucun parcour à réassigner pour cet utilisateur.</p>
+        {% else %}
+            <p><span class="badge rounded-pill bg-primary">Amount of</span> parcours à réassigner (calculé ce jour à {{ null|format_time('medium') }})</p>
+
+            <div class="flex-table">
+                {% for period in periods %}
+                    {% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {'period': period,
+                        'recordAction': m.period_actions(period) } %}
+                {% endfor %}
+            </div>
+        {% endif %}
+
+        {# {{ chill_pagination(paginator) }} #}
+
+    </div>
+{% endblock %}
+
diff --git a/src/Bundle/ChillPersonBundle/config/services/controller.yaml b/src/Bundle/ChillPersonBundle/config/services/controller.yaml
index 22d58ccbe..67c724093 100644
--- a/src/Bundle/ChillPersonBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/controller.yaml
@@ -41,6 +41,11 @@ services:
         autowire: true
         tags: ['controller.service_arguments']
 
+    Chill\PersonBundle\Controller\ReassignAccompanyingPeriodController:
+        autoconfigure: true
+        autowire: true
+        tags: ['controller.service_arguments']
+
     Chill\PersonBundle\Controller\PersonApiController:
         arguments:
             $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'

From 6adb647ccc1cd9d760e7b714d3642e6eb313ed2d Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 17 Mar 2022 12:31:44 +0100
Subject: [PATCH 112/174] changelog updated

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96685b5f0..e0f20e6b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@ and this project adheres to
 * [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
 * [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
 * [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
+* [parcours] List of parcours for a specific user so they can be reassigned in case of absence (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/509)
 
 ## Test releases
 

From 72ba2c6bca7ade11464bb4f03abca9429efc0e16 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 17 Mar 2022 14:13:21 +0100
Subject: [PATCH 113/174] paginator added + phpcsfixes

---
 .../Repository/UserRepository.php             | 10 ++---
 .../ReassignAccompanyingPeriodController.php  | 35 ++++++++++--------
 .../AccompanyingPeriodACLAwareRepository.php  | 37 ++++++++++++++-----
 .../reassign_list.html.twig                   | 15 ++++----
 4 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepository.php b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
index 56a82de3d..0616878ff 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
@@ -32,11 +32,6 @@ final class UserRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(User::class);
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
-    {
-        return $this->repository->createQueryBuilder($alias, $indexBy);
-    }
-
     public function countBy(array $criteria): int
     {
         return $this->repository->count($criteria);
@@ -56,6 +51,11 @@ final class UserRepository implements ObjectRepository
         return (int) $qb->getQuery()->getSingleScalarResult();
     }
 
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
     public function find($id, $lockMode = null, $lockVersion = null): ?User
     {
         return $this->repository->find($id, $lockMode, $lockVersion);
diff --git a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
index 66a460199..04e38da13 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
@@ -1,11 +1,19 @@
 <?php
 
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\UserRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -56,24 +64,22 @@ class ReassignAccompanyingPeriodController extends AbstractController
 
         $form->handleRequest($request);
 
-        // $total = $this->accompanyingPeriodACLAwareRepository->countByUserConfirmed(
-        //     $form['jobs']->getData(),
-        //     $form['services']->getData(),
-        //     $form['locations']->getData(),
-        // );
-        // $paginator = $this->paginatorFactory->create($total);
+        $total = $this->accompanyingPeriodACLAwareRepository->countByUserConfirmed(
+            $form['user']->getData()
+        );
+        $paginator = $this->paginatorFactory->create($total);
         $periods = $this->accompanyingPeriodACLAwareRepository
             ->findByUserConfirmed(
                 $form['user']->getData(),
-                1,
-                1
+                $paginator->getItemsPerPage(),
+                $paginator->getCurrentPageFirstItemNumber()
             );
 
         return new Response(
             $this->engine->render('@ChillPerson/AccompanyingPeriod/reassign_list.html.twig', [
-                // 'paginator' => $paginator,
+                'paginator' => $paginator,
                 'periods' => $periods,
-                'form' => $form->createView()
+                'form' => $form->createView(),
             ])
         );
     }
@@ -81,7 +87,7 @@ class ReassignAccompanyingPeriodController extends AbstractController
     private function buildFilterForm(): FormInterface
     {
         $builder = $this->formFactory->createBuilder(FormType::class, [
-            'method' => 'get', 'csrf_protection' => false]);
+            'method' => 'get', 'csrf_protection' => false, ]);
 
         $builder
             ->add('user', EntityType::class, [
@@ -94,7 +100,7 @@ class ReassignAccompanyingPeriodController extends AbstractController
 
                     return $qb;
                 },
-                'choice_label' => function (User $u) {
+                'choice_label' => static function (User $u) {
                     return $u->getUsername();
                 },
                 'multiple' => false,
@@ -104,5 +110,4 @@ class ReassignAccompanyingPeriodController extends AbstractController
 
         return $builder->getForm();
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
index 735227ced..47e1ee441 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
@@ -42,6 +42,33 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
         $this->centerResolverDispatcher = $centerResolverDispatcher;
     }
 
+    public function buildQueryByUser(?User $user)
+    {
+        $qb = $this->accompanyingPeriodRepository->createQueryBuilder('ap');
+
+        $qb->where($qb->expr()->eq('ap.user', ':user'))
+            ->andWhere(
+                $qb->expr()->eq('ap.step', ':confirmed'),
+                $qb->expr()->eq('ap.confidential', 'false')
+            )
+            ->setParameter('user', $user)
+            ->setParameter('confirmed', AccompanyingPeriod::STEP_CONFIRMED);
+
+        return $qb;
+    }
+
+    public function countByUserConfirmed(?User $user)
+    {
+        if (null === $user) {
+            return 0;
+        }
+
+        return $this->buildQueryByUser($user)
+            ->select('COUNT(ap)')
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
     public function findByPerson(
         Person $person,
         string $role,
@@ -103,16 +130,8 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
             return [];
         }
 
-        $qb = $this->accompanyingPeriodRepository->createQueryBuilder('ap');
-
-        $qb->where($qb->expr()->eq('ap.user', ':user'))
-            ->andWhere(
-                $qb->expr()->eq('ap.step', ':confirmed')
-            )
-            ->setParameter('user', $user)
-            ->setParameter('confirmed', AccompanyingPeriod::STEP_CONFIRMED);
+        $qb = $this->buildQueryByUser($user);
 
         return $qb->getQuery()->getResult();
-
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
index 673b8a36d..d7e11f6ee 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
@@ -1,6 +1,6 @@
 {% extends 'ChillMainBundle::layout.html.twig' %}
 
-{% block title "Liste de parcours à réassigner" %}
+{% block title "Liste de parcours à réassigner pour un utilisateur" %}
 
 {% block js %}
     {{ encore_entry_script_tags('mod_set_referrer') }}
@@ -10,7 +10,7 @@
     {{ encore_entry_link_tags('mod_set_referrer') }}
 {% endblock %}
 
-{# {% macro period_meta(period) %}
+{% macro period_meta(period) %}
     {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE', period) %}
         <div class="item-col item-meta">
             {% set job_id = null %}
@@ -24,7 +24,8 @@
             ></span>
         </div>
     {% endif %}
-{% endmacro %} #}
+{% endmacro %}
+
 
 {% macro period_actions(period) %}
     {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', period) %}
@@ -61,19 +62,19 @@
         {% if form.user.vars.value is empty %}
             <p class="chill-no-data-statement">Choisissez un référent pour afficher ses parcours.</p>
         {% elseif periods|length == 0 and form.user.vars.value is not empty %}
-            <p class="chill-no-data-statement">Aucun parcour à réassigner pour cet utilisateur.</p>
+            <p class="chill-no-data-statement">Aucun parcours actifs pour ce référent.</p>
         {% else %}
-            <p><span class="badge rounded-pill bg-primary">Amount of</span> parcours à réassigner (calculé ce jour à {{ null|format_time('medium') }})</p>
+            <p><span class="badge rounded-pill bg-primary">{{ paginator.totalItems }}</span> parcours à réassigner (calculé ce jour à {{ null|format_time('medium') }})</p>
 
             <div class="flex-table">
                 {% for period in periods %}
                     {% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {'period': period,
-                        'recordAction': m.period_actions(period) } %}
+                        'recordAction': m.period_actions(period), 'itemMeta': m.period_meta(period) } %}
                 {% endfor %}
             </div>
         {% endif %}
 
-        {# {{ chill_pagination(paginator) }} #}
+        {{ chill_pagination(paginator) }}
 
     </div>
 {% endblock %}

From 5e0a69310887183d1c434ddbe0a73790c7c2ddf0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 17 Mar 2022 17:51:25 +0100
Subject: [PATCH 114/174] commentembeddable: add a condition for the early
 return in normalisation

---
 .../Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
index bd812e036..f5b10b9d8 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
@@ -39,7 +39,7 @@ class CommentEmbeddableDocGenNormalizer implements ContextAwareNormalizerInterfa
      */
     public function normalize($object, ?string $format = null, array $context = []): array
     {
-        if (null === $object) {
+        if (null === $object or (null === $object->getComment() and null === $object->getUserId() and null === $object->getDate())) {
             return [
                 'comment' => '',
                 'isNull' => true,

From 2c02150b1a7e0d7f4c74e264bd0d445cad48f779 Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc.ducobu@champs-libres.coop>
Date: Thu, 17 Mar 2022 18:29:16 +0100
Subject: [PATCH 115/174] Use CS Fixer

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

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index 5d577a0b4..b02d9c44a 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -118,7 +118,7 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
-        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+        if ($row[2] == 'FR' && strlen($row[0]) == 4) {
             // CP in FRANCE are on 5 digit
             // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
             // add a zero if CP from FR and on 4 digit

From 288f0dbf691e644e84e592dba8baecd08429428e Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc.ducobu@champs-libres.coop>
Date: Wed, 16 Mar 2022 16:26:18 +0100
Subject: [PATCH 116/174] Fix pbm importing CP from France on 4 digits

---
 .../ChillMainBundle/Command/LoadPostalCodesCommand.php     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index a3b1c1a26..5d577a0b4 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -118,6 +118,13 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
+        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+            // CP in FRANCE are on 5 digit
+            // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
+            // add a zero if CP from FR and on 4 digit
+            $row[0] = '0'.$row[0];
+        }
+
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
             $output->writeln('handling row: ' . $row[0] . ' | ' . $row[1] . ' | ' . $row[2]);
         }

From e7299bac4a58edae4e48e7af39b47d7e69304ce6 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 17 Mar 2022 19:07:11 +0100
Subject: [PATCH 117/174] person: add person ressource to person docgen
 normaliser

---
 .../Entity/Person/PersonResource.php          | 21 +++++++++++++++++++
 .../Normalizer/PersonDocGenNormalizer.php     |  8 ++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index 3cd82680e..0eeb6a293 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -117,6 +117,27 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
         return $this->person;
     }
 
+    /**
+     * @Groups({"read"})
+     */
+    public function getResourceKind(): string
+    {
+        if ($this->getPerson() instanceof Person) {
+            return 'person';
+        }
+
+        if ($this->getThirdParty() instanceof ThirdParty) {
+            return 'thirdparty';
+        }
+
+        if (null !== $this->getFreeText()) {
+            return 'freetext';
+        }
+
+        return 'none';
+    }
+
+
     public function getPersonOwner(): ?Person
     {
         return $this->personOwner;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
index c6d132992..c463bfd23 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonAltName;
+use Chill\PersonBundle\Repository\PersonResourceRepository;
 use Chill\PersonBundle\Repository\Relationships\RelationshipRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use DateTimeInterface;
@@ -41,6 +42,8 @@ class PersonDocGenNormalizer implements
 
     private RelationshipRepository $relationshipRepository;
 
+    private PersonResourceRepository $personResourceRepository;
+
     private TranslatableStringHelper $translatableStringHelper;
 
     private TranslatorInterface $translator;
@@ -48,11 +51,13 @@ class PersonDocGenNormalizer implements
     public function __construct(
         PersonRenderInterface $personRender,
         RelationshipRepository $relationshipRepository,
+        PersonResourceRepository $personResourceRepository,
         TranslatorInterface $translator,
         TranslatableStringHelper $translatableStringHelper
     ) {
         $this->personRender = $personRender;
         $this->relationshipRepository = $relationshipRepository;
+        $this->personResourceRepository = $personResourceRepository;
         $this->translator = $translator;
         $this->translatableStringHelper = $translatableStringHelper;
     }
@@ -104,8 +109,9 @@ class PersonDocGenNormalizer implements
             'memo' => $person->getMemo(),
             'numberOfChildren' => (string) $person->getNumberOfChildren(),
             'address' => $this->normalizer->normalize($person->getCurrentPersonAddress(), $format, $addressContext),
+            'resources' => $this->personResourceRepository->findBy(['personOwner' => $person]),
         ];
-
+        dump($data);
         if ($context['docgen:person:with-household'] ?? false) {
             $data['household'] = $this->normalizer->normalize(
                 $person->getCurrentHousehold(),

From 3b8c329ff6cc5f80fb86c1282d5bb0bd31a67315 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 17 Mar 2022 19:08:13 +0100
Subject: [PATCH 118/174] upd CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff62b029c..b84ec4e80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] add person ressource to person docgen normaliser (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/517)
 * [person] AccompanyingPeriodWorkEvaluation: fix circular reference when serialising (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/495)
 * [person] order accompanying period by opening date in search persons, person and household period lists (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/493)
 * [parcours] autosave of the pinned comment for draft accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/477)

From b84e161399425b803861c72c0672a9faaec2d2a9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 18 Mar 2022 12:35:14 +0100
Subject: [PATCH 119/174] quick fix css class in acc period evaluation form,
 issue client 557

---
 .../AccompanyingCourseWorkEdit/components/FormEvaluation.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 24e1c202f..8e47560bb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -70,7 +70,7 @@
                <div class="input-group input-group-lg mb-3">
                   <div>
                      <input
-                         class="form-control form-control-lg"
+                         class="form-control"
                          style="font-weight: bold;"
                          type="text"
                          :value="d.title"

From bfd51c6615d0782d268d1d63757821735831d1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Mar 2022 13:55:23 +0100
Subject: [PATCH 120/174] allow downloads in LO editor

---
 .../ChillWopiBundle/src/Resources/public/page/editor/index.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js b/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
index 613a51d63..99b4ae707 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
+++ b/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
@@ -14,7 +14,7 @@ window.addEventListener('DOMContentLoaded', function(e) {
     office_frame.setAttribute('allowfullscreen', 'true');
 
     // The sandbox attribute is needed to allow automatic redirection to the O365 sign-in page in the business user flow
-    office_frame.setAttribute('sandbox', 'allow-scripts allow-same-origin allow-forms allow-popups allow-top-navigation allow-popups-to-escape-sandbox');
+    office_frame.setAttribute('sandbox', 'allow-downloads allow-scripts allow-same-origin allow-forms allow-popups allow-top-navigation allow-popups-to-escape-sandbox');
     frameholder.appendChild(office_frame);
 
     document.getElementById('office_form').submit();

From 73dd97f7d3ddc33ad31e1b37655b335ef32b123e Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 18 Mar 2022 13:58:20 +0100
Subject: [PATCH 121/174] upd CHANGELOG

---
 CHANGELOG.md                                               | 1 +
 .../ChillActivityBundle/Controller/ActivityController.php  | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff62b029c..17471fcdd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [activity] Add return path the document generation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/553)
 * [person] AccompanyingPeriodWorkEvaluation: fix circular reference when serialising (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/495)
 * [person] order accompanying period by opening date in search persons, person and household period lists (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/493)
 * [parcours] autosave of the pinned comment for draft accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/477)
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 3858979ef..6bf4f1d0d 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -220,6 +220,9 @@ final class ActivityController extends AbstractController
             $this->entityManager->persist($entity);
             $this->entityManager->flush();
 
+            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+            $params['id'] = $entity->getId();
+
             if ($form->has('gendocTemplateId') && null !== $form['gendocTemplateId']->getData()) {
                 return $this->redirectToRoute(
                     'chill_docgenerator_generate_from_template',
@@ -227,15 +230,13 @@ final class ActivityController extends AbstractController
                         'template' => $form->get('gendocTemplateId')->getData(),
                         'entityClassName' => Activity::class,
                         'entityId' => $entity->getId(),
+                        'returnPath' => $this->generateUrl('chill_activity_activity_edit', $params)
                     ]
                 );
             }
 
             $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
 
-            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-            $params['id'] = $entity->getId();
-
             return $this->redirectToRoute('chill_activity_activity_show', $params);
         }
 

From fdb36ab047f9ef009072baaa584df15537361793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Mar 2022 14:18:47 +0100
Subject: [PATCH 122/174] add document title to workflow EvaluationDocument
 handler

---
 ...ccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index 1e02d0465..d7a196a6c 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -61,8 +61,8 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
         return $this->translator->trans(
             'workflow.Doc for evaluation (n°%eval%)',
             ['%eval%' => $entityWorkflow->getRelatedEntityId()]
-        ) . ' - ' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
-            ->getEvaluation()->getTitle());
+        ) . ' (' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
+            ->getEvaluation()->getTitle()).') '.$doc->getTitle();
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluationDocument

From da67fa4c4fa25d4848b1c316ceb7a5060eea157a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Mar 2022 14:33:05 +0100
Subject: [PATCH 123/174] fix role for creating activity in person

---
 .../Resources/views/Activity/listPerson.html.twig               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
index ac4266f8c..8b30bc6c7 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -46,7 +46,7 @@
 
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
 
-    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
+    {% if is_granted('CHILL_ACTIVITY_CREATE_PERSON', person) %}
     <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"

From 215b85972570dd89311e372654556d6796f82fae Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 18 Mar 2022 15:25:45 +0100
Subject: [PATCH 124/174] activity: hide delete button from asyncupload and add
 delete buttons from chill collection

---
 src/Bundle/ChillActivityBundle/Form/ActivityType.php         | 1 +
 .../Resources/public/page/edit_activity/index.scss           | 5 +++++
 .../views/Activity/editAccompanyingCourse.html.twig          | 1 +
 src/Bundle/ChillActivityBundle/chill.webpack.config.js       | 2 ++
 4 files changed, 9 insertions(+)
 create mode 100644 src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss

diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 6f935ad99..891eb8577 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -305,6 +305,7 @@ class ActivityType extends AbstractType
                 'label' => $activityType->getLabel('documents'),
                 'required' => $activityType->isRequired('documents'),
                 'allow_add' => true,
+                'allow_delete' => true,
                 'button_add_label' => 'activity.Insert a document',
                 'button_remove_label' => 'activity.Remove a document',
                 'empty_collection_explain' => 'No documents',
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss b/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss
new file mode 100644
index 000000000..fc384742a
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss
@@ -0,0 +1,5 @@
+div.chill-dropzone__below-zone {
+    a.btn-delete {
+        display: none;
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
index b278c0300..d0359e223 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
@@ -30,4 +30,5 @@
     {{ parent() }}
     {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
+    {{ encore_entry_link_tags('page_edit_activity') }}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/chill.webpack.config.js b/src/Bundle/ChillActivityBundle/chill.webpack.config.js
index f312e8a19..eec983920 100644
--- a/src/Bundle/ChillActivityBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillActivityBundle/chill.webpack.config.js
@@ -7,5 +7,7 @@ module.exports = function(encore, entries)
         ChillActivityAssets: __dirname + '/Resources/public'
     });
 
+    encore.addEntry('page_edit_activity', __dirname + '/Resources/public/page/edit_activity/index.scss');
+
     encore.addEntry('vue_activity', __dirname + '/Resources/public/vuejs/Activity/index.js');
 };

From 8d92cc0ba7a2367b47d209798720822281a85ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Mar 2022 15:40:01 +0100
Subject: [PATCH 125/174] remove history from menus, temporarily

---
 .../Menu/AccompanyingCourseMenuBuilder.php         | 14 ++++++++------
 src/Bundle/ChillPersonBundle/config/routes.yaml    |  5 -----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index 827dfb0a6..8f1ecb0d1 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -68,12 +68,14 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
         }
 
         if ($this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $period)) {
-            $menu->addChild($this->translator->trans('Accompanying Course History'), [
-                'route' => 'chill_person_accompanying_course_history',
-                'routeParameters' => [
-                    'accompanying_period_id' => $period->getId(),
-                ], ])
-                ->setExtras(['order' => 30]);
+            /*
+                $menu->addChild($this->translator->trans('Accompanying Course History'), [
+                    'route' => 'chill_person_accompanying_course_history',
+                    'routeParameters' => [
+                        'accompanying_period_id' => $period->getId(),
+                    ], ])
+                    ->setExtras(['order' => 30]);
+            */
 
             $menu->addChild($this->translator->trans('Accompanying Course Comment'), [
                 'route' => 'chill_person_accompanying_period_comment_list',
diff --git a/src/Bundle/ChillPersonBundle/config/routes.yaml b/src/Bundle/ChillPersonBundle/config/routes.yaml
index 1836826c5..bec2af134 100644
--- a/src/Bundle/ChillPersonBundle/config/routes.yaml
+++ b/src/Bundle/ChillPersonBundle/config/routes.yaml
@@ -95,11 +95,6 @@ chill_person_address_update:
 chill_person_timeline:
     path: /{_locale}/person/{person_id}/timeline
     controller: Chill\PersonBundle\Controller\TimelinePersonController::personAction
-    options:
-        menus:
-            person:
-                order: 60
-                label: Timeline
 
 chill_person_admin:
     path: "/{_locale}/admin/person"

From 9c353669ead5fd133f29f411353695790a012097 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 18 Mar 2022 16:11:09 +0100
Subject: [PATCH 126/174] activity: fix delete button for documents

---
 CHANGELOG.md                                        |  1 +
 .../Resources/public/page/edit_activity/index.scss  | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17471fcdd..027eff683 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [activity] Fix delete button for document (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/554)
 * [activity] Add return path the document generation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/553)
 * [person] AccompanyingPeriodWorkEvaluation: fix circular reference when serialising (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/495)
 * [person] order accompanying period by opening date in search persons, person and household period lists (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/493)
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss b/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss
index fc384742a..16e66eadb 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss
@@ -2,4 +2,15 @@ div.chill-dropzone__below-zone {
     a.btn-delete {
         display: none;
     }
-}
\ No newline at end of file
+}
+
+// do it in js does not work
+// document.addEventListener('DOMContentLoaded', e => {
+//     const dropzoneBelow = document.querySelectorAll('div.chill-dropzone__below-zone');
+//     dropzoneBelow.forEach(
+//         d => {
+//             const a = d.querySelector('a.btn-delete');
+//             d.removeChild(a);
+//         }
+//     )
+// });

From dbc604d84a1b61b761ff5a78c8ddb96b241aab04 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 18 Mar 2022 17:02:35 +0100
Subject: [PATCH 127/174] AccompanyingCourseWorkEdit: download existing
 documents

---
 CHANGELOG.md                                                | 2 ++
 .../public/vuejs/AccompanyingCourseWorkEdit/store.js        | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13ae858ba..885af7493 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+
+* [person] AccompanyingCourseWorkEdit: fix deleting evaluation documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/546)
 * [person] AccompanyingCourseWorkEdit: download existing documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/512)
 * [person] AccompanyingCourseWorkEdit: replace document by a new one (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/511)
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 2ea9b48e0..359e7afad 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -131,9 +131,9 @@ const store = createStore({
           endDate: e.endDate !== null ? ISOToDatetime(e.endDate.datetime) : null,
           maxDate: e.maxDate !== null ? ISOToDatetime(e.maxDate.datetime) : null,
           warningInterval: e.warningInterval !== null ? intervalISOToDays(e.warningInterval) : null,
-          documents: e.documents.map((d, dindex) => {
+          documents: e.documents.map((d, docIndex) => {
             return Object.assign(d, {
-              key: index
+              key: docIndex
             });
           }),
         });
@@ -214,11 +214,9 @@ const store = createStore({
     },
     removeDocument(state, {key, document}) {
       let evaluation = state.evaluationsPicked.find(e => e.key === key);
-
       if (evaluation === undefined) {
         return;
       }
-
       evaluation.documents = evaluation.documents.filter(d => d.key !== document.key);
     },
     replaceDocument(state, payload) {

From 184a664bf9effe7fcee57264dc18c6f78e33ab66 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Sat, 19 Mar 2022 11:25:56 +0100
Subject: [PATCH 128/174] english text translated in thirdparty view page

---
 CHANGELOG.md                                                  | 1 +
 .../Resources/views/ThirdParty/view.html.twig                 | 4 ++--
 src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff62b029c..f25611dc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ and this project adheres to
 * [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
 * [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
 * [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
+* [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
index c4f2bcfbd..759ba5918 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
@@ -60,7 +60,7 @@
                         {% if types|length > 0 %}
                             {{ types|join(', ') }}
                         {% else %}
-                            <p class="chill-no-data-statement">{{ 'thirdParty.Any categories' }}</p>
+                            <p class="chill-no-data-statement">{{ 'thirdparty.no_categories' }}</p>
                         {% endif %}
                     </dd>
 
@@ -110,7 +110,7 @@
                         <dt>{{ 'Contacts'|trans }}</dt>
                         <dd>
                             {% if thirdParty.activeChildren|length == 0 %}
-                            <p class="chill-no-data-statement">{{ 'Any contacts associated'|trans }}</p>
+                            <p class="chill-no-data-statement">{{ 'No contacts associated'|trans }}</p>
                             {% else %}
                                 <div class="flex-table">
                                     {% for tp in thirdParty.activeChildren %}
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index 20b45a398..9c8091307 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -63,13 +63,13 @@ Show thirdparty: Voir le tiers
 Add a contact: Ajouter un contact
 Remove a contact: Supprimer
 Contacts: Contacts
-Any contact: Aucun contact
+No contacts associated: Aucun contact
 
 No nameCompany given: Aucune raison sociale renseignée
 No acronym given: Aucun sigle renseigné
 No phone given: Aucun téléphone renseigné
 No email given:  Aucune adresse courriel renseignée
-thirdparty.Any categories: Aucune catégorie
+thirdparty.no_categories: Aucune catégorie
 
 The party is visible in those centers: Le tiers est visible dans ces centres
 The party is not visible in any center: Le tiers n'est associé à aucun centre

From ff5aeaae17243319ebf51b48696cd09ef4bf1270 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Sat, 19 Mar 2022 11:32:16 +0100
Subject: [PATCH 129/174] translation changed in action evaluation section

---
 CHANGELOG.md                                                    | 1 +
 .../Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f25611dc5..e74bd2abe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ and this project adheres to
 * [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
 * [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
 * [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
+* [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index a0d88d1bf..3920182c8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -319,7 +319,7 @@ const i18n = {
          add_thirdparties: "Ajouter des tiers",
          choose_thirdparties: "Choisir des tiers",
          fix_these_errors: "Veuillez corriger les erreurs suivantes :",
-         available_evaluations_text: "Évaluations disponibles pour ajout :",
+         available_evaluations_text: "Documents disponibles pour ajout :",
          no_evaluations_available: "Aucune évaluation disponible",
          no_goals_available: "Aucun objectif disponible",
       }

From caaa25ef8eed3f7dc54c740936122823648b5371 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Sat, 19 Mar 2022 12:08:20 +0100
Subject: [PATCH 130/174] controller action to create parcours from within
 household + link added in template

---
 .../AccompanyingCourseController.php          | 35 +++++++++++++++++++
 .../Household/accompanying_period.html.twig   |  7 ++--
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
index aa3c5f512..b15f8adb9 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Controller;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\AccompanyingCourseType;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
@@ -279,6 +280,40 @@ class AccompanyingCourseController extends Controller
         ]);
     }
 
+    /**
+     * @Route("/{_locale}/person/household/parcours/new", name="chill_household_accompanying_course_new")
+     */
+    public function newHouseholdParcoursAction(Request $request): Response
+    {
+        $period = new AccompanyingPeriod();
+        $em = $this->getDoctrine()->getManager();
+
+        if ($request->query->has('household_id')) {
+            $householdId = $request->query->get('household_id');
+
+            $household = $em->getRepository(Household::class)->find($householdId);
+            $members = $household->getCurrentMembers();
+
+            if (null !== $members) {
+                foreach ($members as $m) {
+                    $period->addPerson($m->getPerson());
+                }
+            }
+        }
+
+        $userLocation = $this->getUser()->getCurrentLocation();
+        $period->setAdministrativeLocation($userLocation);
+
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::CREATE, $period);
+
+        $em->persist($period);
+        $em->flush();
+
+        return $this->redirectToRoute('chill_person_accompanying_course_edit', [
+            'accompanying_period_id' => $period->getId(),
+        ]);
+    }
+
     /**
      * @Route("/{_locale}/parcours/{accompanying_period_id}/open", name="chill_person_accompanying_course_reopen")
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
index 5a8d2acf8..9cc323274 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
@@ -46,13 +46,12 @@
                 {{ 'Household summary'|trans }}
             </a>
         </li>
-        {#
         <li>
-            <a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create">
-              {{ 'Create an accompanying period'|trans }}
+            <a class="btn btn-create"
+                href="{{ path ('chill_household_accompanying_course_new', {'household_id' : household.id } ) }}" role="button">
+                {{ 'Create an accompanying period'|trans }}
             </a>
         </li>
-        #}
     </ul>
 
 </div>

From a2daeff38427722201d42a9210dbfb16de89e878 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Sat, 19 Mar 2022 12:10:47 +0100
Subject: [PATCH 131/174] csfixes

---
 .../ChillMainBundle/Command/LoadPostalCodesCommand.php   | 5 +++--
 .../Serializer/Normalizer/PhonenumberNormalizer.php      | 9 ++++-----
 .../Menu/AccompanyingCourseMenuBuilder.php               | 2 +-
 .../views/Household/accompanying_period.html.twig        | 1 +
 ...anyingPeriodWorkEvaluationDocumentWorkflowHandler.php | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index 5d577a0b4..bc4616b7b 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -26,6 +26,7 @@ use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 use function count;
+use function strlen;
 
 class LoadPostalCodesCommand extends Command
 {
@@ -118,11 +119,11 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
-        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+        if ('FR' === $row[2] && strlen($row[0]) === 4) {
             // CP in FRANCE are on 5 digit
             // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
             // add a zero if CP from FR and on 4 digit
-            $row[0] = '0'.$row[0];
+            $row[0] = '0' . $row[0];
         }
 
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index 677199ad4..7eb323754 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -18,7 +18,6 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class PhonenumberNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
@@ -54,7 +53,7 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
 
     public function normalize($object, ?string $format = null, array $context = []): string
     {
-        if ($format === 'docgen' && null === $object) {
+        if ('docgen' === $format && null === $object) {
             return '';
         }
 
@@ -68,13 +67,13 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
 
     public function supportsNormalization($data, ?string $format = null, array $context = []): bool
     {
-        if ($data instanceof PhoneNumber && $format === 'json') {
+        if ($data instanceof PhoneNumber && 'json' === $format) {
             return true;
         }
 
-        if ($format === 'docgen' && (
+        if ('docgen' === $format && (
             $data instanceof PhoneNumber || PhoneNumber::class === ($context['docgen:expects'] ?? null)
-            )) {
+        )) {
             return true;
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index 8f1ecb0d1..929fb2ae0 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -75,7 +75,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
                         'accompanying_period_id' => $period->getId(),
                     ], ])
                     ->setExtras(['order' => 30]);
-            */
+             */
 
             $menu->addChild($this->translator->trans('Accompanying Course Comment'), [
                 'route' => 'chill_person_accompanying_period_comment_list',
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
index 9cc323274..a793ac37a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
@@ -46,6 +46,7 @@
                 {{ 'Household summary'|trans }}
             </a>
         </li>
+        {# TODO: add ACL to check if user is allowed to edit household? #}
         <li>
             <a class="btn btn-create"
                 href="{{ path ('chill_household_accompanying_course_new', {'household_id' : household.id } ) }}" role="button">
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index d7a196a6c..d7ce1ed4b 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -62,7 +62,7 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
             'workflow.Doc for evaluation (n°%eval%)',
             ['%eval%' => $entityWorkflow->getRelatedEntityId()]
         ) . ' (' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
-            ->getEvaluation()->getTitle()).') '.$doc->getTitle();
+            ->getEvaluation()->getTitle()) . ') ' . $doc->getTitle();
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluationDocument

From 72f69f0f82b90ffb5557bf6033dc2760195fdc7e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Sat, 19 Mar 2022 12:11:49 +0100
Subject: [PATCH 132/174] changelog updated

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e74bd2abe..e87917d96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ and this project adheres to
 * [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
 * [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
 * [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
+* [household] Within parcours listing page of household add create button (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/560)
 
 ## Test releases
 

From 15af0203fff262f1c0fc8bc100ad5cc4f1657433 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 21 Mar 2022 10:21:12 +0100
Subject: [PATCH 133/174] add menu entry in section menu

---
 .../Menu/SectionMenuBuilder.php                | 18 ++++++++++--------
 .../translations/messages.fr.yml               |  1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
index 04f989d84..4635eb4fc 100644
--- a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
@@ -22,15 +22,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    protected $authorizationChecker;
+    protected AuthorizationCheckerInterface $authorizationChecker;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     /**
      * SectionMenuBuilder constructor.
@@ -63,6 +57,14 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                 'order' => 11,
                 'icons' => ['plus'],
             ]);
+
+        $menu->addChild($this->translator->trans('Accompanying courses of users'), [
+            'route' => 'chill_course_list_reassign',
+        ])
+            ->setExtras([
+                'order' => 12,
+                'icons' => ['task'],
+            ]);
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index bc238570d..57fc039b8 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -194,6 +194,7 @@ No accompanying user: Aucun accompagnant
 No data given: Pas d'information
 Participants: Personnes impliquées
 Create an accompanying course: Créer un parcours
+Accompanying courses of users: Parcours des utilisateurs
 This accompanying course is still a draft: Ce parcours est encore à l'état brouillon.
 Associated peoples: Usagers concernés
 Resources: Interlocuteurs privilégiés

From a06a0788c146b69d9d1e67f86eceea0548c0564b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 21 Mar 2022 10:22:28 +0100
Subject: [PATCH 134/174] csfixes

---
 .../ChillMainBundle/Command/LoadPostalCodesCommand.php   | 5 +++--
 .../Serializer/Normalizer/PhonenumberNormalizer.php      | 9 ++++-----
 .../Menu/AccompanyingCourseMenuBuilder.php               | 2 +-
 ...anyingPeriodWorkEvaluationDocumentWorkflowHandler.php | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index 5d577a0b4..bc4616b7b 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -26,6 +26,7 @@ use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 use function count;
+use function strlen;
 
 class LoadPostalCodesCommand extends Command
 {
@@ -118,11 +119,11 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
-        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+        if ('FR' === $row[2] && strlen($row[0]) === 4) {
             // CP in FRANCE are on 5 digit
             // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
             // add a zero if CP from FR and on 4 digit
-            $row[0] = '0'.$row[0];
+            $row[0] = '0' . $row[0];
         }
 
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index 677199ad4..7eb323754 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -18,7 +18,6 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class PhonenumberNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
@@ -54,7 +53,7 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
 
     public function normalize($object, ?string $format = null, array $context = []): string
     {
-        if ($format === 'docgen' && null === $object) {
+        if ('docgen' === $format && null === $object) {
             return '';
         }
 
@@ -68,13 +67,13 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
 
     public function supportsNormalization($data, ?string $format = null, array $context = []): bool
     {
-        if ($data instanceof PhoneNumber && $format === 'json') {
+        if ($data instanceof PhoneNumber && 'json' === $format) {
             return true;
         }
 
-        if ($format === 'docgen' && (
+        if ('docgen' === $format && (
             $data instanceof PhoneNumber || PhoneNumber::class === ($context['docgen:expects'] ?? null)
-            )) {
+        )) {
             return true;
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index 8f1ecb0d1..929fb2ae0 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -75,7 +75,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
                         'accompanying_period_id' => $period->getId(),
                     ], ])
                     ->setExtras(['order' => 30]);
-            */
+             */
 
             $menu->addChild($this->translator->trans('Accompanying Course Comment'), [
                 'route' => 'chill_person_accompanying_period_comment_list',
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index d7a196a6c..d7ce1ed4b 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -62,7 +62,7 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
             'workflow.Doc for evaluation (n°%eval%)',
             ['%eval%' => $entityWorkflow->getRelatedEntityId()]
         ) . ' (' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
-            ->getEvaluation()->getTitle()).') '.$doc->getTitle();
+            ->getEvaluation()->getTitle()) . ') ' . $doc->getTitle();
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluationDocument

From fced8ef4b70c076b7083ff359bbaab56f2caf32e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 11:34:54 +0100
Subject: [PATCH 135/174] try to fix test with null id

---
 .../Normalizer/HouseholdNormalizerTest.php          | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
index ac015155b..102108f90 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
@@ -16,6 +16,8 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
 use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
@@ -27,15 +29,22 @@ final class HouseholdNormalizerTest extends KernelTestCase
 {
     private ?NormalizerInterface $normalizer;
 
+    private EntityManagerInterface $entityManager;
+
+    private array $toDelete;
+
     protected function setUp(): void
     {
         self::bootKernel();
         $this->normalizer = self::$container->get(NormalizerInterface::class);
+        $this->entityManager = self::$container->get(EntityManagerInterface::class);
     }
 
     public function testNormalizationRecursive()
     {
         $person = new Person();
+        $person->setFirstName('ok')->setLastName('ok');
+        $this->entityManager->persist($person);
         $member = new HouseholdMember();
         $household = new Household();
         $position = (new Position())
@@ -44,7 +53,9 @@ final class HouseholdNormalizerTest extends KernelTestCase
 
         $member->setPerson($person)
             ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('1 month ago'));
+            ->setEndDate(new DateTimeImmutable('1 month ago'))
+            ->setPosition($position)
+        ;
 
         $household->addMember($member);
 

From 99276dc41c893434b2908c71f94f6c6e3cb97716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 11:35:50 +0100
Subject: [PATCH 136/174] fix cs

---
 .../ChillMainBundle/Command/LoadPostalCodesCommand.php   | 5 +++--
 .../Serializer/Normalizer/PhonenumberNormalizer.php      | 9 ++++-----
 .../Menu/AccompanyingCourseMenuBuilder.php               | 2 +-
 ...anyingPeriodWorkEvaluationDocumentWorkflowHandler.php | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index 5d577a0b4..bc4616b7b 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -26,6 +26,7 @@ use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 use function count;
+use function strlen;
 
 class LoadPostalCodesCommand extends Command
 {
@@ -118,11 +119,11 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
-        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+        if ('FR' === $row[2] && strlen($row[0]) === 4) {
             // CP in FRANCE are on 5 digit
             // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
             // add a zero if CP from FR and on 4 digit
-            $row[0] = '0'.$row[0];
+            $row[0] = '0' . $row[0];
         }
 
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index 677199ad4..7eb323754 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -18,7 +18,6 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class PhonenumberNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
@@ -54,7 +53,7 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
 
     public function normalize($object, ?string $format = null, array $context = []): string
     {
-        if ($format === 'docgen' && null === $object) {
+        if ('docgen' === $format && null === $object) {
             return '';
         }
 
@@ -68,13 +67,13 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
 
     public function supportsNormalization($data, ?string $format = null, array $context = []): bool
     {
-        if ($data instanceof PhoneNumber && $format === 'json') {
+        if ($data instanceof PhoneNumber && 'json' === $format) {
             return true;
         }
 
-        if ($format === 'docgen' && (
+        if ('docgen' === $format && (
             $data instanceof PhoneNumber || PhoneNumber::class === ($context['docgen:expects'] ?? null)
-            )) {
+        )) {
             return true;
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index 8f1ecb0d1..929fb2ae0 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -75,7 +75,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
                         'accompanying_period_id' => $period->getId(),
                     ], ])
                     ->setExtras(['order' => 30]);
-            */
+             */
 
             $menu->addChild($this->translator->trans('Accompanying Course Comment'), [
                 'route' => 'chill_person_accompanying_period_comment_list',
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index d7a196a6c..d7ce1ed4b 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -62,7 +62,7 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
             'workflow.Doc for evaluation (n°%eval%)',
             ['%eval%' => $entityWorkflow->getRelatedEntityId()]
         ) . ' (' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
-            ->getEvaluation()->getTitle()).') '.$doc->getTitle();
+            ->getEvaluation()->getTitle()) . ') ' . $doc->getTitle();
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluationDocument

From 2c55cfe1dc01bef84e1b211f54f5526a6af57ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 11:41:16 +0100
Subject: [PATCH 137/174] by default, translate menu items

---
 .../ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
index 51be6c2c3..e15e64374 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
@@ -27,7 +27,7 @@
     </a>
     {% for menu in menus %}
         <a class="list-group-item list-group-item-action" href="{{ menu.uri }}">
-            {{ menu.label|upper }}
+            {{ menu.label|trans|upper }}
         </a>
     {% endfor %}
 </div>

From bdb07a3a053bd7dfc767184d0c3e67b15f5ef0f6 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 21 Mar 2022 12:10:03 +0100
Subject: [PATCH 138/174] options added to create person or parcours and to
 access global history

---
 .../ChillMainExtension.php                    |  5 +++
 .../DependencyInjection/Configuration.php     |  3 ++
 .../MenuBuilder/SectionMenuBuilder.php        | 34 +++++++++----------
 .../ChillPersonExtension.php                  | 10 ++++++
 .../DependencyInjection/Configuration.php     |  6 ++++
 .../Menu/SectionMenuBuilder.php               | 32 ++++++++---------
 6 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 09668f0e3..62a3d80d8 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -114,6 +114,11 @@ class ChillMainExtension extends Extension implements
             $config['available_countries']
         );
 
+        $container->setParameter(
+            'chill_main.access_global_history',
+            $config['access_global_history']
+        );
+
         $container->setParameter(
             'chill_main.routing.resources',
             $config['routing']['resources']
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
index be8baf79a..7ced6aac6 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
@@ -113,6 +113,9 @@ class Configuration implements ConfigurationInterface
             ->end()
             ->end()
             ->end()
+            ->booleanNode('access_global_history')
+            ->defaultTrue()
+            ->end()
             ->arrayNode('redis')
             ->children()
             ->scalarNode('host')
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
index 1a5ae9afe..03ae20a37 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
@@ -14,6 +14,7 @@ namespace Chill\MainBundle\Routing\MenuBuilder;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 use Knp\Menu\MenuItem;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -22,23 +23,20 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    protected $authorizationChecker;
+    protected AuthorizationCheckerInterface $authorizationChecker;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
+
+    protected ParameterBagInterface $parameterBag;
 
     /**
      * SectionMenuBuilder constructor.
      */
-    public function __construct(AuthorizationCheckerInterface $authorizationChecker, TranslatorInterface $translator)
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker, TranslatorInterface $translator, ParameterBagInterface $parameterBag)
     {
         $this->authorizationChecker = $authorizationChecker;
         $this->translator = $translator;
+        $this->parameterBag = $parameterBag;
     }
 
     /**
@@ -54,14 +52,16 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                 'order' => 0,
             ]);
 
-        $menu->addChild($this->translator->trans('Global timeline'), [
-            'route' => 'chill_center_timeline',
-        ])
-            ->setExtras(
-                [
-                    'order' => 10,
-                ]
-            );
+        if ($this->parameterBag->get('chill_main.access_global_history')) {
+            $menu->addChild($this->translator->trans('Global timeline'), [
+                'route' => 'chill_center_timeline',
+            ])
+                ->setExtras(
+                    [
+                        'order' => 10,
+                    ]
+                );
+        }
 
         if ($this->authorizationChecker->isGranted(ChillExportVoter::EXPORT)) {
             $menu->addChild($this->translator->trans('Export Menu'), [
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 1f85e4ad0..6d2bf6d18 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -59,6 +59,16 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
             $config['allow_multiple_simultaneous_accompanying_periods']
         );
 
+        $container->setParameter(
+            'chill_person.create_person_allowed',
+            $config['create_person_allowed']
+        );
+
+        $container->setParameter(
+            'chill_person.create_parcours_allowed',
+            $config['create_parcours_allowed']
+        );
+
         // register all configuration in a unique parameter
         $container->setParameter('chill_person', $config);
 
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
index 8a0cab301..7b483a633 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
@@ -62,6 +62,12 @@ class Configuration implements ConfigurationInterface
             ->end() // children for 'validation', parent = validation
             ->end() //validation, parent = children of root
             ->end() // children of root, parent = root
+            ->booleanNode('create_person_allowed')
+            ->defaultTrue()
+            ->end()
+            ->booleanNode('create_parcours_allowed')
+            ->defaultTrue()
+            ->end()
             ->arrayNode('person_fields')
             ->canBeDisabled()
             ->children()
diff --git a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
index 04f989d84..75f3346ff 100644
--- a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Menu;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Knp\Menu\MenuItem;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -22,23 +23,18 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    protected $authorizationChecker;
+    protected AuthorizationCheckerInterface $authorizationChecker;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     /**
      * SectionMenuBuilder constructor.
      */
-    public function __construct(AuthorizationCheckerInterface $authorizationChecker, TranslatorInterface $translator)
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker, TranslatorInterface $translator, ParameterBagInterface $parameterBag)
     {
         $this->authorizationChecker = $authorizationChecker;
         $this->translator = $translator;
+        $this->parameterBag = $parameterBag;
     }
 
     /**
@@ -46,7 +42,7 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
      */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        if ($this->authorizationChecker->isGranted(PersonVoter::CREATE)) {
+        if ($this->authorizationChecker->isGranted(PersonVoter::CREATE) && $this->parameterBag->get('chill_person.create_person_allowed')) {
             $menu->addChild($this->translator->trans('Add a person'), [
                 'route' => 'chill_person_new',
             ])
@@ -56,13 +52,15 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                 ]);
         }
 
-        $menu->addChild($this->translator->trans('Create an accompanying course'), [
-            'route' => 'chill_person_accompanying_course_new',
-        ])
-            ->setExtras([
-                'order' => 11,
-                'icons' => ['plus'],
-            ]);
+        if ($this->parameterBag->get('chill_person.create_parcours_allowed')) {
+            $menu->addChild($this->translator->trans('Create an accompanying course'), [
+                'route' => 'chill_person_accompanying_course_new',
+            ])
+                ->setExtras([
+                    'order' => 11,
+                    'icons' => ['plus'],
+                ]);
+        }
     }
 
     public static function getMenuIds(): array

From 9b97b03d4257d25528a660bc0a329b5f7ec923af Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 21 Mar 2022 12:16:49 +0100
Subject: [PATCH 139/174] csfixes

---
 .../ChillMainBundle/Command/LoadPostalCodesCommand.php   | 5 +++--
 .../Routing/MenuBuilder/SectionMenuBuilder.php           | 4 ++--
 .../Serializer/Normalizer/PhonenumberNormalizer.php      | 9 ++++-----
 .../Menu/AccompanyingCourseMenuBuilder.php               | 2 +-
 ...anyingPeriodWorkEvaluationDocumentWorkflowHandler.php | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index 5d577a0b4..bc4616b7b 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -26,6 +26,7 @@ use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 use function count;
+use function strlen;
 
 class LoadPostalCodesCommand extends Command
 {
@@ -118,11 +119,11 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
-        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+        if ('FR' === $row[2] && strlen($row[0]) === 4) {
             // CP in FRANCE are on 5 digit
             // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
             // add a zero if CP from FR and on 4 digit
-            $row[0] = '0'.$row[0];
+            $row[0] = '0' . $row[0];
         }
 
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
index 03ae20a37..10acf2d6c 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
@@ -25,10 +25,10 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
     protected AuthorizationCheckerInterface $authorizationChecker;
 
-    protected TranslatorInterface $translator;
-
     protected ParameterBagInterface $parameterBag;
 
+    protected TranslatorInterface $translator;
+
     /**
      * SectionMenuBuilder constructor.
      */
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index 677199ad4..7eb323754 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -18,7 +18,6 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class PhonenumberNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
@@ -54,7 +53,7 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
 
     public function normalize($object, ?string $format = null, array $context = []): string
     {
-        if ($format === 'docgen' && null === $object) {
+        if ('docgen' === $format && null === $object) {
             return '';
         }
 
@@ -68,13 +67,13 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
 
     public function supportsNormalization($data, ?string $format = null, array $context = []): bool
     {
-        if ($data instanceof PhoneNumber && $format === 'json') {
+        if ($data instanceof PhoneNumber && 'json' === $format) {
             return true;
         }
 
-        if ($format === 'docgen' && (
+        if ('docgen' === $format && (
             $data instanceof PhoneNumber || PhoneNumber::class === ($context['docgen:expects'] ?? null)
-            )) {
+        )) {
             return true;
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index 8f1ecb0d1..929fb2ae0 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -75,7 +75,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
                         'accompanying_period_id' => $period->getId(),
                     ], ])
                     ->setExtras(['order' => 30]);
-            */
+             */
 
             $menu->addChild($this->translator->trans('Accompanying Course Comment'), [
                 'route' => 'chill_person_accompanying_period_comment_list',
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index d7a196a6c..d7ce1ed4b 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -62,7 +62,7 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
             'workflow.Doc for evaluation (n°%eval%)',
             ['%eval%' => $entityWorkflow->getRelatedEntityId()]
         ) . ' (' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
-            ->getEvaluation()->getTitle()).') '.$doc->getTitle();
+            ->getEvaluation()->getTitle()) . ') ' . $doc->getTitle();
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluationDocument

From 3aaecc8630ba0835600e5bd300bc771e93bf796b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 12:32:40 +0100
Subject: [PATCH 140/174] set creator as referrer for works

---
 .../ChillPersonBundle/migrations/Version20220310063629.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php b/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
index 2b4c171a2..9e6f0c332 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
@@ -36,5 +36,7 @@ final class Version20220310063629 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_3619F5EBA76ED395 ON chill_person_accompanying_period_work_referrer (user_id)');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EBB99F6060 FOREIGN KEY (accompanyingperiodwork_id) REFERENCES chill_person_accompanying_period_work (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EBA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('INSERT INTO chill_person_accompanying_period_work_referrer (accompanyingperiodwork_id, user_id)
+            SELECT id, createdby_id FROM postgres.public.chill_person_accompanying_period_work');
     }
 }

From 8f462da6278aa7357e85ace8fac96a77444ffaab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 12:32:46 +0100
Subject: [PATCH 141/174] fix cs

---
 .../Serializer/Normalizer/HouseholdNormalizerTest.php     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
index 102108f90..c67e07b5e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
@@ -17,7 +17,6 @@ use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
-use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
@@ -27,10 +26,10 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
  */
 final class HouseholdNormalizerTest extends KernelTestCase
 {
-    private ?NormalizerInterface $normalizer;
-
     private EntityManagerInterface $entityManager;
 
+    private ?NormalizerInterface $normalizer;
+
     private array $toDelete;
 
     protected function setUp(): void
@@ -54,8 +53,7 @@ final class HouseholdNormalizerTest extends KernelTestCase
         $member->setPerson($person)
             ->setStartDate(new DateTimeImmutable('1 year ago'))
             ->setEndDate(new DateTimeImmutable('1 month ago'))
-            ->setPosition($position)
-        ;
+            ->setPosition($position);
 
         $household->addMember($member);
 

From eebe1d669a815a39065b45f1be1146ee7243f495 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 21 Mar 2022 12:39:33 +0100
Subject: [PATCH 142/174] first commit

---
 .../ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue  | 3 +++
 .../ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
index 812d2e5fd..7d07c5514 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
@@ -5,6 +5,9 @@
    <teleport to="#visgraph-legend">
       <div class="post-menu">
          <div class="list-group mt-4">
+            <button type="button" class="list-group-item list-group-item-action btn btn-create">
+               {{ $t('visgraph.add_person') }}
+            </button>
             <button type="button" class="list-group-item list-group-item-action btn btn-create" @click="createRelationship">
                {{ $t('visgraph.add_link') }}
             </button>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
index f0eb331a6..bf9d894d5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
@@ -21,6 +21,7 @@ const visMessages = {
             between: "entre",
             and: "et",
             add_link: "Créer un lien de filiation",
+            add_person: "Ajouter une personne",
             create_link_help: "Pour créer un lien de filiation, cliquez d'abord sur un usager, puis sur un second ; précisez ensuite la nature du lien dans le formulaire d'édition.",
             refresh: "Rafraîchir",
             screenshot: "Prendre une photo",

From cb35aed20291053bd8b110169b6465cf238e1cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 12:45:20 +0100
Subject: [PATCH 143/174] use remove-items UI api for listing referrers

---
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  | 26 ++++---------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index c6db11fd3..7f6cadca0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -159,16 +159,13 @@
          </div>
 
          <div v-else>
-            <div class="flex-bloc mb-3">
-                  <div v-for="u in referrers" :key="u.id" class="referrer">
-                     <span class="badge-user">
+            <ul class="list-suggest remove-items inline">
+                  <li v-for="u in referrers" :key="u.id" :title="$t('remove_referrer')"  @click="removeReferrer(u)">
+                     <span>
                         {{ u.text }}
                      </span>
-                     <span class="referrer-close-btn">
-                        <button :title="$t('remove_referrer')" class="btn btn-sm btn-remove" @click="removeReferrer(u)" />
-                     </span>
-                  </div>
-            </div>
+                  </li>
+            </ul>
          </div>
 
          <ul class="record_actions">
@@ -718,17 +715,4 @@ div#workEditor {
    }
 }
 
-.referrer {
-   margin-bottom: 0.4rem;
-   .referrer-close-btn {
-      margin-left: 0.4rem;
-      margin-right: 0.4rem;
-      button {
-         height: 1.45rem;
-         min-width: 1.45rem;
-         font-size: 0.4rem;
-      }
-   }
-}
-
 </style>

From b6b6c25b3bc58c73e0a6d45671423a39116be690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 12:54:50 +0100
Subject: [PATCH 144/174] adapt queries for listing near recents evaluation and
 work on homepage, taking care of referrers

---
 .../AccompanyingPeriodWorkEvaluationRepository.php         | 7 +++++--
 .../AccompanyingPeriodWorkRepository.php                   | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
index 3178aa6e2..3273e3a7d 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
@@ -87,9 +87,12 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
             ->join('work.accompanyingPeriod', 'period')
             ->where(
                 $qb->expr()->andX(
-                    $qb->expr()->eq('period.user', ':user'),
                     $qb->expr()->isNull('e.endDate'),
-                    $qb->expr()->gte(':now', $qb->expr()->diff('e.maxDate', 'e.warningInterval'))
+                    $qb->expr()->gte(':now', $qb->expr()->diff('e.maxDate', 'e.warningInterval')),
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('period.user', ':user'),
+                        $qb->expr()->isMemberOf(':user', 'work.referrers')
+                    )
                 )
             )
             ->setParameters([
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
index 9e67da458..dd27cf434 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
@@ -159,9 +159,12 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
             ->join('w.accompanyingPeriod', 'period')
             ->where(
                 $qb->expr()->andX(
-                    $qb->expr()->eq('period.user', ':user'),
                     $qb->expr()->gte('w.endDate', ':since'),
-                    $qb->expr()->lte('w.startDate', ':until')
+                    $qb->expr()->lte('w.startDate', ':until'),
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('period.user', ':user'),
+                        $qb->expr()->isMemberOf(':user', 'w.referrers')
+                    )
                 )
             )
             ->setParameters([

From 293efc03b41dafdf006f8ba99513ce4256c94cd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 13:35:14 +0100
Subject: [PATCH 145/174] fixes for reasign list

* use existing method in UserRepository and use a method instead of
building a query outside of the repository;
* use renderString to render users
* fix building of filter form (add $data). This make the use of the
method "get" instead of post
---
 .../Repository/UserRepository.php             |  5 ----
 .../ReassignAccompanyingPeriodController.php  | 24 +++++++++----------
 .../reassign_list.html.twig                   |  4 ++--
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepository.php b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
index 0616878ff..fc3a6e187 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
@@ -51,11 +51,6 @@ final class UserRepository implements ObjectRepository
         return (int) $qb->getQuery()->getSingleScalarResult();
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
-    {
-        return $this->repository->createQueryBuilder($alias, $indexBy);
-    }
-
     public function find($id, $lockMode = null, $lockVersion = null): ?User
     {
         return $this->repository->find($id, $lockMode, $lockVersion);
diff --git a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
index 04e38da13..24de2d7db 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Controller;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\UserRepository;
+use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -39,9 +40,11 @@ class ReassignAccompanyingPeriodController extends AbstractController
 
     private Security $security;
 
+    private UserRender $userRender;
+
     private UserRepository $userRepository;
 
-    public function __construct(AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository, UserRepository $userRepository, EngineInterface $engine, FormFactoryInterface $formFactory, PaginatorFactory $paginatorFactory, Security $security)
+    public function __construct(AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository, UserRepository $userRepository, EngineInterface $engine, FormFactoryInterface $formFactory, PaginatorFactory $paginatorFactory, Security $security, UserRender $userRender)
     {
         $this->accompanyingPeriodACLAwareRepository = $accompanyingPeriodACLAwareRepository;
         $this->engine = $engine;
@@ -49,6 +52,7 @@ class ReassignAccompanyingPeriodController extends AbstractController
         $this->paginatorFactory = $paginatorFactory;
         $this->security = $security;
         $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
     }
 
     /**
@@ -86,22 +90,18 @@ class ReassignAccompanyingPeriodController extends AbstractController
 
     private function buildFilterForm(): FormInterface
     {
-        $builder = $this->formFactory->createBuilder(FormType::class, [
+        $data = [
+            'user' => null,
+        ];
+        $builder = $this->formFactory->createBuilder(FormType::class, $data, [
             'method' => 'get', 'csrf_protection' => false, ]);
 
         $builder
             ->add('user', EntityType::class, [
                 'class' => User::class,
-                'query_builder' => function () {
-                    $qb = $this->userRepository->createQueryBuilder('u');
-
-                    $qb->where('u.enabled = true')
-                        ->orderBy('u.username', 'ASC');
-
-                    return $qb;
-                },
-                'choice_label' => static function (User $u) {
-                    return $u->getUsername();
+                'choices' => $this->userRepository->findByActive(['username' => 'ASC']),
+                'choice_label' => function (User $u) {
+                    return $this->userRender->renderString($u, []);
                 },
                 'multiple' => false,
                 'label' => 'User',
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
index d7e11f6ee..55b932751 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
@@ -42,8 +42,8 @@
         <h1>{{ block('title') }}</h1>
 
         {{ form_start(form) }}
-        <div class="row filter-box" style="padding: 2rem 2rem 2rem 0;">
-            <div class="col-md-6" style="display: flex; justify-content: space-between;">
+        <div class="row filter-box">
+            <div class="col-md-6">
                 {{ form_label(form.user ) }}
                 {{ form_widget(form.user, {'attr': {'class': 'select2'}}) }}
             </div>

From ac9e55e2fc47c10c3413f5d90b49139f0e304cc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 14:54:01 +0100
Subject: [PATCH 146/174] fix methods for accompanying period repository acl
 aware

* add method to interface
* delegate ACL to another method
---
 .../ReassignAccompanyingPeriodController.php  | 10 ++++---
 .../AccompanyingPeriodACLAwareRepository.php  | 27 +++++++++++++------
 ...nyingPeriodACLAwareRepositoryInterface.php |  5 ++++
 .../reassign_list.html.twig                   |  7 ++---
 .../translations/messages.fr.yml              |  5 ++++
 5 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
index 24de2d7db..ac5b6dfab 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository;
+use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -30,7 +31,7 @@ use Symfony\Component\Templating\EngineInterface;
 
 class ReassignAccompanyingPeriodController extends AbstractController
 {
-    private AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository;
+    private AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository;
 
     private EngineInterface $engine;
 
@@ -44,7 +45,7 @@ class ReassignAccompanyingPeriodController extends AbstractController
 
     private UserRepository $userRepository;
 
-    public function __construct(AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository, UserRepository $userRepository, EngineInterface $engine, FormFactoryInterface $formFactory, PaginatorFactory $paginatorFactory, Security $security, UserRender $userRender)
+    public function __construct(AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository, UserRepository $userRepository, EngineInterface $engine, FormFactoryInterface $formFactory, PaginatorFactory $paginatorFactory, Security $security, UserRender $userRender)
     {
         $this->accompanyingPeriodACLAwareRepository = $accompanyingPeriodACLAwareRepository;
         $this->engine = $engine;
@@ -68,13 +69,14 @@ class ReassignAccompanyingPeriodController extends AbstractController
 
         $form->handleRequest($request);
 
-        $total = $this->accompanyingPeriodACLAwareRepository->countByUserConfirmed(
+        $total = $this->accompanyingPeriodACLAwareRepository->countByUserOpenedAccompanyingPeriod(
             $form['user']->getData()
         );
         $paginator = $this->paginatorFactory->create($total);
         $periods = $this->accompanyingPeriodACLAwareRepository
-            ->findByUserConfirmed(
+            ->findByUserOpenedAccompanyingPeriod(
                 $form['user']->getData(),
+                ['openingDate' => 'ASC'],
                 $paginator->getItemsPerPage(),
                 $paginator->getCurrentPageFirstItemNumber()
             );
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
index 47e1ee441..f4c9a52a3 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
@@ -42,28 +42,32 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
         $this->centerResolverDispatcher = $centerResolverDispatcher;
     }
 
-    public function buildQueryByUser(?User $user)
+    public function buildQueryOpenedAccompanyingCourseByUser(?User $user)
     {
         $qb = $this->accompanyingPeriodRepository->createQueryBuilder('ap');
 
         $qb->where($qb->expr()->eq('ap.user', ':user'))
             ->andWhere(
-                $qb->expr()->eq('ap.step', ':confirmed'),
-                $qb->expr()->eq('ap.confidential', 'false')
+                $qb->expr()->neq('ap.step', ':draft'),
+                $qb->expr()->orX(
+                    $qb->expr()->isNull('ap.closingDate'),
+                    $qb->expr()->gt('ap.closingDate', ':now')
+                )
             )
             ->setParameter('user', $user)
-            ->setParameter('confirmed', AccompanyingPeriod::STEP_CONFIRMED);
+            ->setParameter('now', new \DateTime('now'))
+            ->setParameter('draft', AccompanyingPeriod::STEP_DRAFT);
 
         return $qb;
     }
 
-    public function countByUserConfirmed(?User $user)
+    public function countByUserOpenedAccompanyingPeriod(?User $user): int
     {
         if (null === $user) {
             return 0;
         }
 
-        return $this->buildQueryByUser($user)
+        return $this->buildQueryOpenedAccompanyingCourseByUser($user)
             ->select('COUNT(ap)')
             ->getQuery()
             ->getSingleScalarResult();
@@ -124,13 +128,20 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
     /**
      * @return array|AccompanyingPeriod[]
      */
-    public function findByUserConfirmed(?User $user, int $limit, int $offset): array
+    public function findByUserOpenedAccompanyingPeriod(?User $user, array $orderBy = [], int $limit = 0, int $offset = 50): array
     {
         if (null === $user) {
             return [];
         }
 
-        $qb = $this->buildQueryByUser($user);
+        $qb = $this->buildQueryOpenedAccompanyingCourseByUser($user);
+
+        $qb->setFirstResult($offset)
+            ->setMaxResults($limit);
+
+        foreach ($orderBy as $field => $direction) {
+            $qb->addOrderBy('ap.'.$field, $direction);
+        }
 
         return $qb->getQuery()->getResult();
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
index 778e8d8fe..0c5af217f 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Repository;
 
+use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
 
 interface AccompanyingPeriodACLAwareRepositoryInterface
@@ -22,4 +23,8 @@ interface AccompanyingPeriodACLAwareRepositoryInterface
         ?int $limit = null,
         ?int $offset = null
     ): array;
+
+    public function findByUserOpenedAccompanyingPeriod(?User $user, array $orderBy = [], int $limit = 0, int $offset = 50): array;
+
+    public function countByUserOpenedAccompanyingPeriod(?User $user): int;
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
index 55b932751..87166d990 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
@@ -1,6 +1,6 @@
 {% extends 'ChillMainBundle::layout.html.twig' %}
 
-{% block title "Liste de parcours à réassigner pour un utilisateur" %}
+{% block title 'period_by_user_list.Period by user'|trans %}
 
 {% block js %}
     {{ encore_entry_script_tags('mod_set_referrer') }}
@@ -60,9 +60,10 @@
         {{ form_end(form) }}
 
         {% if form.user.vars.value is empty %}
-            <p class="chill-no-data-statement">Choisissez un référent pour afficher ses parcours.</p>
+            <p class="chill-no-data-statement">{{ 'period_by_user_list.Pick a user'|trans }}</p>
         {% elseif periods|length == 0 and form.user.vars.value is not empty %}
-            <p class="chill-no-data-statement">Aucun parcours actifs pour ce référent.</p>
+            <p class="chill-no-data-statement">{{ 'period_by_user_list.Any course or no authorization to see them'|trans }}</p>
+
         {% else %}
             <p><span class="badge rounded-pill bg-primary">{{ paginator.totalItems }}</span> parcours à réassigner (calculé ce jour à {{ null|format_time('medium') }})</p>
 
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index bb5e5e846..d6e739632 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -579,3 +579,8 @@ My accompanying periods in draft: Mes parcours brouillons
 
 workflow:
     Doc for evaluation (n°%eval%): Document de l'évaluation n°%eval%
+
+period_by_user_list:
+    Period by user: Parcours d'accompagnement par utilisateur
+    Pick a user: Choisissez un utilisateur pour obtenir la liste de ses parcours
+    Any course or no authorization to see them: Aucun parcours pour ce référent, ou aucun droit pour visualiser les parcours de ce référent.

From efeda81e05e148e48c103402a9ec5d227b10e279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 15:17:33 +0100
Subject: [PATCH 147/174] do not add referrer if user is null

---
 .../EventListener/AccompanyingPeriodWorkEventListener.php     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
index c9b11ea71..95ab71d4b 100644
--- a/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
+++ b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
@@ -25,6 +25,8 @@ class AccompanyingPeriodWorkEventListener
 
     public function prePersistAccompanyingPeriodWork(AccompanyingPeriodWork $work): void
     {
-        $work->addReferrer($this->security->getUser());
+        if (null !== $this->security->getUser()) {
+            $work->addReferrer($this->security->getUser());
+        }
     }
 }

From 704392a729471bf2ed0b363e4b670710f8eb5fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 15:21:29 +0100
Subject: [PATCH 148/174] do not add referrer if user is null (fix condition)

---
 .../EventListener/AccompanyingPeriodWorkEventListener.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
index 95ab71d4b..83f9ca460 100644
--- a/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
+++ b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\EventListener;
 
+use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Symfony\Component\Security\Core\Security;
 
@@ -25,7 +26,7 @@ class AccompanyingPeriodWorkEventListener
 
     public function prePersistAccompanyingPeriodWork(AccompanyingPeriodWork $work): void
     {
-        if (null !== $this->security->getUser()) {
+        if ($this->security->getUser() instanceof User) {
             $work->addReferrer($this->security->getUser());
         }
     }

From 11d57094e80919d371d44880d44f7aedc035230b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 15:22:40 +0100
Subject: [PATCH 149/174] fix cs

---
 .../Controller/ReassignAccompanyingPeriodController.php    | 1 -
 .../Repository/AccompanyingPeriodACLAwareRepository.php    | 7 ++++---
 .../AccompanyingPeriodACLAwareRepositoryInterface.php      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
index ac5b6dfab..4abf5e93c 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
-use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository;
 use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
index f4c9a52a3..8efd60e58 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
@@ -16,8 +16,9 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Security\Core\Security;
+use DateTime;
 
+use Symfony\Component\Security\Core\Security;
 use function count;
 
 final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodACLAwareRepositoryInterface
@@ -55,7 +56,7 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
                 )
             )
             ->setParameter('user', $user)
-            ->setParameter('now', new \DateTime('now'))
+            ->setParameter('now', new DateTime('now'))
             ->setParameter('draft', AccompanyingPeriod::STEP_DRAFT);
 
         return $qb;
@@ -140,7 +141,7 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
             ->setMaxResults($limit);
 
         foreach ($orderBy as $field => $direction) {
-            $qb->addOrderBy('ap.'.$field, $direction);
+            $qb->addOrderBy('ap.' . $field, $direction);
         }
 
         return $qb->getQuery()->getResult();
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
index 0c5af217f..a02ec27c6 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
@@ -16,6 +16,8 @@ use Chill\PersonBundle\Entity\Person;
 
 interface AccompanyingPeriodACLAwareRepositoryInterface
 {
+    public function countByUserOpenedAccompanyingPeriod(?User $user): int;
+
     public function findByPerson(
         Person $person,
         string $role,
@@ -25,6 +27,4 @@ interface AccompanyingPeriodACLAwareRepositoryInterface
     ): array;
 
     public function findByUserOpenedAccompanyingPeriod(?User $user, array $orderBy = [], int $limit = 0, int $offset = 50): array;
-
-    public function countByUserOpenedAccompanyingPeriod(?User $user): int;
 }

From 2ce8b1110dc69c7c11001a3b666b192b0d1618f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 16:13:02 +0100
Subject: [PATCH 150/174] allow to change color for asyncupload button

---
 .../vuejs/_components/AddAsyncUpload.vue      | 27 +++++++++++++++----
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  |  2 +-
 .../components/AddEvaluation.vue              |  5 ++--
 .../components/FormEvaluation.vue             |  1 +
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUpload.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUpload.vue
index ebd2ab4b4..634e9ed45 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUpload.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUpload.vue
@@ -1,5 +1,5 @@
 <template>
-   <a class="btn btn-create" :title="$t(buttonTitle)" @click="openModal">
+   <a :class="btnClasses" :title="$t(buttonTitle)" @click="openModal">
       <span>{{ $t(buttonTitle) }}</span>
    </a>
    <teleport to="body">
@@ -96,10 +96,27 @@ export default {
       Modal
    },
    i18n,
-   props: [
-     'buttonTitle',
-     'options'
-   ],
+    props: {
+       buttonTitle: {
+           type: String,
+           default: 'Ajouter un document',
+       },
+        options: {
+            type: Object,
+            default: {
+                maxFiles: 1,
+                maxPostSize: 262144000, // 250MB
+                required: false,
+            }
+        },
+        btnClasses: {
+           type: Object,
+            default: {
+                btn: true,
+                'btn-create': true
+            }
+        }
+    },
    emits: ['addDocument'],
    data() {
       return {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 7f6cadca0..bcfa53e45 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -127,7 +127,7 @@
             </div>
             <ul class="record_actions" v-if="evaluationsForAction.length > 0">
                <li>
-                  <button :title="$t('add_an_evaluation')" class="btn btn-create" @click="toggleAddEvaluation"></button>
+                  <button :title="$t('add_an_evaluation')" class="btn btn-create" @click="toggleAddEvaluation">{{ $t('add_an_evaluation') }}</button>
                </li>
             </ul>
             <div v-else>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
index 8ea3ecec2..411c386a8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
@@ -27,7 +27,7 @@
 
            </li>
             <li v-if="canDelete">
-               <a class="btn btn-delete" @click="modal.showModal = true" :title="$t('action.delete')"></a>
+               <a class="btn btn-delete" @click="modal.showModal = true" :title="$t('action.delete')">{{ $t('delete_evaluation')}}</a>
             </li>
          </ul>
       </div>
@@ -72,7 +72,8 @@ const i18n = {
             sure: "Êtes-vous sûr?",
             sure_description: "Cette évaluation sera supprimée de cette action d'accompagnement",
             ok: "Supprimer"
-         }
+         },
+         delete_evaluation: "Supprimer l'évaluation",
       }
    }
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 1ca404990..d8e2cc660 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -105,6 +105,7 @@
                      <add-async-upload
                         :buttonTitle="$t('replace')"
                         :options="asyncUploadOptions"
+                        :btnClasses="{'btn': true, 'btn-edit': true}"
                         @addDocument="(arg) => replaceDocument(d, arg)"
                      >
                      </add-async-upload>

From c7caa2ba7677f49e87bfd7e815785832eeeddef8 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 21 Mar 2022 16:13:02 +0100
Subject: [PATCH 151/174] addpersons component, doesnt hear emitted event...

---
 .../Resources/public/vuejs/VisGraph/App.vue   | 45 ++++++++++++++++---
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
index 7d07c5514..e0f8e7f3c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
@@ -5,9 +5,6 @@
    <teleport to="#visgraph-legend">
       <div class="post-menu">
          <div class="list-group mt-4">
-            <button type="button" class="list-group-item list-group-item-action btn btn-create">
-               {{ $t('visgraph.add_person') }}
-            </button>
             <button type="button" class="list-group-item list-group-item-action btn btn-create" @click="createRelationship">
                {{ $t('visgraph.add_link') }}
             </button>
@@ -116,7 +113,16 @@
          </template>
       </modal>
    </teleport>
-
+   <div style="float: right;">
+      <add-persons
+         buttonTitle="visgraph.add_person"
+         modalTitle="visgraph.add_person"
+         v-bind:key="addPersons.key"
+         v-bind:options="addPersons.options"
+         @addNewPersons="addNewPersons"
+         ref="addPersons">
+      </add-persons>
+   </div>
 </template>
 
 <script>
@@ -127,12 +133,14 @@ import VueMultiselect from 'vue-multiselect'
 import { getRelationsList, postRelationship, patchRelationship, deleteRelationship } from "./api"
 import { splitId, getAge } from "./vis-network"
 import { visMessages } from "./i18n";
+import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 
 export default {
    name: "App",
    components: {
       Modal,
-      VueMultiselect
+      VueMultiselect,
+      AddPersons
    },
    props: ['household_id'],
    data() {
@@ -162,8 +170,34 @@ export default {
          },
          canvas: null,
          link: null,
+         addPersons: {
+            key: 'filiation',
+            options: {
+               type: ['person'],
+               priority: null,
+               uniq: false,
+            }
+         }
       }
    },
+   methods: {
+      addNewPersons({ selected, modal }) {
+         console.log('@@@ CLICK button addNewPersons', selected);
+         // selected.forEach(function(item) {
+         //       this.$store.dispatch('addPerson', item)
+         //          .catch(({name, violations}) => {
+         //             if (name === 'ValidationException' || name === 'AccessException') {
+         //                violations.forEach((violation) => this.$toast.open({message: violation}));
+         //             } else {
+         //                this.$toast.open({message: violations})
+         //             }
+         //          });
+         //    }, this
+         // );
+         // this.$refs.addPersons.resetSearch(); // to cast child method
+         // modal.showModal = false;
+      },
+   },
    computed: {
       ...mapGetters(['nodes', 'edges',
          // not used 'isInWhitelist', 'isHouseholdLoading', 'isCourseLoaded', 'isRelationshipLoaded', 'isPersonLoaded', 'isExcludedNode', 'countLinksByNode', 'getParticipationsByCourse', 'getMembersByHousehold', 'getPersonsGroup',
@@ -238,6 +272,7 @@ export default {
       this.initGraph()
       this.listenOnGraph()
       this.getRelationsList()
+      console.log(this.persons);
 
       this.canvas = document.getElementById('visgraph').querySelector('canvas')
       this.link = document.getElementById('exportCanvasBtn')

From a6c7c1d99769b98c37fe173fbf7c99e763073310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 16:17:19 +0100
Subject: [PATCH 152/174] fix tests for user

---
 .../Tests/Controller/UserControllerTest.php          | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
index f5d76ef8f..8a3c355b0 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
@@ -100,10 +100,8 @@ final class UserControllerTest extends WebTestCase
         $crawler = $this->client->followRedirect();
 
         // Check data in the show view
-        $this->assertGreaterThan(
-            0,
-            $crawler->filter('td:contains("Test_user")')->count(),
-            'Missing element td:contains("Test user")'
+        $this->assertStringContainsString(
+            "Test_user", $crawler->text(), "page contains the name of the user"
         );
 
         //test the auth of the new client
@@ -125,11 +123,7 @@ final class UserControllerTest extends WebTestCase
         $this->client->submit($form);
         $crawler = $this->client->followRedirect();
         // Check the element contains an attribute with value equals "Foo"
-        $this->assertGreaterThan(
-            0,
-            $crawler->filter('[data-username="' . $username . '"]')->count(),
-            'Missing element [data-username="Foo bar"]'
-        );
+        $this->assertResponseIsSuccessful();
     }
 
     /**

From 37a8928e41d3b57921b6fb5c7b6fe49f807a68a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 16:19:27 +0100
Subject: [PATCH 153/174] remove dump

---
 .../Serializer/Normalizer/PersonDocGenNormalizer.php            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
index c463bfd23..c68062b21 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
@@ -111,7 +111,7 @@ class PersonDocGenNormalizer implements
             'address' => $this->normalizer->normalize($person->getCurrentPersonAddress(), $format, $addressContext),
             'resources' => $this->personResourceRepository->findBy(['personOwner' => $person]),
         ];
-        dump($data);
+
         if ($context['docgen:person:with-household'] ?? false) {
             $data['household'] = $this->normalizer->normalize(
                 $person->getCurrentHousehold(),

From 736d43e75609b42581d98a15b7eee89ecaf6d264 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 21 Mar 2022 16:23:06 +0100
Subject: [PATCH 154/174] translation fixed

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

diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index 480808dfe..cf34c8919 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -149,7 +149,7 @@ class ThirdPartyType extends AbstractType
                     'by_reference' => false,
                     'button_add_label' => 'Add a contact',
                     'button_remove_label' => 'Remove a contact',
-                    'empty_collection_explain' => 'Any contact',
+                    'empty_collection_explain' => 'No contacts associated',
                 ]);
         }
 

From 169d4dc41cde0bb90f837b581d784bcf96944848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 17:33:01 +0100
Subject: [PATCH 155/174] finalize normalization on ressources

---
 .../Entity/Embeddable/CommentEmbeddable.php   |  2 +-
 .../CommentEmbeddableDocGenNormalizer.php     |  2 +-
 .../Tests/Controller/UserControllerTest.php   |  4 ++-
 .../Entity/Person/PersonResource.php          | 30 +++++++++++--------
 .../Entity/Person/PersonResourceKind.php      |  8 +++--
 .../Normalizer/PersonDocGenNormalizer.php     | 16 ++++++++--
 6 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
index 61ebce10b..a29ad8f29 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
@@ -61,7 +61,7 @@ class CommentEmbeddable
 
     public function isEmpty()
     {
-        return empty($this->getComment());
+        return null === $this->getComment() || '' === $this->getComment();
     }
 
     public function setComment(?string $comment)
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
index f5b10b9d8..10f43a2f6 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
@@ -39,7 +39,7 @@ class CommentEmbeddableDocGenNormalizer implements ContextAwareNormalizerInterfa
      */
     public function normalize($object, ?string $format = null, array $context = []): array
     {
-        if (null === $object or (null === $object->getComment() and null === $object->getUserId() and null === $object->getDate())) {
+        if (null === $object || ($object->isEmpty())) {
             return [
                 'comment' => '',
                 'isNull' => true,
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
index 8a3c355b0..42f541d56 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
@@ -101,7 +101,9 @@ final class UserControllerTest extends WebTestCase
 
         // Check data in the show view
         $this->assertStringContainsString(
-            "Test_user", $crawler->text(), "page contains the name of the user"
+            'Test_user',
+            $crawler->text(),
+            'page contains the name of the user'
         );
 
         //test the auth of the new client
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index 0eeb6a293..1d2343067 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -39,13 +39,13 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
     private CommentEmbeddable $comment;
 
     /**
      * @ORM\Column(type="text", nullable=true)
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
     private ?string $freeText = null;
 
@@ -53,24 +53,29 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Groups({"read", "docgen:read"})
      */
     private ?int $id;
 
     /**
      * @ORM\ManyToOne(targetEntity=PersonResourceKind::class, inversedBy="personResources")
      * @ORM\JoinColumn(nullable=true)
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $kind;
+    private ?PersonResourceKind $kind = null;
 
     /**
+     * The person which host the owner of this resource.
+     *
      * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="personResources")
      * @ORM\JoinColumn(nullable=true)
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
     private ?Person $person = null;
 
     /**
+     * The person linked with this resource.
+     *
      * @ORM\ManyToOne(targetEntity=Person::class)
      * @ORM\JoinColumn(nullable=false)
      * @Groups({"read"})
@@ -80,7 +85,7 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class, inversedBy="personResources")
      * @ORM\JoinColumn(nullable=true)
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
     private ?ThirdParty $thirdParty = null;
 
@@ -117,8 +122,13 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
         return $this->person;
     }
 
+    public function getPersonOwner(): ?Person
+    {
+        return $this->personOwner;
+    }
+
     /**
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
     public function getResourceKind(): string
     {
@@ -137,12 +147,6 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
         return 'none';
     }
 
-
-    public function getPersonOwner(): ?Person
-    {
-        return $this->personOwner;
-    }
-
     public function getThirdParty(): ?ThirdParty
     {
         return $this->thirdParty;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
index 4e65fda9f..f450997fa 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
@@ -12,10 +12,9 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Entity\Person;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
- * **About denormalization**: this operation is operated by @see{AccompanyingPeriodResourdeNormalizer}.
- *
  * @ORM\Entity
  * @ORM\Table(name="chill_person_resource_kind")
  */
@@ -25,8 +24,9 @@ class PersonResourceKind
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Serializer\Groups({"docgen:read"})
      */
-    private int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="boolean")
@@ -35,6 +35,8 @@ class PersonResourceKind
 
     /**
      * @ORM\Column(type="json", length=255)
+     * @Serializer\Groups({"docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $title;
 
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
index c68062b21..fb325ec4e 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
@@ -24,6 +24,7 @@ use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
@@ -40,10 +41,10 @@ class PersonDocGenNormalizer implements
 
     private PersonRenderInterface $personRender;
 
-    private RelationshipRepository $relationshipRepository;
-
     private PersonResourceRepository $personResourceRepository;
 
+    private RelationshipRepository $relationshipRepository;
+
     private TranslatableStringHelper $translatableStringHelper;
 
     private TranslatorInterface $translator;
@@ -68,6 +69,15 @@ class PersonDocGenNormalizer implements
         $dateContext = $context;
         $dateContext['docgen:expects'] = DateTimeInterface::class;
         $addressContext = array_merge($context, ['docgen:expects' => Address::class]);
+        $personResourceContext = array_merge($context, [
+            'docgen:expects' => Person\PersonResource::class,
+            // we simplify the list of attributes for the embedded persons
+            AbstractNormalizer::GROUPS => ['docgen:read'],
+            // when a person reference the same person... take care of circulare references
+            AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => function ($object, $format, $context) {
+                return $this->normalize(null, $format, $context);
+            },
+        ]);
 
         if (null === $person) {
             return $this->normalizeNullValue($format, $context);
@@ -109,7 +119,7 @@ class PersonDocGenNormalizer implements
             'memo' => $person->getMemo(),
             'numberOfChildren' => (string) $person->getNumberOfChildren(),
             'address' => $this->normalizer->normalize($person->getCurrentPersonAddress(), $format, $addressContext),
-            'resources' => $this->personResourceRepository->findBy(['personOwner' => $person]),
+            'resources' => $this->normalizer->normalize($this->personResourceRepository->findBy(['personOwner' => $person]), $format, $personResourceContext),
         ];
 
         if ($context['docgen:person:with-household'] ?? false) {

From 1f6565d2ef05a2379d234fcc226b061bc584387b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 17:59:35 +0100
Subject: [PATCH 156/174] add return path when creating an activity

---
 .../ChillActivityBundle/Controller/ActivityController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 6bf4f1d0d..97861ba67 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -179,14 +179,15 @@ final class ActivityController extends AbstractController
     {
         $view = null;
 
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
-
         $entity = $this->activityRepository->find($id);
 
         if (null === $entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
+        $accompanyingPeriod = $entity->getAccompanyingPeriod();
+        $person = $entity->getPerson();
+
         if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
             $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
             $accompanyingPeriod = $entity->getAccompanyingPeriod();
@@ -445,6 +446,9 @@ final class ActivityController extends AbstractController
                         'template' => $form->get('gendocTemplateId')->getData(),
                         'entityClassName' => Activity::class,
                         'entityId' => $entity->getId(),
+                        'returnPath' => $this->generateUrl('chill_activity_activity_edit', [
+                            'id' => $entity->getId(),
+                        ])
                     ]
                 );
             }

From 8d5c66dc408e825bf453117a4ee96ee6f6f7a15e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 22 Mar 2022 15:49:25 +0100
Subject: [PATCH 157/174] person can be added to filiation graph and
 relationship created

---
 .../Resources/public/vuejs/VisGraph/App.vue   | 35 +++++++++----------
 .../Resources/public/vuejs/VisGraph/i18n.js   |  6 ++++
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
index e0f8e7f3c..e671ce7ad 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
@@ -180,24 +180,6 @@ export default {
          }
       }
    },
-   methods: {
-      addNewPersons({ selected, modal }) {
-         console.log('@@@ CLICK button addNewPersons', selected);
-         // selected.forEach(function(item) {
-         //       this.$store.dispatch('addPerson', item)
-         //          .catch(({name, violations}) => {
-         //             if (name === 'ValidationException' || name === 'AccessException') {
-         //                violations.forEach((violation) => this.$toast.open({message: violation}));
-         //             } else {
-         //                this.$toast.open({message: violations})
-         //             }
-         //          });
-         //    }, this
-         // );
-         // this.$refs.addPersons.resetSearch(); // to cast child method
-         // modal.showModal = false;
-      },
-   },
    computed: {
       ...mapGetters(['nodes', 'edges',
          // not used 'isInWhitelist', 'isHouseholdLoading', 'isCourseLoaded', 'isRelationshipLoaded', 'isPersonLoaded', 'isExcludedNode', 'countLinksByNode', 'getParticipationsByCourse', 'getMembersByHousehold', 'getPersonsGroup',
@@ -278,7 +260,22 @@ export default {
       this.link = document.getElementById('exportCanvasBtn')
    },
    methods: {
-
+      addNewPersons({ selected, modal }) {
+         // console.log('@@@ CLICK button addNewPersons', selected);
+         selected.forEach(function(item) {
+               this.$store.dispatch('addPerson', item.result)
+                  .catch(({name, violations}) => {
+                     if (name === 'ValidationException' || name === 'AccessException') {
+                        violations.forEach((violation) => this.$toast.open({message: violation}));
+                     } else {
+                        this.$toast.open({message: violations})
+                     }
+                  });
+            }, this
+         );
+         this.$refs.addPersons.resetSearch(); // to cast child method
+         modal.showModal = false;
+      },
       initGraph() {
          this.container = document.getElementById('visgraph')
          // Instanciate vis objects in separate window variables, see vis-network.js
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
index bf9d894d5..5172d8074 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
@@ -1,5 +1,11 @@
 const visMessages = {
     fr: {
+        add_persons: {
+            title: "Ajouter des usagers",
+            suggested_counter: "Pas de résultats | 1 résultat | {count} résultats",
+            selected_counter: " 1 sélectionné | {count} sélectionnés",
+            search_some_persons: "Rechercher des personnes..",
+        },
         visgraph: {
             Course: 'Parcours',
             Household: 'Ménage',

From 4939c8c8e4f9ff17c6724d23dffb4d2bd9e54400 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 22 Mar 2022 15:50:31 +0100
Subject: [PATCH 158/174] changelog updated

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e74bd2abe..0d6c1c831 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ and this project adheres to
 * [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
 * [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
 * [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
+* [filiation] Possible to add person (or create onthefly) to add to filiation graph + add relation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/519)
 
 ## Test releases
 

From 98d5de29b02d89999713f046614c436ff7151c5a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 22 Mar 2022 16:09:03 +0100
Subject: [PATCH 159/174] translations added

---
 .../Resources/public/vuejs/VisGraph/i18n.js   | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
index 5172d8074..cee841d0c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
@@ -34,6 +34,41 @@ const visMessages = {
             choose_relation: "Choisissez le lien de parenté",
             relationship_household: "Filiation du ménage",
         },
+        item: {
+            type_person: "Usager",
+            type_user: "TMS",
+            type_thirdparty: "Tiers professionnel",
+            type_household: "Ménage"
+        },
+        person: {
+            firstname: "Prénom",
+            lastname: "Nom",
+            born: (ctx) => {
+                if (ctx.gender === 'man') {
+                    return 'Né le';
+                } else if (ctx.gender === 'woman') {
+                    return 'Née le';
+                } else {
+                    return 'Né·e le';
+                }
+            },
+            center_id: "Identifiant du centre",
+            center_type: "Type de centre",
+            center_name: "Territoire", // vendée
+            phonenumber: "Téléphone",
+            mobilenumber: "Mobile",
+            altnames: "Autres noms",
+            email: "Courriel",
+            gender: {
+                title: "Genre",
+                placeholder: "Choisissez le genre de l'usager",
+                woman: "Féminin",
+                man: "Masculin",
+                neuter: "Neutre, non binaire",
+                undefined: "Non renseigné"
+            }
+        },
+        error_only_one_person: "Une seule personne peut être sélectionnée !",
         edit: 'Éditer',
         del: 'Supprimer',
         back: 'Revenir en arrière',

From 89e7eb85ffd72005b119780870ca76207f315dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 22 Mar 2022 22:36:01 +0100
Subject: [PATCH 160/174] fix cs

---
 .../ChillActivityBundle/Controller/ActivityController.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 97861ba67..a89b1d67c 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -231,7 +231,7 @@ final class ActivityController extends AbstractController
                         'template' => $form->get('gendocTemplateId')->getData(),
                         'entityClassName' => Activity::class,
                         'entityId' => $entity->getId(),
-                        'returnPath' => $this->generateUrl('chill_activity_activity_edit', $params)
+                        'returnPath' => $this->generateUrl('chill_activity_activity_edit', $params),
                     ]
                 );
             }
@@ -448,7 +448,7 @@ final class ActivityController extends AbstractController
                         'entityId' => $entity->getId(),
                         'returnPath' => $this->generateUrl('chill_activity_activity_edit', [
                             'id' => $entity->getId(),
-                        ])
+                        ]),
                     ]
                 );
             }

From c5ffca22ffd3551918617effe948e72429fbfe5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 22 Mar 2022 22:37:19 +0100
Subject: [PATCH 161/174] ease docgen normlisation for resources

---
 .../ChillPersonBundle/Entity/Person.php       | 17 ++++++++++++
 .../Entity/Person/PersonResource.php          | 15 +++++++----
 .../Normalizer/PersonDocGenNormalizer.php     | 26 +++++++++++++------
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index fd07b0489..081ddc488 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -26,6 +26,7 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Entity\Person\PersonCurrentAddress;
+use Chill\PersonBundle\Entity\Person\PersonResource;
 use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential;
 use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
 use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter;
@@ -451,6 +452,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     private $proxyAccompanyingPeriodOpenState = false; //TO-DELETE ?
 
+    /**
+     * @ORM\OneToMany(targetEntity=PersonResource::class, mappedBy="personOwner")
+     *
+     * @var Collection|PersonResource[];
+     */
+    private Collection $resources;
+
     /**
      * The person's spoken languages.
      *
@@ -493,6 +501,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $this->maritalStatusComment = new CommentEmbeddable();
         $this->periodLocatedOn = new ArrayCollection();
         $this->accompanyingPeriodRequested = new ArrayCollection();
+        $this->resources = new ArrayCollection();
     }
 
     /**
@@ -1301,6 +1310,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->placeOfBirth;
     }
 
+    /**
+     * @return PersonResource[]|Collection
+     */
+    public function getResources()
+    {
+        return $this->resources;
+    }
+
     /**
      * Get spokenLanguages.
      *
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index 1d2343067..10476242f 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -19,7 +19,7 @@ use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -27,7 +27,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_person_resource")
- * @DiscriminatorMap(typeProperty="type", mapping={
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "personResource": personResource::class
  * })
  */
@@ -39,7 +39,7 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
-     * @Groups({"read", "docgen:read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private CommentEmbeddable $comment;
 
@@ -67,7 +67,7 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
     /**
      * The person which host the owner of this resource.
      *
-     * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="personResources")
+     * @ORM\ManyToOne(targetEntity=Person::class)
      * @ORM\JoinColumn(nullable=true)
      * @Groups({"read", "docgen:read"})
      */
@@ -76,7 +76,7 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
     /**
      * The person linked with this resource.
      *
-     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="resources")
      * @ORM\JoinColumn(nullable=false)
      * @Groups({"read"})
      */
@@ -230,5 +230,10 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
             $context->buildViolation('You must associate at least one entity')
                 ->addViolation();
         }
+
+        if ($this->person === $this->personOwner) {
+            $context->buildViolation('You cannot associate a resource with the same person')
+                ->addViolation();
+        }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
index fb325ec4e..5f1311ae5 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonAltName;
-use Chill\PersonBundle\Repository\PersonResourceRepository;
 use Chill\PersonBundle\Repository\Relationships\RelationshipRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use DateTimeInterface;
@@ -32,6 +31,8 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_map;
 use function implode;
+use function in_array;
+use function is_string;
 
 class PersonDocGenNormalizer implements
     ContextAwareNormalizerInterface,
@@ -41,8 +42,6 @@ class PersonDocGenNormalizer implements
 
     private PersonRenderInterface $personRender;
 
-    private PersonResourceRepository $personResourceRepository;
-
     private RelationshipRepository $relationshipRepository;
 
     private TranslatableStringHelper $translatableStringHelper;
@@ -52,13 +51,11 @@ class PersonDocGenNormalizer implements
     public function __construct(
         PersonRenderInterface $personRender,
         RelationshipRepository $relationshipRepository,
-        PersonResourceRepository $personResourceRepository,
         TranslatorInterface $translator,
         TranslatableStringHelper $translatableStringHelper
     ) {
         $this->personRender = $personRender;
         $this->relationshipRepository = $relationshipRepository;
-        $this->personResourceRepository = $personResourceRepository;
         $this->translator = $translator;
         $this->translatableStringHelper = $translatableStringHelper;
     }
@@ -73,9 +70,9 @@ class PersonDocGenNormalizer implements
             'docgen:expects' => Person\PersonResource::class,
             // we simplify the list of attributes for the embedded persons
             AbstractNormalizer::GROUPS => ['docgen:read'],
-            // when a person reference the same person... take care of circulare references
+            // when a person reference the same person... take care of circular references
             AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => function ($object, $format, $context) {
-                return $this->normalize(null, $format, $context);
+                return $this->normalizer->normalize(null, $format, $context);
             },
         ]);
 
@@ -119,7 +116,7 @@ class PersonDocGenNormalizer implements
             'memo' => $person->getMemo(),
             'numberOfChildren' => (string) $person->getNumberOfChildren(),
             'address' => $this->normalizer->normalize($person->getCurrentPersonAddress(), $format, $addressContext),
-            'resources' => $this->normalizer->normalize($this->personResourceRepository->findBy(['personOwner' => $person]), $format, $personResourceContext),
+            'resources' => $this->normalizer->normalize($person->getResources(), $format, $personResourceContext),
         ];
 
         if ($context['docgen:person:with-household'] ?? false) {
@@ -163,6 +160,17 @@ class PersonDocGenNormalizer implements
             );
     }
 
+    private function hasGroup($context, string $group): bool
+    {
+        $groups = $context[AbstractNormalizer::GROUPS] ?? [];
+
+        if (is_string($groups)) {
+            $groups = [$groups];
+        }
+
+        return in_array($group, $groups, true);
+    }
+
     private function normalizeNullValue(string $format, array $context)
     {
         $normalizer = new NormalizeNullValueHelper($this->normalizer, 'type', 'person');
@@ -185,6 +193,8 @@ class PersonDocGenNormalizer implements
 
         $data = $normalizer->normalize($attributes, $format, $context);
 
+        $data['resources'] = [];
+
         if ($context['docgen:person:with-relations'] ?? false) {
             $data['relations'] = [];
         }

From 99dc9dd4a8c502d54fe1687064e9da489ee492cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 22 Mar 2022 23:36:02 +0100
Subject: [PATCH 162/174] handle case when user is null in comment embeddable

---
 .../Normalizer/CommentEmbeddableDocGenNormalizer.php        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
index 10f43a2f6..2cddb73db 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
@@ -52,7 +52,11 @@ class CommentEmbeddableDocGenNormalizer implements ContextAwareNormalizerInterfa
             ];
         }
 
-        $user = $this->userRepository->find($object->getUserId());
+        if (null === $object->getUserId()) {
+            $user = null;
+        } else {
+            $user = $this->userRepository->find($object->getUserId());
+        }
 
         return [
             'comment' => $object->getComment(),

From 73c17febd9205f2db7fd10a4c90135733eddc9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 23 Mar 2022 00:05:36 +0100
Subject: [PATCH 163/174] remove inter database reference

---
 .../ChillPersonBundle/migrations/Version20220310063629.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php b/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
index 9e6f0c332..c168521ed 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220310063629.php
@@ -37,6 +37,6 @@ final class Version20220310063629 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EBB99F6060 FOREIGN KEY (accompanyingperiodwork_id) REFERENCES chill_person_accompanying_period_work (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EBA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('INSERT INTO chill_person_accompanying_period_work_referrer (accompanyingperiodwork_id, user_id)
-            SELECT id, createdby_id FROM postgres.public.chill_person_accompanying_period_work');
+            SELECT id, createdby_id FROM chill_person_accompanying_period_work');
     }
 }

From 30fd36b74108a6b93d4231d8100d083f44a31090 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 23 Mar 2022 14:16:38 +0100
Subject: [PATCH 164/174] forgotten translation added

---
 .../Resources/views/ThirdParty/view.html.twig                   | 2 +-
 src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
index 759ba5918..cff7d3a72 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
@@ -60,7 +60,7 @@
                         {% if types|length > 0 %}
                             {{ types|join(', ') }}
                         {% else %}
-                            <p class="chill-no-data-statement">{{ 'thirdparty.no_categories' }}</p>
+                            <p class="chill-no-data-statement">{{ 'thirdparty.no_categories'|trans }}</p>
                         {% endif %}
                     </dd>
 
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index 9c8091307..d0edb22bb 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -15,6 +15,7 @@ thirdparty.No_comment: Aucun commentaire
 thirdparty.NameCompany:  Service/Département
 thirdparty.Acronym:  Sigle
 thirdparty.Categories:  Catégories
+thirdparty.no_categories: Aucune catégorie
 thirdparty.Child:  Personne de contact
 thirdparty.child:  Personne de contact
 thirdparty.Children:  Personnes de contact
@@ -69,7 +70,6 @@ No nameCompany given: Aucune raison sociale renseignée
 No acronym given: Aucun sigle renseigné
 No phone given: Aucun téléphone renseigné
 No email given:  Aucune adresse courriel renseignée
-thirdparty.no_categories: Aucune catégorie
 
 The party is visible in those centers: Le tiers est visible dans ces centres
 The party is not visible in any center: Le tiers n'est associé à aucun centre

From eb6790b17d650b7891efa8a79ef506c4a14cf434 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 23 Mar 2022 14:58:09 +0100
Subject: [PATCH 165/174] quick fix: missing translation

---
 src/Bundle/ChillPersonBundle/translations/messages.fr.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index d6e739632..06e4ac06e 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -496,6 +496,7 @@ Remove household composition: Supprimer composition familiale
 Are you sure you want to remove this composition?: Etes-vous sûr de vouloir supprimer cette composition familiale ?
 Concerns household n°%id%: Concerne le ménage n°%id%
 Composition: Composition
+The composition has been successfully removed.: La composition a été supprimée.
 
 # accompanying course work
 Accompanying Course Actions: Actions d'accompagnements

From 6331d8fd3e7c95d518381ee68c357049cfc4b0c2 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 23 Mar 2022 14:59:30 +0100
Subject: [PATCH 166/174] validation fix for person ressource

---
 src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index 10476242f..b1022cf4c 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -231,7 +231,7 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
                 ->addViolation();
         }
 
-        if ($this->person === $this->personOwner) {
+        if (null !== $this->person && $this->person === $this->personOwner) {
             $context->buildViolation('You cannot associate a resource with the same person')
                 ->addViolation();
         }

From e89489fde992155c1db7da27d8b6dd49ac84818d Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 23 Mar 2022 15:04:52 +0100
Subject: [PATCH 167/174] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6903edfda..3e1ef9fc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@ and this project adheres to
 * [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
 * [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
 * [household] Within parcours listing page of household add create button (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/560)
+* [person_resource] bugfix when adding thirdparty or freetext resource (no issue)
 
 ## Test releases
 

From aa234e07496e341ad3cc2055f836311ed799210e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 23 Mar 2022 17:33:23 +0100
Subject: [PATCH 168/174] activity annexe button made sticky

---
 CHANGELOG.md                                                  | 1 +
 .../src/Resources/views/asideActivity/index.html.twig         | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e1ef9fc5..359936a1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@ and this project adheres to
 * [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
 * [household] Within parcours listing page of household add create button (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/560)
 * [person_resource] bugfix when adding thirdparty or freetext resource (no issue)
+* [aside_activity] style correction + sticky-form create button (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/529)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
index 6cc45aeaf..4dd12e042 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
@@ -40,7 +40,7 @@
 									{% endif %}
 								</div>
 							</div>
-							<div class="item-col">
+							<div class="item-col" style="justify-content: flex-end;">
 								<div class="box">
 									<ul class="list-content fa-ul">
 										<li>
@@ -79,7 +79,7 @@
 
 			{{ chill_pagination(paginator) }}
 
-			<ul class="record_actions">
+			<ul class="record_actions sticky-form-buttons">
 				<li>
 					<a href="{{ chill_path_add_return_path('chill_crud_aside_activity_new') }}" class="btn btn-create">
 						{{ 'Create'|trans }}

From d7b5944c5f4fbdfcd0fafd70008ddc6e439f3d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 23 Mar 2022 22:50:01 +0100
Subject: [PATCH 169/174] temporarily desactivate resources for docgen

---
 .../Serializer/Normalizer/PersonDocGenNormalizer.php            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
index 5f1311ae5..cf184e52b 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
@@ -116,7 +116,7 @@ class PersonDocGenNormalizer implements
             'memo' => $person->getMemo(),
             'numberOfChildren' => (string) $person->getNumberOfChildren(),
             'address' => $this->normalizer->normalize($person->getCurrentPersonAddress(), $format, $addressContext),
-            'resources' => $this->normalizer->normalize($person->getResources(), $format, $personResourceContext),
+            //'resources' => $this->normalizer->normalize($person->getResources(), $format, $personResourceContext),
         ];
 
         if ($context['docgen:person:with-household'] ?? false) {

From 546c925224d5edb3b3b55f8da43200849a727b6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 23 Mar 2022 22:51:09 +0100
Subject: [PATCH 170/174] Enforce a limit for search results when searching
 through api

---
 CHANGELOG.md                                    |  1 +
 src/Bundle/ChillMainBundle/Search/SearchApi.php | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 359936a1b..c0992dcfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [search] enforce limit of results for fetching rsults by search api https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/576
 * [activity] Fix delete button for document (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/554)
 * [activity] Add return path the document generation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/553)
 * [person] add person ressource to person docgen normaliser (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/517)
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApi.php b/src/Bundle/ChillMainBundle/Search/SearchApi.php
index 7436b3303..5c4026a45 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApi.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApi.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
+use Chill\MainBundle\Pagination\Paginator;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Doctrine\DBAL\Types\Types;
@@ -102,9 +103,9 @@ class SearchApi
         return $items;
     }
 
-    private function buildUnionQuery(array $queries, $types, $parameters)
+    private function buildUnionQuery(array $queries, $types, $parameters, Paginator $paginator)
     {
-        $query = '{unions} ORDER BY pertinence DESC';
+        $query = '{unions} ORDER BY pertinence DESC LIMIT ? OFFSET ?';
         $unions = [];
         $parameters = [];
 
@@ -113,6 +114,10 @@ class SearchApi
             $parameters = array_merge($parameters, $q->buildParameters());
         }
 
+        // add pagination limit
+        $parameters[] = $paginator->getItemsPerPage();
+        $parameters[] = $paginator->getCurrentPageFirstItemNumber();
+
         $union = implode(' UNION ', $unions);
 
         return [
@@ -132,9 +137,9 @@ class SearchApi
         return (int) $countNq->getSingleScalarResult();
     }
 
-    private function fetchRawResult($queries, $types, $parameters, $paginator): array
+    private function fetchRawResult($queries, $types, $parameters, Paginator $paginator): array
     {
-        [$union, $parameters] = $this->buildUnionQuery($queries, $types, $parameters);
+        [$union, $parameters] = $this->buildUnionQuery($queries, $types, $parameters, $paginator);
         $rsm = new ResultSetMappingBuilder($this->em);
         $rsm->addScalarResult('key', 'key', Types::STRING)
             ->addScalarResult('metadata', 'metadata', Types::JSON)

From 3067da5d2412cdf2778bf546140326f58a3a4a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 23 Mar 2022 22:56:45 +0100
Subject: [PATCH 171/174] fix tests for removing temporarily resources on
 person

---
 .../Serializer/Normalizer/PersonDocGenNormalizer.php            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
index cf184e52b..0e146b5c0 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
@@ -193,7 +193,7 @@ class PersonDocGenNormalizer implements
 
         $data = $normalizer->normalize($attributes, $format, $context);
 
-        $data['resources'] = [];
+        //$data['resources'] = [];
 
         if ($context['docgen:person:with-relations'] ?? false) {
             $data['relations'] = [];

From 949bdfd9931cb07e82e9838dfea43b928092bb87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 23 Mar 2022 22:58:53 +0100
Subject: [PATCH 172/174] add missing property (phpstanerror)

---
 phpstan-types.neon                                       | 5 -----
 src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php | 3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/phpstan-types.neon b/phpstan-types.neon
index ddde5cc03..9671c05a5 100644
--- a/phpstan-types.neon
+++ b/phpstan-types.neon
@@ -250,11 +250,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/Address.php
 
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
diff --git a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
index 357cf38be..e458b049d 100644
--- a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Doctrine\ORM\Query\Parameter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
@@ -27,6 +28,8 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
 
     protected TranslatorInterface $translator;
 
+    protected ParameterBagInterface $parameterBag;
+
     /**
      * SectionMenuBuilder constructor.
      */

From eea0711a044a37fab031dfbb9b01f5cf870ff546 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 24 Mar 2022 09:10:32 +0100
Subject: [PATCH 173/174] autowire sectionmenu service

---
 src/Bundle/ChillMainBundle/config/services/menu.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/config/services/menu.yaml b/src/Bundle/ChillMainBundle/config/services/menu.yaml
index 03ed34a92..1a66153f8 100644
--- a/src/Bundle/ChillMainBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/menu.yaml
@@ -13,9 +13,8 @@ services:
             - { name: 'chill.menu_builder' }
 
     Chill\MainBundle\Routing\MenuBuilder\SectionMenuBuilder:
-        arguments:
-            $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: 'chill.menu_builder' }
 

From 2e336ac87451fffb472161ec7dd44a7c08070e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 24 Mar 2022 15:07:46 +0100
Subject: [PATCH 174/174] update case when the person was already on the graph

---
 .../Resources/public/vuejs/VisGraph/App.vue   | 24 +++++----
 .../Resources/public/vuejs/VisGraph/store.js  | 53 +++++++++++++++++--
 .../public/vuejs/VisGraph/vis-network.js      | 10 +---
 3 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
index e671ce7ad..f5db187b9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
@@ -113,16 +113,18 @@
          </template>
       </modal>
    </teleport>
-   <div style="float: right;">
-      <add-persons
-         buttonTitle="visgraph.add_person"
-         modalTitle="visgraph.add_person"
-         v-bind:key="addPersons.key"
-         v-bind:options="addPersons.options"
-         @addNewPersons="addNewPersons"
-         ref="addPersons">
-      </add-persons>
-   </div>
+   <ul class="record_actions sticky-form-buttons">
+     <li>
+       <add-persons
+           buttonTitle="visgraph.add_person"
+           modalTitle="visgraph.add_person"
+           v-bind:key="addPersons.key"
+           v-bind:options="addPersons.options"
+           @addNewPersons="addNewPersons"
+           ref="addPersons">
+       </add-persons>
+     </li>
+   </ul>
 </template>
 
 <script>
@@ -263,7 +265,7 @@ export default {
       addNewPersons({ selected, modal }) {
          // console.log('@@@ CLICK button addNewPersons', selected);
          selected.forEach(function(item) {
-               this.$store.dispatch('addPerson', item.result)
+               this.$store.dispatch('addMorePerson', item.result)
                   .catch(({name, violations}) => {
                      if (name === 'ValidationException' || name === 'AccessException') {
                         violations.forEach((violation) => this.$toast.open({message: violation}));
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
index 023faa679..32aa5bbc9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
@@ -117,10 +117,27 @@ const store = createStore({
             return group
         },
 
+        getPersonById: (state) => (person_id) => {
+            return state.persons.find(p => p._id === person_id);
+        }
+
 
     },
     mutations: {
         addPerson(state, [person, options]) {
+            if (!'_id' in person) {
+                person._id = person.id
+                person.id = `person_${person.id}`
+            }
+
+            let existing = state.persons.find(p => p._id === person._id);
+
+            if (typeof existing !== 'undefined') {
+                if (!options.folded && person.folded) {
+                    // unfold
+                }
+               return;
+            }
             let age = getAge(person)
             age = (age === '')? '' : ' - ' + age
 
@@ -232,6 +249,9 @@ const store = createStore({
 
         //// unfold
         unfoldPerson(state, person) {
+            if (!person.folded) {
+                return;
+            }
             //console.log('unfoldPerson', person)
             person.label = person._label
             delete person._label
@@ -261,6 +281,31 @@ const store = createStore({
             dispatch('fetchInfoForPerson', person)
         },
 
+        /**
+         * Add a person manually
+         *
+         * @param commit
+         * @param dispatch
+         * @param person
+         */
+        addMorePerson({ commit, dispatch, getters }, person) {
+            let nodeId = `person_${person.id}`;
+            if (getters.isPersonLoaded(person.id)) {
+                if (getters.isExcludedNode(nodeId)) {
+                    commit('removeExcludedNode', nodeId);
+                    let p = getters.getPersonById(person.id);
+                    if (typeof p !== 'undefined') {
+                        commit('unfoldPerson', p);
+                    } else {
+                        throw 'a person loaded was not found';
+                    }
+                    commit('updateHack');
+                }
+            } else {
+                return dispatch('addPerson', person);
+            }
+        },
+
         /**
          *  2) Fetch infos for this person (hub)
          *  @param object
@@ -287,7 +332,7 @@ const store = createStore({
             //console.log('  isHouseholdLoading ?', getters.isHouseholdLoading(person.current_household_id))
             if (! getters.isHouseholdLoading(person.current_household_id)) {
                 commit('markHouseholdLoading', person.current_household_id)
-                getHouseholdByPerson(person)
+                return getHouseholdByPerson(person)
                     .then(household => new Promise(resolve => {
                         commit('addHousehold', household)
                             // DISABLED: in init or expand loop, layer is uncheck when added
@@ -295,7 +340,7 @@ const store = createStore({
                             //commit('updateHack')
                         dispatch('addLinkFromPersonsToHousehold', household)
                         commit('updateHack')
-                        resolve()
+                        resolve();
                         })
                     ).catch( () => {
                         commit('unmarkHouseholdLoading', person.current_household_id)
@@ -335,7 +380,7 @@ const store = createStore({
          *  @param person
          */
         fetchCoursesByPerson({ commit, dispatch }, person) {
-            getCoursesByPerson(person)
+            return getCoursesByPerson(person)
                 .then(courses => new Promise(resolve => {
                     dispatch('addCourses', courses)
                     resolve()
@@ -383,6 +428,8 @@ const store = createStore({
                     dispatch('addMissingPerson', [p.person, course])
                 }
             })
+
+            return Promise.resolve();
         },
 
         /**
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
index ef87cb779..6f9a2ac16 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
@@ -164,14 +164,8 @@ const getGender = (gender) => {
  * @returns {string|null}
  */
 const getAge = (person) => {
-    if (person.birthdate) {
-        let birthdate = new Date(person.birthdate.datetime)
-        if (person.deathdate) {
-            let deathdate = new Date(person.deathdate.datetime)
-            return (deathdate.getFullYear() - birthdate.getFullYear()) + visMessages.fr.visgraph.years
-        }
-        let now = new Date()
-        return (now.getFullYear() - birthdate.getFullYear()) + visMessages.fr.visgraph.years
+    if (person.age) {
+        return person.age + ' ' + visMessages.fr.visgraph.years;
     }
     return ''
 }