From 5351223d44af43d2a063eea6b408749128e0b263 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 23 May 2023 18:12:26 +0200
Subject: [PATCH 01/49] FIX [duplicates] reinstate gestion des doublons

---
 .../Actions/Remove/PersonMove.php             | 69 ++++++++++++++-----
 .../Controller/PersonDuplicateController.php  |  6 +-
 .../Menu/PersonMenuBuilder.php                | 25 ++++---
 .../views/PersonDuplicate/_sidepane.html.twig |  2 +-
 .../views/PersonDuplicate/confirm.html.twig   |  8 +--
 5 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
index 13a62094d..8363134fd 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
@@ -13,7 +13,11 @@ namespace Chill\PersonBundle\Actions\Remove;
 
 use Chill\PersonBundle\Actions\ActionEvent;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Relationships\Relationship;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -42,9 +46,10 @@ class PersonMove
     protected $eventDispatcher;
 
     public function __construct(
-        EntityManagerInterface $em,
+        EntityManagerInterface   $em,
         EventDispatcherInterface $eventDispatcher
-    ) {
+    )
+    {
         $this->em = $em;
         $this->eventDispatcher = $eventDispatcher;
     }
@@ -84,8 +89,11 @@ class PersonMove
             }
 
             foreach ($metadata->getAssociationMappings() as $field => $mapping) {
-                if (Person::class === $mapping['targetEntity']) {
-                    if (in_array($metadata->getName(), $toDelete, true)) {
+                if (in_array($mapping['sourceEntity'], $this->getIgnoredEntities())) {
+                    continue;
+                }
+                if (Person::class === $mapping['targetEntity'] and true === $mapping['isOwningSide']) {
+                    if (in_array($mapping['sourceEntity'], $toDelete, true)) {
                         $sql = $this->createDeleteSQL($metadata, $from, $field);
                         $event = new ActionEvent(
                             $from->getId(),
@@ -117,10 +125,11 @@ class PersonMove
             $from->getId()
         );
 
+        dump($sqls);
         return $sqls;
     }
 
-    protected function createDeleteSQL(ClassMetadata $metadata, Person $from, $field): string
+    private function createDeleteSQL(ClassMetadata $metadata, Person $from, $field): string
     {
         $mapping = $metadata->getAssociationMapping($field);
 
@@ -137,26 +146,41 @@ class PersonMove
         );
     }
 
-    protected function createMoveSQL(ClassMetadata $metadata, Person $from, Person $to, $field): string
+    private function createMoveSQL(ClassMetadata $metadata, Person $from, Person $to, $field): string
     {
         $mapping = $metadata->getAssociationMapping($field);
 
         // Set part of the query, aka <here> in  "UPDATE table SET <here>                                                                                                                                                                            "
         $sets = [];
-
-        foreach ($mapping['joinColumns'] as $columns) {
-            $sets[] = sprintf('%s = %d', $columns['name'], $to->getId());
-        }
-
         $conditions = [];
+        dump($mapping);
 
-        foreach ($mapping['joinColumns'] as $columns) {
-            $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
+        if (array_key_exists('joinTable', $mapping)) {
+            $tableName = (null !== ($mapping['joinTable']['schema'] ?? null) ? $mapping['joinTable']['schema'] . '.' : '')
+                . $mapping['joinTable']['name'];
+
+            foreach ($mapping['joinTable']['inverseJoinColumns'] as $columns) {
+                $sets[] = sprintf('%s = %d', $columns['name'], $to->getId());
+            }
+
+            foreach ($mapping['joinTable']['inverseJoinColumns'] as $columns) {
+                $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
+            }
+        } elseif (array_key_exists('joinColumns', $mapping)) {
+            $tableName = $this->getTableName($metadata);
+            foreach ($mapping['joinColumns'] as $columns) {
+                $sets[] = sprintf('%s = %d', $columns['name'], $to->getId());
+            }
+
+
+            foreach ($mapping['joinColumns'] as $columns) {
+                $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
+            }
         }
 
         return sprintf(
             'UPDATE %s SET %s WHERE %s',
-            $this->getTableName($metadata),
+            $tableName,
             implode(' ', $sets),
             implode(' AND ', $conditions)
         );
@@ -166,10 +190,23 @@ class PersonMove
      * return an array of classes where entities should be deleted
      * instead of moved.
      */
-    protected function getDeleteEntities(): array
+    private function getDeleteEntities(): array
     {
         return [
-            AccompanyingPeriod::class,
+            Person\PersonCenterHistory::class,
+            HouseholdMember::class,
+            AccompanyingPeriodParticipation::class,
+            AccompanyingPeriod\AccompanyingPeriodWork::class,
+            Relationship::class
+        ];
+    }
+
+    private function getIgnoredEntities(): array
+    {
+        return [
+            Person\PersonCurrentAddress::class,
+            PersonHouseholdAddress::class,
+            Person\PersonCenterCurrent::class,
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
index 928112d2e..ab353c83e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
@@ -247,7 +247,7 @@ class PersonDuplicateController extends Controller
         );
 
         $duplicatePersons = $this->similarPersonMatcher->
-            matchPerson($person, $personNotDuplicateRepository, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL);
+            matchPerson($person, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL, false, $personNotDuplicateRepository);
 
         $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
 
@@ -264,14 +264,14 @@ class PersonDuplicateController extends Controller
 
         $nb_activity = $em->getRepository(Activity::class)->findBy(['person' => $id]);
         $nb_document = $em->getRepository(PersonDocument::class)->findBy(['person' => $id]);
-        $nb_event = $em->getRepository(Participation::class)->findBy(['person' => $id]);
+//        $nb_event = $em->getRepository(Participation::class)->findBy(['person' => $id]);
         $nb_task = $em->getRepository(SingleTask::class)->countByParameters(['person' => $id]);
         $person = $em->getRepository(Person::class)->findOneBy(['id' => $id]);
 
         return [
             'nb_activity' => count($nb_activity),
             'nb_document' => count($nb_document),
-            'nb_event' => count($nb_event),
+//            'nb_event' => count($nb_event),
             'nb_task' => $nb_task,
             'nb_addresses' => count($person->getAddresses()),
         ];
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index 39ac557fb..b7934c2b2 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Security;
@@ -106,17 +107,19 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
             ->setExtras([
                 'order' => 99999,
             ]);
-        /*
-        $menu->addChild($this->translator->trans('Person duplicate'), [
-            'route' => 'chill_person_duplicate_view',
-            'routeParameters' => [
-                'person_id' => $parameters['person']->getId(),
-            ],
-        ])
-            ->setExtras([
-                'order' => 99999,
-            ]);
-         */
+
+        if ($this->security->isGranted(PersonVoter::DUPLICATE, $parameters['person'])) {
+            $menu->addChild($this->translator->trans('Person duplicate'), [
+                'route' => 'chill_person_duplicate_view',
+                'routeParameters' => [
+                    'person_id' => $parameters['person']->getId(),
+                ],
+            ])
+                ->setExtras([
+                    'order' => 99999,
+                ]);
+        }
+
         if (
             'visible' === $this->showAccompanyingPeriod
             && $this->security->isGranted(AccompanyingPeriodVoter::SEE, $parameters['person'])
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
index 660fff7a6..1e770062a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
@@ -39,7 +39,7 @@
     <li><b>{{ person.counters.nb_activity }}</b> {{ (person.counters.nb_activity > 1)? 'échanges' : 'échange' }}</li>
     <li><b>{{ person.counters.nb_task }}</b> {{ (person.counters.nb_task > 1)? 'tâches' : 'tâche' }}</li>
     <li><b>{{ person.counters.nb_document }}</b> {{ (person.counters.nb_document > 1)? 'documents' : 'document' }}</li>
-    <li><b>{{ person.counters.nb_event }}</b> {{ (person.counters.nb_event > 1)? 'événements' : 'événement' }}</li>
+{#    <li><b>{{ person.counters.nb_event }}</b> {{ (person.counters.nb_event > 1)? 'événements' : 'événement' }}</li>#}
     <li><b>{{ person.counters.nb_addresses }}</b> {{ (person.counters.nb_addresses > 1)? 'adresses' : 'adresse' }}</li>
 
 </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
index 304e78eb3..218b89f2a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
@@ -25,7 +25,7 @@
 
     <h1>{{ 'Merge duplicate persons folders'|trans }}</h1>
 
-    <div class="col-md-6">
+    <div class="col-md-11">
         <p><b>{{ 'Old person'|trans }}</b>:
             {{ 'Old person explain'|trans }}
         </p>
@@ -43,7 +43,7 @@
         </div>
     </div>
 
-    <div class="col-md-6">
+    <div class="col-md-11">
         <p><b>{{ 'New person'|trans }}</b>:
             {{ 'New person explain'|trans }}
         </p>
@@ -63,10 +63,10 @@
 
     {{ form_start(form) }}
 
-    <div class="col-md-4 centered">
+    <div class="col-md-12 centered">
 
         <div class="container-fluid" style="padding-top: 1em;">
-            <div class="col-1 clear" style="padding-top: 10px;">
+            <div class="clear" style="padding-top: 10px;">
                 {{ form_widget(form.confirm) }}
             </div>
             <div class="col-11">

From 8b82e0c535c33616505ca5ed6e524864cfdc41c3 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 23 May 2023 18:19:31 +0200
Subject: [PATCH 02/49] FIX [rights] user shouldn't be allowed to see
 accompanyingperiods from within household

---
 .../Security/Authorization/AccompanyingPeriodVoter.php          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
index ea32326a4..709624b54 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
 use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Security;
@@ -119,6 +120,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
             ->generate(self::class)
             ->addCheckFor(null, [self::CREATE, self::REASSIGN_BULK])
             ->addCheckFor(AccompanyingPeriod::class, [self::TOGGLE_CONFIDENTIAL, ...self::ALL])
+            ->addCheckFor(Household::class, [self::SEE])
             ->addCheckFor(Person::class, [self::SEE, self::CREATE])
             ->addCheckFor(Center::class, [self::STATS])
             ->build();

From 5109490aad0a0c12db9a8f4c3729de11a131f6bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 24 May 2023 13:09:04 +0200
Subject: [PATCH 03/49] Revert "FIX [duplicates] reinstate gestion des
 doublons"

This reverts commit 5351223d44af43d2a063eea6b408749128e0b263.
---
 .../Actions/Remove/PersonMove.php             | 69 +++++--------------
 .../Controller/PersonDuplicateController.php  |  6 +-
 .../Menu/PersonMenuBuilder.php                | 25 +++----
 .../views/PersonDuplicate/_sidepane.html.twig |  2 +-
 .../views/PersonDuplicate/confirm.html.twig   |  8 +--
 5 files changed, 35 insertions(+), 75 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
index 8363134fd..13a62094d 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
@@ -13,11 +13,7 @@ namespace Chill\PersonBundle\Actions\Remove;
 
 use Chill\PersonBundle\Actions\ActionEvent;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Chill\PersonBundle\Entity\Household\HouseholdMember;
-use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\Relationships\Relationship;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -46,10 +42,9 @@ class PersonMove
     protected $eventDispatcher;
 
     public function __construct(
-        EntityManagerInterface   $em,
+        EntityManagerInterface $em,
         EventDispatcherInterface $eventDispatcher
-    )
-    {
+    ) {
         $this->em = $em;
         $this->eventDispatcher = $eventDispatcher;
     }
@@ -89,11 +84,8 @@ class PersonMove
             }
 
             foreach ($metadata->getAssociationMappings() as $field => $mapping) {
-                if (in_array($mapping['sourceEntity'], $this->getIgnoredEntities())) {
-                    continue;
-                }
-                if (Person::class === $mapping['targetEntity'] and true === $mapping['isOwningSide']) {
-                    if (in_array($mapping['sourceEntity'], $toDelete, true)) {
+                if (Person::class === $mapping['targetEntity']) {
+                    if (in_array($metadata->getName(), $toDelete, true)) {
                         $sql = $this->createDeleteSQL($metadata, $from, $field);
                         $event = new ActionEvent(
                             $from->getId(),
@@ -125,11 +117,10 @@ class PersonMove
             $from->getId()
         );
 
-        dump($sqls);
         return $sqls;
     }
 
-    private function createDeleteSQL(ClassMetadata $metadata, Person $from, $field): string
+    protected function createDeleteSQL(ClassMetadata $metadata, Person $from, $field): string
     {
         $mapping = $metadata->getAssociationMapping($field);
 
@@ -146,41 +137,26 @@ class PersonMove
         );
     }
 
-    private function createMoveSQL(ClassMetadata $metadata, Person $from, Person $to, $field): string
+    protected function createMoveSQL(ClassMetadata $metadata, Person $from, Person $to, $field): string
     {
         $mapping = $metadata->getAssociationMapping($field);
 
         // Set part of the query, aka <here> in  "UPDATE table SET <here>                                                                                                                                                                            "
         $sets = [];
+
+        foreach ($mapping['joinColumns'] as $columns) {
+            $sets[] = sprintf('%s = %d', $columns['name'], $to->getId());
+        }
+
         $conditions = [];
-        dump($mapping);
 
-        if (array_key_exists('joinTable', $mapping)) {
-            $tableName = (null !== ($mapping['joinTable']['schema'] ?? null) ? $mapping['joinTable']['schema'] . '.' : '')
-                . $mapping['joinTable']['name'];
-
-            foreach ($mapping['joinTable']['inverseJoinColumns'] as $columns) {
-                $sets[] = sprintf('%s = %d', $columns['name'], $to->getId());
-            }
-
-            foreach ($mapping['joinTable']['inverseJoinColumns'] as $columns) {
-                $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
-            }
-        } elseif (array_key_exists('joinColumns', $mapping)) {
-            $tableName = $this->getTableName($metadata);
-            foreach ($mapping['joinColumns'] as $columns) {
-                $sets[] = sprintf('%s = %d', $columns['name'], $to->getId());
-            }
-
-
-            foreach ($mapping['joinColumns'] as $columns) {
-                $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
-            }
+        foreach ($mapping['joinColumns'] as $columns) {
+            $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
         }
 
         return sprintf(
             'UPDATE %s SET %s WHERE %s',
-            $tableName,
+            $this->getTableName($metadata),
             implode(' ', $sets),
             implode(' AND ', $conditions)
         );
@@ -190,23 +166,10 @@ class PersonMove
      * return an array of classes where entities should be deleted
      * instead of moved.
      */
-    private function getDeleteEntities(): array
+    protected function getDeleteEntities(): array
     {
         return [
-            Person\PersonCenterHistory::class,
-            HouseholdMember::class,
-            AccompanyingPeriodParticipation::class,
-            AccompanyingPeriod\AccompanyingPeriodWork::class,
-            Relationship::class
-        ];
-    }
-
-    private function getIgnoredEntities(): array
-    {
-        return [
-            Person\PersonCurrentAddress::class,
-            PersonHouseholdAddress::class,
-            Person\PersonCenterCurrent::class,
+            AccompanyingPeriod::class,
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
index ab353c83e..928112d2e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
@@ -247,7 +247,7 @@ class PersonDuplicateController extends Controller
         );
 
         $duplicatePersons = $this->similarPersonMatcher->
-            matchPerson($person, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL, false, $personNotDuplicateRepository);
+            matchPerson($person, $personNotDuplicateRepository, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL);
 
         $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
 
@@ -264,14 +264,14 @@ class PersonDuplicateController extends Controller
 
         $nb_activity = $em->getRepository(Activity::class)->findBy(['person' => $id]);
         $nb_document = $em->getRepository(PersonDocument::class)->findBy(['person' => $id]);
-//        $nb_event = $em->getRepository(Participation::class)->findBy(['person' => $id]);
+        $nb_event = $em->getRepository(Participation::class)->findBy(['person' => $id]);
         $nb_task = $em->getRepository(SingleTask::class)->countByParameters(['person' => $id]);
         $person = $em->getRepository(Person::class)->findOneBy(['id' => $id]);
 
         return [
             'nb_activity' => count($nb_activity),
             'nb_document' => count($nb_document),
-//            'nb_event' => count($nb_event),
+            'nb_event' => count($nb_event),
             'nb_task' => $nb_task,
             'nb_addresses' => count($person->getAddresses()),
         ];
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index b7934c2b2..39ac557fb 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Security;
@@ -107,19 +106,17 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
             ->setExtras([
                 'order' => 99999,
             ]);
-
-        if ($this->security->isGranted(PersonVoter::DUPLICATE, $parameters['person'])) {
-            $menu->addChild($this->translator->trans('Person duplicate'), [
-                'route' => 'chill_person_duplicate_view',
-                'routeParameters' => [
-                    'person_id' => $parameters['person']->getId(),
-                ],
-            ])
-                ->setExtras([
-                    'order' => 99999,
-                ]);
-        }
-
+        /*
+        $menu->addChild($this->translator->trans('Person duplicate'), [
+            'route' => 'chill_person_duplicate_view',
+            'routeParameters' => [
+                'person_id' => $parameters['person']->getId(),
+            ],
+        ])
+            ->setExtras([
+                'order' => 99999,
+            ]);
+         */
         if (
             'visible' === $this->showAccompanyingPeriod
             && $this->security->isGranted(AccompanyingPeriodVoter::SEE, $parameters['person'])
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
index 1e770062a..660fff7a6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
@@ -39,7 +39,7 @@
     <li><b>{{ person.counters.nb_activity }}</b> {{ (person.counters.nb_activity > 1)? 'échanges' : 'échange' }}</li>
     <li><b>{{ person.counters.nb_task }}</b> {{ (person.counters.nb_task > 1)? 'tâches' : 'tâche' }}</li>
     <li><b>{{ person.counters.nb_document }}</b> {{ (person.counters.nb_document > 1)? 'documents' : 'document' }}</li>
-{#    <li><b>{{ person.counters.nb_event }}</b> {{ (person.counters.nb_event > 1)? 'événements' : 'événement' }}</li>#}
+    <li><b>{{ person.counters.nb_event }}</b> {{ (person.counters.nb_event > 1)? 'événements' : 'événement' }}</li>
     <li><b>{{ person.counters.nb_addresses }}</b> {{ (person.counters.nb_addresses > 1)? 'adresses' : 'adresse' }}</li>
 
 </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
index 218b89f2a..304e78eb3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
@@ -25,7 +25,7 @@
 
     <h1>{{ 'Merge duplicate persons folders'|trans }}</h1>
 
-    <div class="col-md-11">
+    <div class="col-md-6">
         <p><b>{{ 'Old person'|trans }}</b>:
             {{ 'Old person explain'|trans }}
         </p>
@@ -43,7 +43,7 @@
         </div>
     </div>
 
-    <div class="col-md-11">
+    <div class="col-md-6">
         <p><b>{{ 'New person'|trans }}</b>:
             {{ 'New person explain'|trans }}
         </p>
@@ -63,10 +63,10 @@
 
     {{ form_start(form) }}
 
-    <div class="col-md-12 centered">
+    <div class="col-md-4 centered">
 
         <div class="container-fluid" style="padding-top: 1em;">
-            <div class="clear" style="padding-top: 10px;">
+            <div class="col-1 clear" style="padding-top: 10px;">
                 {{ form_widget(form.confirm) }}
             </div>
             <div class="col-11">

From 04359f27c6d1563b840980aae56be0ead9d271f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 24 May 2023 13:11:40 +0200
Subject: [PATCH 04/49] Revert "Revert "FIX [duplicates] reinstate gestion des
 doublons""

This reverts commit 5109490aad0a0c12db9a8f4c3729de11a131f6bd.
---
 .../Actions/Remove/PersonMove.php             | 69 ++++++++++++++-----
 .../Controller/PersonDuplicateController.php  |  6 +-
 .../Menu/PersonMenuBuilder.php                | 25 ++++---
 .../views/PersonDuplicate/_sidepane.html.twig |  2 +-
 .../views/PersonDuplicate/confirm.html.twig   |  8 +--
 5 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
index 13a62094d..8363134fd 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
@@ -13,7 +13,11 @@ namespace Chill\PersonBundle\Actions\Remove;
 
 use Chill\PersonBundle\Actions\ActionEvent;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Relationships\Relationship;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -42,9 +46,10 @@ class PersonMove
     protected $eventDispatcher;
 
     public function __construct(
-        EntityManagerInterface $em,
+        EntityManagerInterface   $em,
         EventDispatcherInterface $eventDispatcher
-    ) {
+    )
+    {
         $this->em = $em;
         $this->eventDispatcher = $eventDispatcher;
     }
@@ -84,8 +89,11 @@ class PersonMove
             }
 
             foreach ($metadata->getAssociationMappings() as $field => $mapping) {
-                if (Person::class === $mapping['targetEntity']) {
-                    if (in_array($metadata->getName(), $toDelete, true)) {
+                if (in_array($mapping['sourceEntity'], $this->getIgnoredEntities())) {
+                    continue;
+                }
+                if (Person::class === $mapping['targetEntity'] and true === $mapping['isOwningSide']) {
+                    if (in_array($mapping['sourceEntity'], $toDelete, true)) {
                         $sql = $this->createDeleteSQL($metadata, $from, $field);
                         $event = new ActionEvent(
                             $from->getId(),
@@ -117,10 +125,11 @@ class PersonMove
             $from->getId()
         );
 
+        dump($sqls);
         return $sqls;
     }
 
-    protected function createDeleteSQL(ClassMetadata $metadata, Person $from, $field): string
+    private function createDeleteSQL(ClassMetadata $metadata, Person $from, $field): string
     {
         $mapping = $metadata->getAssociationMapping($field);
 
@@ -137,26 +146,41 @@ class PersonMove
         );
     }
 
-    protected function createMoveSQL(ClassMetadata $metadata, Person $from, Person $to, $field): string
+    private function createMoveSQL(ClassMetadata $metadata, Person $from, Person $to, $field): string
     {
         $mapping = $metadata->getAssociationMapping($field);
 
         // Set part of the query, aka <here> in  "UPDATE table SET <here>                                                                                                                                                                            "
         $sets = [];
-
-        foreach ($mapping['joinColumns'] as $columns) {
-            $sets[] = sprintf('%s = %d', $columns['name'], $to->getId());
-        }
-
         $conditions = [];
+        dump($mapping);
 
-        foreach ($mapping['joinColumns'] as $columns) {
-            $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
+        if (array_key_exists('joinTable', $mapping)) {
+            $tableName = (null !== ($mapping['joinTable']['schema'] ?? null) ? $mapping['joinTable']['schema'] . '.' : '')
+                . $mapping['joinTable']['name'];
+
+            foreach ($mapping['joinTable']['inverseJoinColumns'] as $columns) {
+                $sets[] = sprintf('%s = %d', $columns['name'], $to->getId());
+            }
+
+            foreach ($mapping['joinTable']['inverseJoinColumns'] as $columns) {
+                $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
+            }
+        } elseif (array_key_exists('joinColumns', $mapping)) {
+            $tableName = $this->getTableName($metadata);
+            foreach ($mapping['joinColumns'] as $columns) {
+                $sets[] = sprintf('%s = %d', $columns['name'], $to->getId());
+            }
+
+
+            foreach ($mapping['joinColumns'] as $columns) {
+                $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
+            }
         }
 
         return sprintf(
             'UPDATE %s SET %s WHERE %s',
-            $this->getTableName($metadata),
+            $tableName,
             implode(' ', $sets),
             implode(' AND ', $conditions)
         );
@@ -166,10 +190,23 @@ class PersonMove
      * return an array of classes where entities should be deleted
      * instead of moved.
      */
-    protected function getDeleteEntities(): array
+    private function getDeleteEntities(): array
     {
         return [
-            AccompanyingPeriod::class,
+            Person\PersonCenterHistory::class,
+            HouseholdMember::class,
+            AccompanyingPeriodParticipation::class,
+            AccompanyingPeriod\AccompanyingPeriodWork::class,
+            Relationship::class
+        ];
+    }
+
+    private function getIgnoredEntities(): array
+    {
+        return [
+            Person\PersonCurrentAddress::class,
+            PersonHouseholdAddress::class,
+            Person\PersonCenterCurrent::class,
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
index 928112d2e..ab353c83e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
@@ -247,7 +247,7 @@ class PersonDuplicateController extends Controller
         );
 
         $duplicatePersons = $this->similarPersonMatcher->
-            matchPerson($person, $personNotDuplicateRepository, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL);
+            matchPerson($person, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL, false, $personNotDuplicateRepository);
 
         $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
 
@@ -264,14 +264,14 @@ class PersonDuplicateController extends Controller
 
         $nb_activity = $em->getRepository(Activity::class)->findBy(['person' => $id]);
         $nb_document = $em->getRepository(PersonDocument::class)->findBy(['person' => $id]);
-        $nb_event = $em->getRepository(Participation::class)->findBy(['person' => $id]);
+//        $nb_event = $em->getRepository(Participation::class)->findBy(['person' => $id]);
         $nb_task = $em->getRepository(SingleTask::class)->countByParameters(['person' => $id]);
         $person = $em->getRepository(Person::class)->findOneBy(['id' => $id]);
 
         return [
             'nb_activity' => count($nb_activity),
             'nb_document' => count($nb_document),
-            'nb_event' => count($nb_event),
+//            'nb_event' => count($nb_event),
             'nb_task' => $nb_task,
             'nb_addresses' => count($person->getAddresses()),
         ];
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index 39ac557fb..b7934c2b2 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Security;
@@ -106,17 +107,19 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
             ->setExtras([
                 'order' => 99999,
             ]);
-        /*
-        $menu->addChild($this->translator->trans('Person duplicate'), [
-            'route' => 'chill_person_duplicate_view',
-            'routeParameters' => [
-                'person_id' => $parameters['person']->getId(),
-            ],
-        ])
-            ->setExtras([
-                'order' => 99999,
-            ]);
-         */
+
+        if ($this->security->isGranted(PersonVoter::DUPLICATE, $parameters['person'])) {
+            $menu->addChild($this->translator->trans('Person duplicate'), [
+                'route' => 'chill_person_duplicate_view',
+                'routeParameters' => [
+                    'person_id' => $parameters['person']->getId(),
+                ],
+            ])
+                ->setExtras([
+                    'order' => 99999,
+                ]);
+        }
+
         if (
             'visible' === $this->showAccompanyingPeriod
             && $this->security->isGranted(AccompanyingPeriodVoter::SEE, $parameters['person'])
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
index 660fff7a6..1e770062a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
@@ -39,7 +39,7 @@
     <li><b>{{ person.counters.nb_activity }}</b> {{ (person.counters.nb_activity > 1)? 'échanges' : 'échange' }}</li>
     <li><b>{{ person.counters.nb_task }}</b> {{ (person.counters.nb_task > 1)? 'tâches' : 'tâche' }}</li>
     <li><b>{{ person.counters.nb_document }}</b> {{ (person.counters.nb_document > 1)? 'documents' : 'document' }}</li>
-    <li><b>{{ person.counters.nb_event }}</b> {{ (person.counters.nb_event > 1)? 'événements' : 'événement' }}</li>
+{#    <li><b>{{ person.counters.nb_event }}</b> {{ (person.counters.nb_event > 1)? 'événements' : 'événement' }}</li>#}
     <li><b>{{ person.counters.nb_addresses }}</b> {{ (person.counters.nb_addresses > 1)? 'adresses' : 'adresse' }}</li>
 
 </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
index 304e78eb3..218b89f2a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
@@ -25,7 +25,7 @@
 
     <h1>{{ 'Merge duplicate persons folders'|trans }}</h1>
 
-    <div class="col-md-6">
+    <div class="col-md-11">
         <p><b>{{ 'Old person'|trans }}</b>:
             {{ 'Old person explain'|trans }}
         </p>
@@ -43,7 +43,7 @@
         </div>
     </div>
 
-    <div class="col-md-6">
+    <div class="col-md-11">
         <p><b>{{ 'New person'|trans }}</b>:
             {{ 'New person explain'|trans }}
         </p>
@@ -63,10 +63,10 @@
 
     {{ form_start(form) }}
 
-    <div class="col-md-4 centered">
+    <div class="col-md-12 centered">
 
         <div class="container-fluid" style="padding-top: 1em;">
-            <div class="col-1 clear" style="padding-top: 10px;">
+            <div class="clear" style="padding-top: 10px;">
                 {{ form_widget(form.confirm) }}
             </div>
             <div class="col-11">

From d82a3e0ff6e57ebb1a763d5aa2c995bda6b78797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 24 May 2023 12:06:07 +0200
Subject: [PATCH 05/49] Fixed: [download document] add a target when
 downloading document

---
 .../public/vuejs/StoredObjectButton/DownloadButton.vue      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
index 98645873b..b22035bee 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
@@ -34,6 +34,7 @@ async function download_and_open(event: Event): Promise<void> {
     const raw = await download_and_decrypt_doc(urlInfo, props.storedObject.keyInfos, new Uint8Array(props.storedObject.iv));
 
     button.href = window.URL.createObjectURL(raw);
+    button.target = '_blank';
     button.type = props.storedObject.type;
 
     button.download = props.filename || 'document';
@@ -45,10 +46,7 @@ async function download_and_open(event: Event): Promise<void> {
 
     state.is_ready = true;
 
-    // for fixing https://gitlab.com/Chill-Projet/chill-bundles/-/issues/98
-    window.setTimeout(() => {
-        button.click()
-    }, 750);
+    button.click();
   }
 }
 </script>

From 20023dff671ea7457a5c56c0f94f4e3b7b70d55e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 24 May 2023 13:35:35 +0200
Subject: [PATCH 06/49] DX: fix cs

---
 .../ChillActivityBundle/Controller/ActivityController.php     | 4 ++--
 src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php     | 4 ++--
 src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 97678af50..444c663fc 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -650,8 +650,8 @@ final class ActivityController extends AbstractController
                 throw $this->createNotFoundException('Accompanying Period not found');
             }
 
-        // TODO Add permission
-        // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+            // TODO Add permission
+            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         } else {
             throw $this->createNotFoundException('Person or Accompanying Period not found');
         }
diff --git a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
index 03a1b09ab..a3cebec38 100644
--- a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
@@ -26,12 +26,12 @@ final class PersonMenuBuilder implements LocalMenuBuilderInterface
     /**
      * @var AuthorizationCheckerInterface
      */
-    protected $authorizationChecker;
+    private $authorizationChecker;
 
     /**
      * @var TranslatorInterface
      */
-    protected $translator;
+    private $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index b1446a543..6c4984f33 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -117,7 +117,7 @@ class ThirdPartyType extends AbstractType
                     'label' => 'thirdparty.Contact data are confidential',
                 ]);
 
-        // Institutional ThirdParty (parent)
+            // Institutional ThirdParty (parent)
         } else {
             $builder
                 ->add('nameCompany', TextType::class, [

From a31c4063a19dfc27e3bb4f8502f05c06ed650b3e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 24 May 2023 14:02:05 +0200
Subject: [PATCH 07/49] DX [cs-fixer] fixes

---
 .../Command/SynchronizeEntityInfoViewsCommand.php           | 1 -
 .../Controller/PermissionsGroupController.php               | 1 -
 .../ChillMainBundle/Controller/UserExportController.php     | 1 -
 .../AccompanyingPeriodStepChangeMessageHandler.php          | 1 -
 .../Lifecycle/AccompanyingPeriodStepChangeRequestor.php     | 1 -
 .../Export/Export/ListHouseholdInPeriod.php                 | 1 -
 .../AccompanyingPeriod/AccompanyingPeriodInfoRepository.php | 1 -
 .../Lifecycle/AccompanyingPeriodStepChangeCronjobTest.php   | 1 -
 .../Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php   | 6 +-----
 9 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/SynchronizeEntityInfoViewsCommand.php b/src/Bundle/ChillMainBundle/Command/SynchronizeEntityInfoViewsCommand.php
index c3dc8a87c..05fefe20f 100644
--- a/src/Bundle/ChillMainBundle/Command/SynchronizeEntityInfoViewsCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/SynchronizeEntityInfoViewsCommand.php
@@ -36,5 +36,4 @@ class SynchronizeEntityInfoViewsCommand extends Command
 
         return 0;
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
index 488092931..97e80916c 100644
--- a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
@@ -163,7 +163,6 @@ final class PermissionsGroupController extends AbstractController
      */
     public function deleteLinkRoleScopeAction(int $pgid, int $rsid): Response
     {
-
         $permissionsGroup = $this->permissionsGroupRepository->find($pgid);
         $roleScope = $this->roleScopeRepository->find($rsid);
 
diff --git a/src/Bundle/ChillMainBundle/Controller/UserExportController.php b/src/Bundle/ChillMainBundle/Controller/UserExportController.php
index dc2674dbb..530ac19b7 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserExportController.php
@@ -141,5 +141,4 @@ final readonly class UserExportController
             ]
         );
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeMessageHandler.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeMessageHandler.php
index 881b3999a..4a9873c6d 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeMessageHandler.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeMessageHandler.php
@@ -34,5 +34,4 @@ class AccompanyingPeriodStepChangeMessageHandler implements MessageHandlerInterf
 
         ($this->changer)($period, $message->getTransition());
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestor.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestor.php
index 3d4979608..f1c3563fc 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestor.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestor.php
@@ -84,5 +84,4 @@ class AccompanyingPeriodStepChangeRequestor
             $this->messageBus->dispatch(new AccompanyingPeriodStepChangeRequestMessage($accompanyingPeriodId, 'mark_active'));
         }
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php b/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
index 24d929c00..8894d145d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
@@ -107,7 +107,6 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
                 return $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.household.' . $key);
 
             case 'compositionType':
-                //dump($values);
                 return $this->translatableStringHelper->getLabel($key, $values, 'export.list.household.' . $key);
 
             default:
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepository.php
index 57925b131..0296d00f1 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepository.php
@@ -89,5 +89,4 @@ readonly class AccompanyingPeriodInfoRepository implements AccompanyingPeriodInf
     {
         return AccompanyingPeriodInfo::class;
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjobTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjobTest.php
index 5c3c29179..5a5b50dbb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjobTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjobTest.php
@@ -51,5 +51,4 @@ class AccompanyingPeriodStepChangeCronjobTest extends TestCase
         // can not run: not enough elapsed time
         yield ['2023-01-15T01:00:00+02:00', new \DateTimeImmutable('2023-01-15T00:30:00+02:00'), false];
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php
index f462bc47e..5287ab844 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php
@@ -78,17 +78,13 @@ final class SocialWorkTypeFilterTest extends AbstractFilterTest
         $goals = array_unique($goals);
         $results = array_unique($results);
 
-        $data = [
+        return [
             [
                 'actionType' => implode(',', $actions),
                 'goal' => implode(',', $goals),
                 'result' => implode(',', $results),
             ],
         ];
-        /// TODO ne fonctionne pas
-        var_dump($data);
-
-        return $data;
     }
 
     public function getQueryBuilders(): array

From f5448f9d95babf82d972d3ccc31eb0430cc4d9c7 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 24 May 2023 14:02:49 +0200
Subject: [PATCH 08/49] DX [phpstan] fixes

---
 .../ChillPersonBundle/Actions/Remove/PersonMove.php       | 8 +++-----
 .../Controller/PersonDuplicateController.php              | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
index 8363134fd..4e2f7468e 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
@@ -48,8 +48,7 @@ class PersonMove
     public function __construct(
         EntityManagerInterface   $em,
         EventDispatcherInterface $eventDispatcher
-    )
-    {
+    ) {
         $this->em = $em;
         $this->eventDispatcher = $eventDispatcher;
     }
@@ -89,7 +88,7 @@ class PersonMove
             }
 
             foreach ($metadata->getAssociationMappings() as $field => $mapping) {
-                if (in_array($mapping['sourceEntity'], $this->getIgnoredEntities())) {
+                if (in_array($mapping['sourceEntity'], $this->getIgnoredEntities(), true)) {
                     continue;
                 }
                 if (Person::class === $mapping['targetEntity'] and true === $mapping['isOwningSide']) {
@@ -125,7 +124,6 @@ class PersonMove
             $from->getId()
         );
 
-        dump($sqls);
         return $sqls;
     }
 
@@ -153,7 +151,7 @@ class PersonMove
         // Set part of the query, aka <here> in  "UPDATE table SET <here>                                                                                                                                                                            "
         $sets = [];
         $conditions = [];
-        dump($mapping);
+        $tableName = '';
 
         if (array_key_exists('joinTable', $mapping)) {
             $tableName = (null !== ($mapping['joinTable']['schema'] ?? null) ? $mapping['joinTable']['schema'] . '.' : '')
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
index ab353c83e..386e55039 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
@@ -247,7 +247,7 @@ class PersonDuplicateController extends Controller
         );
 
         $duplicatePersons = $this->similarPersonMatcher->
-            matchPerson($person, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL, false, $personNotDuplicateRepository);
+            matchPerson($person, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL, false);
 
         $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
 
@@ -271,7 +271,7 @@ class PersonDuplicateController extends Controller
         return [
             'nb_activity' => count($nb_activity),
             'nb_document' => count($nb_document),
-//            'nb_event' => count($nb_event),
+            //            'nb_event' => count($nb_event),
             'nb_task' => $nb_task,
             'nb_addresses' => count($person->getAddresses()),
         ];

From 664bf743f933b50db3ded4ce281ff8c973ed8fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 24 May 2023 15:08:59 +0200
Subject: [PATCH 09/49] Fix: force list of activities to be a list with
 incremental keys

---
 ...tActivitiesByAccompanyingPeriodContext.php | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
index 3da451f2e..045d09beb 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
@@ -140,26 +140,36 @@ class ListActivitiesByAccompanyingPeriodContext implements
         return $normalized;
     }
 
+    /**
+     * @return list
+     */
     private function filterActivitiesByUser(array $activities, User $user): array
     {
-        return array_filter(
-            $activities,
-            function ($activity) use ($user) {
-                $activityUsernames = array_map(static fn ($user) => $user['username'], $activity['users'] ?? []);
-                return in_array($user->getUsername(), $activityUsernames, true);
-            }
+        return array_values(
+            array_filter(
+                $activities,
+                function ($activity) use ($user) {
+                    $activityUsernames = array_map(static fn ($user) => $user['username'], $activity['users'] ?? []);
+                    return in_array($user->getUsername(), $activityUsernames, true);
+                }
+            )
         );
     }
 
+    /**
+     * @return list
+     */
     private function filterWorksByUser(array $works, User $user): array
     {
-        return array_filter(
-            $works,
-            function ($work) use ($user) {
-                $workUsernames = array_map(static fn ($user) => $user['username'], $work['referrers'] ?? []);
+        return array_values(
+            array_filter(
+                $works,
+                function ($work) use ($user) {
+                    $workUsernames = array_map(static fn ($user) => $user['username'], $work['referrers'] ?? []);
 
-                return in_array($user->getUsername(), $workUsernames, true);
-            }
+                    return in_array($user->getUsername(), $workUsernames, true);
+                }
+            )
         );
     }
 

From dad36927f31fd9e707e052ccba57366e5c01d29f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 24 May 2023 15:34:39 +0200
Subject: [PATCH 10/49] FEATURE [export] uncheck all centers button

---
 .../views/Export/new_centers_step.html.twig     | 17 +++++++++++++++++
 .../translations/messages.fr.yml                |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
index 9e37dc2cd..40366669c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
@@ -39,8 +39,13 @@
                 {{ 'This will eventually restrict your possibilities in filtering the data.'|trans }}</p>
 
             <h3 class="m-3">{{ 'Center'|trans }}</h3>
+
             {{ form_widget(form.centers.center) }}
 
+            <div class="mb-3 mt-3">
+                <input class="btn btn-misc" type= "button" onclick='uncheckAll(this)' value="{{ 'uncheck all'|trans }}"/>
+            </div>
+
             {% if form.centers.regroupment is defined %}
                 <h3 class="m-3">{{ 'Pick aggregated centers'|trans }}</h3>
                 {{ form_widget(form.centers.regroupment) }}
@@ -53,3 +58,15 @@
 
     </div>
 {% endblock content %}
+
+{% block js %}
+
+    <script>
+        const uncheckAll = () => {
+            const checkedCenters = document.getElementsByName('centers[center][]');
+
+            checkedCenters.forEach(checkbox => checkbox.checked = false)
+        }
+    </script>
+
+{% endblock js %}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 13c300fdd..fa28feef6 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -285,6 +285,8 @@ The export will contains only data from the picked centers.: L'export ne contien
 This will eventually restrict your possibilities in filtering the data.: Les possibilités de filtrages seront adaptées aux droits de consultation pour les centres choisis.
 Go to export options: Vers la préparation de l'export
 Pick aggregated centers: Regroupement de centres
+uncheck all: Désélectionner tout les centres
+check all: Sélectionner tout les centres
 # export creation step 'export' : choose aggregators, filtering and formatter
 Formatter: Mise en forme
 Choose the formatter: Choisissez le format d'export voulu.

From 6e618e688bf4b593702212559277a9aaed02bfcf Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 24 May 2023 15:50:25 +0200
Subject: [PATCH 11/49] DX [php-cs-fixer]

---
 .../ChillActivityBundle/Controller/ActivityController.php     | 4 ++--
 src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php     | 4 ++--
 .../Controller/PersonDuplicateController.php                  | 2 +-
 src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 97678af50..444c663fc 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -650,8 +650,8 @@ final class ActivityController extends AbstractController
                 throw $this->createNotFoundException('Accompanying Period not found');
             }
 
-        // TODO Add permission
-        // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+            // TODO Add permission
+            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         } else {
             throw $this->createNotFoundException('Person or Accompanying Period not found');
         }
diff --git a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
index 03a1b09ab..a3cebec38 100644
--- a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
@@ -26,12 +26,12 @@ final class PersonMenuBuilder implements LocalMenuBuilderInterface
     /**
      * @var AuthorizationCheckerInterface
      */
-    protected $authorizationChecker;
+    private $authorizationChecker;
 
     /**
      * @var TranslatorInterface
      */
-    protected $translator;
+    private $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
index 386e55039..7ade542e0 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
@@ -264,7 +264,7 @@ class PersonDuplicateController extends Controller
 
         $nb_activity = $em->getRepository(Activity::class)->findBy(['person' => $id]);
         $nb_document = $em->getRepository(PersonDocument::class)->findBy(['person' => $id]);
-//        $nb_event = $em->getRepository(Participation::class)->findBy(['person' => $id]);
+        //        $nb_event = $em->getRepository(Participation::class)->findBy(['person' => $id]);
         $nb_task = $em->getRepository(SingleTask::class)->countByParameters(['person' => $id]);
         $person = $em->getRepository(Person::class)->findOneBy(['id' => $id]);
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index b1446a543..6c4984f33 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -117,7 +117,7 @@ class ThirdPartyType extends AbstractType
                     'label' => 'thirdparty.Contact data are confidential',
                 ]);
 
-        // Institutional ThirdParty (parent)
+            // Institutional ThirdParty (parent)
         } else {
             $builder
                 ->add('nameCompany', TextType::class, [

From 77997e2b6f9b6512e1dcb16c9baac9ff928fbd97 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 24 May 2023 16:24:58 +0200
Subject: [PATCH 12/49] FIX [review] fix review comments

---
 .../Resources/views/Export/new_centers_step.html.twig       | 6 +++---
 src/Bundle/ChillMainBundle/translations/messages.fr.yml     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
index 40366669c..2e2dc0ec6 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
@@ -43,7 +43,7 @@
             {{ form_widget(form.centers.center) }}
 
             <div class="mb-3 mt-3">
-                <input class="btn btn-misc" type= "button" onclick='uncheckAll(this)' value="{{ 'uncheck all'|trans }}"/>
+                <input id="toggle-check-all" class="btn btn-misc" type= "button" onclick='uncheckAll(this)' value="{{ 'uncheck all centers'|trans|e('html_attr') }}"/>
             </div>
 
             {% if form.centers.regroupment is defined %}
@@ -63,9 +63,9 @@
 
     <script>
         const uncheckAll = () => {
-            const checkedCenters = document.getElementsByName('centers[center][]');
+            const allCenters = document.getElementsByName('centers[center][]');
 
-            checkedCenters.forEach(checkbox => checkbox.checked = false)
+            allCenters.forEach(checkbox => checkbox.checked = false)
         }
     </script>
 
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index fa28feef6..78de523c4 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -285,8 +285,8 @@ The export will contains only data from the picked centers.: L'export ne contien
 This will eventually restrict your possibilities in filtering the data.: Les possibilités de filtrages seront adaptées aux droits de consultation pour les centres choisis.
 Go to export options: Vers la préparation de l'export
 Pick aggregated centers: Regroupement de centres
-uncheck all: Désélectionner tout les centres
-check all: Sélectionner tout les centres
+uncheck all centers: Désélectionner tous les centres
+check all centers: Sélectionner tous les centres
 # export creation step 'export' : choose aggregators, filtering and formatter
 Formatter: Mise en forme
 Choose the formatter: Choisissez le format d'export voulu.

From fec2dd0f74e852f48fd2bb4102eafc2147468a11 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 24 May 2023 19:51:52 +0200
Subject: [PATCH 13/49] enable debug

---
 .../public/vuejs/_components/Entity/PersonRenderBox.vue        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 740eb0039..1833222e8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -207,7 +207,7 @@
 </template>
 
 <script>
-import {dateToISO} from 'ChillMainAssets/chill/js/date';
+import {dateToISO, ISOToDate} from 'ChillMainAssets/chill/js/date';
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
 import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
@@ -261,6 +261,7 @@ export default {
       return this.person.gender === 'woman' ? 'person.gender.woman' : this.person.gender === 'man' ? 'person.gender.man' : this.person.gender === 'neuter' ? 'person.gender.neuter' : 'person.gender.undefined';
     },
     birthdate: function () {
+       console.log('debug birthdate', this.person.birthdate.datetime, ISOToDate(this.person.birthdate.datetime), new Date(this.person.birthdate.datetime));
       if (this.person.birthdate !== null || this.person.birthdate === "undefined") {
         return new Date(this.person.birthdate.datetime);
       } else {

From 9c85ad74ce627bede999887765531c50d31e653d Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 25 May 2023 09:33:11 +0200
Subject: [PATCH 14/49] [vue] Fix birthdate with wrong date in winter
 (UNCHECKED)

---
 .../public/vuejs/_components/Entity/PersonRenderBox.vue       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 1833222e8..809859114 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -261,9 +261,9 @@ export default {
       return this.person.gender === 'woman' ? 'person.gender.woman' : this.person.gender === 'man' ? 'person.gender.man' : this.person.gender === 'neuter' ? 'person.gender.neuter' : 'person.gender.undefined';
     },
     birthdate: function () {
-       console.log('debug birthdate', this.person.birthdate.datetime, ISOToDate(this.person.birthdate.datetime), new Date(this.person.birthdate.datetime));
+      console.log('debug birthdate', this.person.birthdate.datetime, ISOToDate(this.person.birthdate.datetime), new Date(this.person.birthdate.datetime));
       if (this.person.birthdate !== null || this.person.birthdate === "undefined") {
-        return new Date(this.person.birthdate.datetime);
+        return ISOToDate(this.person.birthdate.datetime);
       } else {
         return "";
       }

From c6658aa2f3a39f37d1500c174be0edf7c878b858 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 22 May 2023 17:15:49 +0200
Subject: [PATCH 15/49] Feature: add thirdParty choice in docgen
 activityContext

---
 .../Service/DocGenerator/ActivityContext.php  | 57 ++++++++++++++++++-
 .../translations/messages.fr.yml              |  4 +-
 .../translations/messages.fr.yml              |  2 +
 3 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index 624859eda..d3a770490 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -24,6 +24,9 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -55,6 +58,10 @@ class ActivityContext implements
 
     private TranslatorInterface $translator;
 
+    private ThirdPartyRender $thirdPartyRender;
+
+    private ThirdPartyRepository $thirdPartyRepository;
+
     public function __construct(
         DocumentCategoryRepository $documentCategoryRepository,
         NormalizerInterface $normalizer,
@@ -63,7 +70,9 @@ class ActivityContext implements
         PersonRenderInterface $personRender,
         PersonRepository $personRepository,
         TranslatorInterface $translator,
-        BaseContextData $baseContextData
+        BaseContextData $baseContextData,
+        ThirdPartyRender $thirdPartyRender,
+        ThirdPartyRepository $thirdPartyRepository
     ) {
         $this->documentCategoryRepository = $documentCategoryRepository;
         $this->normalizer = $normalizer;
@@ -73,6 +82,8 @@ class ActivityContext implements
         $this->personRepository = $personRepository;
         $this->translator = $translator;
         $this->baseContextData = $baseContextData;
+        $this->thirdPartyRender = $thirdPartyRender;
+        $this->thirdPartyRepository = $thirdPartyRepository;
     }
 
     public function adminFormReverseTransform(array $data): array
@@ -89,6 +100,8 @@ class ActivityContext implements
             'person1Label' => $data['person1Label'] ?? $this->translator->trans('docgen.person 1'),
             'person2' => $data['person2'] ?? false,
             'person2Label' => $data['person2Label'] ?? $this->translator->trans('docgen.person 2'),
+            'thirdParty' => $data['thirdParty'] ?? false,
+            'thirdPartyLabel' => $data['thirdPartyLabel'] ?? $this->translator->trans('thirdParty'),
         ];
     }
 
@@ -118,7 +131,15 @@ class ActivityContext implements
             ->add('person2Label', TextType::class, [
                 'label' => 'person 2 label',
                 'required' => true,
-            ]);
+            ])
+            ->add('thirdParty', CheckboxType::class, [
+                'required' => false,
+                'label' => 'docgen.Ask for thirdParty',
+            ])
+            ->add('thirdPartyLabel', TextType::class, [
+                'label' => 'thirdParty label',
+                'required' => true,
+            ]);;
     }
 
     /**
@@ -143,6 +164,21 @@ class ActivityContext implements
                 ]);
             }
         }
+
+        $thirdParties = $entity->getThirdParties();
+        if ($options['thirdParty'] ?? false) {
+            $builder->add('thirdParty', EntityType::class, [
+                'class' => ThirdParty::class,
+                'choices' => $thirdParties,
+                'choice_label' => fn (ThirdParty $p) => $this->thirdPartyRender->renderString($p, []),
+                'multiple' => false,
+                'required' => false,
+                'expanded' => true,
+                'label' => $options['thirdPartyLabel'],
+                'placeholder' => $this->translator->trans('Any third party selected'),
+            ]);
+        }
+
     }
 
     public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
@@ -157,6 +193,12 @@ class ActivityContext implements
             }
         }
 
+        if (null !== ($id = ($data['thirdParty'] ?? null))) {
+            $denormalized['thirdParty'] = $this->thirdPartyRepository->find($id);
+        } else {
+            $denormalized['thirdParty'] = null;
+        }
+
         return $denormalized;
     }
 
@@ -168,6 +210,8 @@ class ActivityContext implements
             $normalized[$k] = null === $data[$k] ? null : $data[$k]->getId();
         }
 
+        $normalized['thirdParty'] = null === $data['thirdParty'] ? null : $data['thirdParty']->getId();
+
         return $normalized;
     }
 
@@ -196,6 +240,13 @@ class ActivityContext implements
             }
         }
 
+        if ($options['thirdParty']) {
+            $data['thirdParty'] = $this->normalizer->normalize($contextGenerationData['thirdParty'], 'docgen', [
+                'docgen:expects' => ThirdParty::class,
+                'groups' => 'docgen:read'
+            ]);
+        }
+
         return $data;
     }
 
@@ -235,7 +286,7 @@ class ActivityContext implements
     {
         $options = $template->getOptions();
 
-        return $options['mainPerson'] || $options['person1'] || $options['person2'];
+        return $options['mainPerson'] || $options['person1'] || $options['person2'] || $options ['thirdParty'];
     }
 
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 341136f65..5cc9ee1f1 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -927,10 +927,10 @@ docgen:
     Accompanying period work: "Action d'accompagnement"
     Accompanying period work context: "Evaluation des actions d'accompagnement"
     Main person: Usager principal
-    person 1: Premièr usager
+    person 1: Premier usager
     person 2: Second usager
     Ask for main person: Demander à l'utilisateur de préciser l'usager principal
-    Ask for person 1: Demander à l'utilisateur de préciser le premièr usager
+    Ask for person 1: Demander à l'utilisateur de préciser le premier usager
     Ask for person 2: Demander à l'utilisateur de préciser le second usager
     A basic context for accompanying period: Contexte pour les parcours
     A context for accompanying period work: Contexte pour les actions d'accompagnement
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index 94a10177b..cf1b6105e 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -75,6 +75,7 @@ No email given:  Aucune adresse courriel renseignée
 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
 No third parties: Aucun tiers
+Any third party selected: Aucun tiers sélectionné
 
 Thirdparty handling: Tiers traitant
 Thirdparty workers: Tiers intervenants
@@ -112,6 +113,7 @@ crud:
 docgen:
     A context for person with a third party (for sending mail): Un contexte d'une personne avec un tiers (pour envoyer un courrier à ce tiers, par exemple)
     Person with third party: Personne avec choix d'un tiers
+    Ask for thirdParty: Demander à l'utilisateur de préciser un tiers
 
 # exports
 export:

From 91a19b9e991a438a527ed25a9fe691f32c084ef3 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 23 May 2023 17:28:23 +0200
Subject: [PATCH 16/49] Feature: add thirdParty choice in docgen accperiod
 context

---
 .../AccompanyingPeriodContext.php             | 64 ++++++++++++++++++-
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index a42765c12..53222b753 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -22,10 +22,14 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
@@ -62,6 +66,10 @@ class AccompanyingPeriodContext implements
 
     private TranslatorInterface $translator;
 
+    private ThirdPartyRender $thirdPartyRender;
+
+    private ThirdPartyRepository $thirdPartyRepository;
+
     public function __construct(
         DocumentCategoryRepository $documentCategoryRepository,
         NormalizerInterface $normalizer,
@@ -70,7 +78,9 @@ class AccompanyingPeriodContext implements
         PersonRenderInterface $personRender,
         PersonRepository $personRepository,
         TranslatorInterface $translator,
-        BaseContextData $baseContextData
+        BaseContextData $baseContextData,
+        ThirdPartyRender $thirdPartyRender,
+        ThirdPartyRepository $thirdPartyRepository
     ) {
         $this->documentCategoryRepository = $documentCategoryRepository;
         $this->normalizer = $normalizer;
@@ -80,6 +90,8 @@ class AccompanyingPeriodContext implements
         $this->personRepository = $personRepository;
         $this->translator = $translator;
         $this->baseContextData = $baseContextData;
+        $this->thirdPartyRender = $thirdPartyRender;
+        $this->thirdPartyRepository = $thirdPartyRepository;
     }
 
     public function adminFormReverseTransform(array $data): array
@@ -103,6 +115,8 @@ class AccompanyingPeriodContext implements
             'person1Label' => $data['person1Label'] ?? $this->translator->trans('docgen.person 1'),
             'person2' => $data['person2'] ?? false,
             'person2Label' => $data['person2Label'] ?? $this->translator->trans('docgen.person 2'),
+            'thirdParty' => $data['thirdParty'] ?? false,
+            'thirdPartyLabel' => $data['thirdPartyLabel'] ?? $this->translator->trans('thirdParty'),
         ];
 
         if (array_key_exists('category', $data)) {
@@ -140,6 +154,14 @@ class AccompanyingPeriodContext implements
                 'label' => 'person 2 label',
                 'required' => true,
             ])
+            ->add('thirdParty', CheckboxType::class, [
+                'required' => false,
+                'label' => 'docgen.Ask for thirdParty',
+            ])
+            ->add('thirdPartyLabel', TextType::class, [
+                'label' => 'thirdParty label',
+                'required' => true,
+            ])
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
                 'class' => DocumentCategory::class,
@@ -190,6 +212,29 @@ class AccompanyingPeriodContext implements
                 ]);
             }
         }
+
+        $thirdParties = array_merge(
+            array_filter([$entity->getRequestorThirdParty()]),
+            array_filter(array_map(
+                fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
+                $entity->getResources()->filter(
+                    static fn (Resource $r): bool => null !== $r->getThirdParty()
+                )->toArray())
+            )
+        );
+
+        if ($options['thirdParty'] ?? false) {
+            $builder->add('thirdParty', EntityType::class, [
+                'class' => ThirdParty::class,
+                'choices' => $thirdParties,
+                'choice_label' => fn (ThirdParty $p) => $this->thirdPartyRender->renderString($p, []),
+                'multiple' => false,
+                'required' => false,
+                'expanded' => true,
+                'label' => $options['thirdPartyLabel'],
+                'placeholder' => $this->translator->trans('Any third party selected'),
+            ]);
+        }
     }
 
     public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
@@ -215,6 +260,13 @@ class AccompanyingPeriodContext implements
             }
         }
 
+        if ($options['thirdParty']) {
+            $data['thirdParty'] = $this->normalizer->normalize($contextGenerationData['thirdParty'], 'docgen', [
+                'docgen:expects' => ThirdParty::class,
+                'groups' => 'docgen:read'
+            ]);
+        }
+
         return $data;
     }
 
@@ -254,7 +306,7 @@ class AccompanyingPeriodContext implements
     {
         $options = $template->getOptions();
 
-        return $options['mainPerson'] || $options['person1'] || $options['person2'];
+        return $options['mainPerson'] || $options['person1'] || $options['person2'] || $options ['thirdParty'];
     }
 
     public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
@@ -264,6 +316,8 @@ class AccompanyingPeriodContext implements
             $normalized[$k] = null !== ($data[$k] ?? null) ? $data[$k]->getId() : null;
         }
 
+        $normalized['thirdParty'] = null === $data['thirdParty'] ? null : $data['thirdParty']->getId();
+
         return $normalized;
     }
 
@@ -279,6 +333,12 @@ class AccompanyingPeriodContext implements
             }
         }
 
+        if (null !== ($id = ($data['thirdParty'] ?? null))) {
+            $denormalized['thirdParty'] = $this->thirdPartyRepository->find($id);
+        } else {
+            $denormalized['thirdParty'] = null;
+        }
+
         return $denormalized;
     }
 

From db33fab097c36d2de80f0c498da3f858a925f3da Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 23 May 2023 18:30:18 +0200
Subject: [PATCH 17/49] Feature: add thirdParty choice in docgen
 accperiodworkevaluation context (WIP)

---
 ...ccompanyingPeriodWorkEvaluationContext.php | 54 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index 34b339822..1c33c9323 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -18,13 +18,18 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * @implements DocGeneratorContextWithPublicFormInterface<AccompanyingPeriodWorkEvaluation>
@@ -43,18 +48,30 @@ class AccompanyingPeriodWorkEvaluationContext implements
 
     private TranslatableStringHelperInterface $translatableStringHelper;
 
+    private ThirdPartyRender $thirdPartyRender;
+
+    private ThirdPartyRepository $thirdPartyRepository;
+
+    private TranslatorInterface $translator;
+
     public function __construct(
         AccompanyingPeriodWorkContext $accompanyingPeriodWorkContext,
         EntityManagerInterface $em,
         EvaluationRepository $evaluationRepository,
         NormalizerInterface $normalizer,
-        TranslatableStringHelperInterface $translatableStringHelper
+        TranslatableStringHelperInterface $translatableStringHelper,
+        ThirdPartyRender $thirdPartyRender,
+        ThirdPartyRepository $thirdPartyRepository,
+        TranslatorInterface $translator
     ) {
         $this->accompanyingPeriodWorkContext = $accompanyingPeriodWorkContext;
         $this->em = $em;
         $this->evaluationRepository = $evaluationRepository;
         $this->normalizer = $normalizer;
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->thirdPartyRender = $thirdPartyRender;
+        $this->thirdPartyRepository = $thirdPartyRepository;
+        $this->translator = $translator;
     }
 
     public function adminFormReverseTransform(array $data): array
@@ -102,6 +119,39 @@ class AccompanyingPeriodWorkEvaluationContext implements
     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void
     {
         $this->accompanyingPeriodWorkContext->buildPublicForm($builder, $template, $entity->getAccompanyingPeriodWork());
+
+        //TODO add more choices to thirdParty form
+        //Question: replace the form or just add more choices to form 'thirdParty'?
+
+        $thirdParties = array_merge(
+            array_filter($entity->getAccompanyingPeriodWork()->getThirdParties()->toArray()),
+            array_filter([$entity->getAccompanyingPeriodWork()->getHandlingThierParty()]),
+            array_filter(array_map(
+                fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
+                $entity->getAccompanyingPeriodWork()->getAccompanyingPeriod()->getResources()->filter(
+                    static fn (Resource $r): bool => null !== $r->getThirdParty()
+                )->toArray())
+            )
+
+        );
+        dump($thirdParties);
+
+        $options = $template->getOptions();
+        if ($options['thirdParty'] ?? false) {
+            $builder->add('thirdParty', EntityType::class, [
+                'class' => ThirdParty::class,
+                'choices' => $thirdParties,
+                'choice_label' => fn (ThirdParty $p) => $this->thirdPartyRender->renderString($p, []),
+                'multiple' => false,
+                'required' => false,
+                'expanded' => true,
+                'label' => $options['thirdPartyLabel'],
+                'placeholder' => $this->translator->trans('Any third party selected'),
+            ]);
+        }
+
+
+
     }
 
     public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
@@ -116,7 +166,7 @@ class AccompanyingPeriodWorkEvaluationContext implements
                 AbstractNormalizer::GROUPS => ['docgen:read'],
             ]
         );
-
+        dump($data);
         return $data;
     }
 

From d0867f9aa3d39af5e2f67289849153de82f153cb Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 23 May 2023 23:02:00 +0200
Subject: [PATCH 18/49] Feature: add thirdParty choice in docgen person context

---
 .../Service/DocGenerator/ActivityContext.php  |  4 +-
 .../AccompanyingPeriodContext.php             |  2 +-
 .../Service/DocGenerator/PersonContext.php    | 71 ++++++++++++++++++-
 .../translations/messages.fr.yml              |  1 +
 4 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index d3a770490..768a0fabe 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -137,9 +137,9 @@ class ActivityContext implements
                 'label' => 'docgen.Ask for thirdParty',
             ])
             ->add('thirdPartyLabel', TextType::class, [
-                'label' => 'thirdParty label',
+                'label' => 'docgen.thirdParty label',
                 'required' => true,
-            ]);;
+            ]);
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index 53222b753..29e8c81a3 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -159,7 +159,7 @@ class AccompanyingPeriodContext implements
                 'label' => 'docgen.Ask for thirdParty',
             ])
             ->add('thirdPartyLabel', TextType::class, [
-                'label' => 'thirdParty label',
+                'label' => 'docgen.thirdParty label',
                 'required' => true,
             ])
             ->add('category', EntityType::class, [
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index 1fdfd23d9..30faa97fd 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -26,14 +26,21 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\Person\PersonResource;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Person\ResidentialAddress;
 use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Repository\ResidentialAddressRepository;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use LogicException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Security;
@@ -67,6 +74,12 @@ final class PersonContext implements PersonContextInterface
 
     private TranslatorInterface $translator;
 
+    private ThirdPartyRender $thirdPartyRender;
+
+    private ThirdPartyRepository $thirdPartyRepository;
+
+    private ResidentialAddressRepository $residentialAddressRepository;
+
     public function __construct(
         AuthorizationHelperInterface $authorizationHelper,
         BaseContextData $baseContextData,
@@ -78,7 +91,10 @@ final class PersonContext implements PersonContextInterface
         ScopeRepositoryInterface $scopeRepository,
         Security $security,
         TranslatorInterface $translator,
-        TranslatableStringHelperInterface $translatableStringHelper
+        TranslatableStringHelperInterface $translatableStringHelper,
+        ThirdPartyRender $thirdPartyRender,
+        ThirdPartyRepository $thirdPartyRepository,
+        ResidentialAddressRepository $residentialAddressRepository
     ) {
         $this->authorizationHelper = $authorizationHelper;
         $this->centerResolverManager = $centerResolverManager;
@@ -91,6 +107,9 @@ final class PersonContext implements PersonContextInterface
         $this->showScopes = $parameterBag->get('chill_main')['acl']['form_show_scopes'];
         $this->translator = $translator;
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->thirdPartyRender = $thirdPartyRender;
+        $this->thirdPartyRepository = $thirdPartyRepository;
+        $this->residentialAddressRepository = $residentialAddressRepository;
     }
 
     public function adminFormReverseTransform(array $data): array
@@ -110,6 +129,8 @@ final class PersonContext implements PersonContextInterface
         $r = [
             'mainPerson' => $data['mainPerson'] ?? false,
             'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'),
+            'thirdParty' => $data['thirdParty'] ?? false,
+            'thirdPartyLabel' => $data['thirdPartyLabel'] ?? $this->translator->trans('thirdParty'),
         ];
 
         if (array_key_exists('category', $data)) {
@@ -131,6 +152,14 @@ final class PersonContext implements PersonContextInterface
                     ->setParameter('docClass', PersonDocument::class),
                 'choice_label' => fn ($entity = null) => $entity ? $this->translatableStringHelper->localize($entity->getName()) : '',
                 'required' => true,
+            ])
+            ->add('thirdParty', CheckboxType::class, [
+                'required' => false,
+                'label' => 'docgen.Ask for thirdParty',
+            ])
+            ->add('thirdPartyLabel', TextType::class, [
+                'label' => 'docgen.thirdParty label',
+                'required' => true,
             ]);
     }
 
@@ -139,12 +168,43 @@ final class PersonContext implements PersonContextInterface
      */
     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void
     {
+        $options = $template->getOptions();
+
         $builder->add('title', TextType::class, [
             'required' => true,
             'label' => 'docgen.Document title',
             'data' => $this->translatableStringHelper->localize($template->getName()),
         ]);
 
+        $thirdParties = array_merge(
+            array_filter(array_map(
+                fn (ResidentialAddress $r): ?ThirdParty => $r->getHostThirdParty(),
+                $this
+                    ->residentialAddressRepository
+                    ->findCurrentResidentialAddressByPerson($entity)
+                )
+            ),
+            array_filter(array_map(
+                fn (PersonResource $r): ?ThirdParty => $r->getThirdParty(),
+                $entity->getResources()->filter(
+                    static fn (PersonResource $r): bool => null !== $r->getThirdParty()
+                )->toArray())
+            )
+        );
+
+        if ($options['thirdParty'] ?? false) {
+            $builder->add('thirdParty', EntityType::class, [
+                'class' => ThirdParty::class,
+                'choices' => $thirdParties,
+                'choice_label' => fn (ThirdParty $p) => $this->thirdPartyRender->renderString($p, []),
+                'multiple' => false,
+                'required' => false,
+                'expanded' => true,
+                'label' => $options['thirdPartyLabel'],
+                'placeholder' => $this->translator->trans('Any third party selected'),
+            ]);
+        }
+
         if ($this->isScopeNecessary($entity)) {
             $builder->add('scope', ScopePickerType::class, [
                 'center' => $this->centerResolverManager->resolveCenters($entity),
@@ -170,6 +230,13 @@ final class PersonContext implements PersonContextInterface
             'docgen:person:with-budget' => true,
         ]);
 
+        if ($template->getOptions()['thirdParty']) {
+            $data['thirdParty'] = $this->normalizer->normalize($contextGenerationData['thirdParty'], 'docgen', [
+                'docgen:expects' => ThirdParty::class,
+                'groups' => 'docgen:read'
+            ]);
+        }
+
         return $data;
     }
 
@@ -223,6 +290,7 @@ final class PersonContext implements PersonContextInterface
         return [
             'title' => $data['title'] ?? '',
             'scope_id' => $scope instanceof Scope ? $scope->getId() : null,
+            'thirdParty' => null === $data['thirdParty'] ? null : $data['thirdParty']->getId(),
         ];
     }
 
@@ -242,6 +310,7 @@ final class PersonContext implements PersonContextInterface
         return [
             'title' => $data['title'] ?? '',
             'scope' => $scope,
+            'thirdParty' => null !== ($id = ($data['thirdParty'] ?? null)) ? $this->thirdPartyRepository->find($id) : null,
         ];
     }
 
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index cf1b6105e..f62a5beff 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -114,6 +114,7 @@ docgen:
     A context for person with a third party (for sending mail): Un contexte d'une personne avec un tiers (pour envoyer un courrier à ce tiers, par exemple)
     Person with third party: Personne avec choix d'un tiers
     Ask for thirdParty: Demander à l'utilisateur de préciser un tiers
+    thirdParty label: Libellé du tiers
 
 # exports
 export:

From 303666b30d85e5fa85438225260ec3d144550640 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 25 May 2023 09:50:25 +0200
Subject: [PATCH 19/49] Feature: add thirdParty choice in docgen
 accperiodworkevaluation context - clean code

---
 .../DocGenerator/AccompanyingPeriodWorkEvaluationContext.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index 1c33c9323..efd687ec9 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -120,9 +120,6 @@ class AccompanyingPeriodWorkEvaluationContext implements
     {
         $this->accompanyingPeriodWorkContext->buildPublicForm($builder, $template, $entity->getAccompanyingPeriodWork());
 
-        //TODO add more choices to thirdParty form
-        //Question: replace the form or just add more choices to form 'thirdParty'?
-
         $thirdParties = array_merge(
             array_filter($entity->getAccompanyingPeriodWork()->getThirdParties()->toArray()),
             array_filter([$entity->getAccompanyingPeriodWork()->getHandlingThierParty()]),
@@ -134,7 +131,6 @@ class AccompanyingPeriodWorkEvaluationContext implements
             )
 
         );
-        dump($thirdParties);
 
         $options = $template->getOptions();
         if ($options['thirdParty'] ?? false) {
@@ -166,7 +162,6 @@ class AccompanyingPeriodWorkEvaluationContext implements
                 AbstractNormalizer::GROUPS => ['docgen:read'],
             ]
         );
-        dump($data);
         return $data;
     }
 

From ef59e6dc1c8e5fb4142df5855b30422443ee91a7 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 25 May 2023 09:59:16 +0200
Subject: [PATCH 20/49] Feature: add thirdParty choice in docgen
 accperiodworkevaluation context - phpcs fix

---
 .../Controller/ActivityController.php                 |  4 ++--
 .../Service/DocGenerator/ActivityContext.php          |  1 -
 .../DocGenerator/AccompanyingPeriodContext.php        |  6 ++++--
 .../AccompanyingPeriodWorkEvaluationContext.php       | 10 ++++------
 .../Service/DocGenerator/PersonContext.php            | 11 +++++++----
 .../ChillThirdPartyBundle/Form/ThirdPartyType.php     |  2 +-
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 444c663fc..97678af50 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -650,8 +650,8 @@ final class ActivityController extends AbstractController
                 throw $this->createNotFoundException('Accompanying Period not found');
             }
 
-            // TODO Add permission
-            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+        // TODO Add permission
+        // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         } else {
             throw $this->createNotFoundException('Person or Accompanying Period not found');
         }
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index 768a0fabe..91827267c 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -178,7 +178,6 @@ class ActivityContext implements
                 'placeholder' => $this->translator->trans('Any third party selected'),
             ]);
         }
-
     }
 
     public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index 29e8c81a3..b8923267a 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -215,11 +215,13 @@ class AccompanyingPeriodContext implements
 
         $thirdParties = array_merge(
             array_filter([$entity->getRequestorThirdParty()]),
-            array_filter(array_map(
+            array_filter(
+                array_map(
                 fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
                 $entity->getResources()->filter(
                     static fn (Resource $r): bool => null !== $r->getThirdParty()
-                )->toArray())
+                )->toArray()
+            )
             )
         );
 
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index efd687ec9..86e2f8ae9 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -123,13 +123,14 @@ class AccompanyingPeriodWorkEvaluationContext implements
         $thirdParties = array_merge(
             array_filter($entity->getAccompanyingPeriodWork()->getThirdParties()->toArray()),
             array_filter([$entity->getAccompanyingPeriodWork()->getHandlingThierParty()]),
-            array_filter(array_map(
+            array_filter(
+                array_map(
                 fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
                 $entity->getAccompanyingPeriodWork()->getAccompanyingPeriod()->getResources()->filter(
                     static fn (Resource $r): bool => null !== $r->getThirdParty()
-                )->toArray())
+                )->toArray()
+            )
             )
-
         );
 
         $options = $template->getOptions();
@@ -145,9 +146,6 @@ class AccompanyingPeriodWorkEvaluationContext implements
                 'placeholder' => $this->translator->trans('Any third party selected'),
             ]);
         }
-
-
-
     }
 
     public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index 30faa97fd..cc46c3341 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -177,18 +177,21 @@ final class PersonContext implements PersonContextInterface
         ]);
 
         $thirdParties = array_merge(
-            array_filter(array_map(
+            array_filter(
+                array_map(
                 fn (ResidentialAddress $r): ?ThirdParty => $r->getHostThirdParty(),
                 $this
                     ->residentialAddressRepository
                     ->findCurrentResidentialAddressByPerson($entity)
-                )
+            )
             ),
-            array_filter(array_map(
+            array_filter(
+                array_map(
                 fn (PersonResource $r): ?ThirdParty => $r->getThirdParty(),
                 $entity->getResources()->filter(
                     static fn (PersonResource $r): bool => null !== $r->getThirdParty()
-                )->toArray())
+                )->toArray()
+            )
             )
         );
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index 6c4984f33..b1446a543 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -117,7 +117,7 @@ class ThirdPartyType extends AbstractType
                     'label' => 'thirdparty.Contact data are confidential',
                 ]);
 
-            // Institutional ThirdParty (parent)
+        // Institutional ThirdParty (parent)
         } else {
             $builder
                 ->add('nameCompany', TextType::class, [

From 6232dabae5a58383550361a134a58023ade4ce57 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 25 May 2023 10:10:52 +0200
Subject: [PATCH 21/49] Feature: add thirdParty choice in docgen
 accperiodworkevaluation context - phpstan

---
 .../DocGenerator/AccompanyingPeriodWorkEvaluationContext.php  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index 86e2f8ae9..75546417f 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -50,8 +50,6 @@ class AccompanyingPeriodWorkEvaluationContext implements
 
     private ThirdPartyRender $thirdPartyRender;
 
-    private ThirdPartyRepository $thirdPartyRepository;
-
     private TranslatorInterface $translator;
 
     public function __construct(
@@ -61,7 +59,6 @@ class AccompanyingPeriodWorkEvaluationContext implements
         NormalizerInterface $normalizer,
         TranslatableStringHelperInterface $translatableStringHelper,
         ThirdPartyRender $thirdPartyRender,
-        ThirdPartyRepository $thirdPartyRepository,
         TranslatorInterface $translator
     ) {
         $this->accompanyingPeriodWorkContext = $accompanyingPeriodWorkContext;
@@ -70,7 +67,6 @@ class AccompanyingPeriodWorkEvaluationContext implements
         $this->normalizer = $normalizer;
         $this->translatableStringHelper = $translatableStringHelper;
         $this->thirdPartyRender = $thirdPartyRender;
-        $this->thirdPartyRepository = $thirdPartyRepository;
         $this->translator = $translator;
     }
 

From ad1b28ff112e23d61593cdf438e7bee27957924a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 25 May 2023 10:15:22 +0200
Subject: [PATCH 22/49] Feature: add thirdParty choice in docgen
 accperiodworkevaluation context - phpcs fix again

---
 .../AccompanyingPeriodContext.php             | 10 +++++-----
 ...ccompanyingPeriodWorkEvaluationContext.php | 10 +++++-----
 .../Service/DocGenerator/PersonContext.php    | 20 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index b8923267a..d0ea59090 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -217,11 +217,11 @@ class AccompanyingPeriodContext implements
             array_filter([$entity->getRequestorThirdParty()]),
             array_filter(
                 array_map(
-                fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
-                $entity->getResources()->filter(
-                    static fn (Resource $r): bool => null !== $r->getThirdParty()
-                )->toArray()
-            )
+                    fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
+                    $entity->getResources()->filter(
+                        static fn (Resource $r): bool => null !== $r->getThirdParty()
+                    )->toArray()
+                )
             )
         );
 
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index 75546417f..d7fff210b 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -121,11 +121,11 @@ class AccompanyingPeriodWorkEvaluationContext implements
             array_filter([$entity->getAccompanyingPeriodWork()->getHandlingThierParty()]),
             array_filter(
                 array_map(
-                fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
-                $entity->getAccompanyingPeriodWork()->getAccompanyingPeriod()->getResources()->filter(
-                    static fn (Resource $r): bool => null !== $r->getThirdParty()
-                )->toArray()
-            )
+                    fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
+                    $entity->getAccompanyingPeriodWork()->getAccompanyingPeriod()->getResources()->filter(
+                        static fn (Resource $r): bool => null !== $r->getThirdParty()
+                    )->toArray()
+                )
             )
         );
 
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index cc46c3341..583ac189c 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -179,19 +179,19 @@ final class PersonContext implements PersonContextInterface
         $thirdParties = array_merge(
             array_filter(
                 array_map(
-                fn (ResidentialAddress $r): ?ThirdParty => $r->getHostThirdParty(),
-                $this
-                    ->residentialAddressRepository
-                    ->findCurrentResidentialAddressByPerson($entity)
-            )
+                    fn (ResidentialAddress $r): ?ThirdParty => $r->getHostThirdParty(),
+                    $this
+                        ->residentialAddressRepository
+                        ->findCurrentResidentialAddressByPerson($entity)
+                )
             ),
             array_filter(
                 array_map(
-                fn (PersonResource $r): ?ThirdParty => $r->getThirdParty(),
-                $entity->getResources()->filter(
-                    static fn (PersonResource $r): bool => null !== $r->getThirdParty()
-                )->toArray()
-            )
+                    fn (PersonResource $r): ?ThirdParty => $r->getThirdParty(),
+                    $entity->getResources()->filter(
+                        static fn (PersonResource $r): bool => null !== $r->getThirdParty()
+                    )->toArray()
+                )
             )
         );
 

From 9593cfde36413190e554c2ec21414f75586ead84 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 25 May 2023 10:32:52 +0200
Subject: [PATCH 23/49] Feature: add thirdParty choice in docgen
 accperiodworkevaluation context - phpcs fix again

---
 .../ChillActivityBundle/Controller/ActivityController.php     | 4 ++--
 src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 97678af50..444c663fc 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -650,8 +650,8 @@ final class ActivityController extends AbstractController
                 throw $this->createNotFoundException('Accompanying Period not found');
             }
 
-        // TODO Add permission
-        // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+            // TODO Add permission
+            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         } else {
             throw $this->createNotFoundException('Person or Accompanying Period not found');
         }
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index b1446a543..6c4984f33 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -117,7 +117,7 @@ class ThirdPartyType extends AbstractType
                     'label' => 'thirdparty.Contact data are confidential',
                 ]);
 
-        // Institutional ThirdParty (parent)
+            // Institutional ThirdParty (parent)
         } else {
             $builder
                 ->add('nameCompany', TextType::class, [

From ff3dab0934f30fe75311ced3c0d635ce954d4e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 25 May 2023 12:36:47 +0200
Subject: [PATCH 24/49] Fixed: vue downloadButton: add more log and various
 improvements

- create a dedicated button for opening
- use nextTick before clicking on the "opening" button
---
 .../StoredObjectButton/DownloadButton.vue     | 94 +++++++++++++------
 .../vuejs/StoredObjectButton/helpers.ts       |  5 +
 2 files changed, 71 insertions(+), 28 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
index b22035bee..10985fdff 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
@@ -1,52 +1,90 @@
 <template>
-  <a :class="props.classes" @click="download_and_open($event)">
-    <i class="fa fa-download"></i>
-    Télécharger
-  </a>
+    <a v-if="!state.is_ready" :class="props.classes" @click="download_and_open($event)">
+        <i class="fa fa-download"></i>
+        Télécharger
+    </a>
+    <a v-else :class="props.classes" target="_blank" :type="props.storedObject.type" :download="buildDocumentName()" :href="state.href_url" ref="open_button">
+        <i class="fa fa-external-link"></i>
+        Ouvrir
+    </a>
 </template>
 
 <script lang="ts" setup>
-import {reactive} from "vue";
+import {reactive, ref, nextTick, onMounted} from "vue";
 import {build_download_info_link, download_and_decrypt_doc} from "./helpers";
 import mime from "mime";
 import {StoredObject} from "../../types";
 
 interface DownloadButtonConfig {
-  storedObject: StoredObject,
-  classes: {[k: string]: boolean},
-  filename?: string,
+    storedObject: StoredObject,
+    classes: { [k: string]: boolean },
+    filename?: string,
 }
 
 interface DownloadButtonState {
-  is_ready: boolean
+    is_ready: boolean,
+    is_running: boolean,
+    href_url: string,
 }
 
 const props = defineProps<DownloadButtonConfig>();
-const state: DownloadButtonState = reactive({is_ready: false});
+const state: DownloadButtonState = reactive({is_ready: false, is_running: false, href_url: "#"});
 
-async function download_and_open(event: Event): Promise<void> {
-  const button = event.target as HTMLAnchorElement;
-
-  if (!state.is_ready) {
-    event.preventDefault();
-    const urlInfo = build_download_info_link(props.storedObject.filename);
-
-    const raw = await download_and_decrypt_doc(urlInfo, props.storedObject.keyInfos, new Uint8Array(props.storedObject.iv));
-
-    button.href = window.URL.createObjectURL(raw);
-    button.target = '_blank';
-    button.type = props.storedObject.type;
-
-    button.download = props.filename || 'document';
+const open_button = ref<HTMLAnchorElement | null>(null);
 
+function buildDocumentName(): string {
+    const document_name = props.filename || 'document';
     const ext = mime.getExtension(props.storedObject.type);
+
     if (null !== ext) {
-      button.download = button.download + '.' + ext;
+        return document_name + '.' + ext;
     }
 
-    state.is_ready = true;
+    return document_name;
+}
 
-    button.click();
-  }
+async function download_and_open(event: Event): Promise<void> {
+    const button = event.target as HTMLAnchorElement;
+
+    if (state.is_running) {
+        console.log('state is running, aborting');
+        return;
+    }
+
+    state.is_running = true;
+
+    if (state.is_ready) {
+        console.log('state is ready. This should not happens');
+        return;
+    }
+
+    const urlInfo = build_download_info_link(props.storedObject.filename);
+    let raw;
+
+    try {
+        raw = await download_and_decrypt_doc(urlInfo, props.storedObject.keyInfos, new Uint8Array(props.storedObject.iv));
+    } catch (e) {
+        console.error("error while downloading and decrypting document");
+        console.error(e);
+        throw e;
+    }
+
+    console.log('document downloading (and decrypting) successfully');
+
+    console.log('creating the url')
+    state.href_url = window.URL.createObjectURL(raw);
+    console.log('url created', state.href_url);
+    state.is_running = false;
+    state.is_ready = true;
+    console.log('new button marked as ready');
+    console.log('will click on button');
+
+    console.log('openbutton is now', open_button.value);
+
+    await nextTick();
+    console.log('next tick actions');
+    console.log('openbutton after next tick', open_button.value);
+    open_button.value?.click();
+    console.log('open button should have been clicked');
 }
 </script>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
index 5b61a108d..c0b0fa940 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
@@ -149,16 +149,21 @@ async function download_and_decrypt_doc(urlGenerator: string, keyData: JsonWebKe
    }
 
    if (iv.length === 0) {
+     console.log('returning document immediatly');
      return rawResponse.blob();
    }
 
+   console.log('start decrypting doc');
+
    const rawBuffer = await rawResponse.arrayBuffer();
 
    try {
      const key = await window.crypto.subtle
        .importKey('jwk', keyData, { name: algo }, false, ['decrypt']);
+     console.log('key created');
      const decrypted = await window.crypto.subtle
        .decrypt({ name: algo, iv: iv }, key, rawBuffer);
+     console.log('doc decrypted');
 
      return Promise.resolve(new Blob([decrypted]));
    } catch (e) {

From 1b0569c9744ede4a7b430888ab87a5880afaf516 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 25 May 2023 13:58:46 +0200
Subject: [PATCH 25/49] Feature: add thirdParty choice in docgen context - use
 array_values

---
 .../AccompanyingPeriodContext.php             | 14 ++++++-----
 ...ccompanyingPeriodWorkEvaluationContext.php | 16 +++++++------
 .../Service/DocGenerator/PersonContext.php    | 24 +++++++++++--------
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index d0ea59090..66be9aceb 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -214,13 +214,15 @@ class AccompanyingPeriodContext implements
         }
 
         $thirdParties = array_merge(
-            array_filter([$entity->getRequestorThirdParty()]),
+            array_filter(array_values([$entity->getRequestorThirdParty()])),
             array_filter(
-                array_map(
-                    fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
-                    $entity->getResources()->filter(
-                        static fn (Resource $r): bool => null !== $r->getThirdParty()
-                    )->toArray()
+                array_values(
+                    array_map(
+                        fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
+                        $entity->getResources()->filter(
+                            static fn (Resource $r): bool => null !== $r->getThirdParty()
+                        )->toArray()
+                    )
                 )
             )
         );
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index d7fff210b..62e13789f 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -117,14 +117,16 @@ class AccompanyingPeriodWorkEvaluationContext implements
         $this->accompanyingPeriodWorkContext->buildPublicForm($builder, $template, $entity->getAccompanyingPeriodWork());
 
         $thirdParties = array_merge(
-            array_filter($entity->getAccompanyingPeriodWork()->getThirdParties()->toArray()),
-            array_filter([$entity->getAccompanyingPeriodWork()->getHandlingThierParty()]),
+            array_filter(array_values($entity->getAccompanyingPeriodWork()->getThirdParties()->toArray())),
+            array_filter(array_values([$entity->getAccompanyingPeriodWork()->getHandlingThierParty()])),
             array_filter(
-                array_map(
-                    fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
-                    $entity->getAccompanyingPeriodWork()->getAccompanyingPeriod()->getResources()->filter(
-                        static fn (Resource $r): bool => null !== $r->getThirdParty()
-                    )->toArray()
+                array_values(
+                    array_map(
+                        fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
+                        $entity->getAccompanyingPeriodWork()->getAccompanyingPeriod()->getResources()->filter(
+                            static fn (Resource $r): bool => null !== $r->getThirdParty()
+                        )->toArray()
+                    )
                 )
             )
         );
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index 583ac189c..4d49bcfba 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -178,19 +178,23 @@ final class PersonContext implements PersonContextInterface
 
         $thirdParties = array_merge(
             array_filter(
-                array_map(
-                    fn (ResidentialAddress $r): ?ThirdParty => $r->getHostThirdParty(),
-                    $this
-                        ->residentialAddressRepository
-                        ->findCurrentResidentialAddressByPerson($entity)
+                array_values(
+                    array_map(
+                        fn (ResidentialAddress $r): ?ThirdParty => $r->getHostThirdParty(),
+                        $this
+                            ->residentialAddressRepository
+                            ->findCurrentResidentialAddressByPerson($entity)
+                    )
                 )
             ),
             array_filter(
-                array_map(
-                    fn (PersonResource $r): ?ThirdParty => $r->getThirdParty(),
-                    $entity->getResources()->filter(
-                        static fn (PersonResource $r): bool => null !== $r->getThirdParty()
-                    )->toArray()
+                array_values(
+                    array_map(
+                        fn (PersonResource $r): ?ThirdParty => $r->getThirdParty(),
+                        $entity->getResources()->filter(
+                            static fn (PersonResource $r): bool => null !== $r->getThirdParty()
+                        )->toArray()
+                    )
                 )
             )
         );

From 6c3fa5cb98b2889e40f1d777f2edc4769ef39be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 25 May 2023 15:22:52 +0200
Subject: [PATCH 26/49] Fixed: [UI] in designation and redispatch list, the
 period's statuses were'nt shown correctly

---
 .../views/AccompanyingPeriod/_list_item.html.twig    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 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 6c7fbf7c0..47b8c8a15 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
@@ -16,11 +16,13 @@
                 </div>
                 <div class="wh-col">
                     {% if period.step == 'DRAFT' %}
-                        <span class="badge bg-secondary">{{- 'Draft'|trans|upper -}}</span>
-                    {% elseif period.step == 'CONFIRMED' %}
-                        <span class="badge bg-primary">{{- 'Confirmed'|trans|upper -}}</span>
-                    {% else %}
-                        <span class="badge bg-danger">{{- 'Closed'|trans|upper -}}</span>
+                        <span class="badge bg-secondary" style="font-size: 85%;" title="{{ 'course.draft'|trans|e('html_attr') }}">{{ 'course.draft'|trans }}</span>
+                    {% elseif period.step == 'CLOSED' %}
+                        <span class="badge bg-danger" style="font-size: 85%;" title="{{ 'course.closed'|trans|e('html_attr') }}">{{ 'course.closed'|trans }}</span>
+                    {% elseif period.step == 'CONFIRMED_INACTIVE_SHORT' %}
+                        <span class="badge bg-chill-yellow text-primary" style="font-size: 85%;" title="{{ 'course.inactive_short'|trans|e('html_attr') }}">{{ 'course.inactive_short'|trans }}</span>
+                    {% elseif period.step == 'CONFIRMED_INACTIVE_LONG' %}
+                        <span class="badge bg-danger" style="font-size: 85%;" title="{{ 'course.inactive_long'|trans|e('html_attr') }}">{{ 'course.inactive_long'|trans }}</span>
                     {% endif %}
                 </div>
             </div>

From b679dbe26ccf27a097dce62ae2590a6bfe5b1f64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 25 May 2023 15:24:14 +0200
Subject: [PATCH 27/49] Fixed: Do not send a confirmation message when period
 is mark_active back

---
 .../AccompanyingPeriod/Events/UserRefEventSubscriber.php     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
index 8d7249928..50e7dcabb 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
@@ -51,7 +51,10 @@ class UserRefEventSubscriber implements EventSubscriberInterface
 
     public function onStateEntered(EnteredEvent $enteredEvent): void
     {
-        if ($enteredEvent->getMarking()->has(AccompanyingPeriod::STEP_CONFIRMED)) {
+        if (
+            $enteredEvent->getMarking()->has(AccompanyingPeriod::STEP_CONFIRMED)
+            and $enteredEvent->getTransition()->getName() === 'confirm'
+        ) {
             $this->onPeriodConfirmed($enteredEvent->getSubject());
         }
     }

From ff03299f80c2e2a24843a52dc23bd25789ddf2d0 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 25 May 2023 17:06:10 +0200
Subject: [PATCH 28/49] FEATURE [workflow][doc] scroll immediately to document
 in workflow and let background flash

---
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  | 21 ++++++++++++++++---
 .../components/AddEvaluation.vue              |  7 +++++--
 .../components/FormEvaluation.vue             | 20 +++++++++++++++---
 .../Workflow/_evaluation_document.html.twig   |  2 +-
 4 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 755e4455c..adbcf1097 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -122,7 +122,8 @@
          <add-evaluation
             v-for="e in pickedEvaluations"
             v-bind:key="e.key"
-            v-bind:evaluation="e">
+            v-bind:evaluation="e"
+            v-bind:docId="this.docId">
          </add-evaluation>
 
          <!-- box to add new evaluation -->
@@ -389,6 +390,7 @@ export default {
    i18n,
    data() {
       return {
+         docId: null,
          isExpanded: false,
          editor: ClassicEditor,
          showAddObjective: false,
@@ -428,7 +430,14 @@ export default {
          },
       };
    },
-   computed: {
+   beforeMount() {
+       const urlParams = new URLSearchParams(window.location.search);
+       this.docId = urlParams.get('doc_id');
+   },
+   mounted() {
+     this.scrollToElement(this.docId);
+   },
+  computed: {
       ...mapState([
          'work',
          'resultsForAction',
@@ -559,7 +568,7 @@ export default {
          });
       },
       saveFormOnTheFly(payload) {
-         console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
+         // console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
 
          let body = { type: payload.type };
          body.name = payload.data.text;
@@ -581,6 +590,12 @@ export default {
                      this.$toast.open({message: 'An error occurred'});
                }
             })
+      },
+      scrollToElement(docId) {
+         const documentEl = document.getElementById(`document_${docId}`);
+         if (documentEl) {
+           documentEl.scrollIntoView({behavior: 'smooth'});
+         }
       }
    }
 };
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 411c386a8..215c5d6cc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
@@ -11,7 +11,7 @@
       </div>
 
       <div>
-         <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation"></form-evaluation>
+         <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation" :docId="docId"></form-evaluation>
 
         <ul class="record_actions">
            <li v-if="evaluation.workflows_availables.length > 0">
@@ -85,7 +85,7 @@ export default {
       Modal,
       ListWorkflowModal,
    },
-   props: ['evaluation'],
+   props: ['evaluation', 'docId'],
    i18n,
    data() {
       return {
@@ -95,6 +95,9 @@ export default {
          }
       };
    },
+/*   mounted() {
+      console.log('docId is here', this.docId)
+   },*/
    computed: {
       pickedEvaluations() {
          return this.$store.state.evaluationsPicked;
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 7dcb595a3..ff7597dec 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -80,7 +80,7 @@
 
        <div class="flex-table">
          <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id">
-           <div class="item-row">
+           <div :id="`document_${d.id}`" class="item-row" :class="[parseInt(this.docId) === d.id ? 'bg-blink' : 'nothing']">
             <div class="input-group input-group-lg mb-3 row">
                   <label class="col-sm-3 col-form-label">Titre du document:</label>
                   <div class="col-sm-9">
@@ -92,7 +92,7 @@
                         :data-key="i"
                         @input="onInputDocumentTitle"/>
                 </div>
-               </div>
+           </div>
            </div>
            <div class="item-row">
                <div class="item-col item-meta">
@@ -221,7 +221,7 @@ const i18n = {
 
 export default {
    name: "FormEvaluation",
-   props: ['evaluation'],
+   props: ['evaluation', 'docId'],
    components: {
       ckeditor: CKEditor.component,
       PickTemplate,
@@ -402,4 +402,18 @@ export default {
    ul.document-upload {
       justify-content: flex-start;
    }
+
+   .bg-blink{
+     color: #050000;
+     padding: 10px;
+     display: inline-block;
+     border-radius: 5px;
+     animation: blinkingBackground 2.2s infinite;
+     animation-iteration-count: 3;
+   }
+   @keyframes blinkingBackground{
+     0%		{ background-color: #fa8888;}
+     50%		{ background-color: #ffffff;}
+     100%	  { background-color: #fa8888;}
+   }
 </style>
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 691a903ab..112d4089d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -123,7 +123,7 @@
         <ul class="record_actions">
             <li>{{ doc.storedObject|chill_document_button_group(doc.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', evaluation.accompanyingPeriodWork)) }}</li>
             <li>
-                <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
+                <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id, 'doc_id': doc.id}) }}">
                     {{ 'Show'|trans }}
                 </a>
             </li>

From ed556d9ee8dd52bd6d076fee7e26b9818b2f3f0e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 31 May 2023 09:47:48 +0200
Subject: [PATCH 29/49] FIX [review] process review and make minor visual
 changes

---
 .../public/vuejs/AccompanyingCourseWorkEdit/App.vue  | 12 ++++++------
 .../components/AddEvaluation.vue                     |  7 ++-----
 .../components/FormEvaluation.vue                    | 12 +++++++-----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index adbcf1097..1c9c2fd6d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -123,7 +123,7 @@
             v-for="e in pickedEvaluations"
             v-bind:key="e.key"
             v-bind:evaluation="e"
-            v-bind:docId="this.docId">
+            v-bind:docAnchorId="this.docAnchorId">
          </add-evaluation>
 
          <!-- box to add new evaluation -->
@@ -390,7 +390,7 @@ export default {
    i18n,
    data() {
       return {
-         docId: null,
+         docAnchorId: null,
          isExpanded: false,
          editor: ClassicEditor,
          showAddObjective: false,
@@ -432,10 +432,10 @@ export default {
    },
    beforeMount() {
        const urlParams = new URLSearchParams(window.location.search);
-       this.docId = urlParams.get('doc_id');
+       this.docAnchorId = urlParams.get('doc_id');
    },
    mounted() {
-     this.scrollToElement(this.docId);
+     this.scrollToElement(this.docAnchorId);
    },
   computed: {
       ...mapState([
@@ -591,8 +591,8 @@ export default {
                }
             })
       },
-      scrollToElement(docId) {
-         const documentEl = document.getElementById(`document_${docId}`);
+      scrollToElement(docAnchorId) {
+         const documentEl = document.getElementById(`document_${docAnchorId}`);
          if (documentEl) {
            documentEl.scrollIntoView({behavior: 'smooth'});
          }
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 215c5d6cc..baa3fa798 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
@@ -11,7 +11,7 @@
       </div>
 
       <div>
-         <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation" :docId="docId"></form-evaluation>
+         <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation" :docAnchorId="docAnchorId"></form-evaluation>
 
         <ul class="record_actions">
            <li v-if="evaluation.workflows_availables.length > 0">
@@ -85,7 +85,7 @@ export default {
       Modal,
       ListWorkflowModal,
    },
-   props: ['evaluation', 'docId'],
+   props: ['evaluation', 'docAnchorId'],
    i18n,
    data() {
       return {
@@ -95,9 +95,6 @@ export default {
          }
       };
    },
-/*   mounted() {
-      console.log('docId is here', this.docId)
-   },*/
    computed: {
       pickedEvaluations() {
          return this.$store.state.evaluationsPicked;
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 ff7597dec..10bac43b3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -80,12 +80,13 @@
 
        <div class="flex-table">
          <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id">
-           <div :id="`document_${d.id}`" class="item-row" :class="[parseInt(this.docId) === d.id ? 'bg-blink' : 'nothing']">
+           <div :id="`document_${d.id}`" class="item-row">
             <div class="input-group input-group-lg mb-3 row">
                   <label class="col-sm-3 col-form-label">Titre du document:</label>
                   <div class="col-sm-9">
                     <input
                         class="form-control document-title"
+                        :class="[parseInt(this.docAnchorId) === d.id ? 'bg-blink' : 'nothing']"
                         type="text"
                         :value="d.title"
                         :id="d.id"
@@ -221,7 +222,7 @@ const i18n = {
 
 export default {
    name: "FormEvaluation",
-   props: ['evaluation', 'docId'],
+   props: ['evaluation', 'docAnchorId'],
    components: {
       ckeditor: CKEditor.component,
       PickTemplate,
@@ -409,11 +410,12 @@ export default {
      display: inline-block;
      border-radius: 5px;
      animation: blinkingBackground 2.2s infinite;
-     animation-iteration-count: 3;
+     animation-iteration-count: 2;
    }
+
    @keyframes blinkingBackground{
-     0%		{ background-color: #fa8888;}
+     0%		{ background-color: #ed776d;}
      50%		{ background-color: #ffffff;}
-     100%	  { background-color: #fa8888;}
+     100%	  { background-color: #ed776d;}
    }
 </style>

From 4489098addd0d202a84d999d43c37d4494a421bf Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 31 May 2023 14:20:54 +0200
Subject: [PATCH 30/49] FIX [calculator] type cast result to a float

---
 src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
index 380e641a6..2a67486f0 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
@@ -21,7 +21,7 @@ class CalculatorResult
 
     public $label;
 
-    public $result;
+    public float $result;
 
     public $type;
 }

From 80dfa092db2c1e51f6fa33a1f843d785edc7e0d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 31 May 2023 23:29:34 +0200
Subject: [PATCH 31/49] fixes: add tests for generation and fix some situation

---
 .../Service/DocGenerator/ActivityContext.php  |   4 +-
 .../AccompanyingPeriodContext.php             |  26 +-
 ...ccompanyingPeriodWorkEvaluationContext.php |   8 +-
 .../Service/DocGenerator/PersonContext.php    |  23 +-
 .../DocGenerator/PersonContextInterface.php   |   3 +-
 .../AccompanyingPeriodContextTest.php         | 291 ++++++++++++++++++
 .../DocGenerator/PersonContextTest.php        | 183 ++++++++++-
 .../Repository/ThirdPartyRepository.php       |   2 +-
 8 files changed, 503 insertions(+), 37 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/AccompanyingPeriodContextTest.php

diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index 91827267c..a20ca365b 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -206,10 +206,10 @@ class ActivityContext implements
         $normalized = [];
 
         foreach (['mainPerson', 'person1', 'person2'] as $k) {
-            $normalized[$k] = null === $data[$k] ? null : $data[$k]->getId();
+            $normalized[$k] = ($data[$k] ?? null)?->getId();
         }
 
-        $normalized['thirdParty'] = null === $data['thirdParty'] ? null : $data['thirdParty']->getId();
+        $normalized['thirdParty'] = ($data['thirdParty'] ?? null)?->getId();
 
         return $normalized;
     }
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index 66be9aceb..0db54a47a 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -44,6 +44,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 use function array_key_exists;
 
 /**
+ * @see AccompanyingPeriodContextTest
  * @template-implements DocGeneratorContextWithPublicFormInterface<AccompanyingPeriod>
  */
 class AccompanyingPeriodContext implements
@@ -116,12 +117,11 @@ class AccompanyingPeriodContext implements
             'person2' => $data['person2'] ?? false,
             'person2Label' => $data['person2Label'] ?? $this->translator->trans('docgen.person 2'),
             'thirdParty' => $data['thirdParty'] ?? false,
-            'thirdPartyLabel' => $data['thirdPartyLabel'] ?? $this->translator->trans('thirdParty'),
+            'thirdPartyLabel' => $data['thirdPartyLabel'] ?? $this->translator->trans('Third party'),
         ];
 
         if (array_key_exists('category', $data)) {
-            $r['category'] = array_key_exists('category', $data) ?
-                $this->documentCategoryRepository->find($data['category']) : null;
+            $r['category'] = $this->documentCategoryRepository->find($data['category']);
         }
 
         return $r;
@@ -214,17 +214,15 @@ class AccompanyingPeriodContext implements
         }
 
         $thirdParties = array_merge(
-            array_filter(array_values([$entity->getRequestorThirdParty()])),
-            array_filter(
-                array_values(
-                    array_map(
-                        fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
-                        $entity->getResources()->filter(
-                            static fn (Resource $r): bool => null !== $r->getThirdParty()
-                        )->toArray()
-                    )
+            array_values(array_filter([$entity->getRequestorThirdParty()])),
+            array_values(array_filter(
+                array_map(
+                    fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
+                    $entity->getResources()->filter(
+                        static fn (Resource $r): bool => null !== $r->getThirdParty()
+                    )->toArray()
                 )
-            )
+            ))
         );
 
         if ($options['thirdParty'] ?? false) {
@@ -320,7 +318,7 @@ class AccompanyingPeriodContext implements
             $normalized[$k] = null !== ($data[$k] ?? null) ? $data[$k]->getId() : null;
         }
 
-        $normalized['thirdParty'] = null === $data['thirdParty'] ? null : $data['thirdParty']->getId();
+        $normalized['thirdParty'] = ($data['thirdParty'] ?? null)?->getId();
 
         return $normalized;
     }
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index 62e13789f..ee746a034 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -117,10 +117,10 @@ class AccompanyingPeriodWorkEvaluationContext implements
         $this->accompanyingPeriodWorkContext->buildPublicForm($builder, $template, $entity->getAccompanyingPeriodWork());
 
         $thirdParties = array_merge(
-            array_filter(array_values($entity->getAccompanyingPeriodWork()->getThirdParties()->toArray())),
-            array_filter(array_values([$entity->getAccompanyingPeriodWork()->getHandlingThierParty()])),
-            array_filter(
-                array_values(
+            array_values(array_filter($entity->getAccompanyingPeriodWork()->getThirdParties()->toArray())),
+            array_values(array_filter([$entity->getAccompanyingPeriodWork()->getHandlingThierParty()])),
+            array_values(
+                array_filter(
                     array_map(
                         fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
                         $entity->getAccompanyingPeriodWork()->getAccompanyingPeriod()->getResources()->filter(
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index 4d49bcfba..1ced31121 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -38,6 +38,7 @@ use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use LogicException;
+use Service\DocGenerator\PersonContextTest;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -50,6 +51,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 use function array_key_exists;
 use function count;
 
+/**
+ * @see PersonContextTest
+ */
 final class PersonContext implements PersonContextInterface
 {
     private AuthorizationHelperInterface $authorizationHelper;
@@ -130,12 +134,11 @@ final class PersonContext implements PersonContextInterface
             'mainPerson' => $data['mainPerson'] ?? false,
             'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'),
             'thirdParty' => $data['thirdParty'] ?? false,
-            'thirdPartyLabel' => $data['thirdPartyLabel'] ?? $this->translator->trans('thirdParty'),
+            'thirdPartyLabel' => $data['thirdPartyLabel'] ?? $this->translator->trans('Third party'),
         ];
 
         if (array_key_exists('category', $data)) {
-            $r['category'] = array_key_exists('category', $data) ?
-                $this->documentCategoryRepository->find($data['category']) : null;
+            $r['category'] = $this->documentCategoryRepository->find($data['category']);
         }
 
         return $r;
@@ -177,8 +180,8 @@ final class PersonContext implements PersonContextInterface
         ]);
 
         $thirdParties = array_merge(
-            array_filter(
-                array_values(
+            array_values(
+                array_filter(
                     array_map(
                         fn (ResidentialAddress $r): ?ThirdParty => $r->getHostThirdParty(),
                         $this
@@ -187,8 +190,8 @@ final class PersonContext implements PersonContextInterface
                     )
                 )
             ),
-            array_filter(
-                array_values(
+            array_values(
+                array_filter(
                     array_map(
                         fn (PersonResource $r): ?ThirdParty => $r->getThirdParty(),
                         $entity->getResources()->filter(
@@ -223,10 +226,6 @@ final class PersonContext implements PersonContextInterface
 
     public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
     {
-        if (!$entity instanceof Person) {
-            throw new UnexpectedTypeException($entity, Person::class);
-        }
-
         $data = [];
         $data = array_merge($data, $this->baseContextData->getData($contextGenerationData['creator'] ?? null));
         $data['person'] = $this->normalizer->normalize($entity, 'docgen', [
@@ -297,7 +296,7 @@ final class PersonContext implements PersonContextInterface
         return [
             'title' => $data['title'] ?? '',
             'scope_id' => $scope instanceof Scope ? $scope->getId() : null,
-            'thirdParty' => null === $data['thirdParty'] ? null : $data['thirdParty']->getId(),
+            'thirdParty' => ($data['thirdParty'] ?? null)?->getId(),
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
index 6de8c1c50..53e241292 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
@@ -19,7 +19,8 @@ use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * @template-extends  DocGeneratorContextWithPublicFormInterface<Person>
+ * @template-extends DocGeneratorContextWithPublicFormInterface<Person>
+ * @template-extends DocGeneratorContextWithAdminFormInterface<Person>
  */
 interface PersonContextInterface extends DocGeneratorContextWithAdminFormInterface, DocGeneratorContextWithPublicFormInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/AccompanyingPeriodContextTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/AccompanyingPeriodContextTest.php
new file mode 100644
index 000000000..f9f888999
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/AccompanyingPeriodContextTest.php
@@ -0,0 +1,291 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Service\DocGenerator;
+
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
+use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Service\DocGenerator\AccompanyingPeriodContext;
+use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+class AccompanyingPeriodContextTest extends KernelTestCase
+{
+    private BaseContextData $baseContextData;
+
+    private DocumentCategoryRepository $documentCategoryRepository;
+
+    private EntityManagerInterface $em;
+
+    private NormalizerInterface $normalizer;
+
+    private PersonRenderInterface $personRender;
+
+    private PersonRepository $personRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private TranslatorInterface $translator;
+
+    private ThirdPartyRender $thirdPartyRender;
+
+    private ThirdPartyRepository $thirdPartyRepository;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->baseContextData = self::$container->get(BaseContextData::class);
+        $this->documentCategoryRepository = self::$container->get(DocumentCategoryRepository::class);
+        $this->em = self::$container->get(EntityManagerInterface::class);
+        $this->normalizer = self::$container->get(NormalizerInterface::class);
+        $this->personRender = self::$container->get(PersonRenderInterface::class);
+        $this->personRepository = self::$container->get(PersonRepository::class);
+        $this->translatableStringHelper = self::$container->get(TranslatableStringHelperInterface::class);
+        $this->translator = self::$container->get(TranslatorInterface::class);
+        $this->thirdPartyRender = self::$container->get(ThirdPartyRender::class);
+        $this->thirdPartyRepository = self::$container->get(ThirdPartyRepository::class);
+    }
+
+    private function buildContext(): AccompanyingPeriodContext
+    {
+        return new AccompanyingPeriodContext(
+            $this->documentCategoryRepository,
+            $this->normalizer,
+            $this->translatableStringHelper,
+            $this->em,
+            $this->personRender,
+            $this->personRepository,
+            $this->translator,
+            $this->baseContextData,
+            $this->thirdPartyRender,
+            $this->thirdPartyRepository,
+        );
+    }
+
+    /**
+     * This test run the methods executed when a document is generated:
+     *
+     * - normalized data from the form in a way that they are stored in message queue;
+     * - denormalize the data from the message queue,
+     * - and get the data, as they will be transmitted to the GeneratorDriver
+     *
+     * @param array $options the options, as they are stored in the DocGeneratorTemplate (the admin form data)
+     * @param AccompanyingPeriod $entity The entity from which the data will be extracted
+     * @param array $data The data, from the public form
+     * @param array $expectedNormalized, how the normalized data are expected (allow to check that this data will be compliant with the storage in messenger queue)
+     * @param callable $assertionsOnData some test that will be executed on the normalized data
+     * @dataProvider provideNormalizedData
+     */
+    public function testContextGenerationDataNormalizeDenormalizeGetData(
+        array $options,
+        AccompanyingPeriod $entity,
+        array $data,
+        array $expectedNormalized,
+        callable $assertionsOnData
+    ): void {
+        $context = $this->buildContext();
+        $template = new DocGeneratorTemplate();
+        $template->setName(["fr" =>"test"])->setContext(AccompanyingPeriodContext::class)
+            ->setDescription("description")->setActive(true)
+            ->setOptions($options);
+
+        $normalized = $context->contextGenerationDataNormalize($template, $entity, $data);
+
+        self::assertEquals($expectedNormalized, $normalized);
+
+        $denormalized = $context->contextGenerationDataDenormalize($template, $entity, $normalized);
+
+        $data = $context->getData($template, $entity, $denormalized);
+
+        call_user_func($assertionsOnData, $data);
+    }
+
+    public function provideNormalizedData(): iterable
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $thirdParty = $em->createQuery("SELECT t FROM " . ThirdParty::class . " t")
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $thirdParty) {
+            throw new \RuntimeException("No thirdparty in database");
+        }
+
+        $period = $em->createQuery("SELECT a FROM " . AccompanyingPeriod::class . " a WHERE a.step = 'CONFIRMED'")
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $period) {
+            throw new \RuntimeException("No confirmed period in database");
+        }
+
+        $person = $em->createQuery("SELECT p FROM " . Person::class . " p")
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $person) {
+            throw new \RuntimeException("No confirmed period in database");
+        }
+
+        yield [
+            // test with only thirdParty
+            [
+                'mainPerson' => false,
+                'mainPersonLabel' => 'person',
+                'person1' => false,
+                'person1Label' => 'person2',
+                'person2' => false,
+                'person2Label' => 'person2',
+                'thirdParty' => true,
+                'thirdPartyLabel' => '3party'
+            ],
+            $period,
+            [
+                'thirdParty' => $thirdParty
+            ],
+            [
+                'thirdParty' => $thirdParty->getId(),
+                'mainPerson' => null,
+                'person1' => null,
+                'person2' => null,
+            ],
+            function (array $data) use ($thirdParty, $period) {
+                self::assertArrayHasKey('thirdParty', $data);
+                self::assertEquals($thirdParty->getId(), $data['thirdParty']['id']);
+
+                self::assertArrayHasKey('course', $data);
+                self::assertEquals($period->getId(), $data['course']['id']);
+            },
+        ];
+
+        yield [
+            // test with only mainPerson
+            [
+                'mainPerson' => true,
+                'mainPersonLabel' => 'person',
+                'person1' => false,
+                'person1Label' => 'person2',
+                'person2' => false,
+                'person2Label' => 'person2',
+                'thirdParty' => false,
+                'thirdPartyLabel' => '3party'
+            ],
+            $period,
+            [
+                'mainPerson' => $person,
+            ],
+            [
+                'thirdParty' => null,
+                'mainPerson' => $person->getId(),
+                'person1' => null,
+                'person2' => null,
+            ],
+            function (array $data) use ($person, $period) {
+                self::assertArrayHasKey('mainPerson', $data);
+                self::assertEquals($person->getId(), $data['mainPerson']['id']);
+
+                self::assertArrayHasKey('course', $data);
+                self::assertEquals($period->getId(), $data['course']['id']);
+            },
+        ];
+
+        yield [
+            // test with every options activated
+            [
+                'mainPerson' => true,
+                'mainPersonLabel' => 'person',
+                'person1' => true,
+                'person1Label' => 'person2',
+                'person2' => true,
+                'person2Label' => 'person2',
+                'thirdParty' => true,
+                'thirdPartyLabel' => '3party'
+            ],
+            $period,
+            [
+                'mainPerson' => $person,
+                'person1' => $person,
+                'person2' => $person,
+                'thirdParty' => $thirdParty,
+            ],
+            [
+                'thirdParty' => $thirdParty->getId(),
+                'mainPerson' => $person->getId(),
+                'person1' => $person->getId(),
+                'person2' => $person->getId(),
+            ],
+            function (array $data) use ($person, $thirdParty, $period) {
+                self::assertArrayHasKey('mainPerson', $data);
+                self::assertEquals($person->getId(), $data['mainPerson']['id']);
+
+                self::assertArrayHasKey('person1', $data);
+                self::assertEquals($person->getId(), $data['person1']['id']);
+
+                self::assertArrayHasKey('person2', $data);
+                self::assertEquals($person->getId(), $data['person2']['id']);
+
+                self::assertArrayHasKey('thirdParty', $data);
+                self::assertEquals($thirdParty->getId(), $data['thirdParty']['id']);
+
+                self::assertArrayHasKey('course', $data);
+                self::assertEquals($period->getId(), $data['course']['id']);
+            },
+        ];
+
+        yield [
+            // test with any option activated
+            [
+                'mainPerson' => false,
+                'mainPersonLabel' => 'person',
+                'person1' => false,
+                'person1Label' => 'person2',
+                'person2' => false,
+                'person2Label' => 'person2',
+                'thirdParty' => false,
+                'thirdPartyLabel' => '3party'
+            ],
+            $period,
+            [
+                'mainPerson' => null,
+                'person1' => null,
+                'person2' => null,
+                'thirdParty' => null,
+            ],
+            [
+                'thirdParty' => null,
+                'mainPerson' => null,
+                'person1' => null,
+                'person2' => null,
+            ],
+            function (array $data) use ($period) {
+                self::assertArrayHasKey('course', $data);
+                self::assertEquals($period->getId(), $data['course']['id']);
+            },
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php
index d0138dc30..71fce8c92 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php
@@ -18,20 +18,30 @@ use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\ResidentialAddressRepository;
+use Chill\PersonBundle\Service\DocGenerator\AccompanyingPeriodContext;
 use Chill\PersonBundle\Service\DocGenerator\PersonContext;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Exception\Prediction\FailedPredictionException;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -46,10 +56,142 @@ use function count;
  * @internal
  * @coversNothing
  */
-final class PersonContextTest extends TestCase
+final class PersonContextTest extends KernelTestCase
 {
     use ProphecyTrait;
 
+    /**
+     * This test run the methods executed when a document is generated:
+     *
+     * - normalized data from the form in a way that they are stored in message queue;
+     * - denormalize the data from the message queue,
+     * - and get the data, as they will be transmitted to the GeneratorDriver
+     *
+     * @param array $options the options, as they are stored in the DocGeneratorTemplate (the admin form data)
+     * @param Person $entity The entity from which the data will be extracted
+     * @param array $data The data, from the public form
+     * @param array $expectedNormalized, how the normalized data are expected (allow to check that this data will be compliant with the storage in messenger queue)
+     * @param callable $assertionsOnData some test that will be executed on the normalized data
+     * @dataProvider provideNormalizedData
+     */
+    public function testContextGenerationDataNormalizeDenormalizeGetData(
+        array $options,
+        Person $entity,
+        array $data,
+        array $expectedNormalized,
+        callable $assertionsOnData
+    ): void {
+        // we boot kernel only for this test
+        self::bootKernel();
+
+        // we create a PersonContext with the minimal dependency injection needed (relying on
+        // prophecy for other dependencies)
+        $context = $this->buildPersonContext(
+            null,
+            self::$container->get(BaseContextData::class),
+            self::$container->get(CenterResolverManagerInterface::class),
+            self::$container->get(DocumentCategoryRepository::class),
+            self::$container->get(EntityManagerInterface::class),
+            self::$container->get(NormalizerInterface::class),
+            (new ParameterBag(['chill_main' => ['acl' => ['form_show_scopes' => false]]])),
+            null,
+            self::$container->get(Security::class),
+            null,
+            null,
+            null,
+            self::$container->get(ThirdPartyRepository::class)
+        );
+        $template = new DocGeneratorTemplate();
+        $template->setName(["fr" =>"test"])->setContext(AccompanyingPeriodContext::class)
+            ->setDescription("description")->setActive(true)
+            ->setOptions($options);
+
+        $normalized = $context->contextGenerationDataNormalize($template, $entity, $data);
+
+        self::assertEquals($expectedNormalized, $normalized);
+
+        $denormalized = $context->contextGenerationDataDenormalize($template, $entity, $normalized);
+
+        $data = $context->getData($template, $entity, $denormalized);
+
+        call_user_func($assertionsOnData, $data);
+    }
+
+    public function provideNormalizedData(): iterable
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $thirdParty = $em->createQuery("SELECT t FROM " . ThirdParty::class . " t")
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $thirdParty) {
+            throw new \RuntimeException("No thirdparty in database");
+        }
+
+        $person = $em->createQuery("SELECT p FROM " . Person::class . " p")
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $person) {
+            throw new \RuntimeException("No confirmed period in database");
+        }
+
+        $category = self::$container->get(DocumentCategoryRepository::class)
+            ->findAll()[0];
+
+        if (null === $category) {
+            throw new \RuntimeException("no document category in database");
+        }
+
+        yield [
+            [
+                'thirdParty' => true,
+                'thirdPartyLabel' => '3party',
+                'category' => $category,
+            ],
+            $person,
+            [
+                'title' => 'test',
+                'thirdParty' => $thirdParty,
+            ],
+            [
+                'thirdParty' => $thirdParty->getId(),
+                'title' => 'test',
+                'scope_id' => null,
+            ],
+            function ($data) use ($person, $thirdParty) {
+                self::assertArrayHasKey('person', $data);
+                self::assertEquals($person->getId(), $data['person']['id']);
+
+                self::assertArrayHasKey('thirdParty', $data);
+                self::assertEquals($thirdParty->getId(), $data['thirdParty']['id']);
+            }
+        ];
+
+        yield [
+            [
+                'thirdParty' => false,
+                'thirdPartyLabel' => '3party',
+                'category' => $category,
+            ],
+            $person,
+            [
+                'title' => 'test',
+            ],
+            [
+                'title' => 'test',
+                'scope_id' => null,
+                'thirdParty' => null,
+            ],
+            function ($data) use ($person, $thirdParty) {
+                self::assertArrayHasKey('person', $data);
+                self::assertEquals($person->getId(), $data['person']['id']);
+            }
+        ];
+    }
+
     /**
      * Test that the build person context works in the case when 'form_show_scope' is false.
      */
@@ -208,9 +350,13 @@ final class PersonContextTest extends TestCase
         ?EntityManagerInterface $em = null,
         ?NormalizerInterface $normalizer = null,
         ?ParameterBagInterface $parameterBag = null,
+        ?ScopeRepositoryInterface $scopeRepository = null,
         ?Security $security = null,
         ?TranslatorInterface $translator = null,
-        ?TranslatableStringHelperInterface $translatableStringHelper = null
+        ?TranslatableStringHelperInterface $translatableStringHelper = null,
+        ?ThirdPartyRender $thirdPartyRender = null,
+        ?ThirdPartyRepository $thirdPartyRepository = null,
+        ?ResidentialAddressRepository $residentialAddressRepository = null
     ): PersonContext {
         if (null === $authorizationHelper) {
             $authorizationHelper = $this->prophesize(AuthorizationHelperInterface::class)->reveal();
@@ -250,6 +396,11 @@ final class PersonContextTest extends TestCase
             $parameterBag = new ParameterBag(['chill_main' => ['acl' => ['form_show_scopes' => true]]]);
         }
 
+        if (null === $scopeRepository) {
+            $scopeRepository = $this->prophesize(ScopeRepositoryInterface::class);
+            $scopeRepository = $scopeRepository->reveal();
+        }
+
         if (null === $security) {
             $security = $this->prophesize(Security::class);
             $security->getUser()->willReturn(new User());
@@ -267,6 +418,28 @@ final class PersonContextTest extends TestCase
             $translatableStringHelper = $translatableStringHelper->reveal();
         }
 
+        if (null === $thirdPartyRender) {
+            $thirdPartyRender = $this->prophesize(ThirdPartyRender::class);
+            $thirdPartyRender = $thirdPartyRender->reveal();
+        }
+
+        if (null === $thirdPartyRepository) {
+            $thirdPartyRepository = $this->prophesize(ThirdPartyRepository::class);
+            $thirdPartyRepository = $thirdPartyRepository->reveal();
+        }
+
+        if (null === $residentialAddressRepository) {
+            $residentialAddressRepository = $this->prophesize(ResidentialAddressRepository::class);
+            $residentialAddressRepository->findCurrentResidentialAddressByPerson(Argument::type(Person::class), Argument::any())
+                ->willReturn([
+                    (new Person\ResidentialAddress())
+                        ->setAddress((new Address())
+                            ->setStreet('test street')
+                            ->setPostcode(new PostalCode()))
+                ]);
+            $residentialAddressRepository = $residentialAddressRepository->reveal();
+        }
+
         return new PersonContext(
             $authorizationHelper,
             $baseContextData,
@@ -275,9 +448,13 @@ final class PersonContextTest extends TestCase
             $em,
             $normalizer,
             $parameterBag,
+            $scopeRepository,
             $security,
             $translator,
-            $translatableStringHelper
+            $translatableStringHelper,
+            $thirdPartyRender,
+            $thirdPartyRepository,
+            $residentialAddressRepository
         );
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
index 76e15ef17..f9893b9d9 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
@@ -21,7 +21,7 @@ use DomainException;
 
 use function array_key_exists;
 
-final class ThirdPartyRepository implements ObjectRepository
+class ThirdPartyRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 

From 9c109d2efdbe78d99d813b3a35abf9c532cf8fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 31 May 2023 23:47:02 +0200
Subject: [PATCH 32/49] DX: use array spred instead of array_merge

---
 .../AccompanyingPeriodContext.php             | 19 ++++------
 ...ccompanyingPeriodWorkEvaluationContext.php | 20 ++++------
 .../Service/DocGenerator/PersonContext.php    | 37 +++++++++----------
 3 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index 0db54a47a..4f6235930 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -213,17 +213,14 @@ class AccompanyingPeriodContext implements
             }
         }
 
-        $thirdParties = array_merge(
-            array_values(array_filter([$entity->getRequestorThirdParty()])),
-            array_values(array_filter(
-                array_map(
-                    fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
-                    $entity->getResources()->filter(
-                        static fn (Resource $r): bool => null !== $r->getThirdParty()
-                    )->toArray()
-                )
-            ))
-        );
+        $thirdParties = [...array_values(array_filter([$entity->getRequestorThirdParty()])), ...array_values(array_filter(
+            array_map(
+                fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
+                $entity->getResources()->filter(
+                    static fn (Resource $r): bool => null !== $r->getThirdParty()
+                )->toArray()
+            )
+        ))];
 
         if ($options['thirdParty'] ?? false) {
             $builder->add('thirdParty', EntityType::class, [
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index ee746a034..f58788120 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -116,20 +116,16 @@ class AccompanyingPeriodWorkEvaluationContext implements
     {
         $this->accompanyingPeriodWorkContext->buildPublicForm($builder, $template, $entity->getAccompanyingPeriodWork());
 
-        $thirdParties = array_merge(
-            array_values(array_filter($entity->getAccompanyingPeriodWork()->getThirdParties()->toArray())),
-            array_values(array_filter([$entity->getAccompanyingPeriodWork()->getHandlingThierParty()])),
-            array_values(
-                array_filter(
-                    array_map(
-                        fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
-                        $entity->getAccompanyingPeriodWork()->getAccompanyingPeriod()->getResources()->filter(
-                            static fn (Resource $r): bool => null !== $r->getThirdParty()
-                        )->toArray()
-                    )
+        $thirdParties = [...array_values(array_filter($entity->getAccompanyingPeriodWork()->getThirdParties()->toArray())), ...array_values(array_filter([$entity->getAccompanyingPeriodWork()->getHandlingThierParty()])), ...array_values(
+            array_filter(
+                array_map(
+                    fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
+                    $entity->getAccompanyingPeriodWork()->getAccompanyingPeriod()->getResources()->filter(
+                        static fn (Resource $r): bool => null !== $r->getThirdParty()
+                    )->toArray()
                 )
             )
-        );
+        )];
 
         $options = $template->getOptions();
         if ($options['thirdParty'] ?? false) {
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index 1ced31121..9d7f1cdd5 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -179,28 +179,25 @@ final class PersonContext implements PersonContextInterface
             'data' => $this->translatableStringHelper->localize($template->getName()),
         ]);
 
-        $thirdParties = array_merge(
-            array_values(
-                array_filter(
-                    array_map(
-                        fn (ResidentialAddress $r): ?ThirdParty => $r->getHostThirdParty(),
-                        $this
-                            ->residentialAddressRepository
-                            ->findCurrentResidentialAddressByPerson($entity)
-                    )
-                )
-            ),
-            array_values(
-                array_filter(
-                    array_map(
-                        fn (PersonResource $r): ?ThirdParty => $r->getThirdParty(),
-                        $entity->getResources()->filter(
-                            static fn (PersonResource $r): bool => null !== $r->getThirdParty()
-                        )->toArray()
-                    )
+        $thirdParties = [...array_values(
+            array_filter(
+                array_map(
+                    fn (ResidentialAddress $r): ?ThirdParty => $r->getHostThirdParty(),
+                    $this
+                        ->residentialAddressRepository
+                        ->findCurrentResidentialAddressByPerson($entity)
                 )
             )
-        );
+        ), ...array_values(
+            array_filter(
+                array_map(
+                    fn (PersonResource $r): ?ThirdParty => $r->getThirdParty(),
+                    $entity->getResources()->filter(
+                        static fn (PersonResource $r): bool => null !== $r->getThirdParty()
+                    )->toArray()
+                )
+            )
+        )];
 
         if ($options['thirdParty'] ?? false) {
             $builder->add('thirdParty', EntityType::class, [

From 07ff425bfcdc26dc512cadd999e7bcf8fc2d5893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 1 Jun 2023 09:39:40 +0200
Subject: [PATCH 33/49] initialize .changie and backup previous changelog

---
 .changes/header.tpl.md       |   6 +
 .changes/unreleased/.gitkeep |   0
 .changes/v2.0.0.md           | 677 +++++++++++++++++++++++++++++++++++
 .changie.yaml                |  31 ++
 CHANGELOG.md                 |  18 +-
 5 files changed, 723 insertions(+), 9 deletions(-)
 create mode 100644 .changes/header.tpl.md
 create mode 100644 .changes/unreleased/.gitkeep
 create mode 100644 .changes/v2.0.0.md
 create mode 100644 .changie.yaml

diff --git a/.changes/header.tpl.md b/.changes/header.tpl.md
new file mode 100644
index 000000000..df8faa7b2
--- /dev/null
+++ b/.changes/header.tpl.md
@@ -0,0 +1,6 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
+and is generated by [Changie](https://github.com/miniscruff/changie).
diff --git a/.changes/unreleased/.gitkeep b/.changes/unreleased/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.changes/v2.0.0.md b/.changes/v2.0.0.md
new file mode 100644
index 000000000..8d70ecba6
--- /dev/null
+++ b/.changes/v2.0.0.md
@@ -0,0 +1,677 @@
+## 2.0.0
+
+* this is a release to relaunch our proceess of release with semantic versioning
+
+## Test releases
+
+### 2.0.0-beta3
+
+* [person][export] Fixed: rename the alias for `accompanying_period` to `acp` in filter associated with person
+* [activity][export] Feature: improve label for aliases in "Filter by activity type"
+* [activity][export] DX/Feature: use of an `ActivityTypeRepositoryInterface` instead of the old-style EntityRepository
+* [person][export] Fixed: some inconsistency with date filter on accompanying courses
+* [person][export] Fixed: use left join for related entities in accompanying course aggregators
+* [workflow] Feature: allow user to copy and send manually the access link for the workflow
+* [workflow] Feature: show the email addresses that received an access link for the workflow
+### 2.0.0-beta2
+
+* [workflow]: Fixed: the notification is sent when the user is added to the first step.
+* [budget] Feature: allow to desactivate some charges and resources, adding an `active` key in the configuration
+* [person] Feature: on Evaluation, allow to configure an URL from the admin
+
+### 2022-06
+
+* [workflow]: added pagination to workflow list page
+* [homepage_widget]: null error on tasks widget fixed
+* [person-thirdparty]: fix quick-add of names that consist of multiple parts (eg. De Vlieger) within onthefly modal person/thirdparty
+* [search]: Order of birthdate fields changed in advanced search to avoid confusion.
+* [workflow]: Constraint added to workflow (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/675)
+* [social_action]: only show active objectives (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/625)
+* [household]: Reposition and cut button for enfant hors menage have been deleted (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/620)
+* [admin]: Add crud for composition type in admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/611)
+* [social_action]: only show active objectives (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/625)
+
+## Test releases
+
+### 2022-05-30
+
+* fix creating a new AccompanyingPeriodWorkEvaluationDocument when replacing the document (the workflow was lost)
+
+### 2022-05-27
+
+* [storedobject] add title field on StoredObject entity + use it in activity documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
+* [main] add a "read more..." on comment embeddable when overflown (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
+* [person] add closing motive to closed acc course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/603)
+* [person] household filiation: fetch person info when unfolding person (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/586)
+* [admin] repair edit of social action in the admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/601)
+* [admin]: add select2 to Goal form type entity fields (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/702)
+* [main] allow hide permissions group list menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
+* [main] allow hide change user password menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
+* [main] filter user jobs by active jobs (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
+* [main] add civility to User (entity, migration and form type) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
+* [admin] refactorisation of the admin section: reorganisation of the menu, translations, form types, new entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/592)
+* [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596)
+* [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)
+* [main] admin user_job: improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/588)
+* [address] can add extra address info even if noAddress (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/576)
+
+
+### 2022-05-06
+
+* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+
+### 2021-04-29
+
+* [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)
+* [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
+* Load relationships without gender in french fixtures
+* Add command to remove old draft accompanying periods
+* [parcours]: If users assings him/herself as referrer and job is not null. Update parcours job (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/578)
+
+### 2021-04-28
+
+* [address] fix bug when editing address: update location and addressreferenceId + better update of the map in edition (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/593)
+* [main] avoid address reference search on undefined post code (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/561)
+* [person] prevent duplicate relationship in filiation/household graph (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/560)
+* [Documents] Validate storedObject and allow for null data (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/565)
+* [parcours]: Comments can be unpinned + edit/delete for all users that are allowed to edit parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/566)
+
+### 2021-04-26
+
+* [Datepickers] datepickers fixed when using keyboard to enter date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/545)
+* [social_action] Display 'agents traitants' in parcours resumé and social action list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/568)
+* [Person_search] Closed parcours shown within an accordeon that can be opened/closed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/574)
+
+### 2021-04-24
+
+* [notification email on course designation] allow raw string in email content generation
+* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
+* [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634)
+* [Parcours]: The number of 'mes parcours' displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/572)
+* [Hompage_widget]: Renaming of tabs and removal of social actions tab (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/570)
+* [activity]: Ignore thirdparties when creating a social action via an activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/573)
+* [parcours]: change wording of warning message and button when user is not associated to a household yet (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/590#note_918370943)
+* [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older
+* [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error
+* [Notifications] delay the sending of notificaiton to kernel.terminate
+* [Notifications / Period user change] fix the sending of notification when user changes
+* [Activity form] invert 'incoming' and 'receiving' in Activity form
+* [Activity form] keep the same order for 'attendee' field in new and edit form
+* [list with period] use "sameas" test operator to introduce requestor in list
+* [notification email on course designation] allow raw string in email content generation
+* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
+* [evaluation_document] changing date to datetime in order to display the time at which document was created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/569)
+
+
+### 2021-04-13
+
+* [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
+* [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)
+* [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);
+* [docgen] add a new context with a list of activities in course
+* [docgen] add a comment in budget lines
+* [notifications] allow to send a notification to an email address. The address receive an access link
+* [adresses] add constraints in database to avoid errors later: postcode not null, and validfrom <= validto
+* [accompanying work editor] add a label on document title input
+
+### 2021-04-07
+
+* notification list: move action buttons outside of the toggle
+* fix detecting of non-read notification
+* filter users which are disabled in search user api
+* order query for location and add pagination in list
+* allow every person which has part for a workflow  to see the workflow page
+* able to see the workflow if the evaluation document has been deleted
+* hardcode the list of supported mime types for edition with collabora
+* list of accompanying course: allow to see the pinned comment in list_item
+
+### 2021-04-06
+
+* [main] notification toggle read: correct js syntax for compilation in production (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/548)
+* [parcours] Display of interlocuteurs changed to flex-table in parcours edit page to prevent cut-off of information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/535)
+* [activity] espace entre les boutons pour supprimer les documents
+
+
+### continuous release in February and March
+
+* Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType
+* [person] Accompanying course evaluation documents: disable the WOPI edit link if mimetype not supported and if no keyInfos
+(https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/585)
+* [activity] display error messages above the form in creating a new location (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/481)
+* [activity] show required field in activity edit/new by an asterix in the vuejs fields (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/494)
+* [ACL] fix allow to see the course, event if the scope'course does not contains the scope's user
+* [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)
+* [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)
+* [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)
+* [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)
+* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
+* [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)
+* [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)
+* [person] Add title to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
+* [person] Order social issues by the field "ordering" (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/388)
+* [Person/Household list] when listing other simultaneous members of an household, exclude the members on person, not on members (avoid to show two membersship with the same person)
+* [draft periods] add a delete button (if acl granted) on each draft period listed on draft period page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/463)
+* [Person] Display suffixText in RenderPerson, PersonText.vue, RenderPersonBox.vue (was made for displaying "enfant confie") (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/441)
+* [budget]: budget enabled for persons and households (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/469)
+*  [person] residential address: show residential address or info in PersonRenderBox, refactor Residential Address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/439)
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
+* [documents] Improve flex-table item-col placement when long buttons and long metadata
+* [thirdparty] Fix display of multiple contact badges so they wrap onto next line (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/482)
+* [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)
+* [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)
+* [activity] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
+* [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)
+* [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)
+* [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)
+* [thirdparty] For contacts show current civility/profession in edit form + fix saving of edited information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/491)
+* [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] add firstname field to thirdparty 'child' or 'contact' types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/508)
+* [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)
+* [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)
+* [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 + prevent personOwner themselves to be added. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/526)
+* [aside_activity] style correction + sticky-form create button (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/529)
+* [budget] order within the menu adjusted (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/592)
+* [onthefly] fix create person. Bug was noticed in filiation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/591)
+* [parcours] Create document buttons made sticky (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/532)
+* [person] Trailing guillemet removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/530)
+* [notification] Display of social action within workflow notification set to display block (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/537)
+* [onthefly] trim trailing whitespace in email of person and thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/542)
+
+* [action] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
+## Test releases
+
+### test release 2022-02-21
+
+* [notifications] Word 'un' changed to number '1' for notifications in user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/483)
+* [documents] 'gabarit' changed to 'modèle' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/405)
+* [person_resources] Menu name and order changed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/460)
+* workflow: fix sending notifications
+* [thirdparty] Extend the thirdparty search to thirdparty children (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/448)
+* [person]: AddPersons: allow creation of person or thirdparty only (no users) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
+* [person]: AddPersons: allow creation of person or thirdparty depending on allowed types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
+* [person]: AddPersons: add suggestion of name when creating new person or thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
+* [main] Address: fix small bug: when modifying an address without street (isNoAddress), also check errors if street is an empty string as back-end change null value to empty string for street (and streetNumber)
+* [main] Address: stronger client-side validation of addresses (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/449)
+* [person] accompanying course: filter suggested entities by open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/415)
+[activity] can click through the cross icon for removing person in concerned group (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
+[activity] correct associated persons by considering only open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
+* [person_resources]: Renderboxes used to display person/thirdparty info (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/465)
+* [Household]: Add end date in HouseholdMember form for 'enfant hors menage' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/434)
+* [homepage_widget]: If no sender then display as 'notification automatique' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/435)
+* [parcours]: Order social activities and only display most recent three in parcours resumé (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/481)
+* [3party]: 3party: redirect to parent when contact (child) is opened in view page
+* [parcours / addresses]: launch an event when a person change address (either through changing household or because the household is associated to a new address). If the person is localising a course, the course location go back to a temporarily address.
+* [thirdparty]: address/phonenumber/email/fonction displayed in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/401)
+* [thirdparty_contact]: in search results the 'qualité' is displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/465)
+* [bug]: fix confidential toggle of address in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/460)
+
+
+
+### test release 2022-02-14
+
+* AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)
+* [doc-generator] do not set required fields for mainPerson, person1, person2 (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement#456)
+* [doc-generation] add age and obele in the mainPerson, person1 and person2 list + add obele in person renderString if addAge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/370)
+* [person] accompanying course work: fix on-the-fly update of thirdParty
+* fix normalisation of accompanying course requestor api (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/378)
+* [person] add a returnPath when clicking on some Person or ThirdParty badge (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/427)
+* [person] accompanying course work: fix on-the-fly update of thirdParty
+* [on-the-fly] close modal only after validation
+* [person] correct thirdparty PATCH url + add email and altnames in AddPerson and serializer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/433)
+* change order for accompanying course work list
+* [parcours]: Mes parcours brouillon added to user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/440)
+* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
+* [person]: style fix in parcours listing per person. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/432)
+* [parcours]: Only the referrer can toggle the intensity of the parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
+* [household]: display address of current household (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/415)
+* ajoute un ordre dans les localisation (api)
+* [pick entity]: fix translations in modal (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/419)
+* [homepage_widget]: fix translation on emergency badge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/440)
+* [person]: create person and household added to button dropdown (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/454)
+* display full address in address.text in normalization. Adapt AddressRenderBox
+* [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459)
+* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
+* [Thirdparty_contact]: address blurred if confidential in view page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/450)
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
+
+
+### test release 2021-02-01
+
+* renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche
+* renomme date de début en date d'ouverture dans le formulaire parcours
+* [homepage widget] improve content tables, improve counter pluralization with style on number
+* [notification lists] add comments counter information
+* [workflows] fix popover header with previous transition
+* [parcours]: validation + message for closing parcours adjusted.
+* [household]: household composition double edit button replaced by a delete action (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/426)
+[fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
+[homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
+* [person]: Comment on marital status is possible even if marital status is not defined (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/421)
+* [parcours]: In the list of person results the requestor is not displayed if defined as anonymous (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/424)
+* [bugfix]: modal closes and newly created person/thirdparty is selected when multiple persons/thirdparties are created through the modal (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/429)
+* [person_resource]: Onthefly button added to view person/thirdparty and badge differentiation for a contact-thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/428)
+* [workflow][notification] improve how notifications and workflows are 'attached' to entities: contextual list, counter, buttons and vue modal
+* [AddAddress] disable multiselect search, and rely only on most pertinent Cities and Street computed backend
+* [fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
+* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
+* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
+
+
+### test release 2021-01-31
+
+* [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409)
+* [person] accompanying course: close modal when edit participation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
+* [person] accompanying course: treat validation error when editing on-the-fly entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
+* [activity] show activity attendee (présence) in the activity list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/412)
+* [activity] admin: change validation rule for social action visible field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/413)
+* [parcours]: component added to change the opening date of a parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/411)
+* [search]: listing of parcours display changed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/410)
+* [user]: page with accompanying periods to which is user is referent (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/408)
+* [person] age added to renderstring + renderbox/ vue component created to display person text (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/389)
+* [household member editor] allow to push to existing household
+
+
+### test release 2021-01-28
+
+* [person] improve filiations vis graph: disable physics, use chill colors for persons-households-course, increase label of relations, remove labels on household arrows and other improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/286, https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/362)
+* [activity] Order activity by date and by id (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/364)
+* [main] increase length of 4 Address fields (change to TEXT, no size limits) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/277)
+* [main] Add confidential option for address, in edit and view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/165)
+* [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
+* [person] Add residential address entity, form and list for each person
+* [aside_activity]: dynamicUserPickerType used (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/399)
+* dispatching list
+
+
+### test release 2021-01-26
+
+* [parcours] comments truncated if too long + link added (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/406)
+* [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
+* [person ressources]: module added
+
+
+### test release 2022-01-24
+
+* [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
+* [notification: formulaire création] descend la box avec la description dans le bas du formulaire
+* [notification for activity]: fix link to activity
+* [notification] add "URGENT" before accompanying course with emergency = true
+* [notification] add a "read more" button on system notification
+* [notification] add `[Chill]` in the subject of each notification, automatically
+* [notification] add a counter for notification in activity list and accompanying period list, and search results
+* [parcours] bugfix if deathdate is not defined (eg. for a thirdparty) parcours is still displayed. Gave error before.
+* [workflow] add breadcrumb to show steps
+* [popover] add popover html popup mechanism (used by workflow breadcrumb)
+* [templates] improve updatedBy macro in item metadatas
+* [parcours]: bug fix when comment is pinned all other comments remain in the collection (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/385)
+* [workflow]
+  * add My workflow section with my opened subscriptions
+  * apply workflow on documents, accompanyingCourseWork and Evaluations
+* [wopi-link] a new vue component allow to open wopi link in a fullscreen chill-themed modal
+
+### test release 2022-01-19
+* vuejs: add dead information on all on-the-fly person render boxes, in vis graph and other templates (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/271)
+* [thirdparty] fix bug in 3rd party view: types was replaced by thirdPartyTypes
+* [main] location form type: fix unmapped address field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/246)
+* [activity] fix wrong import of js assets for adding and viewing documents in activity (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/83 & https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/176)
+* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
+* [forms] dynamic picker types for user/person/thirdparty types created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/386)
+
+### test release 2022-01-17
+
+* [main] Add editableByUser field to locationType entity, adapt the admin template and add this condition in the location-type endpoint (see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/297)
+* [main] Add mainLocation field to User entity and add it in user form type
+* rewrite page which allow to select activity
+* [main] Add mainLocation field to User entity and add it in user form type
+* [course list in person context] show full username/label for ref
+* [accompanying period work] remove the possibility to  generate document from an accompanying period work
+* vuejs: add validation on required fields for AddPerson, Address and Location components
+* vuejs: treat 422 validation errors in locations and AddPerson components
+* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
+
+## Test releases
+* vuejs: add validation on required fields for AddPerson, Address and Location components
+* vuejs: treat 422 validation errors in locations and AddPerson components
+* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
+
+### test release 2022-01-12
+
+* fix thirdparty normalizer on telephone field: https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/322
+
+### test release 2022-01-11
+
+* vuejs: translate in French all multiselect widgets
+* [address] define address lines according postal standards for France and Belgium (default) and change AddressRender, chill_entity_render_box and AddressRenderBox.vue
+* [household] change translations (champs-libres/departement-de-la-vendee/accent-suivi-developpement#109)
+* [household] add address i18n in household component (champs-libres/departement-de-la-vendee/accent-suivi-developpement#158)
+* [household] add on the fly i18n in household component
+* [household] redirect to the household page when a household is created from a person (champs-libres/departement-de-la-vendee/accent-suivi-developpement#175)
+* [household] household member editor: display alert if some members have already an household (champs-libres/departement-de-la-vendee/accent-suivi-developpement#172)
+* [household] household member editor: do not add in new members if the member is included in the members of household (champs-libres/departement-de-la-vendee/accent-suivi-developpement#123)
+* [household] household member editor: remove markNoAddress button (champs-libres/departement-de-la-vendee/accent-suivi-developpement#109)
+* [person]: ordering fields in add person (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/61)
+* [person]: Add email and alt names in add person (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/61)
+* [accompanyingCourse] Add a delete action and delete buttons to delete a accompanying course when step = DRAFT (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/64)
+* [accompanyingCourse] Add a administrative location in the accompanying course, set the user current location as default, allow to select a location in a select field and do not allow to confirm the accompanying course if location is empty.
+* [accompanyingCourse] Add the administrative location in the available variables for document generation
+* AddAddress: optimize loading: wait for the user finish typing;
+* UserPicker: fix bug with deprecated role
+* docgen: add base context + tests
+* docgen: add age for person
+* [household menu] fix filiation order https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/265
+* [AddAddress]: optimize loading: wait for the user finish typing;
+* [UserPicker]: fix bug with deprecated role
+* [docgen]: add base context + tests
+* [docgen]: add age for person
+* [task]: fix dropdown menu style + fix bug in singleTaskController (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/338)
+* Household: fix bug when moving person on the same day (see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/281)
+* Household: show date validFrom and validTo when moving
+* address reference: add index for refid
+* [accompanyingCourse_work] fix styles conflicts + fix bug with remove goal (remove goals one at a time)
+* [accompanyingCourse] improve masonry on resume page, add origin
+* [notification] new notification interface, can be associated to AccompanyingCourse/Period, Activities.
+  * List notifications, show, and comment in User section
+  * Notify button and contextual notification box on associated objects pages
+* [accompanyingCourse] add a comment for each resource associated. A modal allow to save comment. Comment is displayed in on-the-fly show modal of the accompanyingCourse context (edit page + resume page).
+
+### test release 2021-12-14
+
+* [asideactivity] creation of aside activity category fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/262)
+* [vendee/person] fix typo "situation professionelle" => "situation professionnelle"
+* [main] add availableForUsers condition from locationType in the location API endpoint (champs-libres/departement-de-la-vendee/accent-suivi-developpement#248)
+* [main] add the current location of the user as API point + add it in the activity location list (champs-libres/departement-de-la-vendee/accent-suivi-developpement#247)
+* [activity] improve show/new/edit templates, fix SEE and SEE_DETAILS acl
+* [badges] create specific badge for TMS, and make person/thirdparty badges clickable with on-the-fly modal in :
+    * concerned groups items (activity, calendar)
+    * accompanyingCourseWork lists
+    * accompanyingCourse lists
+* [acompanyingCourse] add initial comment on Resume page
+* [person] create button full width (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/330)
+
+### test release 2021-12-11
+
+* [main] add order field to civility
+* [main] change address format in case the country is France, in Address render box and address normalizer
+* [person] add validator for accompanying period with a test on social issues (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/76)
+* [activity] fix visibility for location
+* [origin] fix origin: use correctly the translatable strings
+    * /!\ everyone must update the origin table. As there is only one row, execute `update chill_person_accompanying_period_origin set label = jsonb_build_object('fr', 'appel téléphonique');`
+* [person] redirect bug fixed.
+* [action] add an unrelated issue within action creation.
+* [origin] fix origin: use correctly the translatable strings
+    * /!\ everyone must update the origin table. As there is only one row, execute `update chill_person_accompanying_period_origin set label = jsonb_build_object('fr', 'appel téléphonique');`
+* [main] change order of civilities in civility fixtures (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] set min attr in the minimum of children field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] add marital status date in person view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] show number of children + allow set number of children to null (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] show acceptSMS option (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] add death information in person render box in twig and vue render boxes (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [asideactivity] creation of aside activity category fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/262)
+* [vendee/person] fix typo "situation professionelle" => "situation professionnelle"
+* [accompanyingcourse_work] Changes in layout/behavior of edit form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/321)
+* [badge-entity] design coherency between pills badge-person and 3 kinds of badge-thirdparty
+* [AddPersons] suggestions row are clickable, not only checkbox
+
+### test release 2021-12-06
+
+* [main] address: use search API end points for getting postal code and reference address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/316)
+* [main] address: in edit mode, select the encoded values in multiselect for address reference and city (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/316)
+* [person search] fix bug when using birthdate after and birthdate before
+* [person search] increase pertinence when lastname begins with search pattern
+* [activity/actions] Améliore la cohérence du design entre
+  * la page résumé d'un parcours (liste d'actions récentes et liste d'activités récentes)
+  * la page liste des actions
+  * la page liste des activités (contexte personne / contexte parcours)
+* [household] field to edit wheter person is titulaire of household or not removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/322)
+* [activity] create work if a work with same social action is not associated to the activity
+* [visgraph] improve and fix bugs on vis-network relationship graph
+* [bugfix] posting of birth- and deathdate through api fixed.
+* [suggestions] improve suggestions lists
+
+### Test release 2021-11-19 - bis
+
+* [household] do not allow to create two addresses on the same date
+* [activity] handle case when there is no social action associated to social issue
+* [activity] layout for issues / actions
+* [activity][bugfix] in edit mode, the form will now load the social action list
+
+
+### Test release 2021-11-29
+
+* [person] suggest entities (person | thirdparty) when creating/editing the accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/119)
+* [activity] add custom validation on the Activity class, based on what is required from the ActivityType (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/188)
+* [main] translate multiselect messages when selecting/creating address
+* [main] set the coordinates of the city when creating a new address OR choosing "pas d'adresse complète"
+* Use the user.label in accompanying course banner, instead of username;
+* fix: show validation message when closing accompanying course;
+* [thirdparty] link from modal to thirdparty detail page fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/228)
+* [assets] new asset to style suggestions lists (with add/remove item link) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/258)
+* [accompanyingCourseWorkEdit] improves hyphenation and line breaks for long badges
+* [acompanyingCourse] improve Resume page
+  * complete all needed informations,
+  * actions and activities are clickables,
+  * better placement with js masonry blocks on top of content area,
+  * https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/101
+  * https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/295
+* [activity/calendar] on show page, concerned groups of persons table adapt itself to isVisibles options
+* [activity] remove the "plus" button in activity list
+* [activity] check ACL on activity list in person context
+* [list for accompanying course in person] filter list using ACL
+* [validation] toasts are displayed for errors when modifying accompanying course (generalization required).
+* [period] only the user can enable confidentiality
+* add an endpoint for checking permissions. See https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/232
+* [activity] for a new activity: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
+* [calendar] for a new rdv: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
+* [period] Validation added when period is confidential and confirmed -> user cannot be null.
+
+
+## Test releases
+
+### Test release 2021-11-22
+
+* [activity] delete admin_user_show in twig template because this route is not defined and should be defined
+* [activity] suggest requestor, user and ressources for adding persons|user|3rdparty
+* [calendar] suggest persons, professionals and invites for adding persons|3rdparty|user
+* [activity] take into account the restrictions on person|thirdparties|users visibilities defined in ActivityType
+* [main] Add currentLocation to the User entity + add a page for selecting this location + add in the user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/133)
+* [activity] add user current location as default location for a new activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/133)
+* [task] Select2 field in task form to allow search for a user (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/167)
+* remove "search by phone configuration option": search by phone is now executed by default
+* remplacer le classement par ordre alphabétique par un classement par ordre de pertinence, qui tient compte:
+    * de la présence d'une string avec le nom de la ville;
+    * de la similarité;
+    * du fait que la recherche commence par une partie du mot recherché
+* ajouter la recherche par numéro de téléphone directement dans la barre de recherche et dans le formulaire recherche avancée;
+* ajouter la recherche par date de naissance directement dans la barre de recherche;
+* ajouter la recherche par ville dans la recherche avancée
+* ajouter un lien vers le ménage dans les résultats de recherche
+* ajouter l'id du parcours dans les résultats de recherche
+* ajouter le demandeur dans les résultats de recherche
+* ajout d'un bouton "recherche avancée" sur la page d'accueil
+* [person] create an accompanying course: add client-side validation if no origin (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/210)
+* [person] fix bounds for computing current person address: the new address appears immediatly
+* [docgen] create a normalizer and serializer for normalization on doc format
+* [person normalization] the key center is now "centers" and is an array. Empty array if no center
+* [accompanyingCourse] Ability to close accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/296)
+* [task] Select2 field in task form to allow search for a user (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/167)
+* [list result] show all courses, except ones with period closed
+* [accompanyingCourse] improve banner with small carousel to display slide social-issues or slide associated persons (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/69)
+
+### Test release 2021-11-15
+
+* [main] fix adding multiple AddresseDeRelais (combine PickAddressType with ChillCollection)
+* [person]: do not suggest the current household of the person (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/51)
+* [person]: display other phone numbers in view + add message in case no others phone numbers (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/184)
+* unnecessary whitespace removed from person banner after person-id + double parentheses removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/290)
+* [person]: delete accompanying period work, including related objects (cascade) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/36)
+* [address]: Display of incomplete address adjusted.
+* [household]: improve relationship graph
+    * add form to create/edit/delete relationship link,
+    * improve graph refresh mechanism
+    * add feature to export canvas as image (png)
+* [person suggest] In widget "add person", improve the pertinence of persons when one of the names starts with the pattern;
+* [person] do not ask for center any more on person creation
+* [3party] do not ask for center any more on 3party creation
+
+## Test releases
+
+### Test release 2021-11-08
+
+* [person]: Display the name of a user when searching after a User (TMS)
+* [person]: Add civility to the person
+* [person]: Various improvements on the edit person form
+* [person]: Set available_languages and available_countries as parameters for use in the edit person form
+* [activity] Bugfix: documents can now be added to an activity.
+* [tasks] improve tasks with filter order
+* [tasks] refactor singleControllerTasks: limit the number of conditions from the context
+* [validations] validation of accompanying period added: no duplicate participations or resources (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/60).
+* [renderbox] If gender of person is not defined, no icon is displayed instead of neuter-icon (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/129).
+* [confidential information] module added to blur confidential information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/248).
+* refactor `AuthorizationHelper` and `UserACLAwareRepository` to fix constructor, and separate logic for parent role helper into `ParentRoleHelper`
+* [main]: filter location and locationType in backend: exclude NULL names, only active and availableToUsers
+* [activity]: perform client-side validation & show/hide fields in the "new location" modal
+* [person]: normalize person with CenterResolverDispatcher and handle case where center is null or multiple in PersonRenderBox
+* [docstore] voter for PersonDocument and AccompanyingCourseDocument on the 2.0 way (using VoterHelperFactory)
+* [docstore] add authorization check inside controller and menu
+* [activity]: fix inheritance for role `ACTIVITY FULL` and add missing acl in menu
+* [person] show current address in search results
+* [person] show alt names in search results
+* [admin]: links to activity admin section added again.
+* [household]: endDate field deleted from household edit form.
+* [household]: View accompanying periods of current and old household members.
+* [tasks]: different layout for task list / my tasks, and fix link to tasks in alert or in warning
+* [admin]: links to activity admin section added again.
+* [household]: household addresses ordered by ValidFrom date and by id to show the last created address on top.
+* [socialWorkAction]: display of social issue and parent issues + banner context added.
+* [DBAL dependencies] Upgrade to DBAL 3.1
+
+### Test release 2021-10-27
+
+* [person]: delete double actions buttons on search person page
+* [person]: accompanying course work: remove creation date display the list of work + handle case when end date is null
+* [main]: Add new pages with a menu for managing location and location type in the admin
+* [main]: Add some fixtures for location type
+* [calendar]: Pass the location when transforming a calendar item (rdv) into an activity
+* [calendar]: Add a user menu for "my calendar"
+
+### Test release 2021-10-18
+
+* [3party]: french translation of contact and company
+* [3party]: show parent in list
+* [3party]: change color for badge "child"
+* [3party]: fix address creation
+* [household members editor] finalisation of editor
+* [AccompanyingCourse banner]: replace translation referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/70)
+* [Location]: add location system in activity and RV (calendar). User can choose in location list or create a new location.
+* [household]: add relationship page with dynamic data visualisation graph
+
+## Test releases
+
+### Test release 2021-10-11
+
+* Address: zoom on postal code geometry + fix origin of manually entered postal code
+
+* in the Address vue component, order the postal code and street address by alphabetic and numeric order
+
+* add 3 new fields to PostalCode and adapt postal code command and fixtures
+
+* [Aside activity] Fixes for aside activity
+
+    * categories with child
+    * fast creation buttons
+    * add ordering for types
+
+* [AccompanyingCourse Resume page] dashboard for AccompanyingCourseWork and for Activities;
+* Improve badges behaviour with small screens;
+
+* [ThirdParty]:
+
+    * third party list
+    * create a kind contact/institution when create a new thirdparty, and set contact embedded as kind=child;
+    * filter thirdparties in list
+
+* [FilterOrder]: add development kit for generating filter and ordering in list
+* [Capitalization of names] person names are capitalized on creation, on prePersist event
+* [On-The-Fly] modale works for showing, editing and creating person or thirdparty ;
+* [AccompanyingCourse Resume page] associated persons list, can see household when hover, and with show on-the-fly modale when clicking person ;
+
+### test release 2021-10-04
+
+* [Household editor][UI] Update how household suggestion and addresses are picked;
+
+    See https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/80
+* [AddAddress] Handle address suggestion;
+* [CenterType][Create a person] when overriding the ACL rules, allow to show a PickCenterType
+    when no centers are reachable by the default ACL.
+* [Household] Show comment event if no address are associated with the household;
+* [Person results] Add requestor into search results:
+
+    * a badge "requestor" is shown into search results;
+    * periods where the person is only requestor (without participating) are also shown;
+
+    Issues:
+
+    * https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/13
+    * https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/199
+* [Person form] "accept sms" not required:
+
+    https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/37
+    https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/221
+
+* [Household editor] suggest only temporarily addresses;
+    See https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/82
+* On-The-Fly modale works for showing, editing and creating person and thirdparty ;
+* AccompanyingCourse Resume page: list associated persons by household, see household when hover, and show on-the-fly modale when clicking on person ;
+* [AddAddress] Handle address suggestion;
+* [AddAddress][Entity address]: add a link between address and address reference;
+* [Household editor] suggest household by comparing the temporary addresses from courses;
+
+    See https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/81
+* On-The-Fly modale works for showing, editing and creating person and thirdparty
+
+
+## Test released
+
+<!--
+
+Coming soon...
+
+DO NOT ADD unreleased items here. Add them under "Unreleased" title
+
+### Test release yyyy-mm-dd
+
+-->
+
+## Stable releases
+
+No stable releases for v2+
+
diff --git a/.changie.yaml b/.changie.yaml
new file mode 100644
index 000000000..e77a5ecf3
--- /dev/null
+++ b/.changie.yaml
@@ -0,0 +1,31 @@
+changesDir: .changes
+unreleasedDir: unreleased
+headerPath: header.tpl.md
+changelogPath: CHANGELOG.md
+versionExt: md
+versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
+kindFormat: '### {{.Kind}}'
+changeFormat: >-
+    '* {{- if not (eq .Custom.Issue "") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})){{- end }} {{.Body}}'
+custom:
+    -   key: Issue
+        label: Issue number (on chill-bundles repository) (optional)
+        optional: true
+        type: int
+        minInt: 1
+kinds:
+    -   label: Feature
+        auto: minor
+    -   label: Deprecated
+        auto: minor
+    -   label: Fixed
+        auto: patch
+    -   label: Security
+        auto: patch
+    -   label: DX
+        auto: patch
+newlines:
+    afterChangelogHeader: 1
+    beforeChangelogVersion: 1
+    endOfVersion: 1
+envPrefix: CHANGIE_
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2f951479..5475b20b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,19 @@
 # Changelog
-
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to
+adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
+and is generated by [Changie](https://github.com/miniscruff/changie).
 
-* [Semantic Versioning](https://semver.org/spec/v2.0.0.html) for stable releases;
-* date versioning for test releases
 
-## Unreleased
+## 2.0.0
+
+* this is a release to relaunch our proceess of release with semantic versioning
+
+## Test releases
+
+### 2.0.0-beta3
 
-<!-- write down unreleased development here -->
 * [person][export] Fixed: rename the alias for `accompanying_period` to `acp` in filter associated with person
 * [activity][export] Feature: improve label for aliases in "Filter by activity type"
 * [activity][export] DX/Feature: use of an `ActivityTypeRepositoryInterface` instead of the old-style EntityRepository
@@ -18,9 +21,6 @@ and this project adheres to
 * [person][export] Fixed: use left join for related entities in accompanying course aggregators
 * [workflow] Feature: allow user to copy and send manually the access link for the workflow
 * [workflow] Feature: show the email addresses that received an access link for the workflow
-
-## Test releases
-
 ### 2.0.0-beta2
 
 * [workflow]: Fixed: the notification is sent when the user is added to the first step.

From 1b9fea04ce209046b43ac6e59209c7c05a28eb8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 1 Jun 2023 10:26:35 +0200
Subject: [PATCH 34/49] [changies] fixes and allow multiline messages

---
 .changie.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.changie.yaml b/.changie.yaml
index e77a5ecf3..83fd9770a 100644
--- a/.changie.yaml
+++ b/.changie.yaml
@@ -6,13 +6,16 @@ versionExt: md
 versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
 kindFormat: '### {{.Kind}}'
 changeFormat: >-
-    '* {{- if not (eq .Custom.Issue "") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})){{- end }} {{.Body}}'
+    * {{ if not (eq .Custom.Issue "") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})) {{- end }}{{.Body}}
 custom:
     -   key: Issue
         label: Issue number (on chill-bundles repository) (optional)
         optional: true
         type: int
         minInt: 1
+body:
+    # allow multiline messages
+    block: true
 kinds:
     -   label: Feature
         auto: minor

From 0fd36a319633ced130f21b2e33a0f44ff7cee34d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 6 Jun 2023 14:40:24 +0200
Subject: [PATCH 35/49] fix list of "my accompanying periods"

---
 .../unreleased/Fixed-20230606-143955.yaml     |  6 +++++
 .../UserAccompanyingPeriodController.php      | 23 +++++++++++++++----
 .../user_periods_list.html.twig               |  9 ++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20230606-143955.yaml

diff --git a/.changes/unreleased/Fixed-20230606-143955.yaml b/.changes/unreleased/Fixed-20230606-143955.yaml
new file mode 100644
index 000000000..a7ab6b6a1
--- /dev/null
+++ b/.changes/unreleased/Fixed-20230606-143955.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: 'List of "my accompanying periods": separate the active and closed periods in
+  two different lists, and show the inactive_long and inactive_short periods'
+time: 2023-06-06T14:39:55.68417576+02:00
+custom:
+  Issue: "111"
diff --git a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
index 658fdb7be..1b67014b3 100644
--- a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
@@ -12,9 +12,11 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
 class UserAccompanyingPeriodController extends AbstractController
@@ -32,12 +34,24 @@ class UserAccompanyingPeriodController extends AbstractController
     /**
      * @Route("/{_locale}/person/accompanying-periods/my", name="chill_person_accompanying_period_user")
      */
-    public function listAction(Request $request)
+    public function listAction(Request $request): Response
     {
-        $total = $this->accompanyingPeriodRepository->countBy(['user' => $this->getUser(), 'step' => ['CONFIRMED', 'CLOSED']]);
+        $active = $request->query->getBoolean('active', true);
+        $steps = match ($active) {
+            true => [
+                AccompanyingPeriod::STEP_CONFIRMED,
+                AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
+                AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+            ],
+            false => [
+                AccompanyingPeriod::STEP_CLOSED,
+            ]
+        };
+
+        $total = $this->accompanyingPeriodRepository->countBy(['user' => $this->getUser(), 'step' => $steps]);
         $pagination = $this->paginatorFactory->create($total);
         $accompanyingPeriods = $this->accompanyingPeriodRepository->findBy(
-            ['user' => $this->getUser(), 'step' => ['CONFIRMED', 'CLOSED']],
+            ['user' => $this->getUser(), 'step' => $steps],
             ['openingDate' => 'DESC'],
             $pagination->getItemsPerPage(),
             $pagination->getCurrentPageFirstItemNumber()
@@ -46,13 +60,14 @@ class UserAccompanyingPeriodController extends AbstractController
         return $this->render('@ChillPerson/AccompanyingPeriod/user_periods_list.html.twig', [
             'accompanyingPeriods' => $accompanyingPeriods,
             'pagination' => $pagination,
+            'active' => $active,
         ]);
     }
 
     /**
      * @Route("/{_locale}/person/accompanying-periods/my/drafts", name="chill_person_accompanying_period_draft_user")
      */
-    public function listDraftsAction(Request $request)
+    public function listDraftsAction(): Response
     {
         $total = $this->accompanyingPeriodRepository->countBy(['user' => $this->getUser(), 'step' => 'DRAFT']);
         $pagination = $this->paginatorFactory->create($total);
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig
index 031e0728c..38e055378 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig
@@ -17,6 +17,15 @@
     <div class="col-md-10">
         <h1>{{ 'My accompanying periods'|trans }}</h1>
 
+        <ul class="nav nav-pills justify-content-center">
+            <li class="nav-item">
+                <a class="nav-link {% if active == true %}active{% endif %}" aria-current="page" href="{{ chill_path_forward_return_path('chill_person_accompanying_period_user', {'active': true}) }}">{{ ['Confirmed'|trans, 'course.inactive_short'|trans, 'course.inactive_long'|trans]|join(', ') }}</a>
+            </li>
+            <li class="nav-item ">
+                <a class="nav-link {% if active == false %}active{% endif %}" href="{{ chill_path_forward_return_path('chill_person_accompanying_period_user', {'active': false}) }}">{{ 'course.closed'|trans }}</a>
+            </li>
+        </ul>
+
         <p>{{ 'Number of periods'|trans }}: <span class="badge rounded-pill bg-primary">{{ pagination.totalItems }}</span></p>
 
         <div class="flex-table accompanyingcourse-list">

From 88f48d474fd33a06887083e666c4f26caf93b5af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 6 Jun 2023 17:08:38 +0200
Subject: [PATCH 36/49] fix association's annotation between
 PersonCenterCurrent and Person entities

---
 .changes/unreleased/Fixed-20230606-170742.yaml              | 6 ++++++
 .../ChillPersonBundle/Entity/Person/PersonCenterCurrent.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/Fixed-20230606-170742.yaml

diff --git a/.changes/unreleased/Fixed-20230606-170742.yaml b/.changes/unreleased/Fixed-20230606-170742.yaml
new file mode 100644
index 000000000..0bd65b6cf
--- /dev/null
+++ b/.changes/unreleased/Fixed-20230606-170742.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: use the correct annotation for the association between PersonCurrentCenter and
+  Person
+time: 2023-06-06T17:07:42.060486553+02:00
+custom:
+  Issue: ""
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php
index 6d67fbbbb..6de73de0d 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php
@@ -45,7 +45,7 @@ class PersonCenterCurrent
     private ?int $id = null;
 
     /**
-     * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="centerCurrent")
+     * @ORM\OneToOne(targetEntity=Person::class, inversedBy="centerCurrent")
      */
     private Person $person;
 

From 73b95732db02d9ff6095cdb05d19e09051af5655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 7 Jun 2023 13:06:10 +0200
Subject: [PATCH 37/49] Add new methods to RegroupmentRepository and fix
 association Regroupment/Center

---
 .changes/unreleased/DX-20230607-130344.yaml   |  6 +++++
 src/Bundle/ChillMainBundle/Entity/Center.php  | 17 +++++++++++-
 .../ChillMainBundle/Entity/Regroupment.php    | 25 ++++++++++++++++--
 .../ChillMainBundle/Form/RegroupmentType.php  |  2 +-
 .../Repository/RegroupmentRepository.php      | 26 +++++++++++++++++++
 5 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 .changes/unreleased/DX-20230607-130344.yaml

diff --git a/.changes/unreleased/DX-20230607-130344.yaml b/.changes/unreleased/DX-20230607-130344.yaml
new file mode 100644
index 000000000..c7774c395
--- /dev/null
+++ b/.changes/unreleased/DX-20230607-130344.yaml
@@ -0,0 +1,6 @@
+kind: DX
+body: Add methods to RegroupmentRepository and fullfill Center / Regroupment Doctrine
+  mapping
+time: 2023-06-07T13:03:44.177864269+02:00
+custom:
+  Issue: ""
diff --git a/src/Bundle/ChillMainBundle/Entity/Center.php b/src/Bundle/ChillMainBundle/Entity/Center.php
index 5ca051ec0..0d5402409 100644
--- a/src/Bundle/ChillMainBundle/Entity/Center.php
+++ b/src/Bundle/ChillMainBundle/Entity/Center.php
@@ -48,12 +48,19 @@ class Center implements HasCenterInterface
      */
     private string $name = '';
 
+    /**
+     * @var Collection<Regroupment>
+     * @ORM\ManyToMany(targetEntity=Regroupment::class, mappedBy="centers")
+     */
+    private Collection $regroupments;
+
     /**
      * Center constructor.
      */
     public function __construct()
     {
-        $this->groupCenters = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->groupCenters = new ArrayCollection();
+        $this->regroupments = new ArrayCollection();
     }
 
     /**
@@ -106,6 +113,14 @@ class Center implements HasCenterInterface
         return $this->name;
     }
 
+    /**
+     * @return Collection<Regroupment>
+     */
+    public function getRegroupments(): Collection
+    {
+        return $this->regroupments;
+    }
+
     /**
      * @param $name
      *
diff --git a/src/Bundle/ChillMainBundle/Entity/Regroupment.php b/src/Bundle/ChillMainBundle/Entity/Regroupment.php
index 96953abf5..c5d9525cf 100644
--- a/src/Bundle/ChillMainBundle/Entity/Regroupment.php
+++ b/src/Bundle/ChillMainBundle/Entity/Regroupment.php
@@ -22,11 +22,12 @@ use Doctrine\ORM\Mapping as ORM;
 class Regroupment
 {
     /**
-     * @var Center
      * @ORM\ManyToMany(
-     *     targetEntity=Center::class
+     *     targetEntity=Center::class,
+     *     inversedBy="regroupments"
      * )
      * @ORM\Id
+     * @var Collection<Center>
      */
     private Collection $centers;
 
@@ -52,6 +53,26 @@ class Regroupment
         $this->centers = new ArrayCollection();
     }
 
+    public function addCenter(Center $center): self
+    {
+        if (!$this->centers->contains($center)) {
+            $this->centers->add($center);
+            $center->getRegroupments()->add($this);
+        }
+
+        return $this;
+    }
+
+    public function removeCenter(Center $center): self
+    {
+        if ($this->centers->contains($center)) {
+            $this->centers->removeElement($center);
+            $center->getRegroupments()->removeElement($this);
+        }
+
+        return $this;
+    }
+
     public function getCenters(): Collection
     {
         return $this->centers;
diff --git a/src/Bundle/ChillMainBundle/Form/RegroupmentType.php b/src/Bundle/ChillMainBundle/Form/RegroupmentType.php
index bc8e6684f..22814598a 100644
--- a/src/Bundle/ChillMainBundle/Form/RegroupmentType.php
+++ b/src/Bundle/ChillMainBundle/Form/RegroupmentType.php
@@ -31,7 +31,7 @@ class RegroupmentType extends AbstractType
             ->add('centers', EntityType::class, [
                 'class' => Center::class,
                 'multiple' => true,
-                'attr' => ['class' => 'select2'],
+                'expanded' => true,
             ])
             ->add('isActive', CheckboxType::class, [
                 'label' => 'Actif ?',
diff --git a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
index a28f2f341..84e2efe81 100644
--- a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
@@ -14,6 +14,8 @@ namespace Chill\MainBundle\Repository;
 use Chill\MainBundle\Entity\Regroupment;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
 use Doctrine\Persistence\ObjectRepository;
 
 final class RegroupmentRepository implements ObjectRepository
@@ -59,6 +61,30 @@ final class RegroupmentRepository implements ObjectRepository
         return $this->repository->findOneBy($criteria, $orderBy);
     }
 
+    /**
+     * @throws NonUniqueResultException
+     * @throws NoResultException
+     */
+    public function findOneByName(string $name): ?Regroupment
+    {
+        return $this->repository->createQueryBuilder('r')
+            ->where('LOWER(r.name) = LOWER(:searched)')
+            ->setParameter('searched', $name)
+            ->getQuery()
+            ->getSingleResult();
+    }
+
+    /**
+     * @return array<Regroupment>
+     */
+    public function findRegroupmentAssociatedToAnyCenter(): array
+    {
+        return $this->repository->createQueryBuilder('r')
+            ->where('SIZE(r.centers) = 0')
+            ->getQuery()
+            ->getResult();
+    }
+
     public function getClassName()
     {
         return Regroupment::class;

From c73beef3aff5d73111f675b19dc13e0fbeb20909 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 7 Jun 2023 13:25:48 +0200
Subject: [PATCH 38/49] FIX [rights][household] check rights to be able to
 create a parcours from within household

---
 .../views/Household/accompanying_period.html.twig  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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 acd251735..e71559585 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
@@ -41,12 +41,14 @@
             </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">
-                {{ 'Create an accompanying period'|trans }}
-            </a>
-        </li>
+        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+            <li>
+                <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>
+        {% endif %}
     </ul>
 
 </div>

From 520d5ab6d4698874bfae1d78510fb4ef735b152c Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 7 Jun 2023 13:30:53 +0200
Subject: [PATCH 39/49] FIX [rights][menu] dont show menu item parcours if user
 doesn't have the proper rights

---
 .../Menu/HouseholdMenuBuilder.php             | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
index 074c27027..65b751bc2 100644
--- a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
@@ -12,7 +12,9 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class HouseholdMenuBuilder implements LocalMenuBuilderInterface
@@ -22,9 +24,12 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
      */
     protected $translator;
 
-    public function __construct(TranslatorInterface $translator)
+    private Security $security;
+
+    public function __construct(TranslatorInterface $translator, Security $security)
     {
         $this->translator = $translator;
+        $this->security = $security;
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters): void
@@ -53,12 +58,15 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
             ], ])
             ->setExtras(['order' => 17]);
 
-        $menu->addChild($this->translator->trans('household.Accompanying period'), [
-            'route' => 'chill_person_household_accompanying_period',
-            'routeParameters' => [
-                'household_id' => $household->getId(),
-            ], ])
-            ->setExtras(['order' => 20]);
+        if ($this->security->isGranted(AccompanyingPeriodVoter::SEE, $parameters['household']))
+        {
+            $menu->addChild($this->translator->trans('household.Accompanying period'), [
+                'route' => 'chill_person_household_accompanying_period',
+                'routeParameters' => [
+                    'household_id' => $household->getId(),
+                ],])
+                ->setExtras(['order' => 20]);
+        }
 
         $menu->addChild($this->translator->trans('household.Addresses'), [
             'route' => 'chill_person_household_addresses',

From 199223293e6b1f9b7da78649a670d18dad63b596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 7 Jun 2023 13:36:26 +0200
Subject: [PATCH 40/49] rename method

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

diff --git a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
index 84e2efe81..c115d5d98 100644
--- a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
@@ -77,7 +77,7 @@ final class RegroupmentRepository implements ObjectRepository
     /**
      * @return array<Regroupment>
      */
-    public function findRegroupmentAssociatedToAnyCenter(): array
+    public function findRegroupmentAssociatedToNoCenter(): array
     {
         return $this->repository->createQueryBuilder('r')
             ->where('SIZE(r.centers) = 0')

From 23ee29ab0de50ed8447d2cceb812b0d83fcabb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 7 Jun 2023 11:39:19 +0000
Subject: [PATCH 41/49] Apply 1 suggestion(s) to 1 file(s)

---
 .../Resources/views/Household/accompanying_period.html.twig      | 1 -
 1 file changed, 1 deletion(-)

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 e71559585..c734eee8e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
@@ -40,7 +40,6 @@
                 {{ 'Household summary'|trans }}
             </a>
         </li>
-        {# TODO: add ACL to check if user is allowed to edit household? #}
         {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
             <li>
                 <a class="btn btn-create"

From f42e1723abaac2430fd0850b6e5683a4e22b65b2 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 7 Jun 2023 17:39:28 +0200
Subject: [PATCH 42/49] FIX [php-cs-fixer]

---
 src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
index 65b751bc2..13291bdd1 100644
--- a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
@@ -58,8 +58,7 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
             ], ])
             ->setExtras(['order' => 17]);
 
-        if ($this->security->isGranted(AccompanyingPeriodVoter::SEE, $parameters['household']))
-        {
+        if ($this->security->isGranted(AccompanyingPeriodVoter::SEE, $parameters['household'])) {
             $menu->addChild($this->translator->trans('household.Accompanying period'), [
                 'route' => 'chill_person_household_accompanying_period',
                 'routeParameters' => [

From f5b71a0c413a92a76081c49b9023c97231bbf46e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 7 Jun 2023 17:47:23 +0200
Subject: [PATCH 43/49] DX [changie] entry added

---
 .changes/unreleased/Security-20230607-174702.yaml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changes/unreleased/Security-20230607-174702.yaml

diff --git a/.changes/unreleased/Security-20230607-174702.yaml b/.changes/unreleased/Security-20230607-174702.yaml
new file mode 100644
index 000000000..ecdc1d191
--- /dev/null
+++ b/.changes/unreleased/Security-20230607-174702.yaml
@@ -0,0 +1,7 @@
+kind: Security
+body: Rights are checked for display of 'accompanying period' tab in household menu.
+  Rights are also checked for creation of 'accompanying period' from within household
+  context
+time: 2023-06-07T17:47:02.488819553+02:00
+custom:
+  Issue: "105"

From 1d7279c022041a9d13a520f849a640325e1d61bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 12 Jun 2023 18:03:39 +0200
Subject: [PATCH 44/49] release v2.1.0

---
 .changes/unreleased/DX-20230607-130344.yaml    |  6 ------
 .changes/unreleased/Fixed-20230606-143955.yaml |  6 ------
 .../unreleased/Security-20230607-174702.yaml   |  7 -------
 .changes/v2.1.0.md                             | 17 +++++++++++++++++
 CHANGELOG.md                                   | 18 ++++++++++++++++++
 5 files changed, 35 insertions(+), 19 deletions(-)
 delete mode 100644 .changes/unreleased/DX-20230607-130344.yaml
 delete mode 100644 .changes/unreleased/Fixed-20230606-143955.yaml
 delete mode 100644 .changes/unreleased/Security-20230607-174702.yaml
 create mode 100644 .changes/v2.1.0.md

diff --git a/.changes/unreleased/DX-20230607-130344.yaml b/.changes/unreleased/DX-20230607-130344.yaml
deleted file mode 100644
index c7774c395..000000000
--- a/.changes/unreleased/DX-20230607-130344.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: DX
-body: Add methods to RegroupmentRepository and fullfill Center / Regroupment Doctrine
-  mapping
-time: 2023-06-07T13:03:44.177864269+02:00
-custom:
-  Issue: ""
diff --git a/.changes/unreleased/Fixed-20230606-143955.yaml b/.changes/unreleased/Fixed-20230606-143955.yaml
deleted file mode 100644
index a7ab6b6a1..000000000
--- a/.changes/unreleased/Fixed-20230606-143955.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: 'List of "my accompanying periods": separate the active and closed periods in
-  two different lists, and show the inactive_long and inactive_short periods'
-time: 2023-06-06T14:39:55.68417576+02:00
-custom:
-  Issue: "111"
diff --git a/.changes/unreleased/Security-20230607-174702.yaml b/.changes/unreleased/Security-20230607-174702.yaml
deleted file mode 100644
index ecdc1d191..000000000
--- a/.changes/unreleased/Security-20230607-174702.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: Security
-body: Rights are checked for display of 'accompanying period' tab in household menu.
-  Rights are also checked for creation of 'accompanying period' from within household
-  context
-time: 2023-06-07T17:47:02.488819553+02:00
-custom:
-  Issue: "105"
diff --git a/.changes/v2.1.0.md b/.changes/v2.1.0.md
new file mode 100644
index 000000000..ade83aee0
--- /dev/null
+++ b/.changes/v2.1.0.md
@@ -0,0 +1,17 @@
+## v2.1.0 - 2023-06-12
+
+### Feature
+
+* [docgen] allow to pick a third party when generating a document in context Activity, AccompanyingPeriod
+
+### Fixed
+
+* ([#111](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/111)) List of "my accompanying periods": separate the active and closed periods in two different lists, and show the inactive_long and inactive_short periods
+
+### Security
+
+* ([#105](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/105)) Rights are checked for display of 'accompanying period' tab in household menu. Rights are also checked for creation of 'accompanying period' from within household context
+
+### DX
+
+* Add methods to RegroupmentRepository and fullfill Center / Regroupment Doctrine mapping
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5475b20b8..f10f12f9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,24 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v2.1.0 - 2023-06-12
+
+### Feature
+
+* [docgen] allow to pick a third party when generating a document in context Activity, AccompanyingPeriod
+
+### Fixed
+
+* ([#111](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/111)) List of "my accompanying periods": separate the active and closed periods in two different lists, and show the inactive_long and inactive_short periods
+
+### Security
+
+* ([#105](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/105)) Rights are checked for display of 'accompanying period' tab in household menu. Rights are also checked for creation of 'accompanying period' from within household context
+
+### DX
+
+* Add methods to RegroupmentRepository and fullfill Center / Regroupment Doctrine mapping
+
 ## 2.0.0
 
 * this is a release to relaunch our proceess of release with semantic versioning

From c4dd46a03c8e10020adc8186deea894617b2a2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 13 Jun 2023 15:26:21 +0200
Subject: [PATCH 45/49] fix phpstan issues

---
 .../ChillReportBundle/DataFixtures/ORM/LoadReports.php      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
index db4646eed..30477f269 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
@@ -166,7 +166,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
     /**
      * pick a random choice.
      *
-     * @return string|string[] the array of slug if multiple, a single slug otherwise
+     * @return string|string[]
      */
     private function getRandomChoice(CustomField $field)
     {
@@ -211,6 +211,8 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
                 return $result;
             }
         }
+
+        return $picked;
     }
 
     /**
@@ -226,7 +228,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
     /**
      * pick a choice within a 'choices' options (for choice type).
      *
-     * @return the slug of the selected choice
+     * @return string the slug of the selected choice
      */
     private function pickChoice(array $choices)
     {

From c683123ecaf9efb4b65ad6a616115eea7796f151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 13 Jun 2023 15:47:06 +0200
Subject: [PATCH 46/49] set blinking animation on item-row, not just on the
 input

---
 .../AccompanyingCourseWorkEdit/components/FormEvaluation.vue   | 3 +--
 1 file changed, 1 insertion(+), 2 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 10bac43b3..3788c3454 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -79,14 +79,13 @@
        <h5>{{ $t('Documents') }} :</h5>
 
        <div class="flex-table">
-         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id">
+         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id" :class="[parseInt(this.docAnchorId) === d.id ? 'bg-blink' : 'nothing']">
            <div :id="`document_${d.id}`" class="item-row">
             <div class="input-group input-group-lg mb-3 row">
                   <label class="col-sm-3 col-form-label">Titre du document:</label>
                   <div class="col-sm-9">
                     <input
                         class="form-control document-title"
-                        :class="[parseInt(this.docAnchorId) === d.id ? 'bg-blink' : 'nothing']"
                         type="text"
                         :value="d.title"
                         :id="d.id"

From e0c21e46aebf1fdb9f34aa8903438c0ffd72a2e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 13 Jun 2023 15:49:16 +0200
Subject: [PATCH 47/49] add changelog entry

---
 .changes/unreleased/Feature-20230613-154903.yaml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changes/unreleased/Feature-20230613-154903.yaml

diff --git a/.changes/unreleased/Feature-20230613-154903.yaml b/.changes/unreleased/Feature-20230613-154903.yaml
new file mode 100644
index 000000000..7506bf473
--- /dev/null
+++ b/.changes/unreleased/Feature-20230613-154903.yaml
@@ -0,0 +1,7 @@
+kind: Feature
+body: When navigating from a workflow regarding to an evaluation's document to an
+  accompanying course, scroll directly to the document, and blink to highlight this
+  document
+time: 2023-06-13T15:49:03.663438985+02:00
+custom:
+  Issue: ""

From a136a278daa4e10dd30be72b1bfbcc5142252fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 13 Jun 2023 15:53:50 +0200
Subject: [PATCH 48/49] remove console.log

---
 .../public/vuejs/_components/Entity/PersonRenderBox.vue          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 809859114..2576efd35 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -261,7 +261,6 @@ export default {
       return this.person.gender === 'woman' ? 'person.gender.woman' : this.person.gender === 'man' ? 'person.gender.man' : this.person.gender === 'neuter' ? 'person.gender.neuter' : 'person.gender.undefined';
     },
     birthdate: function () {
-      console.log('debug birthdate', this.person.birthdate.datetime, ISOToDate(this.person.birthdate.datetime), new Date(this.person.birthdate.datetime));
       if (this.person.birthdate !== null || this.person.birthdate === "undefined") {
         return ISOToDate(this.person.birthdate.datetime);
       } else {

From fadc007bfe6c6cd19d4b5acf3046d1cac286b93d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 13 Jun 2023 15:55:05 +0200
Subject: [PATCH 49/49] add changelog entry

---
 .changes/unreleased/Fixed-20230613-155453.yaml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changes/unreleased/Fixed-20230613-155453.yaml

diff --git a/.changes/unreleased/Fixed-20230613-155453.yaml b/.changes/unreleased/Fixed-20230613-155453.yaml
new file mode 100644
index 000000000..f183c3a17
--- /dev/null
+++ b/.changes/unreleased/Fixed-20230613-155453.yaml
@@ -0,0 +1,5 @@
+kind: Fixed
+body: Fix birthdate timezone in PersonRenderBox
+time: 2023-06-13T15:54:53.125120559+02:00
+custom:
+  Issue: "58"