Merge branch 'master' into 'fix-accompanying-period-opening'

# Conflicts:
#   src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php

@@ -5,13 +5,19 @@ namespace Chill\PersonBundle\Controller;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Chill\PersonBundle\Privacy\AccompanyingPeriodPrivacyEvent;
 use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Symfony\Component\Serializer\Exception\RuntimeException;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\MainBundle\Entity\Scope;
+use Symfony\Component\Workflow\Registry;
 
 class AccompanyingCourseApiController extends ApiController
 {
@@ -19,10 +25,37 @@ class AccompanyingCourseApiController extends ApiController
 
     protected ValidatorInterface $validator;
 
-    public function __construct(EventDispatcherInterface $eventDispatcher, $validator)
-    {
+    private Registry $registry;
+
+    public function __construct(
+        EventDispatcherInterface $eventDispatcher,
+        ValidatorInterface $validator,
+        Registry $registry
+    ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->validator = $validator;
+        $this->registry = $registry;
+    }
+
+    public function confirmApi($id, Request $request, $_format): Response
+    {
+        /** @var AccompanyingPeriod $accompanyingPeriod */ 
+        $accompanyingPeriod = $this->getEntity('participation', $id, $request);
+
+        $this->checkACL('confirm', $request, $_format, $accompanyingPeriod);
+$workflow = $this->registry->get($accompanyingPeriod);
+
+        if (FALSE === $workflow->can($accompanyingPeriod, 'confirm')) {
+            throw new BadRequestException('It is not possible to confirm this period');
+        }
+
+        $workflow->apply($accompanyingPeriod, 'confirm');
+
+        $this->getDoctrine()->getManager()->flush();
+
+        return $this->json($accompanyingPeriod, Response::HTTP_OK, [], [
+            'groups' => [ 'read' ]
+        ]);
     }
     
     public function participationApi($id, Request $request, $_format)
@@ -55,12 +88,76 @@ class AccompanyingCourseApiController extends ApiController
 
         if ($errors->count() > 0) {
             // only format accepted
-            return $this->json($errors);
+            return $this->json($errors, 422);
         }
 
         $this->getDoctrine()->getManager()->flush();
 
-        return $this->json($participation);
+        return $this->json($participation, 200, [], ['groups' => [ 'read' ]]);
+    }
+
+    public function resourceApi($id, Request $request, string $_format): Response
+    {
+        return $this->addRemoveSomething('resource', $id, $request, $_format, 'resource', Resource::class);
+    }
+
+    public function scopeApi($id, Request $request, string $_format): Response
+    {
+        return $this->addRemoveSomething('scope', $id, $request, $_format, 'scope', Scope::class, [ 'groups' => [ 'read' ] ]);
+    }
+
+    public function commentApi($id, Request $request, string $_format): Response
+    {
+        return $this->addRemoveSomething('comment', $id, $request, $_format, 'comment', Comment::class);
+    }
+
+    public function socialIssueApi($id, Request $request, string $_format): Response
+    {
+        return $this->addRemoveSomething('socialissue', $id, $request, $_format, 'socialIssue', SocialIssue::class, [ 'groups' => [ 'read' ] ]);
+    }
+
+    public function requestorApi($id, Request $request, string $_format): Response
+    {
+        /** @var AccompanyingPeriod $accompanyingPeriod */
+        $action = 'requestor';
+        $accompanyingPeriod = $this->getEntity($action, $id, $request);
+        // a requestor may be a person or a thirdParty
+
+        $this->checkACL($action, $request, $_format, $accompanyingPeriod);
+        $this->onPostCheckACL($action, $request, $_format, $accompanyingPeriod);
+
+        if (Request::METHOD_DELETE === $request->getMethod()) {
+            $accompanyingPeriod->setRequestor(NULL);
+        } elseif (Request::METHOD_POST === $request->getMethod()) {
+            $requestor = null;
+            $exceptions = [];
+            foreach ([Person::class, ThirdParty::class] as $class) {
+                try {
+                    $requestor = $this->getSerializer()
+                        ->deserialize($request->getContent(), $class, $_format, []);
+                } catch (RuntimeException $e) {
+                    $exceptions[] = $e;
+                } 
+            }
+            if ($requestor === null) {
+                throw new BadRequestException('Could not find any person or requestor', 0, $exceptions[0]);
+            }
+
+            $accompanyingPeriod->setRequestor($requestor);
+        } else {
+            throw new BadRequestException('method not supported');
+        }
+
+        $errors = $this->validator->validate($accompanyingPeriod);
+
+        if ($errors->count() > 0) {
+            // only format accepted
+            return $this->json($errors, 422);
+        }
+
+        $this->getDoctrine()->getManager()->flush();
+
+        return $this->json($accompanyingPeriod->getRequestor(), 200, [], ['groups' => [ 'read']]);
     }
 
     protected function onPostCheckACL(string $action, Request $request, string $_format, $entity): ?Response

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php

@@ -6,6 +6,7 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Privacy\AccompanyingPeriodPrivacyEvent;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -42,6 +43,41 @@ class AccompanyingCourseController extends Controller
         $this->dispatcher = $dispatcher;
         $this->validator = $validator;
     }
+
+    /**
+     * @Route("/{_locale}/person/parcours/new", name="chill_person_accompanying_course_new")
+     */
+    public function newAction(Request $request): Response
+    {
+        $period = new AccompanyingPeriod();
+        $em = $this->getDoctrine()->getManager();
+
+        if ($request->query->has('person_id')) {
+            $personIds = $request->query->get('person_id');
+
+            if (FALSE === \is_array($personIds)) {
+                throw new BadRequestException("person_id parameter should be an array");
+            }
+
+            foreach ($personIds as $personId) {
+                $person = $em->getRepository(Person::class)->find($personId);
+                if (NULL !== $person) {
+                    $period->addPerson($person);
+                }
+            }
+        }
+
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $period);
+
+        $em->persist($period);
+        $em->flush();
+
+        return $this->redirectToRoute('chill_person_accompanying_course_show', [
+            'accompanying_period_id' => $period->getId()
+        ]);
+         
+    }
+
     /**
      * Homepage of Accompanying Course section
      *
@@ -86,76 +122,4 @@ class AccompanyingCourseController extends Controller
         ]);
     }
 
-    /**
-     * Get API Data for showing endpoint
-     *
-     * @Route(
-     *     "/{_locale}/person/api/1.0/accompanying-course/{accompanying_period_id}/show.{_format}",
-     *     name="chill_person_accompanying_course_api_show"
-     * )
-     * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
-     */
-    public function showAPI(AccompanyingPeriod $accompanyingCourse, $_format): Response
-    {
-        // TODO check ACL on AccompanyingPeriod
-
-        $this->dispatcher->dispatch(
-            AccompanyingPeriodPrivacyEvent::ACCOMPANYING_PERIOD_PRIVACY_EVENT,
-            new AccompanyingPeriodPrivacyEvent($accompanyingCourse, [
-            'action' => 'showApi'
-            ])
-        );
-
-        switch ($_format) {
-            case 'json':
-                return $this->json($accompanyingCourse);
-            default:
-                throw new BadRequestException('Unsupported format');
-        }
-
-    }
-
-    /**
-     * Get API Data for showing endpoint
-     *
-     * @Route(
-     *     "/{_locale}/person/api/1.0/accompanying-course/{accompanying_period_id}/participation.{_format}",
-     *     name="chill_person_accompanying_course_api_add_participation",
-     *     methods={"POST"},
-     *     format="json",
-     *     requirements={
-     *         "_format": "json",
-     *     }
-     * )
-     * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
-     */
-    public function addParticipationAPI(Request $request, AccompanyingPeriod $accompanyingCourse, $_format): Response
-    {
-        switch ($_format) {
-            case 'json':
-                $person = $this->serializer->deserialize($request->getContent(), Person::class, $_format, [
-
-                ]);
-                break;
-            default:
-                throw new BadRequestException('Unsupported format');
-        }
-
-        if (NULL === $person) {
-            throw new BadRequestException('person id not found');
-        }
-
-        // TODO add acl
-        $accompanyingCourse->addPerson($person);
-        $errors = $this->validator->validate($accompanyingCourse);
-
-        if ($errors->count() > 0) {
-            // only format accepted
-            return $this->json($errors);
-        }
-
-        $this->getDoctrine()->getManager()->flush();
-
-        return new JsonResponse();
-    }
 }

src/Bundle/ChillPersonBundle/Controller/ApiPersonController.php

@@ -1,30 +0,0 @@
-<?php
-/*
- * Copyright (C) 2015-2021 Champs-Libres Coopérative <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-namespace Chill\PersonBundle\Controller;
-
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\JsonResponse;
-
-
-class ApiPersonController extends Controller
-{
-    public function viewAction($id, $_format) 
-    {
-        
-    }
-}

src/Bundle/ChillPersonBundle/Controller/PersonApiController.php

@@ -0,0 +1,50 @@
+<?php
+/*
+ * Copyright (C) 2015-2021 Champs-Libres Coopérative <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Chill\PersonBundle\Controller;
+
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Symfony\Component\Security\Core\Role\Role;
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Symfony\Component\HttpFoundation\Request;
+
+
+class PersonApiController extends ApiController
+{
+    private AuthorizationHelper $authorizationHelper;
+
+    /**
+     * @param AuthorizationHelper $authorizationHelper
+     */
+    public function __construct(AuthorizationHelper $authorizationHelper)
+    {
+        $this->authorizationHelper = $authorizationHelper;
+    }
+    
+    protected function createEntity(string $action, Request $request): object
+    {
+        $person = parent::createEntity($action, $request);
+
+        // TODO temporary hack to allow creation of person with fake center
+        $centers = $this->authorizationHelper->getReachableCenters($this->getUser(),
+            new Role(PersonVoter::CREATE));
+        $person->setCenter($centers[0]);
+
+        return $person;
+    }
+}

src/Bundle/ChillPersonBundle/Controller/PersonController.php

@@ -38,6 +38,7 @@ use Symfony\Component\Translation\TranslatorInterface;
 use Chill\MainBundle\Search\SearchProvider;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
+use Chill\PersonBundle\Repository\PersonNotDuplicateRepository;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Doctrine\ORM\EntityManagerInterface;
 
@@ -290,7 +291,7 @@ final class PersonController extends AbstractController
         return $errors;
     }
 
-    public function reviewAction(Request $request)
+    public function reviewAction(Request $request, PersonNotDuplicateRepository $personNotDuplicateRepository)
     {
         if ($request->getMethod() !== 'POST') {
             $r = new Response("You must send something to review the creation of a new Person");
@@ -299,7 +300,6 @@ final class PersonController extends AbstractController
         }
 
         $form = $this->createForm(
-                //CreationPersonType::NAME,
                 CreationPersonType::class,
                 new Person(),
                 array(
@@ -326,7 +326,7 @@ final class PersonController extends AbstractController
             }
 
             $form = $this->createForm(
-                CreationPersonType::NAME,
+                CreationPersonType::class,
                 $person,
                 array(
                    'action' => $this->generateUrl('chill_person_review'),
@@ -342,8 +342,7 @@ final class PersonController extends AbstractController
 
         $this->em->persist($person);
 
-        $alternatePersons = $this->similarPersonMatcher
-            ->matchPerson($person);
+        $alternatePersons = $this->similarPersonMatcher->matchPerson($person, $personNotDuplicateRepository);
 
         if (count($alternatePersons) === 0) {
             return $this->forward('ChillPersonBundle:Person:create');

src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php

@@ -19,6 +19,7 @@ use Symfony\Component\Translation\TranslatorInterface;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\EventBundle\Entity\Participation;
+use Chill\PersonBundle\Repository\PersonNotDuplicateRepository;
 use Chill\TaskBundle\Entity\SingleTask;
 
 class PersonDuplicateController extends Controller
@@ -62,7 +63,7 @@ class PersonDuplicateController extends Controller
         $this->eventDispatcher = $eventDispatcher;
     }
 
-    public function viewAction($person_id)
+    public function viewAction($person_id, PersonNotDuplicateRepository $personNotDuplicateRepository)
     {
         $person = $this->_getPerson($person_id);
         if ($person === null) {
@@ -74,10 +75,9 @@ class PersonDuplicateController extends Controller
           "You are not allowed to see this person.");
 
         $duplicatePersons = $this->similarPersonMatcher->
-            matchPerson($person, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL);
+            matchPerson($person, $personNotDuplicateRepository, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL);
 
-        $notDuplicatePersons = $this->getDoctrine()->getRepository(PersonNotDuplicate::class)
-            ->findNotDuplicatePerson($person);
+        $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
 
         return $this->render('ChillPersonBundle:PersonDuplicate:view.html.twig', [
             'person' => $person,
@@ -97,7 +97,7 @@ class PersonDuplicateController extends Controller
 
         $person1->counters = $this->_getCounters($person1_id);
         $person2->counters = $this->_getCounters($person2_id);
-        
+
         if ($person1 === null) {
             throw $this->createNotFoundException("Person with id $person1_id not"
                 . " found on this server");
@@ -264,17 +264,17 @@ class PersonDuplicateController extends Controller
 
         return [$person1, $person2];
     }
-    
+
     private function _getCounters($id): ?array
     {
         $em = $this->getDoctrine()->getManager();
-        
+
         $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_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),

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriod.php

@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Chill\PersonBundle\DataFixtures\ORM;
+
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+
+/**
+ * Description of LoadAccompanyingPeriod
+ *
+ * @author Champs-Libres Coop
+ */
+class LoadAccompanyingPeriod extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
+{
+    use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
+
+
+    public const ACCOMPANYING_PERIOD = 'parcours 1';
+
+    public function getOrder()
+    {
+        return 10004;
+    }
+
+    public static $references = array();
+
+    public function load(ObjectManager $manager)
+    {
+
+        $centerA = $this->getReference('centerA');
+        $centerAId = $centerA->getId();
+
+        $personIds = $this->container->get('doctrine.orm.entity_manager')
+            ->createQueryBuilder()
+            ->select('p.id')
+            ->from('ChillPersonBundle:Person', 'p')
+            ->where('p.center = :centerAId')
+            ->orderBy('p.id', 'ASC')
+            ->setParameter('centerAId', $centerAId)
+            ->getQuery()
+            ->getScalarResult();
+
+        $openingDate = new \DateTime('2020-04-01');
+
+        $person1 = $manager->getRepository(Person::class)->find($personIds[0]);
+        $person2 = $manager->getRepository(Person::class)->find($personIds[1]);
+
+        $socialScope = $this->getReference('scope_social');
+
+        $a = new AccompanyingPeriod($openingDate);
+        $a->addPerson($person1);
+        $a->addPerson($person2);
+        $a->addScope($socialScope);
+        $a->setStep(AccompanyingPeriod::STEP_CONFIRMED);
+
+        $manager->persist($a);
+
+        $this->addReference(self::ACCOMPANYING_PERIOD, $a);
+        echo "Adding one AccompanyingPeriod\n";
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php

@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Chill\PersonBundle\DataFixtures\ORM;
+
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
+
+/**
+ * Description of LoadAccompanyingPeriodOrigin
+ *
+ * @author Champs-Libres Coop
+ */
+class LoadAccompanyingPeriodOrigin extends AbstractFixture implements OrderedFixtureInterface
+{
+
+    public const ACCOMPANYING_PERIOD_ORIGIN = 'accompanying_period_origin';
+
+    public function getOrder()
+    {
+        return 10005;
+    }
+
+    private $phoneCall = ['en' => 'phone call', 'fr' => 'appel téléphonique'];
+
+    public static $references = array();
+
+    public function load(ObjectManager $manager)
+    {
+        $o = new Origin();
+        $o->setLabel(json_encode($this->phoneCall));
+
+        $manager->persist($o);
+
+        $this->addReference(self::ACCOMPANYING_PERIOD_ORIGIN, $o);
+        echo "Adding one AccompanyingPeriod Origin\n";
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialActions.php

@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * Chill is a suite of a modules, Chill is a software for social workers
+ * Copyright (C) 2021, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Chill\PersonBundle\DataFixtures\ORM;
+
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+
+/**
+ * Create social actions
+ *
+ */
+class LoadSocialActions extends AbstractFixture implements OrderedFixtureInterface
+{
+    public function getOrder()
+    {
+        return 10020;
+    }
+
+    public static $socialActions = [
+        'social_action_info_conseil' => [
+            'title' => [
+                'fr' => 'Informer, conseiller'
+            ],
+            'issue' => 'social_issue_prev_prot'
+        ],
+        'social_action_instruire' => [
+            'title' => [
+                'fr' => 'Instruire l\'imprime unique pour des impayés'
+            ],
+            'issue' => 'social_issue_prev_prot'
+        ],
+        'social_action_MASP' => [
+            'title' => [
+                'fr' => 'MASP'
+            ],
+            'issue' => 'social_issue_diff_fin'
+        ],
+        'social_action_protection_enfant' => [
+            'title' => [
+                'fr' => 'Protection Enfant confié dans le cadre judiciaire'
+            ],
+            'issue' => 'social_issue_enfant_protection'
+        ],
+    ];
+
+    public function load(ObjectManager $manager)
+    {
+        foreach (static::$socialActions as $ref => $new) {
+            $socialAction = new SocialAction();
+            $socialAction->setTitle($new['title']);
+            $socialAction->setIssue($this->getReference($new['issue']));
+            $socialAction->setDefaultNotificationDelay(new \DateInterval('P5D'));
+
+            $manager->persist($socialAction);
+            $this->addReference($ref, $socialAction);
+            print("Adding SocialAction '".$new['title']['fr']."'\n");
+        }
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialGoals.php

@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * Chill is a suite of a modules, Chill is a software for social workers
+ * Copyright (C) 2021, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Chill\PersonBundle\DataFixtures\ORM;
+
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+use Chill\PersonBundle\Entity\SocialWork\Goal;
+
+
+/**
+ * Create social goals
+ *
+ */
+class LoadSocialGoals extends AbstractFixture implements OrderedFixtureInterface
+{
+    public function getOrder()
+    {
+        return 10030;
+    }
+
+    public static $socialGoals = [
+        'social_goal_instuire_dossier' => [
+            'title' => [
+                'fr' => 'Instruire le dossier de surendettement'
+            ],
+            'action' => 'social_action_MASP'
+        ],
+        'social_goal_proteger' => [
+            'title' => [
+                'fr' => 'Protéger via une assistance educative placement'
+            ],
+            'action' => 'social_action_protection_enfant'
+        ],
+    ];
+
+    public function load(ObjectManager $manager)
+    {
+        foreach (static::$socialGoals as $ref => $new) {
+            $socialGoal = new Goal();
+            $socialGoal->setTitle($new['title']);
+            $socialGoal->addSocialAction($this->getReference($new['action']));
+
+            $manager->persist($socialGoal);
+            $this->addReference($ref, $socialGoal);
+            print("Adding SocialGoal '".$new['title']['fr']."'\n");
+        }
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialIssues.php

@@ -0,0 +1,90 @@
+<?php
+
+/*
+ * Chill is a suite of a modules, Chill is a software for social workers
+ * Copyright (C) 2021, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Chill\PersonBundle\DataFixtures\ORM;
+
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+
+/**
+ * Create social issues
+ *
+ */
+class LoadSocialIssues extends AbstractFixture implements OrderedFixtureInterface
+{
+    public function getOrder()
+    {
+        return 10010;
+    }
+
+    public static $socialIssues = [
+        'social_issue_diff_fin_or_admin' => [
+            'title' => [
+                'fr' => 'ADULTE - DIFFICULTES FINANCIERES ET/OU ADMINISTRATIVES'
+            ]
+        ],
+        'social_issue_prev_prot' => [
+            'title' => [
+                'fr' => 'ADULTE PREVENTION/PROTECTION'
+            ],
+            'parent' => 'social_issue_diff_fin_or_admin'
+        ],
+        'social_issue_diff_fin' => [
+            'title' => [
+                'fr' => 'Difficulté financière'
+            ],
+            'parent' => 'social_issue_diff_fin_or_admin'
+        ],
+        'social_issue_enfant_famille' => [
+            'title' => [
+                'fr' => 'Enfant / famille'
+            ]
+        ],
+        'social_issue_enfant_protection' => [
+            'title' => [
+                'fr' => 'enfant - protection'
+            ],
+            'parent' => 'social_issue_enfant_famille'
+        ],
+    ];
+
+    public function load(ObjectManager $manager)
+    {
+        foreach (static::$socialIssues as $ref => $new) {
+            $socialIssue = new SocialIssue();
+            $socialIssue->setTitle($new['title']);
+
+            if ( array_key_exists('parent', $new)) {
+                $parentRef = $new['parent'];
+                $parent = $this->getReference($parentRef);
+                $socialIssue->setParent($parent);
+            }
+
+            $manager->persist($socialIssue);
+            $this->addReference($ref, $socialIssue);
+            print("Adding SocialIssue '".$new['title']['fr']."'\n");
+        }
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialResults.php

@@ -0,0 +1,94 @@
+<?php
+
+/*
+ * Chill is a suite of a modules, Chill is a software for social workers
+ * Copyright (C) 2021, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Chill\PersonBundle\DataFixtures\ORM;
+
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+use Chill\PersonBundle\Entity\SocialWork\Result;
+
+
+/**
+ * Create social results
+ *
+ */
+class LoadSocialResults extends AbstractFixture implements OrderedFixtureInterface
+{
+    public function getOrder()
+    {
+        return 10040;
+    }
+
+    public static $socialResults = [
+        'social_result_FSL_acces' => [
+            'title' => [
+                'fr' => 'FSL - accès cautionnement'
+            ],
+            'action' => 'social_action_instruire'
+        ],
+        'social_result_FSL_maintien' => [
+            'title' => [
+                'fr' => 'FSL maintien - impayés de loyer'
+            ],
+            'action' => 'social_action_MASP'
+        ],
+        'social_result_soutien_parental' => [
+            'title' => [
+                'fr' => 'Soutien parental'
+            ],
+            // 'action' => 'social_action_protection_enfant', (via le goal)
+            'goal' => 'social_goal_proteger'
+        ],
+        'social_result_accompagnement_mineur' => [
+            'title' => [
+                'fr' => 'Accompagnement du mineur'
+            ],
+            // 'action' => 'social_action_protection_enfant', (via le goal)
+            'goal' => 'social_goal_proteger',
+        ],
+    ];
+
+    public function load(ObjectManager $manager)
+    {
+        foreach (static::$socialResults as $ref => $new) {
+            $socialResult = new Result();
+            $socialResult->setTitle($new['title']);
+
+            if ( array_key_exists('action', $new)) {
+                $action = $this->getReference($new['action']);
+                $socialResult->addSocialAction($action);
+            }
+
+            if ( array_key_exists('goal', $new)) {
+                $goal = $this->getReference($new['goal']);
+                $socialResult->addGoal($goal);
+            }
+
+
+            $manager->persist($socialResult);
+            $this->addReference($ref, $socialResult);
+            print("Adding SocialResult '".$new['title']['fr']."'\n");
+        }
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php

@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Copyright (C) 2014-2016 Julien Fastré <julien.fastre@champs-libres.coop>
  *
@@ -73,9 +72,11 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $loader->load('services/command.yaml');
         $loader->load('services/actions.yaml');
         $loader->load('services/form.yaml');
-        $loader->load('services/repository.yaml');
         $loader->load('services/templating.yaml');
         $loader->load('services/alt_names.yaml');
+        // We can get rid of this file when the service 'chill.person.repository.person' is no more used.
+        // We should use the PersonRepository service instead of a custom service name.
+        $loader->load('services/repository.yaml');
         $loader->load('services/serializer.yaml');
         $loader->load('services/security.yaml');
 
@@ -164,6 +165,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $this->prependHomepageWidget($container);
         $this->prependDoctrineDQL($container);
         $this->prependCruds($container);
+        $this->prependWorkflows($container);
 
         //add person_fields parameter as global
         $chillPersonConfig = $container->getExtensionConfig($this->getAlias());
@@ -193,6 +195,39 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         ));
     }
 
+    protected function prependWorkflows(ContainerBuilder $container)
+    {
+         $container->prependExtensionConfig('framework', [
+           'workflows' => [
+                'accompanying_period_lifecycle' => [
+                    'type' =>  'state_machine',
+                    'audit_trail' => [ 
+                        'enabled' =>  true
+                    ],
+                    'marking_store' => [
+                        'type' =>  'method',
+                        'property' =>  'step',
+                    ],
+                    'supports' => [
+                        'Chill\PersonBundle\Entity\AccompanyingPeriod'
+                    ],
+                    'initial_marking' =>  'DRAFT',
+                    'places' => [
+                        'DRAFT',
+                        'CONFIRMED',
+                    ],
+                    'transitions' => [
+                        'confirm' => [
+                            'from' =>  'DRAFT',
+                            'to' =>  'CONFIRMED'
+                        ],
+                    ],
+                ],
+            ]
+        ]);
+
+    }
+
     /**
      * Add a widget "add a person" on the homepage, automatically
      *
@@ -320,10 +355,29 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     'actions' => [
                         '_entity' => [
                             'roles' => [ 
-                                Request::METHOD_GET => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE
+                                Request::METHOD_GET => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                                Request::METHOD_PATCH => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                                Request::METHOD_PUT => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                            ],
+                            'methods' => [
+                                Request::METHOD_GET => true, 
+                                Request::METHOD_PUT => true, 
+                                Request::METHOD_PATCH => true, 
                             ]
                         ],
                         'participation' => [
+                            'methods' => [
+                                Request::METHOD_POST => true,
+                                Request::METHOD_DELETE => true,
+                                Request::METHOD_GET => false,
+                                Request::METHOD_HEAD => false,
+                            ],
+                            'roles' => [
+                                Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                                Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE
+                            ]
+                        ],
+                        'resource' => [
                             'methods' => [
                                 Request::METHOD_POST => true, 
                                 Request::METHOD_DELETE => true,
@@ -334,8 +388,67 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                                 Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
                                 Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE
                             ]
-                        ]
-                        
+                        ],
+                        'comment' => [
+                            'methods' => [
+                                Request::METHOD_POST => true, 
+                                Request::METHOD_DELETE => true,
+                                Request::METHOD_GET => false,
+                                Request::METHOD_HEAD => false,
+                            ],
+                            'roles' => [ 
+                                Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                                Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE
+                            ]
+                        ],
+                        'requestor' => [
+                            'methods' => [
+                                Request::METHOD_POST => true, 
+                                Request::METHOD_DELETE => true,
+                                Request::METHOD_GET => false,
+                                Request::METHOD_HEAD => false,
+                            ],
+                            'roles' => [ 
+                                Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                                Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE
+                            ]
+                        ],
+                        'scope' => [
+                            'methods' => [
+                                Request::METHOD_POST => true, 
+                                Request::METHOD_DELETE => true,
+                                Request::METHOD_GET => false,
+                                Request::METHOD_HEAD => false,
+                            ],
+                            'roles' => [ 
+                                Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                                Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE
+                            ]
+                        ],
+                        'socialissue' => [
+                            'methods' => [
+                                Request::METHOD_POST => true, 
+                                Request::METHOD_DELETE => true,
+                                Request::METHOD_GET => false,
+                                Request::METHOD_HEAD => false,
+                            ],
+                            'controller_action' => 'socialIssueApi',
+                            'roles' => [ 
+                                Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                                Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE
+                            ]
+                        ],
+
+                        'confirm' => [
+                            'methods' => [
+                                Request::METHOD_POST => true, 
+                                Request::METHOD_GET => false,
+                                Request::METHOD_HEAD => false,
+                            ],
+                            'roles' => [ 
+                                Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                            ]
+                        ],
                     ]
                 ],
                 [
@@ -346,19 +459,61 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     'base_role' => 'ROLE_USER',
                     'actions' => [
                         '_index' => [
-                            'methods' => [ 
+                            'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true
                             ],
                         ],
                         '_entity' => [
-                            'methods' => [ 
+                            'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true
                             ]
                         ],
                     ]
-                ]
+                ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\SocialWork\SocialIssue::class,
+                    'name' => 'social_work_social_issue',
+                    'base_path' => '/api/1.0/person/social-work/social-issue',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_index' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true
+                            ],
+                        ],
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true
+                            ]
+                        ],
+                    ]
+                ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\Person::class,
+                    'name' => 'person',
+                    'base_path' => '/api/1.0/person/person',
+                    'base_role' => \Chill\PersonBundle\Security\Authorization\PersonVoter::SEE,
+                    'controller' => \Chill\PersonBundle\Controller\PersonApiController::class,
+                    'actions' => [
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                                Request::METHOD_POST=> true,
+                            ],
+                            'roles' => [
+                                Request::METHOD_GET => \Chill\PersonBundle\Security\Authorization\PersonVoter::SEE,
+                                Request::METHOD_HEAD => \Chill\PersonBundle\Security\Authorization\PersonVoter::SEE,
+                                Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\PersonVoter::CREATE,
+
+                            ]
+                        ],
+                    ]
+                ],
             ]
         ]);
     }

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -22,25 +22,34 @@
 
 namespace Chill\PersonBundle\Entity;
 
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Entity\Scope;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Chill\MainBundle\Entity\User;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
 /**
  * AccompanyingPeriod Class
  *
- * @ORM\Entity(repositoryClass="Chill\PersonBundle\Repository\AccompanyingPeriodRepository")
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period")
+ * @DiscriminatorMap(typeProperty="type", mapping={
+ *  "accompanying_period"=AccompanyingPeriod::class
+ *  })
  */
-class AccompanyingPeriod
+class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
 {
     /**
      * Mark an accompanying period as "occasional"
@@ -80,6 +89,7 @@ class AccompanyingPeriod
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @Groups({"read"})
      */
     private $id;
 
@@ -87,6 +97,7 @@ class AccompanyingPeriod
      * @var \DateTime
      *
      * @ORM\Column(type="date")
+     * @Groups({"read", "write"})
      */
     private $openingDate;
 
@@ -94,6 +105,7 @@ class AccompanyingPeriod
      * @var \DateTime
      *
      * @ORM\Column(type="date", nullable=true)
+     * @Groups({"read", "write"})
      */
     private $closingDate = null;
 
@@ -101,6 +113,7 @@ class AccompanyingPeriod
      * @var string
      *
      * @ORM\Column(type="text")
+     * @Groups({"read", "write"})
      */
     private $remark = '';
 
@@ -108,17 +121,28 @@ class AccompanyingPeriod
      * @var Collection
      *
      * @ORM\OneToMany(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\Comment",
-     *       mappedBy="accompanyingPeriod"
+     *       mappedBy="accompanyingPeriod",
+     *       cascade={"persist", "remove"},
+     *       orphanRemoval=true
      *     )
      */
     private $comments;
 
+    /**
+     * @ORM\ManyToOne(
+     *    targetEntity=Comment::class
+     * )
+     * @Groups({"read"})
+     */
+    private ?Comment $initialComment = null;
+
     /**
      * @var Collection
      *
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
      *     mappedBy="accompanyingPeriod",
      *     cascade={"persist", "refresh", "remove", "merge", "detach"})
+     * @Groups({"read"})
      */
     private $participations;
 
@@ -128,36 +152,42 @@ class AccompanyingPeriod
      * @ORM\ManyToOne(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive")
      * @ORM\JoinColumn(nullable=true)
+     * @Groups({"read", "write"})
      */
     private $closingMotive = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      * @ORM\JoinColumn(nullable=true)
+     * @Groups({"read", "write"})
      */
     private $user;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      * @ORM\JoinColumn(nullable=true)
+     * @Groups({"read"})
      */
     private $createdBy;
 
     /**
      * @var string
      * @ORM\Column(type="string", length=32, nullable=true)
+     * @Groups({"read"})
      */
     private $step = self::STEP_DRAFT;
     
     /**
      * @ORM\ManyToOne(targetEntity=Origin::class)
      * @ORM\JoinColumn(nullable=true)
+     * @Groups({"read", "write"})
      */
     private $origin;
 
     /**
      * @var string
      * @ORM\Column(type="string", nullable=true)
+     * @Groups({"read", "write"})
      */
     private $intensity;
 
@@ -172,6 +202,7 @@ class AccompanyingPeriod
      *     joinColumns={@ORM\JoinColumn(name="accompanying_period_id", referencedColumnName="id")},
      *     inverseJoinColumns={@ORM\JoinColumn(name="scope_id", referencedColumnName="id")}
      * )
+     * @Groups({"read"})
      */
     private $scopes;
 
@@ -189,19 +220,22 @@ class AccompanyingPeriod
 
     /**
      * @var bool
-     * @ORM\Column(type="boolean")
+     * @ORM\Column(type="boolean", options={"default": false} )
+     * @Groups({"read", "write"})
      */
     private $requestorAnonymous = false;
 
     /**
      * @var bool
-     * @ORM\Column(type="boolean")
+     * @ORM\Column(type="boolean", options={"default": false} )
+     * @Groups({"read", "write"})
      */
     private $emergency = false;
 
     /**
      * @var bool
-     * @ORM\Column(type="boolean")
+     * @ORM\Column(type="boolean", options={"default": false} )
+     * @Groups({"read", "write"})
      */
     private $confidential = false;
 
@@ -210,21 +244,54 @@ class AccompanyingPeriod
      *
      * @ORM\OneToMany(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\Resource",
-     *     mappedBy="accompanyingPeriod"
+     *     mappedBy="accompanyingPeriod",
+     *     cascade={"persist", "remove"},
+     *     orphanRemoval=true
      * )
+     * @Groups({"read"})
      */
     private $resources;
 
+    /**
+     * @ORM\ManyToMany(
+     *     targetEntity=SocialIssue::class
+     * )
+     * @ORM\JoinTable(
+     *     name="chill_person_accompanying_period_social_issues"
+     *  )
+     * @Groups({"read"})
+     */
+    private Collection $socialIssues;
+
+    /**
+     * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
+     */
+    private \DateTimeInterface $createdAt;
+
+    /**
+     * @ORM\ManyToOne(
+     *    targetEntity=User::class
+     * )
+     */
+    private User $updatedBy;
+    
+    /**
+     * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
+     */
+    private \DateTimeInterface $updatedAt;
+
     /**
      * AccompanyingPeriod constructor.
      *
      * @param \DateTime $dateOpening
      * @uses AccompanyingPeriod::setClosingDate()
      */
-    public function __construct(\DateTime $dateOpening) {
-        $this->setOpeningDate($dateOpening);
+    public function __construct(\DateTime $dateOpening = null) {
+        $this->setOpeningDate($dateOpening ?? new \DateTime('now'));
         $this->participations = new ArrayCollection();
         $this->scopes = new ArrayCollection();
+        $this->socialIssues = new ArrayCollection();
+        $this->comments = new ArrayCollection();
     }
 
     /**
@@ -318,23 +385,55 @@ class AccompanyingPeriod
         return $this->remark;
     }
 
+    /**
+     * @Groups({"read"})
+     */
     public function getComments(): Collection
     {
-        return $this->comments;
+        return $this->comments->filter(function (Comment $c) {
+            return $c !== $this->initialComment;
+        });
     }
 
     public function addComment(Comment $comment): self
     {
         $this->comments[] = $comment;
+        $comment->setAccompanyingPeriod($this);
 
         return $this;
     }
 
     public function removeComment(Comment $comment): void
     {
+        $comment->setAccompanyingPeriod(null);
         $this->comments->removeElement($comment);
     }
 
+    /**
+     * @Groups({"write"})
+     */
+    public function setInitialComment(?Comment $comment = null): self
+    {
+        if (NULL !== $this->initialComment) {
+            $this->removeComment($this->initialComment);
+        } 
+        if ($comment instanceof Comment) {
+            $this->addComment($comment);
+        }
+
+        $this->initialComment = $comment;
+
+        return $this;
+    }
+
+    /**
+     * @Groups({"read"})
+     */
+    public function getInitialComment(): ?Comment
+    {
+        return $this->initialComment;
+    }
+
     /**
      * Get Participations Collection
      */
@@ -458,7 +557,7 @@ class AccompanyingPeriod
             return false;
         }
 
-        $participation = $this->participationsContainsPerson($person);
+        $participation = $this->getParticipationsContainsPerson($person);
         if (!null === $participation)
         {
             $person = $participation->getPerson();
@@ -540,9 +639,9 @@ class AccompanyingPeriod
         return $this->requestorPerson;
     }
 
-    public function setRequestorPerson(Person $requestorPerson): self
+    private function setRequestorPerson(Person $requestorPerson = null): self
     {
-        $this->requestorPerson = ($this->requestorThirdParty === null) ? $requestorPerson : null;
+        $this->requestorPerson = $requestorPerson;
 
         return $this;
     }
@@ -552,21 +651,53 @@ class AccompanyingPeriod
         return $this->requestorThirdParty;
     }
 
-    public function setRequestorThirdParty(ThirdParty $requestorThirdParty): self
+    private function setRequestorThirdParty(ThirdParty $requestorThirdParty = null): self
     {
-        $this->requestorThirdParty = ($this->requestorPerson === null) ? $requestorThirdParty : null;
+        $this->requestorThirdParty = $requestorThirdParty;
 
         return $this;
     }
 
     /**
      * @return Person|ThirdParty
+     * @Groups({"read"})
      */
     public function getRequestor()
     {
         return $this->requestorPerson ?? $this->requestorThirdParty;
     }
 
+
+    /**
+     * Set a requestor
+     *
+     * The requestor is either an instance of ThirdParty, or an
+     * instance of Person
+     *
+     * @param $requestor Person|ThirdParty
+     * @return self
+     * @throw UnexpectedValueException if the requestor is not a Person or ThirdParty
+     * @Groups({"write"})
+     */
+    public function setRequestor($requestor): self
+    {
+        if ($requestor instanceof Person) {
+            $this->setRequestorThirdParty(NULL);
+            $this->setRequestorPerson($requestor);
+        } elseif ($requestor instanceof ThirdParty) {
+            $this->setRequestorThirdParty($requestor);
+            $this->setRequestorPerson(NULL);
+        } elseif (NULL === $requestor) {
+            $this->setRequestorPerson(NULL);
+            $this->setRequestorThirdParty(NULL);
+        } else {
+            throw new \UnexpectedValueException("requestor is not an instance of Person or ThirdParty");
+        }
+
+        return $this;
+    }
+
+
     public function isRequestorAnonymous(): bool
     {
         return $this->requestorAnonymous;
@@ -663,6 +794,7 @@ class AccompanyingPeriod
 
     public function addResource(Resource $resource): self
     {
+        $resource->setAccompanyingPeriod($this);
         $this->resources[] = $resource;
 
         return $this;
@@ -670,9 +802,27 @@ class AccompanyingPeriod
 
     public function removeResource(Resource $resource): void
     {
+        $resource->setAccompanyingPeriod(null);
         $this->resources->removeElement($resource);
     }
 
+    public function getSocialIssues(): Collection
+    {
+        return $this->socialIssues;
+    }
+
+    public function addSocialIssue(SocialIssue $socialIssue): self
+    {
+        $this->socialIssues[] = $socialIssue;
+
+        return $this;
+    }
+
+    public function removeSocialIssue(SocialIssue $socialIssue): void
+    {
+        $this->socialIssues->removeElement($socialIssue);
+    }
+
     /**
      * Get a list of all persons which are participating to this course
      */
@@ -684,4 +834,25 @@ class AccompanyingPeriod
             }
         );
     }
+
+    public function setCreatedAt(\DateTimeInterface $datetime): self
+    {
+        $this->createdAt = $datetime;
+
+        return $this;
+    }
+
+    public function setUpdatedBy(User $user): self
+    {
+        $this->updatedBy = $user;
+
+        return $this;
+    }
+
+    public function setUpdatedAt(\DateTimeInterface $datetime): self
+    {
+        $this->updatedAt = $datetime;
+
+        return $this;
+    }
 }

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

@@ -4,7 +4,6 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\SocialWork\Result;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
@@ -13,7 +12,7 @@ use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity(repositoryClass=AccompanyingPeriodWorkRepository::class)
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period_work")
  */
  class AccompanyingPeriodWork

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

@@ -4,13 +4,12 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Chill\PersonBundle\Entity\SocialWork\Result;
-use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkGoalRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity(repositoryClass=AccompanyingPeriodWorkGoalRepository::class)
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period_work_goal")
  */
 class AccompanyingPeriodWorkGoal

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

@@ -29,8 +29,7 @@ use Doctrine\Common\Collections\ArrayCollection;
 /**
  * ClosingMotive give an explanation why we closed the Accompanying period
  *
- * @ORM\Entity(
- *     repositoryClass="Chill\PersonBundle\Repository\AccompanyingPeriod\ClosingMotiveRepository")
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period_closingmotive")
  */
 class ClosingMotive

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

@@ -22,21 +22,28 @@
 
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-use Chill\PersonBundle\Repository\AccompanyingPeriod\CommentRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 
 /**
- * @ORM\Entity(repositoryClass=CommentRepository::class)
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period_comment")
+ * @DiscriminatorMap(typeProperty="type", mapping={
+ *    "accompanying_period_comment"=Comment::class
+ * })
  */
-class Comment
+class Comment implements TrackCreationInterface, TrackUpdateInterface
 {
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Groups({"read"})
      */
     private $id;
 
@@ -44,34 +51,39 @@ class Comment
      * @ORM\ManyToOne(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod",
      *     inversedBy="comments")
-     * @ORM\JoinColumn(nullable=false)
+     * @ORM\JoinColumn(nullable=false, onDelete="CASCADE")
      */
     private $accompanyingPeriod;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      * @ORM\JoinColumn(nullable=false)
+     * @Groups({"read"})
      */
     private $creator;
 
     /**
      * @ORM\Column(type="datetime")
+     * @Groups({"read"})
      */
     private $createdAt;
 
     /**
      * @ORM\Column(type="datetime")
+     * @Groups({"read"})
      */
     private $updatedAt;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      * @ORM\JoinColumn(nullable=false)
+     * @Groups({"read"})
      */
     private $updatedBy;
 
     /**
      * @ORM\Column(type="text")
+     * @Groups({"read", "write"})
      */
     private $content;
 
@@ -104,6 +116,11 @@ class Comment
         return $this;
     }
 
+    public function setCreatedBy(User $user): self
+    {
+        return $this->setCreator($user);
+    }
+
     public function getCreatedAt(): ?\DateTimeInterface
     {
         return $this->createdAt;
@@ -133,7 +150,7 @@ class Comment
         return $this->updatedBy;
     }
 
-    public function setUpdatedBy(?User $updatedBy): self
+    public function setUpdatedBy(User $updatedBy): self
     {
         $this->updatedBy = $updatedBy;
 

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

@@ -22,11 +22,11 @@
 
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-use Chill\PersonBundle\Repository\AccompanyingPeriod\OriginRepository;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
- * @ORM\Entity(repositoryClass=OriginRepository::class)
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period_origin")
  */
 class Origin
@@ -35,16 +35,19 @@ class Origin
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Groups({"read"})
      */
     private $id;
 
     /**
      * @ORM\Column(type="json")
+     * @Groups({"read"})
      */
     private $label;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true)
+     * @Groups({"read"})
      */
     private $noActiveAfter;
 

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

@@ -22,16 +22,21 @@
 
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-use Chill\PersonBundle\Repository\AccompanyingPeriod\ResourceRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\ResourceRepository;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity(repositoryClass=ResourceRepository::class)
  * @ORM\Table(name="chill_person_accompanying_period_resource")
+ * @DiscriminatorMap(typeProperty="type", mapping={
+ *   "accompanying_period_resource"=Resource::class
+ *  })
  */
 class Resource
 {
@@ -39,6 +44,7 @@ class Resource
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Groups({"read"})
      */
     private $id;
 
@@ -91,7 +97,7 @@ class Resource
         return $this->thirdParty;
     }
 
-    public function setThirdParty(?ThirdParty $thirdParty): self
+    private function setThirdParty(?ThirdParty $thirdParty): self
     {
         $this->thirdParty = $thirdParty;
 
@@ -103,7 +109,7 @@ class Resource
         return $this->person;
     }
 
-    public function setPerson(?Person $person): self
+    private function setPerson(?Person $person): self
     {
         $this->person = $person;
 
@@ -121,9 +127,35 @@ class Resource
 
         return $this;
     }
+
+    /**
+     *
+     * @param $resource Person|ThirdParty
+     */
+    public function setResource($resource): self
+    {
+        if ($resource instanceof ThirdParty) {
+            $this->setThirdParty($resource);
+            $this->setPerson(NULL);
+        } elseif ($resource instanceof Person) {
+            $this->setPerson($resource);
+            $this->setThirdParty(NULL);
+        } elseif (NULL === $resource) {
+            $this->setPerson(NULL);
+            $this->setThirdParty(NULL);
+        } else {
+            throw new \UnexpectedValueException(sprintf("the resource ".
+                "should be an instance of %s or %s", Person::class,
+                ThirdParty::class));
+        }
+
+        return $this;
+    }
+    
     
     /**
-     * @return Person|ThirdParty
+     * @return ThirdParty|Person
+     * @Groups({"read", "write"})
      */
     public function getResource()
     {

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php

@@ -22,17 +22,21 @@
 
 namespace Chill\PersonBundle\Entity;
 
-use Chill\PersonBundle\Repository\AccompanyingPeriodParticipationRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
 /**
  * AccompanyingPeriodParticipation Class
  *
  * @package Chill\PersonBundle\Entity
- * @ORM\Entity(repositoryClass=AccompanyingPeriodParticipationRepository::class)
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period_participation")
+ * @DiscriminatorMap(typeProperty="type", mapping={
+ *  "accompanying_period_participation"=AccompanyingPeriodParticipation::class
+ *  })
  */
 class AccompanyingPeriodParticipation
 {
@@ -40,12 +44,14 @@ class AccompanyingPeriodParticipation
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Groups({"read"})
      */
     private $id;
     
     /**
      * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="accompanyingPeriodParticipations")
      * @ORM\JoinColumn(name="person_id", referencedColumnName="id", nullable=false)
+     * @Groups({"read"})
      */
     private $person;
     
@@ -57,11 +63,13 @@ class AccompanyingPeriodParticipation
     
     /**
      * @ORM\Column(type="date", nullable=false)
+     * @Groups({"read"})
      */
     private $startDate;
     
     /**
      * @ORM\Column(type="date", nullable=true)
+     * @Groups({"read"})
      */
     private $endDate = null;
     

src/Bundle/ChillPersonBundle/Entity/Household/Household.php

@@ -2,13 +2,12 @@
 
 namespace Chill\PersonBundle\Entity\Household;
 
-use Chill\PersonBundle\Repository\Household\HouseholdRepository;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\Collection;
 use Chill\MainBundle\Entity\Address;
 
 /**
- * @ORM\Entity(repositoryClass=HouseholdRepository::class)
+ * @ORM\Entity
  */
 class Household
 {

src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMembers.php

@@ -3,12 +3,11 @@
 namespace Chill\PersonBundle\Entity\Household;
 
 use Doctrine\ORM\Mapping as ORM;
-use Chill\PersonBundle\Repository\Household\HouseholdMembersRepository;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Household\Household;
 
 /**
- * @ORM\Entity(repositoryClass=HouseholdMembersRepository::class)
+ * @ORM\Entity
  */
 class HouseholdMembers
 {

src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php

@@ -25,7 +25,7 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * MaritalStatus
  *
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_marital_status")
  * @ORM\HasLifecycleCallbacks()
  */

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -34,17 +34,21 @@ use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
 /**
  * Person Class
  *
- * @ORM\Entity(repositoryClass="Chill\PersonBundle\Repository\PersonRepository")
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_person",
  *     indexes={@ORM\Index(
  *          name="person_names",
  *          columns={"firstName", "lastName"}
  * )})
  * @ORM\HasLifecycleCallbacks()
+ * @DiscriminatorMap(typeProperty="type", mapping={
+ *   "person"=Person::class
+ * })
  */
 class Person implements HasCenterInterface
 {

src/Bundle/ChillPersonBundle/Entity/PersonAltName.php

@@ -8,7 +8,7 @@ use Doctrine\ORM\Mapping as ORM;
  * PersonAltName
  *
  * @ORM\Table(name="chill_person_alt_name")
- * @ORM\Entity(repositoryClass="Chill\PersonBundle\Repository\PersonAltNameRepository")
+ * @ORM\Entity
  */
 class PersonAltName
 {

src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php

@@ -9,7 +9,7 @@ use Chill\MainBundle\Entity\User;
  * PersonNotDuplicate
  *
  * @ORM\Table(name="chill_person_not_duplicate")
- * @ORM\Entity(repositoryClass="Chill\PersonBundle\Repository\PersonNotDuplicateRepository")
+ * @ORM\Entity
  */
 class PersonNotDuplicate
 {

src/Bundle/ChillPersonBundle/Entity/PersonPhone.php

@@ -8,7 +8,7 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * Person Phones
  *
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_phone")
  */
 class PersonPhone

src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php

@@ -2,11 +2,10 @@
 
 namespace Chill\PersonBundle\Entity\SocialWork;
 
-use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity(repositoryClass=EvaluationRepository::class)
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_social_work_evaluation")
  */
 class Evaluation

src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php

@@ -2,13 +2,12 @@
 
 namespace Chill\PersonBundle\Entity\SocialWork;
 
-use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity(repositoryClass=GoalRepository::class)
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_social_work_goal")
  */
 class Goal

src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php

@@ -4,13 +4,12 @@ namespace Chill\PersonBundle\Entity\SocialWork;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
-use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity(repositoryClass=ResultRepository::class)
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_social_work_result")
  */
 class Result

src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php

@@ -2,13 +2,12 @@
 
 namespace Chill\PersonBundle\Entity\SocialWork;
 
-use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity(repositoryClass=SocialActionRepository::class)
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_social_action")
  */
 class SocialAction

src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php

@@ -1,15 +1,18 @@
 <?php
 namespace Chill\PersonBundle\Entity\SocialWork;
 
-
-use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
 /**
- * @ORM\Entity(repositoryClass=SocialIssueRepository::class)
+ * @ORM\Entity
  * @ORM\Table(name="chill_person_social_issue")
+ * @DiscriminatorMap(typeProperty="type", mapping={
+ *   "social_issue"=SocialIssue::class
+ * })
  */
 class SocialIssue
 {
@@ -37,6 +40,7 @@ class SocialIssue
 
     /**
      * @ORM\Column(type="json")
+     * @Groups({"read"})
      */
     private $title = [];
 
@@ -61,6 +65,11 @@ class SocialIssue
         return $this->parent;
     }
 
+    public function hasParent(): bool
+    {
+        return $this->parent !== null;
+    }
+
     public function setParent(?self $parent): self
     {
         $this->parent = $parent;

src/Bundle/ChillPersonBundle/Form/CreationPersonType.php

@@ -33,9 +33,10 @@ use Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
 
-class CreationPersonType extends AbstractType
+final class CreationPersonType extends AbstractType
 {
-
+    // TODO: This is only used in test.
+    // TODO: See if this is still valid and update accordingly.
     const NAME = 'chill_personbundle_person_creation';
 
     const FORM_NOT_REVIEWED = 'not_reviewed';

src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -3,6 +3,7 @@
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Knp\Menu\MenuItem;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -32,24 +33,31 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
     
     public function buildMenu($menuId, MenuItem $menu, array $parameters): void
     {
+        $period = $parameters['accompanyingCourse'];
+
         $menu->addChild($this->translator->trans('Resume Accompanying Course'), [
             'route' => 'chill_person_accompanying_course_index',
             'routeParameters' => [
-                'accompanying_period_id' => $parameters['accompanyingCourse']->getId()
+                'accompanying_period_id' => $period->getId()
         ]])
         ->setExtras(['order' => 10]);
         
         $menu->addChild($this->translator->trans('Edit Accompanying Course'), [
             'route' => 'chill_person_accompanying_course_show',
             'routeParameters' => [
-                'accompanying_period_id' => $parameters['accompanyingCourse']->getId()
+                'accompanying_period_id' => $period->getId()
         ]])
         ->setExtras(['order' => 20]);
 
+        if (AccompanyingPeriod::STEP_DRAFT === $period->getStep()) {
+            // no more menu items if the period is draft
+            return;
+        }
+
         $menu->addChild($this->translator->trans('Accompanying Course Details'), [
             'route' => 'chill_person_accompanying_course_history',
             'routeParameters' => [
-                'accompanying_period_id' => $parameters['accompanyingCourse']->getId()
+                'accompanying_period_id' => $period->getId()
         ]])
         ->setExtras(['order' => 30]);
     }

src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php

@@ -71,6 +71,14 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                     'icons' => [ 'plus' ]
                 ]);
         }
+
+        $menu->addChild($this->translator->trans('Create an accompanying course'), [
+                'route' => 'chill_person_accompanying_course_new'
+            ])
+            ->setExtras([
+                'order' => 11,
+                'icons' => [ 'plus' ]
+            ]);
     }
     
     /**

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php

@@ -3,8 +3,8 @@
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * @method AccompanyingPeriodWorkGoal|null find($id, $lockMode = null, $lockVersion = null)
@@ -12,10 +12,12 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method AccompanyingPeriodWorkGoal[]    findAll()
  * @method AccompanyingPeriodWorkGoal[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class AccompanyingPeriodWorkGoalRepository extends ServiceEntityRepository
+final class AccompanyingPeriodWorkGoalRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        parent::__construct($registry, AccompanyingPeriodWorkGoal::class);
+        $this->repository = $entityManager->getRepository(AccompanyingPeriodWorkGoal::class);
     }
 }

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php

@@ -3,8 +3,8 @@
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * @method AccompanyingPeriodWork|null find($id, $lockMode = null, $lockVersion = null)
@@ -12,10 +12,12 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method AccompanyingPeriodWork[]    findAll()
  * @method AccompanyingPeriodWork[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class AccompanyingPeriodWorkRepository extends ServiceEntityRepository
+final class AccompanyingPeriodWorkRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        parent::__construct($registry, AccompanyingPeriodWork::class);
+        $this->repository = $entityManager->getRepository(AccompanyingPeriodWork::class);
     }
 }

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php

@@ -22,8 +22,9 @@
 
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
+use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 
 /**
@@ -32,17 +33,24 @@ use Doctrine\ORM\Query\ResultSetMappingBuilder;
  *
  * @package Chill\PersonBundle\Repository
  */
-class ClosingMotiveRepository extends EntityRepository
+final class ClosingMotiveRepository
 {
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(ClosingMotive::class);
+    }
+
     /**
      * @param bool $onlyLeaf
      * @return mixed
      */
     public function getActiveClosingMotive(bool $onlyLeaf = true)
     {
-        $rsm = new ResultSetMappingBuilder($this->getEntityManager());
-        $rsm->addRootEntityFromClassMetadata($this->getClassName(), 'cm');
-        
+        $rsm = new ResultSetMappingBuilder($this->repository->getEntityManager());
+        $rsm->addRootEntityFromClassMetadata($this->repository->getClassName(), 'cm');
+
         $sql = "SELECT ".(string) $rsm."
             FROM chill_person_accompanying_period_closingmotive AS cm
             WHERE
@@ -55,10 +63,11 @@ class ClosingMotiveRepository extends EntityRepository
         }
         
         $sql .= " ORDER BY cm.ordering ASC";
-        
-        return $this->_em
+
+        return $this
+            ->repository
+            ->getEntityManager()
             ->createNativeQuery($sql, $rsm)
-            ->getResult()
-            ;
+            ->getResult();
     }
 }

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php

@@ -23,8 +23,8 @@
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * @method Comment|null find($id, $lockMode = null, $lockVersion = null)
@@ -32,11 +32,12 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method Comment[]    findAll()
  * @method Comment[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class CommentRepository extends ServiceEntityRepository
+final class CommentRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        parent::__construct($registry, Comment::class);
+        $this->repository = $entityManager->getRepository(Comment::class);
     }
-    
 }

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php

@@ -23,8 +23,8 @@
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * @method Origin|null find($id, $lockMode = null, $lockVersion = null)
@@ -32,11 +32,12 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method Origin[]    findAll()
  * @method Origin[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class OriginRepository extends ServiceEntityRepository
+final class OriginRepository
 {
-    public function __construct(ManagerRegistry $registry)
-    {
-        parent::__construct($registry, Origin::class);
-    }
+    private EntityRepository $repository;
 
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(Origin::class);
+    }
 }

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php

@@ -23,6 +23,7 @@
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
+use Doctrine\ORM\EntityRepository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
@@ -32,11 +33,12 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method Resource[]    findAll()
  * @method Resource[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class ResourceRepository extends ServiceEntityRepository
+final class ResourceRepository extends ServiceEntityRepository
 {
+    private EntityRepository $repository;
+
     public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, Resource::class);
     }
-
 }

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php

@@ -23,8 +23,8 @@
 namespace Chill\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * @method AccompanyingPeriodParticipation|null find($id, $lockMode = null, $lockVersion = null)
@@ -32,11 +32,12 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method AccompanyingPeriodParticipation[]    findAll()
  * @method AccompanyingPeriodParticipation[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class AccompanyingPeriodParticipationRepository extends ServiceEntityRepository
+final class AccompanyingPeriodParticipationRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        parent::__construct($registry, AccompanyingPeriodParticipation::class);
+        $this->repository = $entityManager->getRepository(AccompanyingPeriodParticipation::class);
     }
-    
 }

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php

@@ -23,9 +23,8 @@
 namespace Chill\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * @method AccompanyingPeriod|null find($id, $lockMode = null, $lockVersion = null)
@@ -33,10 +32,12 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method AccompanyingPeriod[]    findAll()
  * @method AccompanyingPeriod[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class AccompanyingPeriodRepository extends ServiceEntityRepository
+final class AccompanyingPeriodRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        parent::__construct($registry, AccompanyingPeriod::class);
+        $this->repository = $entityManager->getRepository(AccompanyingPeriod::class);
     }
 }

src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php

@@ -3,8 +3,8 @@
 namespace Chill\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\HouseholdMembers;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * @method HouseholdMembers|null find($id, $lockMode = null, $lockVersion = null)
@@ -12,11 +12,13 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method HouseholdMembers[]    findAll()
  * @method HouseholdMembers[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class HouseholdMembersRepository extends ServiceEntityRepository
+final class HouseholdMembersRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        parent::__construct($registry, HouseholdMembers::class);
+        $this->repository = $entityManager->getRepository(HouseholdMembers::class);
     }
 
     // /**

src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php

@@ -3,8 +3,8 @@
 namespace Chill\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\Household;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * @method Household|null find($id, $lockMode = null, $lockVersion = null)
@@ -12,11 +12,13 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method Household[]    findAll()
  * @method Household[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class HouseholdRepository extends ServiceEntityRepository
+final class HouseholdRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        parent::__construct($registry, Household::class);
+        $this->repository = $entityManager->getRepository(Household::class);
     }
 
     // /**

src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php

@@ -2,12 +2,22 @@
 
 namespace Chill\PersonBundle\Repository;
 
+use Chill\PersonBundle\Entity\PersonAltName;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+
 /**
  * PersonAltNameRepository
  *
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class PersonAltNameRepository extends \Doctrine\ORM\EntityRepository
+final class PersonAltNameRepository
 {
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(PersonAltName::class);
+    }
 }

src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php

@@ -4,6 +4,7 @@ namespace Chill\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonNotDuplicate;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
 /**
@@ -11,8 +12,15 @@ use Doctrine\ORM\EntityRepository;
  *
  * @package Chill\PersonBundle\Repository
  */
-class PersonNotDuplicateRepository  extends EntityRepository
+final class PersonNotDuplicateRepository
 {
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(PersonNotDuplicate::class);
+    }
+
     /**
      * @param \Chill\PersonBundle\Entity\Person $person
      *
@@ -20,7 +28,7 @@ class PersonNotDuplicateRepository  extends EntityRepository
      */
     public function findNotDuplicatePerson(Person $person)
     {
-        $qb = $this->createQueryBuilder('pnd');
+        $qb = $this->repository->createQueryBuilder('pnd');
         $qb->select('pnd')
             ->where('pnd.person1 = :person OR pnd.person2 = :person')
         ;

src/Bundle/ChillPersonBundle/Repository/PersonRepository.php

@@ -18,16 +18,25 @@
 
 namespace Chill\PersonBundle\Repository;
 
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 
-/**
- * Class PersonRepository
- *
- * @package Chill\PersonBundle\Repository
- */
-class PersonRepository extends EntityRepository
+final class PersonRepository
 {
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(Person::class);
+    }
+
+    public function find($id, $lockMode = null, $lockVersion = null)
+    {
+        return $this->repository->find($id, $lockMode, $lockVersion);
+    }
+
     /**
      * @param string $phonenumber
      * @param $centers
@@ -44,7 +53,7 @@ class PersonRepository extends EntityRepository
         $maxResults,
         array $only = ['mobile', 'phone']
     ) {
-        $qb = $this->createQueryBuilder('p');
+        $qb = $this->repository->createQueryBuilder('p');
         $qb->select('p');
         
         $this->addByCenters($qb, $centers);
@@ -71,7 +80,7 @@ class PersonRepository extends EntityRepository
         array $only = ['mobile', 'phone']
         ): int
     {
-        $qb = $this->createQueryBuilder('p');
+        $qb = $this->repository->createQueryBuilder('p');
         $qb->select('COUNT(p)');
         
         $this->addByCenters($qb, $centers);

src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php

@@ -3,8 +3,8 @@
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * @method Evaluation|null find($id, $lockMode = null, $lockVersion = null)
@@ -12,10 +12,12 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method Evaluation[]    findAll()
  * @method Evaluation[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class EvaluationRepository extends ServiceEntityRepository
+final class EvaluationRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        parent::__construct($registry, Evaluation::class);
+        $this->repository = $entityManager->getRepository(Evaluation::class);
     }
 }

src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php

@@ -3,8 +3,8 @@
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\Goal;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * @method Goal|null find($id, $lockMode = null, $lockVersion = null)
@@ -12,10 +12,12 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method Goal[]    findAll()
  * @method Goal[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class GoalRepository extends ServiceEntityRepository
+final class GoalRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        parent::__construct($registry, Goal::class);
+        $this->repository = $entityManager->getRepository(Goal::class);
     }
 }

src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php

@@ -3,8 +3,8 @@
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\Result;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * @method Result|null find($id, $lockMode = null, $lockVersion = null)
@@ -12,10 +12,12 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method Result[]    findAll()
  * @method Result[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class ResultRepository extends ServiceEntityRepository
+final class ResultRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        parent::__construct($registry, Result::class);
+        $this->repository = $entityManager->getRepository(Result::class);
     }
 }

src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php

@@ -3,8 +3,8 @@
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * @method SocialAction|null find($id, $lockMode = null, $lockVersion = null)
@@ -12,10 +12,12 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method SocialAction[]    findAll()
  * @method SocialAction[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class SocialActionRepository extends ServiceEntityRepository
+final class SocialActionRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        parent::__construct($registry, SocialAction::class);
+        $this->repository = $entityManager->getRepository(SocialAction::class);
     }
 }

src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php

@@ -4,7 +4,8 @@ namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 /**
  * @method SocialIssue|null find($id, $lockMode = null, $lockVersion = null)
@@ -12,10 +13,12 @@ use Doctrine\Persistence\ManagerRegistry;
  * @method SocialIssue[]    findAll()
  * @method SocialIssue[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class SocialIssueRepository extends ServiceEntityRepository
+final class SocialIssueRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        parent::__construct($registry, SocialIssue::class);
+        $this->repository = $entityManager->getRepository(SocialIssue::class);
     }
 }

src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App.vue

@@ -1,45 +0,0 @@
-<template>
-   <accompanying-course v-bind:accompanying_course="accompanying_course"/>
-   <persons-associated v-bind:persons_associated="accompanying_course.persons"/>
-   <requestor v-bind:accompanying_course="accompanying_course"/>
-</template>
-
-<script>
-import AccompanyingCourse from './components/AccompanyingCourse.vue';
-import PersonsAssociated from './components/PersonsAssociated.vue';
-import Requestor from './components/Requestor.vue';
-
-export default {
-   name: 'App',
-   components: { 
-      AccompanyingCourse,
-      PersonsAssociated, 
-      Requestor
-   },
-   data() {
-      return {
-         accompanying_course: {}
-      };
-   },
-   computed: {
-      accompanyingCourseId() {
-         return window.accompanyingCourseId;
-      }
-   },
-   methods: {
-      async getAccompanyingCourse() {
-         let data_;
-         return fetch(`/fr/api/parcours/${accompanyingCourseId}/show`)
-            .then(response => response.json())
-            .then(data => {
-               this.$data.accompanying_course = data;
-            });
-      }
-   },
-   async mounted() {
-      await this.getAccompanyingCourse();
-   }
-};
-</script>
-
-<style scoped></style>

src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/AccompanyingCourse.vue

@@ -1,26 +0,0 @@
-<template>
-   <div class="vue-component">
-      <h3>Parcours</h3>
-      <dl>
-         <dt>id</dt>
-            <dd>{{ accompanying_course.id }}</dd>
-         <dt>opening_date</dt>
-            <dd>{{ accompanying_course.opening_date }}</dd>
-         <dt>closing_date</dt>
-            <dd>{{ accompanying_course.closing_date }}</dd>
-         <dt>remark</dt>
-            <dd>{{ accompanying_course.remark }}</dd>
-         <dt>closing_motive</dt>
-            <dd>{{ accompanying_course.closing_motive }}</dd>
-      </dl>
-   </div>
-</template>
-
-<script>
-export default {
-   name: 'AccompanyingCourse',
-   props: {
-      accompanying_course: Object
-   }
-}
-</script>

src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonItem.vue

@@ -1,25 +0,0 @@
-<template>
-<tr>
-   <td>{{ person.firstname }}</td>
-   <td>{{ person.lastname }}</td>
-   <td>{{ person.startdate }}</td>
-   <td>{{ person.enddate }}</td>
-   <td>
-      <ul class="record_actions">
-         <li><button class="sc-button bt-show"></button></li>
-         <li><button class="sc-button bt-update"></button></li>
-         <li><button class="sc-button bt-delete" @click.prevent="$emit('remove', person)"></button></li>
-      </ul>
-   </td>
-</tr>
-</template>
-
-<script>
-export default {
-   name: 'PersonItem',
-   props: {
-      person: { type: Object, required: true }
-   },
-   emits: ['remove']
-}
-</script>

src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonsAssociated.vue

@@ -1,69 +0,0 @@
-<template>
-<div class="vue-component">
-   <h3>Usagers concernés</h3>
-    
-   <label>{{ counter }} usagers</label>
-   
-   <table class="rounded"> 
-      <thead>
-         <tr>
-            <th class="chill-orange">firstname</th>
-            <th class="chill-orange">lastname</th>
-            <th class="chill-orange">startdate</th>
-            <th class="chill-orange">enddate</th>
-            <th class="chill-orange">actions</th>
-         </tr>
-      </thead>
-      <tbody> 
-         <person-item 
-            v-for="person in persons_associated" 
-            v-bind:person="person" 
-            v-bind:key="person.id" 
-            @remove="removePerson" />
-      </tbody>
-   </table>
-   
-   <ul class="record_actions">
-      <li><button class="sc-button bt-create" @click="addPerson">Ajouter un usager</button></li>
-   </ul>
-   
-</div>
-</template>
-
-<script>
-import PersonItem from "./PersonItem.vue"
-
-export default {
-   name: 'PersonsAssociated',
-   components: { 
-      PersonItem 
-   },
-   props: { 
-      persons_associated: Array 
-   },
-   data() {
-      return {
-         persons: this.persons_associated
-      }
-   },
-   computed: {
-      async counter() {
-         // Pourquoi je peux pas compter un tableau avec length ???!!!
-         return this.persons_associated.length //     <= boum !
-      }
-   },
-   methods: {
-      addPerson() {
-         this.persons_associated.push({
-            "firstname": "Lisa",
-            "lastname": "Simpson",
-            "startdate": "1975-09-15",
-            "enddate": "2021-04-20"
-         })
-      },
-      removePerson(item) {
-         this.persons_associated = this.persons_associated.filter(person => person !== item)
-      }
-   }
-}
-</script>

src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/Requestor.vue

@@ -1,16 +0,0 @@
-<template>
-   <div class="vue-component">
-      <h3>Demandeur</h3>
-      {{ accompanying_course.id }}
-      {{ accompanying_course.remark }}
-   </div>
-</template>
-
-<script>
-export default {
-   name: 'Requestor',
-   props: {
-      accompanying_course: Object
-   }
-}
-</script>

src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/index.js

@@ -1,8 +0,0 @@
-import App from './App.vue';
-import { createApp } from 'vue';
-
-const app = createApp({
-   template: `<app></app>`
-})
-.component('app', App)
-.mount('#accompanying-course');

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue

@@ -0,0 +1,106 @@
+<template>
+   <banner></banner>
+   <sticky-nav></sticky-nav>
+   
+   <h1 v-if="accompanyingCourse.step === 'DRAFT'">{{ $t('course.title.draft') }}</h1>
+   <h1 v-else>{{ $t('course.title.active') }}</h1>
+   
+   <persons-associated></persons-associated>
+   <requestor></requestor>
+   <social-issue></social-issue>
+   <referrer></referrer>
+   <resources></resources>
+   <comment v-if="accompanyingCourse.step === 'DRAFT'"></comment>
+   <confirm v-if="accompanyingCourse.step === 'DRAFT'"></confirm>
+   
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import Banner from './components/Banner.vue';
+import StickyNav from './components/StickyNav.vue';
+import PersonsAssociated from './components/PersonsAssociated.vue';
+import Requestor from './components/Requestor.vue';
+import SocialIssue from './components/SocialIssue.vue';
+import Referrer from './components/Referrer.vue';
+import Resources from './components/Resources.vue';
+import Comment from './components/Comment.vue';
+import Confirm from './components/Confirm.vue';
+
+export default {
+   name: 'App',
+   components: { 
+      Banner,
+      StickyNav,
+      PersonsAssociated, 
+      Requestor,
+      SocialIssue,
+      Referrer,
+      Resources,
+      Comment,
+      Confirm,
+   },
+   computed: mapState([
+      'accompanyingCourse'
+   ])
+};
+</script>
+
+<style lang="scss">
+   div#accompanying-course {
+      h1 {
+         margin: 1.5em 0;
+      }
+      div.vue-component {
+         h2 {
+            margin-left: 0.7em;
+            position: relative;
+            &:before {
+               position: absolute;
+               /*
+               content: "\f192";  //circle-dot
+               content: "\f1dd";  //paragraph
+               content: "\f292";  //hashtag
+               content: "\f069";  //asterisk
+               */
+               content: "\f142";  //ellipsis-v
+               font-family: "ForkAwesome";
+               color: #718596ab;
+               left: -22px;
+               top: 4px;
+            }
+            a[name^="section"] {
+               position: absolute;
+               top: -3.5em;  // ref. stickNav
+            }
+         }
+         padding: 0.8em 0em;
+         margin: 2em 0;
+         border: 1px dotted #718596ab; 
+         border-radius: 5px;
+         border-left: 1px dotted #718596ab;
+         border-right: 1px dotted #718596ab;
+         /* debug components
+         position: relative; 
+         &:before { 
+            content: "vuejs component";
+            position: absolute;
+            left: 1.5em;
+            top: -0.9em;
+            background-color: white;
+            color: grey;
+            padding: 0 0.3em;
+         }
+         */
+         dd { 
+            margin-left: 1em; 
+         }
+         & > div {
+            margin: 1em 3em 0;
+         }
+         table {
+         }
+      }
+      
+}
+</style>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js

@@ -0,0 +1,177 @@
+/*
+* Endpoint v.2 chill_api_single_accompanying_course__entity
+* method GET/HEAD, get AccompanyingCourse Instance
+*
+*  @id   integer - id of accompanyingCourse
+*/
+const getAccompanyingCourse = (id) => { 
+   const url = `/api/1.0/person/accompanying-course/${id}.json`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response'); 
+      });
+};
+
+/*
+* Endpoint v.2 chill_api_single_accompanying_course__entity
+* method PATCH, patch AccompanyingCourse Instance
+*
+*  @id     integer - id of accompanyingCourse
+*  @body   Object - dictionary with changes to post
+*/
+const patchAccompanyingCourse = (id, body) => { 
+   console.log('body', body);
+   const url = `/api/1.0/person/accompanying-course/${id}.json`;
+   return fetch(url, {
+         method: 'PATCH',
+         headers: {
+           'Content-Type': 'application/json;charset=utf-8'
+         },
+         body: JSON.stringify(body)
+      })
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response'); 
+      });
+};
+
+/*
+* Endpoint to change 'DRAFT' step to 'CONFIRMED'
+*/
+const confirmAccompanyingCourse = (id) => {
+   const url = `/api/1.0/person/accompanying-course/${id}/confirm.json`
+   return fetch(url, {
+         method: 'POST',
+         headers: {'Content-Type': 'application/json;charset=utf-8'}
+      })
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response'); 
+      });
+};
+
+/*
+* Endpoint 
+*/
+const getSocialIssues = () => {
+   const url = `/api/1.0/person/social-work/social-issue.json`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response'); 
+      });
+};
+
+/*
+* Endpoint v.2 chill_api_single_accompanying_course_participation, 
+* method POST/DELETE, add/close a participation to the accompanyingCourse
+*
+*  @id               integer - id of accompanyingCourse
+*  @payload          integer - id of person
+*  @method           string - POST or DELETE
+*/
+const postParticipation = (id, payload, method) => {
+   const body = { type: payload.type, id: payload.id };
+   const url = `/api/1.0/person/accompanying-course/${id}/participation.json`;
+   return fetch(url, {
+         method: method,
+         headers: {
+           'Content-Type': 'application/json;charset=utf-8'
+         },
+         body: JSON.stringify(body)
+      })
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response'); 
+      });
+};
+
+/*
+* Endpoint v.2 chill_api_single_accompanying_course_requestor, 
+* method POST/DELETE, add/close a requestor to the accompanyingCourse
+*
+*  @id               integer - id of accompanyingCourse
+*  @payload          object of type person|thirdparty
+*  @method           string - POST or DELETE
+*/
+const postRequestor = (id, payload, method) => {
+   //console.log('payload', payload);
+   const body = (payload)? { type: payload.type, id: payload.id } : {};
+   console.log('body', body);
+   const url = `/api/1.0/person/accompanying-course/${id}/requestor.json`;
+   return fetch(url, {
+         method: method,
+         headers: {
+           'Content-Type': 'application/json;charset=utf-8'
+         },
+         body: JSON.stringify(body)
+      })
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response'); 
+      });
+};
+
+/*
+* Endpoint v.2 chill_api_single_accompanying_course_resource, 
+* method POST/DELETE, add/remove a resource to the accompanyingCourse
+*
+*  @id               integer - id of accompanyingCourse
+*  @payload          object of type person|thirdparty
+*  @method           string - POST or DELETE
+*/
+const postResource = (id, payload, method) => {
+   //console.log('payload', payload);
+   const body = { type: "accompanying_period_resource" };
+   switch (method) {
+      case 'DELETE':
+         body['id'] = payload.id; 
+         break;
+      default:
+         body['resource'] = { type: payload.type, id: payload.id };
+   }   
+   console.log('body', body);
+   const url = `/api/1.0/person/accompanying-course/${id}/resource.json`;
+   return fetch(url, {
+         method: method,
+         headers: {
+           'Content-Type': 'application/json;charset=utf-8'
+         },
+         body: JSON.stringify(body)
+      })
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response'); 
+      });
+};
+
+/*
+* Endpoint to Add/remove SocialIssue
+*/
+const postSocialIssue = (id, body, method) => {
+   //console.log('api body and method', body, method); 
+   const url = `/api/1.0/person/accompanying-course/${id}/socialissue.json`;
+   return fetch(url, {
+         method: method,
+         headers: {
+           'Content-Type': 'application/json;charset=utf-8'
+         },
+         body: JSON.stringify(body)
+      })
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response'); 
+      });
+};
+
+export { 
+   getAccompanyingCourse,
+   patchAccompanyingCourse,
+   confirmAccompanyingCourse,
+   getSocialIssues,
+   postParticipation,
+   postRequestor,
+   postResource,
+   postSocialIssue
+};

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue

@@ -0,0 +1,92 @@
+<template>
+   
+   <div class="vue-component" style="display: none;">
+      <dl>
+         <dt>{{ $t('course.id') }}</dt>
+         <dd>{{ accompanyingCourse.id }}</dd>
+      </dl>
+      <dl v-if="accompanyingCourse.closingDate">
+         <dt>{{ $t('course.closing_date') }}</dt>
+         <dd>{{ $d(accompanyingCourse.closingDate.datetime, 'short') }}</dd>
+
+         <dt>{{ $t('course.closing_motive') }}</dt>
+         <dd v-if="accompanyingCourse.closingMotive">{{ accompanyingCourse.closingMotive.name.fr }}</dd>
+      </dl>
+   </div>
+      
+   <teleport to="#header-accompanying_course-name #banner-flags">
+      <toggle-flags></toggle-flags>
+   </teleport>
+   
+   <teleport to="#header-accompanying_course-name #banner-status">
+      <div v-if="accompanyingCourse.step === 'DRAFT'">
+         <span class="badge badge-secondary">
+            {{ $t('course.step.draft') }}
+         </span>
+      </div>
+      <div v-else>
+         <div>
+            <span class="badge badge-primary">
+               {{ $t('course.step.active') }}
+            </span>
+         </div>
+         <div>
+            <span>
+               <i>{{ $t('course.open_at') }}{{ $d(accompanyingCourse.openingDate.datetime, 'text') }}</i>
+            </span>
+            <br>
+            <span v-if="accompanyingCourse.user">
+               {{ $t('course.by') }}<b>{{ accompanyingCourse.user.username }}</b>
+            </span>
+         </div>
+      </div>
+   </teleport>
+   
+   <teleport to="#header-accompanying_course-details #banner-social-issues">
+      <div class="grid-12">
+         <social-issue
+            v-for="issue in accompanyingCourse.socialIssues"
+            v-bind:key="issue.id"
+            v-bind:issue="issue">
+         </social-issue>
+      </div>
+   </teleport>
+
+</template>
+
+<script>
+import ToggleFlags from './Banner/ToggleFlags';
+import SocialIssue from './Banner/SocialIssue.vue';
+
+export default {
+   name: 'Banner',
+   components: {
+      ToggleFlags,
+      SocialIssue
+   },
+   computed: {
+      accompanyingCourse() {
+         return this.$store.state.accompanyingCourse
+      }
+   }
+}
+</script>
+
+<style lang="scss">
+   div#banner-flags,
+   div#banner-status {
+      margin: 1.5em 0;
+      div {
+         text-align: right;
+         margin-bottom: 0.8em;
+      }
+      .badge {
+         text-transform: uppercase;
+      }
+   }
+   div#banner-status {
+      span.badge {
+         font-size: 90%;
+      }
+   }
+</style>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/SocialIssue.vue

@@ -0,0 +1,20 @@
+<template>
+  <span class="badge badge-secondary">{{ issue.text }}</span>
+</template>
+
+<script>
+export default {
+   name: "SocialIssues",
+   props: ['issue']
+}
+</script>
+
+<style lang="scss" scoped>
+span.badge {
+   font-size: 95%;
+   text-transform: capitalize !important;
+   font-weight: 500 !important;
+   margin-bottom: 5px;
+   margin-right: 1em;
+}
+</style>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue

@@ -0,0 +1,89 @@
+<template>
+   <div>
+      <a @click="toggleIntensity" class="flag-toggle">
+         {{ $t('course.occasional') }}
+         <i class="fa" :class="{ 'fa-toggle-on': isRegular, 'fa-toggle-on fa-flip-horizontal': !isRegular }"></i>
+         {{ $t('course.regular') }}
+      </a>
+   </div>
+   
+   <div>
+      <button class="badge badge-pill" :class="{ 'badge-primary': isEmergency, 'badge-secondary': !isEmergency }" @click="toggleEmergency">
+         {{ $t('course.emergency') }}
+      </button>
+      <button class="badge badge-pill" :class="{ 'badge-primary': isConfidential, 'badge-secondary': !isConfidential }" @click="toggleConfidential">
+         {{ $t('course.confidential') }}
+      </button>
+   </div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+export default {
+   name: "ToggleFlags",
+   computed: {
+      ...mapState({
+         intensity: state => state.accompanyingCourse.intensity,
+         emergency: state => state.accompanyingCourse.emergency,
+         confidential: state => state.accompanyingCourse.confidential,
+      }),
+      isRegular() {
+         return (this.intensity === 'regular') ? true : false;
+      },
+      isEmergency() {
+         return (this.emergency) ? true : false;
+      },
+      isConfidential() {
+         return (this.confidential) ? true : false;
+      }
+   },
+   methods: {
+      toggleIntensity() {
+         let value;
+         switch (this.intensity) {
+            case "occasional":
+               value = "regular";
+               break;
+            case "regular":
+               value = "occasional";
+               break;
+            default:
+               //temporaire (modif backend)
+               value = "occasional";
+         }
+         this.$store.dispatch('toggleIntensity', value);
+      },
+      toggleEmergency() {
+         this.$store.dispatch('toggleEmergency', (!this.isEmergency));
+      },
+      toggleConfidential() {
+         this.$store.dispatch('toggleConfidential', (!this.isConfidential));
+      }
+   }
+}
+</script>
+
+<style lang="scss" scoped>
+    a.flag-toggle {
+        color: white;
+        padding: 0 10px;
+        cursor: pointer;
+        &:hover {
+            color: white;
+            text-decoration: underline;
+            border-radius: 20px;
+        }
+        i {
+            margin: auto 0.4em;
+        }
+    }
+    button.badge {
+       margin-left: 0.8em;
+       &.badge-secondary {
+           opacity: 0.5;
+           &:hover {
+              opacity: 0.7;
+           }
+       }
+    }
+</style>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue

@@ -0,0 +1,99 @@
+<template>
+   <div class="vue-component">
+      <h2><a name="section-60"></a>{{ $t('comment.title') }}</h2>
+      
+      <!--div class="error flash_message" v-if="errors.length > 0">
+         {{ errors[0] }}
+         TODO fix errors flashbag for app component
+      </div-->
+      
+      <div>
+         <form @submit.prevent="submitform">
+            
+            <label for="content">{{ $t('comment.label') }}</label>
+            
+            <div v-if="initialComment">
+               {{ $t('comment.created_by', [
+                  initialComment.creator.text, 
+                  $d(initialComment.createdAt.datetime, 'long')
+               ]) }}
+            </div>
+            
+            <textarea 
+               name="content" 
+               v-bind:placeholder="$t('comment.content')"
+               rows="8" 
+               cols="80"
+               ckeditor="ckeditor"
+               v-model="content">
+            </textarea>
+            
+            <ul class="record_actions">
+               <li>
+                  <button type="submit" class="sc-button bt-save">{{ $t('action.save') }}</button>
+               </li>
+               <li v-if="initialComment !== null">
+                  <a class="sc-button bt-delete" 
+                     @click="removeComment">
+                     {{ $t('action.delete') }}
+                  </a>
+               </li>
+            </ul>
+            
+         </form>
+      </div>
+      
+   </div>
+</template>
+
+<script>
+export default {
+   name: "Comment",
+   data() {
+      return {
+         formdata: { 
+            type: "accompanying_period_comment",
+            content: ''
+         }
+      }
+   },
+   computed: {
+      initialComment() {
+         return this.$store.state.accompanyingCourse.initialComment;
+      },
+      content: {
+         set(value) {
+            this.formdata.content = value;
+         },
+         get() {
+            return (this.initialComment)? this.initialComment.content : null;
+         }
+      },
+      errors() {
+         return this.$store.state.errorMsg;
+      }
+   },
+   methods: {
+      submitform() {
+         console.log('submit');
+         this.$store.dispatch('postFirstComment', this.formdata);
+      },
+      removeComment() {
+         console.log('remove');
+         this.$store.dispatch('postFirstComment', null);
+      }
+   }
+}
+/*
+* TODO
+* - [x] delete button in ul record_actions, but not in form
+* - [ ] display updatedAt => initialComment fetch PATCH content changes MUST NOT change object id !!
+* - [ ] ckeditor integration
+*/
+</script>
+
+<style lang="scss" scoped>
+   div.vue-component > div {
+      //margin: 1em;
+   }
+</style>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue

@@ -0,0 +1,80 @@
+<template>
+<div class="vue-component">
+   <h2><a name="section-70"></a>
+      {{ $t('confirm.title') }}
+   </h2>
+
+   <div>
+      <p>
+         {{ $t('confirm.text_draft') }}
+         <span class="badge badge-secondary">{{ $t('course.step.draft') }}</span>
+      </p>
+      <p>
+         {{ $t('confirm.text_active') }}
+         <span class="badge badge-primary">{{ $t('course.step.active') }}</span>
+      </p>
+      
+      <ul class="record_actions">
+         <li>
+            <button class="sc-button bt-save" @click="modal.showModal = true">
+               {{ $t('confirm.ok') }}
+            </button>
+         </li>
+      </ul>
+   </div>
+
+   <teleport to="body">
+      <modal v-if="modal.showModal" :modalDialogClass="modal.modalDialogClass" @close="modal.showModal = false">
+         <template v-slot:header>
+            <h2 class="modal-title">{{ $t('confirm.sure') }}</h2>
+         </template>
+         <template v-slot:body>
+            <p>{{ $t('confirm.sure_description') }}</p>
+         </template>
+         <template v-slot:footer>
+            <button class="sc-button red" @click="confirmCourse">
+               {{ $t('confirm.ok') }}
+            </button>
+         </template>
+      </modal>
+   </teleport>
+
+</div>
+</template>
+
+<script>
+import Modal from 'ChillMainAssets/vuejs/_components/Modal';
+
+export default {
+   name: "Confirm",
+   components: {
+      Modal,
+   },
+   data() {
+      return {
+         modal: {
+            showModal: false,
+            modalDialogClass: "modal-dialog-centered modal-md"
+         }
+      }
+   },
+   computed: {
+      accompanyingCourse() {
+         return this.$store.state.accompanyingCourse
+      }
+   },
+   methods: {
+      confirmCourse() {
+         console.log('@@ CLICK confirmCourse');
+         this.$store.dispatch('confirmAccompanyingCourse');
+         console.log('confirm last');
+      }
+   }
+}
+</script>
+
+<style lang="scss" scoped>
+div.vue-component > div {
+    //margin: 1em;
+}
+</style>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue

@@ -0,0 +1,91 @@
+<template>
+<div class="vue-component">
+   <h2><a name="section-10"></a>{{ $t('persons_associated.title')}}</h2>
+   
+   <div>
+      <label>{{ $tc('persons_associated.counter', counter) }}</label>
+   </div>
+   
+   <table class="rounded" v-if="participations.length > 0">
+      <thead>
+         <tr>
+            <th class="chill-orange">{{ $t('persons_associated.firstname') }}</th>
+            <th class="chill-orange">{{ $t('persons_associated.lastname') }}</th>
+            <th class="chill-orange">{{ $t('persons_associated.startdate') }}</th>
+            <th class="chill-orange">{{ $t('persons_associated.enddate') }}</th>
+            <th class="chill-orange">{{ $t('action.actions') }}</th>
+         </tr>
+      </thead>
+      <tbody>
+         <person-item
+            v-for="participation in participations"
+            v-bind:participation="participation"
+            v-bind:key="participation.id"
+            @remove="removeParticipation"
+            @close="closeParticipation">
+         </person-item>
+      </tbody>
+   </table>
+
+   <div>
+      <add-persons 
+         buttonTitle="persons_associated.add_persons"
+         modalTitle="add_persons.title"
+         v-bind:key="addPersons.key"
+         v-bind:options="addPersons.options"
+         @addNewPersons="addNewPersons"
+         ref="addPersons"> <!-- to cast child method -->
+      </add-persons>
+   </div>
+
+</div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import PersonItem from "./PersonsAssociated/PersonItem.vue"
+import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'
+
+export default {
+   name: 'PersonsAssociated',
+   components: {
+      PersonItem,
+      AddPersons
+   },
+   data() {
+      return {
+         addPersons: {
+            key: 'persons_associated',
+            options: {
+               type: ['person'],
+               priority: null,
+               uniq: false,
+            }
+         }
+      }
+   },
+   computed: mapState({
+      participations: state => state.accompanyingCourse.participations,
+      counter: state => state.accompanyingCourse.participations.length
+   }),
+   methods: {
+      removeParticipation(item) {
+         console.log('@@ CLICK remove participation: item', item);
+         this.$store.dispatch('removeParticipation', item);
+      },
+      closeParticipation(item) {
+         console.log('@@ CLICK close participation: item', item);
+         this.$store.dispatch('closeParticipation', item);
+      },
+      addNewPersons({ selected, modal }) {
+         console.log('@@@ CLICK button addNewPersons', selected);
+         selected.forEach(function(item) {
+               this.$store.dispatch('addParticipation', item);
+            }, this
+         );
+         this.$refs.addPersons.resetSearch(); // to cast child method
+         modal.showModal = false;
+      }
+   }
+}
+</script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/PersonItem.vue

@@ -0,0 +1,58 @@
+<template>
+<tr>
+   <td>{{ participation.person.firstName }}</td>
+   <td>{{ participation.person.lastName }}</td>
+   <td><span v-if="participation.startDate">
+       {{ $d(participation.startDate.datetime, 'short') }}</span>
+   </td>
+   <td><span v-if="participation.endDate">
+       {{ $d(participation.endDate.datetime, 'short') }}</span>
+   </td>
+   <td>
+      <ul class="record_actions">
+         <li>
+            <a class="sc-button bt-show" target="_blank"
+               :href="url.show"
+               :title="$t('action.show')">
+            </a>
+         </li>
+         <li>
+            <a class="sc-button bt-update" target="_blank"
+               :href="url.edit"
+               :title="$t('action.edit')">
+            </a>
+         </li>
+         <!--li>
+            <button class="sc-button bt-delete"
+               :title="$t('action.delete')" 
+               @click.prevent="$emit('remove', participation)">
+            </button>
+         </li-->
+         <li>
+            <button v-if="!participation.endDate"
+               class="sc-button bt-remove"
+               :title="$t('action.remove')" 
+               @click.prevent="$emit('close', participation)">
+            </button>
+            <button v-else class="sc-button bt-remove disabled"></button>
+         </li>
+      </ul>
+   </td>
+</tr>
+</template>
+
+<script>
+export default {
+   name: 'PersonItem',
+   props: ['participation'],
+   data() {
+      return {
+         url: {
+            show: '/fr/person/' + this.participation.person.id + '/general',
+            edit: '/fr/person/' + this.participation.person.id + '/general/edit'
+         }
+      }
+   },
+   emits: ['remove', 'close']
+}
+</script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue

@@ -0,0 +1,77 @@
+<template>
+  <div class="vue-component">
+     <h2><a name="section-40"></a>{{ $t('referrer.title') }}</h2>
+     
+     <div class="my-4">
+        <label for="" class="">
+           {{ $t('referrer.label') }}
+        </label>
+        
+        <VueMultiselect
+           track-by="id"
+           label="text"
+           :multiple="false"
+           :searchable="true"
+           :placeholder="$t('referrer.placeholder')"
+           @update:model-value="updateReferrer"
+           :model-value="value"
+           :options="options">
+        </VueMultiselect>
+        
+        <ul class="record_actions">
+           <li>
+             <button 
+                class="sc-button bt-create" 
+                type="button" 
+                name="button"
+                @click="assignMe">
+                {{ $t('referrer.assign_me') }}
+             </button>
+           </li>
+        </ul>
+        
+     </div>
+  </div>
+</template>
+
+<script>
+import VueMultiselect from 'vue-multiselect';
+//import { getUsers } from '../api';
+import { mapState } from 'vuex';
+
+export default {
+   name: "Referrer",
+   components: { VueMultiselect },
+   data() {
+      return {
+         options: []
+      }
+   },
+   computed: {
+      ...mapState({
+         value: state => state.accompanyingCourse.user,
+      }),
+   },
+   mounted() {
+      this.getOptions();
+   },
+   methods: {
+      getOptions() {
+         //getUsers().then(response => new Promise((resolve, reject) => {
+         //   console.log(response);
+         //   resolve();
+         //})).catch(er => this.$store.commit('catchError'), error));
+      },
+      updateReferrer(value) {
+         //this.$store.dispatch('updateReferrer', this.transformValue(value));
+      },
+      transformValue(value) {
+         let payload = value;
+         return { payload, body, method };
+      },
+      assignMe() {
+         console.log('assign me');
+      }
+   }
+}
+</script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue

@@ -0,0 +1,122 @@
+<template>
+<div class="vue-component">
+   
+   <h2><a name="section-20"></a>{{ $t('requestor.title') }}</h2>
+   
+   <div v-if="accompanyingCourse.requestor">
+      <label>
+         <input type="checkbox" v-model="isAnonymous" :value="value" />
+         {{ $t('requestor.is_anonymous') }}
+      </label>
+      
+      <dt>{{ $t('requestor.type') }}</dt>   
+      <dd>{{ accompanyingCourse.requestor.type }}</dd>
+      <dt>{{ $t('requestor.text') }}</dt>   
+      <dd>{{ accompanyingCourse.requestor.text }}</dd>
+      <dt>{{ $t('requestor.is_anonymous') }}</dt>
+      <dd>{{ accompanyingCourse.requestorAnonymous }}</dd>
+         
+      <div v-if="accompanyingCourse.requestor.type === 'person'">
+         <dt>{{ $t('requestor.person_id') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.person_id }}</dd>
+         <dt>{{ $t('requestor.birthdate') }}</dt>   
+         <dd>{{ $d(accompanyingCourse.requestor.birthdate.datetime, 'short') }}</dd>
+         <dt>{{ $t('requestor.center') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.center.name }}</dd>
+         <dt>{{ $t('requestor.firstName') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.firstName }}</dd>
+         <dt>{{ $t('requestor.lastName') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.lastName }}</dd>
+         <dt>{{ $t('requestor.phonenumber') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.phonenumber }}</dd>
+         <dt>{{ $t('requestor.mobilenumber') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.mobilenumber }}</dd>
+         <dt>{{ $t('requestor.altNames') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.altNames }}</dd>
+      </div>
+      
+      <div v-if="accompanyingCourse.requestor.type === 'thirdparty'">
+         <dt>{{ $t('requestor.person_id') }}</dt>   
+         <dd>{{ accompanyingCourse.requestor.thirdparty_id }}</dd>
+         <dt>{{ $t('requestor.address') }}</dt>
+         <dd>{{ accompanyingCourse.requestor.address.text }}</dd>
+         <dt>{{ $t('requestor.location') }}</dt>
+         <dd>{{ accompanyingCourse.requestor.address.postcode.name }}</dd>
+      </div>
+
+      <ul class="record_actions">
+         <li>
+            <button class="sc-button bt-remove"
+               :title="$t('action.remove')" 
+               @click="removeRequestor">
+               {{ $t('action.remove') }}
+            </button>
+         </li>
+      </ul>
+   </div> 
+   <div v-else>
+      <label>{{ $t('requestor.counter') }}</label>
+   </div>  
+   
+   <div>
+      <add-persons v-if="accompanyingCourse.requestor === null"
+         buttonTitle="requestor.add_requestor"
+         modalTitle="requestor.add_requestor"
+         v-bind:key="addPersons.key"
+         v-bind:options="addPersons.options"
+         @addNewPersons="addNewPersons"
+         ref="addPersons"> <!-- to cast child method -->
+      </add-persons>
+   </div>
+
+</div>
+</template>
+
+<script>
+import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'
+
+export default {
+   name: 'Requestor',
+   components: {
+      AddPersons,
+   },
+   data() {
+      return {
+         addPersons: {
+            key: 'requestor',
+            options: {
+               type: ['person', 'thirdparty'],
+               priority: null,
+               uniq: true,
+            }
+         }
+      }
+   },
+   computed: {
+      accompanyingCourse() {
+         return this.$store.state.accompanyingCourse
+      },
+      isAnonymous: {
+         set(value) {
+            console.log('requestorIsAnonymous value',value);
+            this.$store.dispatch('requestorIsAnonymous', value);
+         },
+         get() {
+            return this.$store.state.accompanyingCourse.requestorAnonymous;
+         }
+      }
+   },
+   methods: {
+      removeRequestor() {
+         console.log('@@ CLICK remove requestor: item');
+         this.$store.dispatch('removeRequestor');
+      },
+      addNewPersons({ selected, modal }) {
+         console.log('@@@ CLICK button addNewPersons', selected);
+         this.$store.dispatch('addRequestor', selected.shift());
+         this.$refs.addPersons.resetSearch(); // to cast child method
+         modal.showModal = false;
+      }
+   }
+}
+</script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue

@@ -0,0 +1,85 @@
+<template>
+<div class="vue-component">
+  
+   <h2><a name="section-50"></a>{{ $t('resources.title')}}</h2>
+   
+   <div>
+      <label>{{ $tc('resources.counter', counter) }}</label>
+   </div>
+   
+   <table class="rounded" v-if="resources.length > 0">
+      <thead>
+         <tr>
+            <th class="chill-orange">{{ $t('resources.text') }}</th>
+            <th class="chill-orange">{{ $t('resources.description') }}</th>
+            <th class="chill-orange">{{ $t('action.actions') }}</th>
+         </tr>
+      </thead>
+      <tbody>
+         <resource-item
+            v-for="resource in resources"
+            v-bind:resource="resource"
+            v-bind:key="resource.id"
+            @remove="removeResource">
+         </resource-item>
+      </tbody>
+   </table>
+   
+   <div>
+      <add-persons 
+        buttonTitle="resources.add_resources"
+        modalTitle="resources.add_resources"
+        v-bind:key="addPersons.key"
+        v-bind:options="addPersons.options"
+        @addNewPersons="addNewPersons"
+        ref="addPersons"> <!-- to cast child method -->
+      </add-persons>
+   </div>
+
+</div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
+import ResourceItem from './Resources/ResourceItem.vue';
+
+export default {
+   name: 'Resources',
+   components: {
+      AddPersons,
+      ResourceItem
+   },
+   data() {
+      return {
+         addPersons: {
+            key: 'resources',
+            options: {
+               type: ['person', 'thirdparty'],
+               priority: null,
+               uniq: false,
+            }
+         }
+      }
+   },
+   computed: mapState({
+      resources: state => state.accompanyingCourse.resources,
+      counter: state => state.accompanyingCourse.resources.length
+   }),
+   methods: {
+      removeResource(item) {
+         console.log('@@ CLICK remove resource: item', item);
+         this.$store.dispatch('removeResource', item);
+      },
+      addNewPersons({ selected, modal }) {
+         console.log('@@@ CLICK button addNewPersons', selected);
+         selected.forEach(function(item) {
+               this.$store.dispatch('addResource', item);
+            }, this
+         );
+         this.$refs.addPersons.resetSearch(); // to cast child method
+         modal.showModal = false;
+      }
+   }
+}
+</script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue

@@ -0,0 +1,68 @@
+<template>
+<tr>
+   
+   <td>
+      <span class="badge badge-pill badge-secondary" 
+         v-bind:title="resource.resource.id">
+         <span v-if="resource.resource.type === 'person'" >{{ $t('item.type_person') }}</span>
+         <span v-if="resource.resource.type === 'thirdparty'" >{{ $t('item.type_thirdparty') }}</span>
+      </span>
+      {{ resource.resource.text }}
+   </td>
+      
+   <td v-if="resource.resource.type === 'person'">
+      {{ $tc('person.born') }}{{ $d(resource.resource.birthdate.datetime, 'short') }}
+   </td>
+   <td v-else-if="resource.resource.type === 'thirdparty'">
+      {{ resource.resource.address.text }}<br>
+      {{ resource.resource.address.postcode.name }}
+   </td>
+   
+   <td>
+      <ul class="record_actions">
+         <li>
+            <a class="sc-button bt-show" target="_blank"
+               :href="url.show"
+               :title="$t('action.show')">
+            </a>
+         </li>
+         <li>
+            <a class="sc-button bt-update" target="_blank"
+               :href="url.edit"
+               :title="$t('action.edit')">
+            </a>
+         </li>
+         <li>
+            <button
+               class="sc-button bt-remove"
+               :title="$t('action.remove')" 
+               @click.prevent="$emit('remove', resource)">
+            </button>
+            
+         </li>
+      </ul>
+   </td>
+</tr>
+</template>
+
+<script>
+export default {
+   name: 'ResourceItem',
+   props: ['resource'],
+   emits: ['remove'],
+   computed: {
+      type() {
+         return this.resource.resource.type;
+      },
+      url() {
+         return (this.type === 'person') ? {
+            show: `/fr/person/${this.resource.resource.id}/general`,
+            edit: `/fr/person/${this.resource.resource.id}/general/edit`
+         } : {
+            show: `/fr/thirdparty/thirdparty/${this.resource.resource.id}/show`,
+            edit: `/fr/thirdparty/thirdparty/${this.resource.resource.id}/update`
+         }
+      }
+   }
+}
+</script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue

@@ -0,0 +1,80 @@
+<template>
+  <div class="vue-component">
+     <h2><a name="section-30"></a>{{ $t('social_issue.title') }}</h2>
+     
+     <div class="my-4">
+        <!--label for="field">{{ $t('social_issue.label') }}</label
+        -->
+        <VueMultiselect
+           name="field"
+           :close-on-select="false"
+           :allow-empty="true" 
+           :show-labels="false" 
+           track-by="id"
+           label="text"
+           :multiple="true"
+           :searchable="false"
+           :placeholder="$t('social_issue.label')"
+           @update:model-value="updateSocialIssues"
+           :model-value="value"
+           :options="options">
+        </VueMultiselect>
+     </div>
+     
+  </div>
+</template>
+
+<script>
+import VueMultiselect from 'vue-multiselect';
+import { getSocialIssues } from '../api';
+import { mapState } from 'vuex';
+
+export default {
+   name: "SocialIssue",
+   components: { VueMultiselect },
+   data() {
+      return {
+         options: []
+      }
+   },
+   computed: {
+      ...mapState({
+         value: state => state.accompanyingCourse.socialIssues,
+      }),
+   },
+   mounted() {
+      this.getOptions();
+   },
+   methods: {
+      getOptions() {
+         getSocialIssues().then(response => new Promise((resolve, reject) => {
+            //console.log('get socialIssues', response.results);
+            this.options = response.results;
+            resolve();
+         })).catch(error => this.$store.commit('catchError', error));        
+      },
+      updateSocialIssues(value) {
+         this.$store.dispatch('updateSocialIssues', this.transformValue(value));
+      },
+      transformValue(updated) {
+         let stored = this.value;
+         let added = updated.filter(x => stored.indexOf(x) === -1).shift();
+         let removed = stored.filter(x => updated.indexOf(x) === -1).shift();
+         let method = (typeof removed === 'undefined') ? 'POST' : 'DELETE';         
+         let changed = (typeof removed === 'undefined') ? added : removed;
+         let body = { type: "social_issue", id: changed.id };
+         //console.log('body', body);
+         //console.log('@@@', method, changed.text);
+         let payload = updated;
+         return { payload, body, method };
+      }
+   }
+}
+</script>
+
+<style src="vue-multiselect/dist/vue-multiselect.css"></style>
+<style lang="scss">
+   span.multiselect__tag {
+      background: #e2793d;
+   }
+</style>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue

@@ -0,0 +1,191 @@
+<template>
+   <teleport to="#content_conainter .container.content .container">
+      <div id="navmap">
+         <nav>
+            <a class="top" href="#top">
+               <i class="fa fa-fw fa-square"></i>
+               <span>{{ $t('nav.top') }}</span>
+            </a>
+            <item
+               v-for="item of items"
+               :key="item.key"
+               :item="item"
+               :step="step">
+            </item>
+         </nav>
+      </div>
+   </teleport>
+</template>
+
+<script>
+import Item from './StickyNav/Item.vue';
+
+export default {
+   name: "StickyNav",
+   components: {
+      Item
+   },
+   data() {
+      return {
+         header: document.querySelector("header.navigation.container"),
+         bannerName: document.querySelector("#header-accompanying_course-name"),
+         bannerDetails: document.querySelector("#header-accompanying_course-details"),
+         container: null,
+         heightSum: null,
+         stickyNav: null,
+         limit: 25,
+         anchors: null,
+         items: [],
+      }
+   },
+   computed: {
+      accompanyingCourse() {
+         return this.$store.state.accompanyingCourse;
+      },
+      step() {
+         return this.accompanyingCourse.step;
+      },
+      top() {
+         return parseInt(window.getComputedStyle(this.stickyNav).getPropertyValue('top').slice(0, -2));
+      },
+   },
+   mounted() {
+      this.ready();
+      window.addEventListener('scroll', this.handleScroll);
+   },
+   destroyed() {
+      window.removeEventListener('scroll', this.handleScroll);
+   },
+   methods: {
+      ready() {
+
+         // load datas DOM when mounted ready
+         this.container = document.querySelector("#content_conainter .container.content .container");
+         this.stickyNav = document.querySelector('#navmap');
+         this.anchors = document.querySelectorAll("h2 a[name^='section']");
+         this.initItemsMap();                  
+         
+         // TODO resizeObserver not supports IE !
+         // Listen when elements change size, then recalculate heightSum and initItemsMap
+         const resizeObserver = new ResizeObserver(entries => {
+            this.refreshPos();
+         });
+         
+         resizeObserver.observe(this.header);
+         resizeObserver.observe(this.bannerName);
+         resizeObserver.observe(this.bannerDetails);
+         resizeObserver.observe(this.container);
+      },
+      initItemsMap() {
+         
+         this.anchors.forEach(anchor => {
+            this.items.push({
+               pos: null,
+               active: false,
+               key: parseInt(anchor.name.slice(8).slice(0, -1)),
+               name: '#' + anchor.name
+            })
+         });
+      },
+      refreshPos() {
+         
+         //console.log('refreshPos');
+         this.heightSum = this.header.offsetHeight + this.bannerName.offsetHeight + this.bannerDetails.offsetHeight;
+         
+         this.anchors.forEach((anchor, i) => {
+            this.items[i].pos = this.findPos(anchor)['y'];
+         });
+      },
+      findPos(element) {
+         
+          let posX = 0, posY = 0;
+          do {
+              posX += element.offsetLeft;
+              posY += element.offsetTop;
+              element = element.offsetParent;
+          }
+          while( element != null );
+          
+          let pos = [];
+          pos['x'] = posX;
+          pos['y'] = posY;
+          
+          return pos;
+      },
+      handleScroll(event) {
+         
+         let pos = this.findPos(this.stickyNav);
+         let top = this.heightSum + this.top - window.scrollY;
+         //console.log(window.scrollY); 
+         
+         if (top > this.limit) {            
+            this.stickyNav.style.position = 'absolute';
+            this.stickyNav.style.left = '-60px';
+         } else {
+            this.stickyNav.style.position = 'fixed';
+            this.stickyNav.style.left = pos['x'] + 'px';
+         }
+         
+         this.switchActive();
+      },
+      switchActive() {
+         
+         this.items.forEach((item, i) => {
+            let next = (this.items[i+1]) ? this.items[i+1].pos : '100000';
+            item.active = 
+                (window.scrollY >= item.pos & window.scrollY < next) ? true : false;
+         }, this);
+         
+         // last item never switch active because scroll reach bottom of page 
+         if (document.body.scrollHeight == window.scrollY + window.innerHeight) {
+            this.items[this.items.length-1].active = true;
+            this.items[this.items.length-2].active = false;
+         } else {
+            this.items[this.items.length-1].active = false;
+         }
+      }
+   }
+}
+</script>
+
+<style lang="scss">
+div#navmap {
+   position: absolute;
+   top: 30px;
+   left: -60px; //-10%;
+   nav {
+      font-size: small;
+      a {
+         display: block;
+         box-sizing: border-box;
+         margin-bottom: -3px;
+         color: #71859669;
+         &.top {
+            color: #718596;
+         }
+         span {
+            display: none;
+         }
+         &:hover, 
+         &.active {
+            span {
+               display: inline;
+               padding-left: 8px;
+            }
+         }
+         &:hover {
+            color: #718596b5;
+         }
+         &.active {
+            color: #e2793d; //orange
+            //color: #eec84a; //jaune
+         }
+      }
+   }
+}
+@media only screen and (max-width: 768px) {
+   div.sticky-section {
+      display: none;
+   }
+}
+</style>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue

@@ -0,0 +1,30 @@
+<template>
+   <a 
+      v-if="item.key <= 5"
+      :href="item.name" 
+      :class="{ 'active': isActive }"
+      >
+      <i class="fa fa-fw fa-square"></i>
+      <span>{{ item.key }}</span>
+   </a>
+   <a 
+      v-else-if="step === 'DRAFT'"
+      :href="item.name" 
+      :class="{ 'active': isActive }"
+      >
+      <i class="fa fa-fw fa-square"></i>
+      <span>{{ item.key }}</span>
+   </a>
+</template>
+
+<script>
+export default {
+   name: "Item",
+   props: ['item', 'step'],
+   computed: {
+      isActive() {
+         return this.item.active;
+      }
+   }
+}
+</script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Test.vue

@@ -0,0 +1,81 @@
+<template>
+<div class="vue-component">
+   <h2></a>Tests</h2>
+   
+   <!-- Modal -->
+   <ul class="record_actions">
+      <li>
+         <button class="sc-button bt-create" @click="modal1.showModal = true">
+            {{ $t('action.show_modal') }}
+         </button>
+      </li>
+      <li>
+         <button class="sc-button bt-create" @click="modal2.showModal = true">
+            Ouvrir une seconde modale
+         </button>
+      </li>
+   </ul>
+   
+   <teleport to="body">
+   <modal v-if="modal1.showModal" :modalDialogClass="modal1.modalDialogClass" @close="modal1.showModal = false">      
+      <template v-slot:header>
+         <h2 class="modal-title">Le titre de ma modale</h2>
+      </template>
+      <template v-slot:body>
+         <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus luctus facilisis suscipit. Cras pulvinar, purus sagittis pulvinar porta, enim ex posuere lacus, in pulvinar lectus magna in odio. Nullam iaculis congue lorem ac suscipit. Proin ut rutrum augue. Ut vehicula risus nec hendrerit ullamcorper. Ut volutpat eu mi eget viverra. Morbi dictum placerat suscipit. </p>
+         <p>Quisque non erat tincidunt, lacinia justo ut, pulvinar nisl. Nunc id enim ut sem pretium interdum consectetur eu quam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Etiam posuere erat eget augue finibus luctus. Maecenas auctor, tortor non luctus ultrices, neque neque porttitor ex, nec lacinia lorem ligula et elit. Sed tempor nulla vitae lorem sollicitudin dictum. Vestibulum nec arcu eget elit pulvinar pretium. Phasellus facilisis metus sed diam luctus, feugiat scelerisque velit dignissim.</p>
+         <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus luctus facilisis suscipit. Cras pulvinar, purus sagittis pulvinar porta, enim ex posuere lacus, in pulvinar lectus magna in odio. Nullam iaculis congue lorem ac suscipit. Proin ut rutrum augue. Ut vehicula risus nec hendrerit ullamcorper. Ut volutpat eu mi eget viverra. Morbi dictum placerat suscipit. </p>
+         <p>Quisque non erat tincidunt, lacinia justo ut, pulvinar nisl. Nunc id enim ut sem pretium interdum consectetur eu quam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Etiam posuere erat eget augue finibus luctus. Maecenas auctor, tortor non luctus ultrices, neque neque porttitor ex, nec lacinia lorem ligula et elit. Sed tempor nulla vitae lorem sollicitudin dictum. Vestibulum nec arcu eget elit pulvinar pretium. Phasellus facilisis metus sed diam luctus, feugiat scelerisque velit dignissim.</p>
+         <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus luctus facilisis suscipit. Cras pulvinar, purus sagittis pulvinar porta, enim ex posuere lacus, in pulvinar lectus magna in odio. Nullam iaculis congue lorem ac suscipit. Proin ut rutrum augue. Ut vehicula risus nec hendrerit ullamcorper. Ut volutpat eu mi eget viverra. Morbi dictum placerat suscipit. </p>
+         <p>Quisque non erat tincidunt, lacinia justo ut, pulvinar nisl. Nunc id enim ut sem pretium interdum consectetur eu quam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Etiam posuere erat eget augue finibus luctus. Maecenas auctor, tortor non luctus ultrices, neque neque porttitor ex, nec lacinia lorem ligula et elit. Sed tempor nulla vitae lorem sollicitudin dictum. Vestibulum nec arcu eget elit pulvinar pretium. Phasellus facilisis metus sed diam luctus, feugiat scelerisque velit dignissim.</p>
+      </template>
+      <template v-slot:footer>
+         <button class="sc-button green" @click="modal1.showModal = false; modal2.showModal = true">
+            {{ $t('action.next')}}</button>
+      </template>
+   </modal>
+   </teleport>
+   
+   <teleport to="body">
+   <modal v-if="modal2.showModal" :modalDialogClass="modal2.modalDialogClass" @close="modal2.showModal = false">      
+      <template v-slot:header>
+         <h2 class="modal-title">Une autre modale</h2>
+      </template>
+      <template v-slot:body>
+         <p>modal 2</p>
+      </template>
+      <template v-slot:footer>
+         <button class="sc-button green" @click="modal2.showModal = false">
+            {{ $t('action.save')}}</button>
+      </template>
+   </modal>
+   </teleport>
+   <!-- END Modal -->
+   
+</div>
+</template>
+
+<script>
+import Modal from 'ChillMainAssets/vuejs/_components/Modal'
+
+export default {
+   name: 'Test',
+   components: {
+      Modal,
+   },
+   data() {
+      return {
+         modal1: {
+            showModal: false,
+            modalDialogClass: "modal-dialog-scrollable modal-xl"  // modal-lg modal-md modal-sm
+         },
+         modal2: {
+            showModal: false,
+            modalDialogClass: "modal-dialog-centered modal-sm"  // modal-lg modal-md modal-sm
+         }
+      }
+   },
+   computed: {
+   }
+}
+</script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js

@@ -0,0 +1,23 @@
+import { createApp } from 'vue'
+import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
+import { appMessages } from './js/i18n'
+import { initPromise } from './store'
+
+import App from './App.vue';
+
+initPromise.then(store => {
+
+   //console.log('store in create_store', store);
+   //console.log('store accompanyingCourse', store.state.accompanyingCourse);
+
+   const i18n = _createI18n(appMessages);
+  
+   const app = createApp({
+      template: `<app></app>`,
+   })
+   .use(store)
+   .use(i18n)
+   .component('app', App)
+   .mount('#accompanying-course');
+   
+});

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js

@@ -0,0 +1,95 @@
+import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+
+const appMessages = {
+   fr: {
+      course: {
+         id: "id",
+         title: {
+            draft: "Création d'un nouveau parcours",
+            active: "Modification du parcours"
+         },
+         opening_date: "Date d'ouverture",
+         closing_date: "Date de clôture",
+         remark: "Commentaire",
+         closing_motive: "Motif de clôture",
+         user: "TMS",
+         flags: "Indicateurs",
+         status: "État",
+         step: {
+            draft: "Brouillon",
+            active: "En file active"
+         },
+         open_at: "ouvert le ",
+         by: "par ", 
+         emergency: "urgent",
+         confidential: "confidentiel",
+         regular: "régulier",
+         occasional: "ponctuel"
+      },
+      persons_associated: {
+         title: "Usagers concernés",
+         counter: "Il n'y a pas encore d'usager | 1 usager | {count} usagers",
+         firstname: "Prénom",
+         lastname: "Nom",
+         startdate: "Date d'entrée",
+         enddate: "Date de sortie",
+         add_persons: "Ajouter des usagers",
+      },
+      requestor: {
+         title: "Demandeur",
+         add_requestor: "Ajouter un demandeur",
+         is_anonymous: "Le demandeur est anonyme",
+         counter: "Il n'y a pas encore de demandeur",
+         type: "Type",
+         person_id: "id",
+         text: "Dénomination",
+         firstName: "Prénom",
+         lastName: "Nom",
+         birthdate: "Date de naissance",
+         center: "Centre",
+         phonenumber: "Téléphone",
+         mobilenumber: "Mobile",
+         altNames: "Autres noms",
+         address: "Adresse",
+         location: "Localité",
+      },
+      social_issue: {
+         title: "Problématiques sociales",
+         label: "Choisir les problématiques sociales",
+      },
+      referrer: {
+         title: "Référent du parcours",
+         label: "Vous pouvez choisir un TMS ou vous assigner directement comme référent",
+         placeholder: "Choisir un TMS",
+         assign_me: "M'assigner comme référent",
+      },
+      resources: {
+         title: "Interlocuteurs privilégiés",
+         counter: "Il n'y a pas encore d'interlocuteur | 1 interlocuteur | {count} interlocuteurs",
+         text: "Dénomination",
+         description: "Description",
+         add_resources: "Ajouter des interlocuteurs",
+      },
+      comment: {
+         title: "Observations",
+         label: "Ajout d'une note",
+         content: "Rédigez une première note...",
+         created_by: "créé par {0}, le {1}" 
+      },
+      confirm: {
+         title: "Confirmation",
+         text_draft: "Le parcours est actuellement à l'état de ",
+         text_active: "En validant cette étape, vous lui donnez le statut ",
+         sure: "Êtes-vous sûr ?",
+         sure_description: "Une fois le changement confirmé, il n'est plus possible de le remettre à l'état de brouillon !",
+         ok: "Confirmer le parcours"
+      },
+
+   }
+};
+
+Object.assign(appMessages.fr, personMessages.fr);
+
+export {
+   appMessages
+};

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js

@@ -0,0 +1,204 @@
+import 'es6-promise/auto';
+import { createStore } from 'vuex';
+import { getAccompanyingCourse, 
+   patchAccompanyingCourse,
+   confirmAccompanyingCourse,
+   postParticipation, 
+   postRequestor,
+   postResource,
+   postSocialIssue } from '../api';
+
+const debug = process.env.NODE_ENV !== 'production';
+const id = window.accompanyingCourseId;
+
+let initPromise = getAccompanyingCourse(id)
+   .then(accompanying_course => new Promise((resolve, reject) => {
+            
+      const store = createStore({
+         strict: debug,
+         modules: {
+         },
+         state: {
+            accompanyingCourse: accompanying_course,
+            errorMsg: []
+         },
+         getters: {
+         },
+         mutations: {
+            catchError(state, error) {
+               state.errorMsg.push(error); 
+            },
+            removeParticipation(state, participation) {
+               //console.log('### mutation: remove participation', participation.id);
+               state.accompanyingCourse.participations = state.accompanyingCourse.participations.filter(element => element !== participation);
+            },
+            closeParticipation(state, { participation, payload }) {
+               //console.log('### mutation: close item', { participation, payload });
+               // find row position and replace by closed participation
+               state.accompanyingCourse.participations.splice(
+                  state.accompanyingCourse.participations.findIndex(element => element === payload), 1, participation
+               );
+            },
+            addParticipation(state, participation) {
+               //console.log('### mutation: add participation', participation);
+               state.accompanyingCourse.participations.push(participation);
+            },
+            removeRequestor(state) {
+               //console.log('### mutation: removeRequestor');
+               state.accompanyingCourse.requestor = null;
+            },
+            addRequestor(state, requestor) {
+               //console.log('### mutation: addRequestor', requestor);
+               state.accompanyingCourse.requestor = requestor;
+            },
+            requestorIsAnonymous(state, value) {
+               //console.log('### mutation: requestorIsAnonymous', value);
+               state.accompanyingCourse.requestorAnonymous = value;
+            },
+            removeResource(state, resource) {
+               //console.log('### mutation: removeResource', resource);
+               state.accompanyingCourse.resources = state.accompanyingCourse.resources.filter(element => element !== resource);
+            },
+            addResource(state, resource) {
+               //console.log('### mutation: addResource', resource);
+               state.accompanyingCourse.resources.push(resource);
+            },
+            toggleIntensity(state, value) {
+               state.accompanyingCourse.intensity = value;
+            },
+            toggleEmergency(state, value) {
+               //console.log('### mutation: toggleEmergency');
+               state.accompanyingCourse.emergency = value;
+            },
+            toggleConfidential(state, value) {
+               //console.log('### mutation: toggleConfidential');
+               state.accompanyingCourse.confidential = value;
+            },
+            postFirstComment(state, comment) {
+               //console.log('### mutation: postFirstComment', comment);
+               state.accompanyingCourse.initialComment = comment;
+            }, 
+            updateSocialIssues(state, value) {
+               state.accompanyingCourse.socialIssues = value;
+            },
+            confirmAccompanyingCourse(state, response) {
+               //console.log('### mutation: confirmAccompanyingCourse: response', response);
+               state.accompanyingCourse.step = response.step;
+            }
+         },
+         actions: {
+            removeParticipation({ commit }, payload) {
+               commit('removeParticipation', payload);
+               // fetch DELETE request...
+            },
+            closeParticipation({ commit }, payload) {
+               //console.log('## action: fetch delete participation: payload', payload);
+               postParticipation(id, payload.person, 'DELETE')
+               .then(participation => new Promise((resolve, reject) => {
+                  commit('closeParticipation', { participation, payload });
+                  resolve();
+               })).catch((error) => { commit('catchError', error) }); 
+            },
+            addParticipation({ commit }, payload) {
+               //console.log('## action: fetch post participation (select item): payload', payload);
+               postParticipation(id, payload.result, 'POST')
+               .then(participation => new Promise((resolve, reject) => {
+                  commit('addParticipation', participation);
+                  resolve();
+               })).catch((error) => { commit('catchError', error) }); 
+            },
+            removeRequestor({ commit, dispatch }) {
+               //console.log('## action: fetch delete requestor');
+               postRequestor(id, null, 'DELETE')
+               .then(requestor => new Promise((resolve, reject) => {
+                  commit('removeRequestor');
+                  dispatch('requestorIsAnonymous', false);
+                  resolve();
+               })).catch((error) => { commit('catchError', error) }); 
+            },
+            addRequestor({ commit }, payload) {
+               //console.log('## action: fetch post requestor: payload', payload);
+               postRequestor(id, payload.result, 'POST')
+               .then(requestor => new Promise((resolve, reject) => {
+                  commit('addRequestor', requestor);
+                  resolve();
+               })).catch((error) => { commit('catchError', error) }); 
+            },
+            requestorIsAnonymous({ commit }, payload) {
+               //console.log('## action: fetch patch AccompanyingCourse: payload', payload);
+               patchAccompanyingCourse(id, { type: "accompanying_period", requestorAnonymous: payload })
+               .then(course => new Promise((resolve, reject) => {
+                  commit('requestorIsAnonymous', course.requestorAnonymous)
+                  resolve();
+               })).catch((error) => { commit('catchError', error) });
+            },
+            removeResource({ commit }, payload) {
+               //console.log('## action: fetch postResource: payload', payload);
+               postResource(id, payload, 'DELETE')
+               .then(resource => new Promise((resolve, reject) => {
+                  commit('removeResource', payload) // mieux un retour de l'objet !
+                  resolve();
+               })).catch((error) => { commit('catchError', error) });
+            },
+            addResource({ commit }, payload) {
+               //console.log('## action: fetch postResource: payload', payload);
+               postResource(id, payload.result, 'POST')
+               .then(resource => new Promise((resolve, reject) => {
+                  commit('addResource', resource)
+                  resolve();
+               })).catch((error) => { commit('catchError', error) });
+            },
+            toggleIntensity({ commit }, payload) {
+               //console.log(payload);
+               patchAccompanyingCourse(id, { type: "accompanying_period", intensity: payload })
+               .then(course => new Promise((resolve, reject) => {
+                  commit('toggleIntensity', course.intensity);
+                  resolve();
+               })).catch((error) => { commit('catchError', error) });
+            },
+            toggleEmergency({ commit }, payload) {
+               patchAccompanyingCourse(id, { type: "accompanying_period", emergency: payload })
+               .then(course => new Promise((resolve, reject) => {
+                  commit('toggleEmergency', course.emergency);
+                  resolve();
+               })).catch((error) => { commit('catchError', error) });
+            },
+            toggleConfidential({ commit }, payload) {
+               patchAccompanyingCourse(id, { type: "accompanying_period", confidential: payload })
+               .then(course => new Promise((resolve, reject) => {
+                  commit('toggleConfidential', course.confidential);
+                  resolve();
+               })).catch((error) => { commit('catchError', error) });
+            },
+            postFirstComment({ commit }, payload) {
+               //console.log('## action: postFirstComment: payload', payload);
+               patchAccompanyingCourse(id, { type: "accompanying_period", initialComment: payload })
+               .then(course => new Promise((resolve, reject) => {
+                  commit('postFirstComment', course.initialComment);
+                  resolve();
+               })).catch((error) => { commit('catchError', error) });
+            },
+            updateSocialIssues({ commit }, { payload, body, method }) {
+               //console.log('## action: payload', { payload, body, method });
+               postSocialIssue(id, body, method)
+               .then(response => new Promise((resolve, reject) => {
+                  //console.log('response', response);
+                  commit('updateSocialIssues', payload);
+                  resolve();
+               })).catch((error) => { commit('catchError', error) });
+            },
+            confirmAccompanyingCourse({ commit }) {
+               //console.log('## action: confirmAccompanyingCourse');
+               confirmAccompanyingCourse(id)
+               .then(response => new Promise((resolve, reject) => {
+                  commit('confirmAccompanyingCourse', response);
+                  console.log('fetch resolve'); // redirection with #top anchor
+                  resolve();
+               })).catch((error) => { commit('catchError', error) });
+            }
+         }
+      });
+      resolve(store);
+   }));
+
+export { initPromise };

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js

@@ -0,0 +1,46 @@
+/*
+* Build query string with query and options
+*/
+const parametersToString = ({ query, options }) => {
+   let types ='';
+   options.type.forEach(function(type) { 
+      types += '&type[]=' + type;
+   }); 
+   return 'q=' + query + types;
+};
+
+/* 
+* Endpoint chill_person_search
+* method GET, get a list of persons
+* 
+*  @query string - the query to search for
+*/
+const searchPersons =  ({ query, options }) => {
+   let queryStr = parametersToString({ query, options });
+   let url = `/fr/search.json?name=person_regular&${queryStr}`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response'); 
+      });
+};
+
+/* 
+* Endpoint v.2 chill_main_search_global
+* method GET, get a list of persons and thirdparty
+* 
+*  NOTE: this is a temporary WIP endpoint, return inconsistent random results
+*  @query string - the query to search for
+*/
+const searchPersons_2 =  ({ query, options }) => {
+   let queryStr = parametersToString({ query, options });
+   let url = `/api/1.0/search.json?${queryStr}`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response'); 
+      });
+};
+
+
+export { searchPersons, searchPersons_2 };

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue

@@ -0,0 +1,254 @@
+<template>
+   <ul class="record_actions">
+      <li>
+         <button class="sc-button bt-create" @click="openModal">
+            {{ $t(buttonTitle) }}
+         </button>
+      </li>
+   </ul>
+
+   <teleport to="body">
+      <modal v-if="modal.showModal"
+         :modalDialogClass="modal.modalDialogClass"
+         @close="modal.showModal = false">
+
+         <template v-slot:header>
+            <h3 class="modal-title">{{ $t(modalTitle) }}</h3>
+         </template>
+
+         <template v-slot:body-head>
+            <div class="modal-body">
+               <div class="search">
+                  
+                  <label style="float: right;">
+                     {{ $tc('add_persons.suggested_counter', suggestedCounter) }}
+                  </label>
+
+                  <input id="search-persons"
+                     name="query"
+                     v-model="query"
+                     :placeholder="$t('add_persons.search_some_persons')"
+                     ref="search" />
+                  <i class="fa fa-search fa-lg"></i>
+                  <i class="fa fa-times" v-if="queryLength >= 3" @click="resetSuggestion"></i>
+
+               </div>
+            </div>
+            <div class="modal-body" v-if="checkUniq === 'checkbox'">
+               <div class="count">
+                  <span>
+                     <a v-if="suggestedCounter > 2" @click="selectAll">
+                        {{ $t('action.check_all')}}
+                     </a>
+                     <a v-if="selectedCounter > 0" @click="resetSelection">
+                        <i v-if="suggestedCounter > 2"> • </i>
+                        {{ $t('action.reset')}}
+                     </a>
+                  </span>
+                  <span v-if="selectedCounter > 0">
+                     {{ $tc('add_persons.selected_counter', selectedCounter) }}
+                  </span>
+               </div>
+            </div>
+         </template>
+
+         <template v-slot:body>
+            <!--span class="discret">Selection: {{ selected }}</span-->
+            <div class="results">
+
+               <person-suggestion
+                  v-for="item in this.selectedAndSuggested.slice().reverse()"
+                  v-bind:key="itemKey(item)"
+                  v-bind:item="item"
+                  v-bind:search="search"
+                  v-bind:type="checkUniq"
+                  @updateSelected="updateSelected">
+               </person-suggestion>
+
+               <button v-if="query.length >= 3" class="sc-button bt-create ml-5 mt-2" name="createPerson">
+                  {{ $t('action.create') }} "{{ query }}"
+               </button>
+            </div>
+         </template>
+
+         <template v-slot:footer>
+            <button class="sc-button green" 
+               @click.prevent="$emit('addNewPersons', { selected, modal })">
+               <i class="fa fa-plus fa-fw"></i>{{ $t('action.add')}}
+            </button>
+         </template>
+
+      </modal>
+   </teleport>
+</template>
+
+<script>
+import Modal from 'ChillMainAssets/vuejs/_components/Modal';
+import PersonSuggestion from './AddPersons/PersonSuggestion';
+import { searchPersons, searchPersons_2 } from 'ChillPersonAssets/vuejs/_api/AddPersons';
+
+export default {
+   name: 'AddPersons',
+   components: {
+      Modal,
+      PersonSuggestion,
+   },
+   props: [
+      'buttonTitle',
+      'modalTitle',
+      'options'
+   ],
+   emits: ['addNewPersons'],
+   data() {
+      return {
+         modal: {
+            showModal: false,
+            modalDialogClass: "modal-dialog-scrollable modal-xl"
+         },
+         search: {
+            query: "",
+            suggested: [],
+            selected: []
+         }
+      }
+   },
+   computed: {
+      query: {
+         set(query) {
+            return this.setQuery(query);
+         },
+         get() {
+            return this.search.query;
+         }
+      },
+      queryLength() {
+         return this.search.query.length;
+      },
+      suggested() {
+         return this.search.suggested;
+      },
+      suggestedCounter() {
+         return this.search.suggested.length;
+      },
+      selected() {
+         return this.search.selected;
+      },
+      selectedCounter() {
+         return this.search.selected.length;
+      },
+      selectedAndSuggested() {
+         const uniqBy = (a, key) => [
+               ...new Map(
+                  a.map(x => [key(x), x])
+               ).values()
+         ];
+         let union = [...new Set([
+            ...this.suggested.slice().reverse(),
+            ...this.selected.slice().reverse(), 
+         ])];
+         return uniqBy(union, k => k.key);
+      },
+      options() {
+         return this.options;
+      },
+      checkUniq() {
+         if (this.options.uniq === true) {
+            return 'radio';
+         }
+         return 'checkbox';
+      }
+   },
+   methods: {
+      openModal() {
+         this.modal.showModal = true;
+         this.$nextTick(function() {
+            this.$refs.search.focus();
+         })
+      },
+      setQuery(query) {
+         this.search.query = query;
+         if (query.length >= 3) {
+            searchPersons_2({ query, options: this.options })
+               .then(suggested => new Promise((resolve, reject) => {
+                  console.log('suggested', suggested);
+                  this.loadSuggestions(suggested.results);
+                  resolve();
+            }));
+         } else {
+            this.loadSuggestions([]);
+         }
+      },
+      loadSuggestions(suggested) { 
+         console.log('suggested', suggested);
+         this.search.suggested = suggested;
+         this.search.suggested.forEach(function(item) {
+            item.key = this.itemKey(item);
+         }, this);
+      },
+      updateSelected(value) {
+         console.log('value', value);
+         this.search.selected = value;
+      },
+      resetSearch() {
+         this.resetSelection();
+         this.resetSuggestion();
+      },
+      resetSuggestion() {
+         this.search.query = "";
+         this.search.suggested = [];
+      },
+      resetSelection() {
+         this.search.selected = [];
+      },
+      selectAll() {
+         this.search.suggested.forEach(function(item) {
+            this.search.selected.push(item);
+         }, this);
+      },
+      itemKey(item) {
+         return item.result.type + item.result.id;
+      }
+   },
+}
+</script>
+
+<style lang="scss">
+   div.body-head {
+      overflow-y: unset;
+      div.modal-body:first-child {
+         margin: auto 4em;
+         div.search {
+            position: relative;
+            input { 
+               padding: 1.2em 1.5em 1.2em 2.5em;
+               margin: 1em 0;
+            }
+            i {
+               position: absolute;
+               opacity: 0.5;
+               padding: 0.65em 0;
+               top: 50%; 
+            }
+            i.fa-search {
+               left: 0.5em;
+            }
+            i.fa-times {
+               right: 1em;
+               padding: 0.75em 0;
+               cursor: pointer;
+            }
+         }
+      }
+      div.modal-body:last-child {
+         padding-bottom: 0;
+      }
+      div.count {
+         margin: -0.5em 0 0.7em;
+         display: flex;
+         justify-content: space-between;
+         a {
+            cursor: pointer;
+         }
+      }
+   }
+</style>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue

@@ -0,0 +1,101 @@
+<template>
+   <div class="list-item" :class="{ checked: isChecked }">
+         
+         <div class="container">
+            <input 
+               v-bind:type="type" 
+               v-model="selected"
+               name="item"
+               v-bind:id="item"
+               v-bind:value="setValueByType(item, type)" />
+         </div>
+            
+         <suggestion-person 
+            v-if="item.result.type === 'person'"
+            v-bind:item="item">
+         </suggestion-person>
+         
+         <suggestion-third-party 
+            v-if="item.result.type === 'thirdparty'"
+            v-bind:item="item">
+         </suggestion-third-party>
+
+   </div>
+</template>
+
+<script>
+import SuggestionPerson from './TypePerson';
+import SuggestionThirdParty from './TypeThirdParty';
+
+export default {
+   name: 'PersonSuggestion',
+   components: {
+      SuggestionPerson,
+      SuggestionThirdParty,
+   },
+   props: [
+      'item', 
+      'search',
+      'type'
+   ],
+   emits: ['updateSelected'],
+   computed: {
+      selected: {
+         set(value) {
+            console.log('value', value);
+            this.$emit('updateSelected', value);
+         },
+         get() {
+            return this.search.selected;
+         }
+      },
+      isChecked() {
+         return (this.search.selected.indexOf(this.item) === -1) ? false : true;
+      },
+   },
+   methods: {
+      setValueByType(value, type) {
+         return (type === 'radio')? [value] : value;
+      }
+   }
+};
+</script>
+
+<style lang="scss">
+   div.results {   
+      div.list-item {
+         padding: 0.4em 0.8em;
+         display: flex;
+         flex-direction: row;
+         &.checked {
+            background-color: #ececec;
+            border-bottom: 1px dotted #8b8b8b;
+         }
+         div.container {
+            & > input {
+               margin-right: 0.8em;
+            }
+            span:not(.name) {
+               margin-left: 0.5em;
+               opacity: 0.5;
+               font-size: 90%;
+               font-style: italic;
+            }
+         }
+         div.right_actions {
+            margin: 0 0 0 auto;
+            display: flex;
+            align-items: flex-end;
+            & > * {
+               margin-left: 0.5em;
+               align-self: baseline;
+            }
+            a.sc-button {
+               border: 1px solid lightgrey;
+               font-size: 70%;
+               padding: 4px;
+            } 
+         }
+      }
+   }
+</style>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue

@@ -0,0 +1,35 @@
+<template>
+   <div class="container">
+   
+      <span class="name">
+         {{ item.result.text }}
+      </span>
+      <span class="birthday">
+         {{ $d(item.result.birthdate.datetime, 'short') }}
+      </span>
+      
+   </div>
+   <div class="right_actions">
+      
+      <span class="badge badge-pill badge-secondary" :title="item.key">
+         {{ $t('item.type_person') }}
+      </span>
+      <a class="sc-button bt-show" target="_blank" :title="item.key" :href="url.show"></a>
+      
+   </div>
+</template>
+
+<script>
+export default {
+   name: 'SuggestionPerson',
+   props: ['item'],
+   data() {
+      return {
+         url: {
+            show: '/fr/person/' + this.item.result.person_id + '/general',
+            edit: '/fr/person/' + this.item.result.person_id + '/general/edit'
+         },
+      }
+   },
+}
+</script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue

@@ -0,0 +1,36 @@
+<template>
+   <div class="container">
+   
+      <span class="name">
+         {{ item.result.text }}
+      </span>
+      <span class="location">
+         {{ item.result.address.text }} - 
+         {{ item.result.address.postcode.name }}
+      </span>
+      
+   </div>
+   <div class="right_actions">
+      
+      <span class="badge badge-pill badge-secondary" :title="item.key">
+         {{ $t('item.type_thirdparty') }}
+      </span>
+      <a class="sc-button bt-show" target="_blank" :title="item.key" :href="url.show"></a>
+      
+   </div>
+</template>
+
+<script>
+export default {
+   name: 'SuggestionThirdParty',
+   props: ['item'],
+   data() {
+      return {
+         url: {
+            show: '/fr/thirdparty/thirdparty/' + this.item.result.thirdparty_id + '/show',
+            edit: '/fr/thirdparty/thirdparty/' + this.item.result.thirdparty_id + '/edit'
+         },
+      }
+   },
+}
+</script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js

@@ -0,0 +1,26 @@
+const personMessages = {
+   fr: {
+      add_persons: {
+         title: "Ajouter des usagers",
+         suggested_counter: "Pas de résultats | 1 résultat | {count} résultats",
+         selected_counter: " 1 sélectionné | {count} sélectionnés",
+         search_some_persons: "Rechercher des personnes..",
+      },
+      item: {
+         type_person: "Usager",
+         type_user: "TMS",
+         type_thirdparty: "Tiers",
+         type_household: "Ménage"
+      },
+      person: {
+         firstname: "Prénom",
+         lastname: "Nom",
+         born: "né le ",
+      },
+      error_only_one_person: "Une seule personne peut être sélectionnée !"
+   }
+};
+
+export {
+   personMessages
+};

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig

@@ -2,39 +2,24 @@
     <div class="grid-12 parent" id="header-accompanying_course-name" >
         <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
 
-            <div class="grid-5">{% set title = title %}
+            <div class="grid-6">{% set title = title %}
                 <h1>
                     <i class="fa fa-random fa-fw"></i>
-                    {{ 'Accompanying Course'|trans }}{# ou défini en amont
-                    {{ title|default('Accompanying Course'|trans)|raw }} #}
-                    <span style="font-weight: lighter; font-size: 65%;">(n°{{ accompanyingCourse.id  }})</span>
+                    {{ 'Accompanying Course'|trans }}
+                    <span style="font-weight: lighter; font-size: 50%;">(n°{{ accompanyingCourse.id  }})</span>
                 </h1>
             </div>
 
-            <div class="grid-4">
-                <ul class="record_actions">
-                    <li>ponctuel <i class="fa fa-toggle-on fa-fw"></i> régulier</li>
-                    <li>ouvert</li>
-                    <li>en file active</li>
-                    <li>urgent</li>
-                </ul>
-            </div>
+            <div class="grid-3" id="banner-flags"></div>
 
-            <div class="grid-3">
-                <p style="text-align: right;">
-                    <i>ouvert le 11 avril 2019</i><br>
-                    par <b>Soline Maillet | SIPAS</b>
-                </p>
-            </div>
+            <div class="grid-3" id="banner-status"></div>
 
         </div>
     </div>
     <div class="grid-12 parent" id="header-accompanying_course-details" >
         <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
 
-            <div class="grid-4">Problématiques sociales</div>
-            <div class="grid-4">_</div>
-            <div class="grid-4">_</div>
+            <div id="banner-social-issues"></div>
 
         </div>
     </div>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig

@@ -6,21 +6,23 @@
 
 {% block content %}
 
-    <h1>{{ block('title') }}</h1>
+  {% if 'DRAFT' == accompanyingCourse.step %}
+  <div class="grid-8 centered error flash_message">
+      <span>
+        {{ 'This accompanying course is still a draft'|trans }} 
+        <a href="{{ path('chill_person_accompanying_course_show', { 'accompanying_period_id': accompanyingCourse.id } ) }}">
+        {{ 'Edit & activate accompanying course'|trans }}
+        </a>
+      </span>
+  </div>
+  {% endif %}
 
-    <pre>
-{{ accompanyingCourse.id }}
-{{ accompanyingCourse.openingDate|format_date('short') }}
-{{ accompanyingCourse.closingDate|format_date('short') }}
-{{ accompanyingCourse.closingMotive|chill_entity_render_box }}
-{{ accompanyingCourse.remark|raw }}
-{{ accompanyingCourse.user }}
-usagers:
-{% for p in accompanyingCourse.participations %}
-    {{ p.person.id }} | <a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}">{{ p.person.fullnamecanonical }}</a> | {{ p.startdate|format_date('short') }} | {{ p.enddate|format_date('short') }}
-{% endfor %}
-    </pre>
+  <h1>{{ 'Associated peoples'|trans }}</h1>
 
-    {{ dump() }}
+  <h1>{{ 'Resources'|trans }}</h1>
+
+  <h1>{{ 'Social actions'|trans }}</h1>
+  
+  <h1>{{ 'Last events on accompanying course'|trans }}</h1>
 
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/show.html.twig

@@ -1,19 +1,22 @@
 {% extends 'ChillPersonBundle:AccompanyingCourse:layout.html.twig' %}
 
+{% set title = 'DRAFT' == accompanyingCourse.step ? 'New accompanying course' : 'Edit accompanying course' %}
+
 {% block title %}
-    {{ 'Edit Accompanying Course'|trans }}
+    {{ title|trans }}
 {% endblock %}
 
 {% block content %}
+   <div id="accompanying-course"></div> {#  <== insert accompanyingCourse vue component  #}
+{% endblock %}
 
-   <h1>{{ block('title') }}</h1>
-   
-   <div id="accompanying-course"></div>    
-
-   {{ encore_entry_script_tags('accompanying_course') }}
+{% block css %}
+   {{ encore_entry_link_tags('accompanying_course') }}
+{% endblock %}
 
+{% block js %}
    <script type="text/javascript">
       window.accompanyingCourseId = {{ accompanyingCourse.id|e('js') }};
    </script>
-   
+   {{ encore_entry_script_tags('accompanying_course') }}
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig

@@ -49,4 +49,22 @@
 
     {{ form_end(form) }}
 
+
+    NEW FORM
+
+    {% block content %}
+        <h1>{{ block('title') }}</h1>
+        <div id="address"></div>
+    {% endblock %}
+
+    {% block stylesheets %}
+        <link href="{{ asset('build/address.css') }}" type="text/css" rel="stylesheet" />
+    {% endblock %}
+
+    {% block js %}
+        {{ encore_entry_script_tags('address') }}
+    {% endblock %}
+
+
+
 {% endblock personcontent %}

src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php

@@ -22,12 +22,13 @@ use Chill\PersonBundle\Entity\PersonNotDuplicate;
 use Doctrine\ORM\EntityManagerInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Repository\PersonNotDuplicateRepository;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 
 /**
- * 
+ *
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
@@ -41,20 +42,20 @@ class SimilarPersonMatcher
      * @var EntityManagerInterface
      */
     protected $em;
-    
+
     /**
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
     /**
-     * @var TokenStorageInterface 
+     * @var TokenStorageInterface
      */
     protected $tokenStorage;
-    
+
     public function __construct(
-        EntityManagerInterface $em, 
-        AuthorizationHelper $authorizationHelper, 
+        EntityManagerInterface $em,
+        AuthorizationHelper $authorizationHelper,
         TokenStorageInterface $tokenStorage
     ) {
         $this->em = $em;
@@ -62,7 +63,7 @@ class SimilarPersonMatcher
         $this->tokenStorage = $tokenStorage;
     }
 
-    public function matchPerson(Person $person, $precision = 0.15, $orderBy = self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY)
+    public function matchPerson(Person $person, PersonNotDuplicateRepository $personNotDuplicateRepository, $precision = 0.15, $orderBy = self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY)
     {
         $centers = $this->authorizationHelper->getReachableCenters(
             $this->tokenStorage->getToken()->getUser(),
@@ -77,8 +78,7 @@ class SimilarPersonMatcher
             . ' AND p.id != :personId '
         ;
 
-        $notDuplicatePersons = $this->em->getRepository(PersonNotDuplicate::class)
-            ->findNotDuplicatePerson($person);
+        $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
 
         if (count($notDuplicatePersons)) {
             $dql .= ' AND p.id not in (:notDuplicatePersons)';

src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php

@@ -38,6 +38,9 @@ class AccompanyingPeriodVoter extends AbstractChillVoter  implements ProvideRole
         }
 
         // TODO take scopes into account
+        if (count($subject->getPersons()) === 0) {
+            return true;
+        }
         foreach ($subject->getPersons() as $person) {
             // give access as soon as on center is reachable
             if ($this->helper->userHasAccess($token->getUser(), $person->getCenter(), $attribute)) {

src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodNormalizer.php

@@ -1,59 +0,0 @@
-<?php
-/*
- *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-namespace Chill\PersonBundle\Serializer\Normalizer;
-
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
-use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
-
-
-class AccompanyingPeriodNormalizer implements NormalizerInterface, NormalizerAwareInterface {
-
-    protected ?NormalizerInterface $normalizer = null;
-
-    public function normalize($period, string $format = null, array $context = array())
-    {
-        /** @var AccompanyingPeriod $period */
-        return [
-            'id' => $period->getId(),
-            'openingDate' => $this->normalizer->normalize($period->getOpeningDate(), $format),
-            'closingDate' => $this->normalizer->normalize($period->getClosingDate(), $format),
-            'remark' => $period->getRemark(),
-            'participations' => $this->normalizer->normalize($period->getParticipations(), $format),
-            'closingMotive' => $this->normalizer->normalize($period->getClosingMotive(), $format),
-            'user' => $this->normalizer->normalize($period->getUser(), $format),
-            'step' => $period->getStep(),
-            'origin' => $this->normalizer->normalize($period->getOrigin(), $format),
-            'intensity' => $period->getIntensity(),
-            'emergency' => $period->isEmergency(),
-            'confidential' => $period->isConfidential()
-        ];
-    }
-
-    public function supportsNormalization($data, string $format = null): bool
-    {
-        return $data instanceof AccompanyingPeriod;
-    }
-
-    public function setNormalizer(NormalizerInterface $normalizer)
-    {
-        $this->normalizer = $normalizer;
-    }
-}

src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php

@@ -41,6 +41,7 @@ class AccompanyingPeriodParticipationNormalizer implements NormalizerInterface,
 
     public function supportsNormalization($data, string $format = null): bool
     {
+        return false;
         return $data instanceof AccompanyingPeriodParticipation;
     }
 

src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace Chill\PersonBundle\Serializer\Normalizer;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\ResourceRepository;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
+use Symfony\Component\Serializer\Exception;
+use Chill\MainBundle\Serializer\Normalizer\DiscriminatedObjectDenormalizer;
+
+
+class AccompanyingPeriodResourceNormalizer implements DenormalizerInterface, DenormalizerAwareInterface
+{
+    use DenormalizerAwareTrait;
+
+    use ObjectToPopulateTrait;
+
+    private ResourceRepository $repository;
+
+    public function __construct(ResourceRepository $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    public function denormalize($data, string $type, string $format = null, array $context = [])
+    {
+        $resource = $this->extractObjectToPopulate($type, $context);
+
+        if ('accompanying_period_resource' !== ($data['type'] ?? NULL)) {
+            throw new Exception\InvalidArgumentException("the key type must be present in data and set to 'accompanying_period_resource'");
+        }
+
+        if ($resource === NULL && \array_key_exists('id', $data)) {
+            $resource = $this->repository->find($data['id']);
+
+            if (NULL === $resource) {
+                throw new Exception\UnexpectedValueException(sprintf("the resource with".
+                    "id %d is not found", $data['id']));
+            }
+
+            // if resource found, available only for read-only
+            if (count($data) > 2) {
+                unset($data['id']);
+                unset($data['type']);
+                throw new Exception\ExtraAttributesException($data);
+            }
+        }
+
+        if ($resource === NULL) {
+            $resource = new Resource();
+        }
+
+        if (\array_key_exists('resource', $data)) {
+            $res = $this->denormalizer->denormalize(
+                $data['resource'],
+                DiscriminatedObjectDenormalizer::TYPE,
+                $format,
+                \array_merge(
+                    $context,
+                    [ 
+                        DiscriminatedObjectDenormalizer::ALLOWED_TYPES => 
+                        [ 
+                            Person::class, ThirdParty::class
+                        ]
+                    ]
+                )
+            );
+
+            $resource->setResource($res);
+        } 
+
+        return $resource;
+    }
+    
+
+    public function supportsDenormalization($data, string $type, string $format = null)
+    {
+        return $type === Resource::class;
+    }  
+}

src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php

@@ -18,14 +18,20 @@
  */
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Symfony\Component\Serializer\Exception\RuntimeException;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
-
+use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
 
 /**
  * Serialize a Person entity
@@ -34,17 +40,22 @@ use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 class PersonNormalizer implements
     NormalizerInterface,
     NormalizerAwareInterface,
-    DenormalizerInterface
+    DenormalizerInterface,
+    DenormalizerAwareInterface
 {
+    private ChillEntityRenderExtension $render;
 
-    protected NormalizerInterface $normalizer;
+    private PersonRepository $repository;
 
-    protected PersonRepository $repository;
+    use NormalizerAwareTrait;
 
-    public const GET_PERSON = 'get_person';
+    use ObjectToPopulateTrait;
 
-    public function __construct(PersonRepository $repository)
+    use DenormalizerAwareTrait;
+
+    public function __construct(ChillEntityRenderExtension $render, PersonRepository $repository)
     {
+        $this->render = $render;
         $this->repository = $repository;
     }
 
@@ -52,44 +63,82 @@ class PersonNormalizer implements
     {
         /** @var Person $person */
         return [
+            'type' => 'person',
             'id' => $person->getId(),
+            'text' => $this->render->renderString($person),
             'firstName' => $person->getFirstName(),
             'lastName' => $person->getLastName(),
             'birthdate' => $this->normalizer->normalize($person->getBirthdate()),
-            'center' => $this->normalizer->normalize($person->getCenter())
+            'center' => $this->normalizer->normalize($person->getCenter()),
+            'phonenumber' => $person->getPhonenumber(),
+            'mobilenumber' => $person->getMobilenumber(),
+            'altNames' => $this->normalizeAltNames($person->getAltNames()),
+            'gender' => $person->getGender(),
+            'gender_numeric' => $person->getGenderNumeric(),
         ];
     }
 
-    public function denormalize($data, string $type, string $format = null, array $context = []): Person
+    protected function normalizeAltNames($altNames): array
     {
-        if ($context[self::GET_PERSON] ?? true) {
-            $id = $data['id'] ?? null;
-            if (NULL === $id) {
-                throw new RuntimeException("missing id into person object");
-            }
-        }
-        /** var Person $person */
-        $person = $this->repository->findOneById($id);
+        $r = [];
 
-        if (NULL === $person) {
-            return UnexpectedValueException("person id not found");
+        foreach ($altNames as $n) {
+            $r[] = [ 'key' => $n->getKey(), 'label' => $n->getLabel() ];
         }
 
-        return $person;
+        return $r;
     }
+    
 
     public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof Person;
     }
 
-    public function supportsDenormalization($data, string $type, ?string $format = NULL): bool
+    public function denormalize($data, string $type, string $format = null, array $context = [])
     {
-        return Person::class === $type;
+        $person = $this->extractObjectToPopulate($type, $context);
+
+        if (\array_key_exists('id', $data)) {
+            $person = $this->repository->find($data['id']);
+
+            if (null === $person) {
+                throw new UnexpectedValueException("The person with id \"{$data['id']}\" does ".
+                    "not exists");
+            }
+            // currently, not allowed to update a person through api
+            // if instantiated with id
+            return $person;
+        }
+
+        if (null === $person) {
+            $person = new Person();
+        }
+
+        foreach (['firstName', 'lastName', 'phonenumber', 'mobilenumber', 'gender']
+            as $item) {
+            if (\array_key_exists($item, $data)) {
+                $person->{'set'.\ucfirst($item)}($data[$item]);
+            }
+        }
+
+        foreach ([
+            'birthdate' => \DateTime::class,
+            'center' => Center::class
+        ] as $item => $class) {
+            if (\array_key_exists($item, $data)) {
+                $object = $this->denormalizer->denormalize($data[$item], $class, $format, $context);
+                if ($object instanceof $class) {
+                    $person->{'set'.\ucfirst($item)}($object);
+                }
+            }
+        }
+
+        return $person;
     }
 
-    public function setNormalizer(NormalizerInterface $normalizer)
+    public function supportsDenormalization($data, string $type, string $format = null)
     {
-        $this->normalizer = $normalizer;
+        return $type === Person::class && ($data['type'] ?? NULL) === 'person';
     }
 }

src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Chill\PersonBundle\Serializer\Normalizer;
+
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+
+class SocialIssueNormalizer implements NormalizerInterface, NormalizerAwareInterface
+{
+    private SocialIssueRender $render;
+
+    use NormalizerAwareTrait;
+
+    /**
+     * @param SocialIssueRender $render
+     */
+    public function __construct(SocialIssueRender $render)
+    {
+        $this->render = $render;
+    }
+    
+
+    public function normalize($socialIssue, string $format = null, array $context = [])
+    {
+        /** @var SocialIssue $socialIssue */
+        return [
+            'type' => 'social_issue',
+            'id' => $socialIssue->getId(),
+            'parent_id' => $socialIssue->hasParent() ? $socialIssue->getParent()->getId() : null,
+            'children_ids' => $socialIssue->getChildren()->map(function (SocialIssue $si) { return $si->getId(); }),
+            'title' => $socialIssue->getTitle(),
+            'text' => $this->render->renderString($socialIssue, [])
+        ];
+    }
+
+    public function supportsNormalization($data, string $format = null): bool
+    {
+        return $data instanceof SocialIssue;
+    }
+}

src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Chill\PersonBundle\Templating\Entity;
+
+use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+
+class SocialIssueRender implements ChillEntityRenderInterface
+{
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public const SEPARATOR_KEY = 'default.separator';
+
+    public const DEFAULT_ARGS = [
+       self::SEPARATOR_KEY => ' > ',
+   ];
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function supports($entity, array $options): bool
+    {
+        return $entity instanceof SocialIssueRender;
+    }
+    
+    public function renderString($socialIssue, array $options): string
+    {
+        /** @var $socialIssue SocialIssue */
+        $options = \array_merge(self::DEFAULT_ARGS, $options); 
+
+        $str = $this->translatableStringHelper->localize($socialIssue->getTitle());
+
+        while ($socialIssue->hasParent()) {
+            $socialIssue = $socialIssue->getParent();
+            $str .= $options[self::SEPARATOR_KEY].$this->translatableStringHelper->localize(
+                $socialIssue->getTitle()
+            );
+        }
+
+        return $str;
+    }
+    
+    public function renderBox($entity, array $options): string
+    {
+        return "renderBox not implemented for social issue";
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php

@@ -27,11 +27,14 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Center;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
 
 /**
  * Test api for AccompanyingCourseControllerTest
@@ -40,6 +43,10 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
 {
     protected static EntityManagerInterface $em;
 
+    protected ?int $personId = NULL;
+
+    protected ?AccompanyingPeriod $period = NULL;
+
     /**
      * Setup before the first test of this class (see phpunit doc)
      */
@@ -85,6 +92,310 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
         $this->assertEquals(404, $response->getStatusCode(), "Test that the response of rest api has a status code 'not found' (404)");
     }
 
+    /**
+     *
+     * @dataProvider dataGenerateRandomAccompanyingCourseWithSocialIssue
+     */
+    public function testAccompanyingCourseAddRemoveSocialIssue(AccompanyingPeriod $period, SocialIssue $si)
+    {
+        $this->client->request(
+            Request::METHOD_POST,
+            sprintf('/api/1.0/person/accompanying-course/%d/socialissue.json', $period->getId()),
+            [],
+            [],
+            [],
+            \json_encode([ 'type' => 'social_issue', 'id' => $si->getId() ])
+        );
+        
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+        $data = \json_decode($this->client->getResponse()->getContent(), true);
+        $this->assertArrayHasKey('id', $data);
+        $this->assertArrayHasKey('type', $data);
+        $this->assertEquals('social_issue', $data['type']);
+
+
+        $this->client->request(
+            Request::METHOD_DELETE,
+            sprintf('/api/1.0/person/accompanying-course/%d/socialissue.json', $period->getId()),
+            [],
+            [],
+            [],
+            \json_encode([ 'type' => 'social_issue', 'id' => $si->getId() ])
+        );
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+    }
+
+    /**
+     * @dataProvider dataGenerateRandomRequestorValidData
+     */
+    public function testCommentWithValidData(AccompanyingPeriod $period, $personId, $thirdPartyId)
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $this->client->request(
+            Request::METHOD_POST,
+            sprintf('/api/1.0/person/accompanying-course/%d/comment.json', $period->getId()),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            \json_encode([ 'type' => 'accompanying_period_comment', 'content' => "this is a text"])
+        );
+        $response = $this->client->getResponse();
+        $data = \json_decode($response->getContent(), true);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertArrayHasKey('id', $data);
+
+        $this->client->request(
+            Request::METHOD_DELETE,
+            sprintf('/api/1.0/person/accompanying-course/%d/comment.json', $period->getId()),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            \json_encode([ 'type' => 'accompanying_period_comment', 'id' => $data['id']])
+        );
+        $response = $this->client->getResponse();
+        $data = \json_decode($response->getContent(), true);
+
+        $this->assertEquals(200, $response->getStatusCode());
+    }
+
+    /**
+     * @dataProvider dataGenerateRandomRequestorValidData
+     */
+    public function testResourceWithValidData(AccompanyingPeriod $period, $personId, $thirdPartyId)
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        // post a person
+        $this->client->request(
+            Request::METHOD_POST,
+            sprintf('/api/1.0/person/accompanying-course/%d/resource.json', $period->getId()),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            \json_encode([ 'type' => 'accompanying_period_resource', 'resource' => [ 'type' => 'person', 'id' => $personId ]])
+        );
+        $response = $this->client->getResponse();
+        $data = \json_decode($response->getContent(), true);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertArrayHasKey('id', $data);
+        $this->assertEquals($personId, $data['resource']['id']);
+
+        // check into database
+        $resource = $em->getRepository(Resource::class)
+            ->find($data['id']);
+        $this->assertInstanceOf(Resource::class, $resource);
+        $this->assertInstanceOf(Person::class, $resource->getResource());
+        $this->assertEquals($personId, $resource->getResource()->getId());
+
+        // remove the resource
+        $this->client->request(
+            Request::METHOD_DELETE,
+            sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId()),
+            [],
+            [],
+            [], //server
+            \json_encode([ 'type' => 'accompanying_period_resource', 'id' => $resource->getId()])
+        );
+        $response = $this->client->getResponse();
+        $this->assertEquals(200, $response->getStatusCode());
+
+       // post a third party 
+        $this->client->request(
+            Request::METHOD_POST,
+            sprintf('/api/1.0/person/accompanying-course/%d/resource.json', $period->getId()),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            \json_encode([ 'type' => 'accompanying_period_resource', 'resource' => [ 'type' => 'thirdparty', 'id' => $thirdPartyId ]])
+        );
+        $response = $this->client->getResponse();
+        $data = \json_decode($response->getContent(), true);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertArrayHasKey('id', $data);
+        $this->assertEquals($thirdPartyId, $data['resource']['id']);
+
+        // check into database
+        $resource = $em->getRepository(Resource::class)
+            ->find($data['id']);
+        $this->assertInstanceOf(Resource::class, $resource);
+        $this->assertInstanceOf(ThirdParty::class, $resource->getResource());
+        $this->assertEquals($thirdPartyId, $resource->getResource()->getId());
+
+        // remove the resource
+        $this->client->request(
+            Request::METHOD_DELETE,
+            sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId()),
+            [],
+            [],
+            [], //server
+            \json_encode([ 'type' => 'accompanying_period_resource', 'id' => $resource->getId()])
+        );
+        $response = $this->client->getResponse();
+        $this->assertEquals(200, $response->getStatusCode());
+    }
+
+    /**
+     * @dataProvider dataGenerateRandomRequestorValidData
+     */
+    public function testRequestorWithValidData(AccompanyingPeriod $period, $personId, $thirdPartyId)
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        // post a person
+        $this->client->request(
+            Request::METHOD_POST,
+            sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId()),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            \json_encode([ 'type' => 'person', 'id' => $personId ])
+        );
+        $response = $this->client->getResponse();
+        $data = \json_decode($response->getContent(), true);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertArrayHasKey('id', $data);
+        $this->assertEquals($personId, $data['id']);
+
+        // check into database
+        $period = $em->getRepository(AccompanyingPeriod::class)
+            ->find($period->getId());
+        $this->assertInstanceOf(Person::class, $period->getRequestor());
+        $this->assertEquals($personId, $period->getRequestor()->getId());
+
+       // post a third party 
+        $this->client->request(
+            Request::METHOD_POST,
+            sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId()),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            \json_encode([ 'type' => 'thirdparty', 'id' => $thirdPartyId ])
+        );
+        $response = $this->client->getResponse();
+        $data = \json_decode($response->getContent(), true);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertArrayHasKey('id', $data);
+        $this->assertEquals($thirdPartyId, $data['id']);
+
+        // check into database
+        $period = $em->getRepository(AccompanyingPeriod::class)
+            ->find($period->getId());
+        $this->assertInstanceOf(ThirdParty::class, $period->getRequestor());
+        $this->assertEquals($thirdPartyId, $period->getRequestor()->getId());
+
+        // remove the requestor
+        $this->client->request(
+            Request::METHOD_DELETE,
+            sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId())
+        );
+        $response = $this->client->getResponse();
+        $this->assertEquals(200, $response->getStatusCode());
+
+        // check into database
+        $period = $em->getRepository(AccompanyingPeriod::class)
+            ->find($period->getId());
+        $em->refresh($period);
+        $this->assertNull($period->getRequestor());
+    }
+
+    /**
+     * @dataProvider dataGenerateNewAccompanyingCourse
+     */
+    public function testConfirm(AccompanyingPeriod $period)
+    {
+        $this->client->request(
+            Request::METHOD_POST,
+            sprintf('/api/1.0/person/accompanying-course/%d/confirm.json', $period->getId())
+        );
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+        // add period to remove it in tear down
+        $this->period = $period;
+    }
+
+    /**
+     *
+     * @dataProvider dataGenerateRandomAccompanyingCourse
+     */
+    public function testAccompanyingPeriodPatch(int $personId, AccompanyingPeriod $period)
+    {
+        $initialValueEmergency = $period->isEmergency();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $this->client->request(
+            Request::METHOD_PATCH, 
+            sprintf('/api/1.0/person/accompanying-course/%d.json', $period->getId()),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            \json_encode([ 'type' => 'accompanying_period', 'emergency' => !$initialValueEmergency ])
+        );
+        $response = $this->client->getResponse();
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $period = $em->getRepository(AccompanyingPeriod::class)
+            ->find($period->getId());
+        $em->refresh($period);
+        $this->assertEquals(!$initialValueEmergency, $period->isEmergency());
+
+        // restore the initial valud
+        $period->setEmergency($initialValueEmergency);
+        $em->flush();
+    }
+
+    public function dataGenerateRandomRequestorValidData(): \Iterator
+    {
+        $dataLength = 2;
+        $maxResults = 100;
+
+        static::bootKernel();
+        $em = static::$container->get(EntityManagerInterface::class);
+        $center = $em->getRepository(Center::class)
+            ->findOneBy(array('name' => 'Center A'));
+
+        $personIds = $em->createQuery("SELECT p.id FROM ".
+            Person::class." p ".
+            " WHERE p.center = :center")
+            ->setParameter('center', $center)
+            ->setMaxResults($maxResults)
+            ->getScalarResult();
+        
+        // create a random order
+        shuffle($personIds);
+
+        $thirdPartyIds = $em->createQuery("SELECT t.id FROM ".
+            ThirdParty::class." t ")
+            ->setMaxResults($maxResults)
+            ->getScalarResult();
+        
+        // create a random order
+        shuffle($thirdPartyIds);
+
+        $i = 0;
+        while ($i <= $dataLength) {
+            $person = $em->getRepository(Person::class)
+                ->find(\array_pop($personIds)['id']);
+
+            if (count($person->getAccompanyingPeriods()) === 0) {
+                continue;
+            }
+
+            $period = $person->getAccompanyingPeriods()[0];
+
+            yield [$period, \array_pop($personIds)['id'], \array_pop($thirdPartyIds)['id'] ];
+            $i++;
+        }
+    }
+
     /**
      *
      * @dataProvider dataGenerateRandomAccompanyingCourse
@@ -97,7 +408,7 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            \json_encode([ 'id' => $personId ])
+            \json_encode([ 'type' => 'person', 'id' => $personId ])
         );
         $response = $this->client->getResponse();
         $data = \json_decode($response->getContent(), true);
@@ -128,7 +439,7 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            \json_encode([ 'id' => $personId ])
+            \json_encode([ 'type' => 'person', 'id' => $personId ])
         );
         $response = $this->client->getResponse();
         $data = \json_decode($response->getContent(), true);
@@ -148,25 +459,79 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
 
     protected function tearDown()
     {
-        // remove participation created during test 'testAccompanyingCourseAddParticipation'
-        // and if the test could not remove it
-
-        $testAddParticipationName = 'testAccompanyingCourseAddParticipation';
-
-        if ($testAddParticipationName !== \substr($this->getName(), 0, \strlen($testAddParticipationName))) {
-            return;
-        }
-
         $em = static::$container->get(EntityManagerInterface::class);
 
-        $participation = $em
-            ->getRepository(AccompanyingPeriodParticipation::class)
-            ->findOneBy(['person' => $this->personId, 'accompanyingPeriod' => $this->period])
-            ;
+        // remove participation if set
+        if ($this->personId && $this->period) {
+            $participation = $em
+                ->getRepository(AccompanyingPeriodParticipation::class)
+                ->findOneBy(['person' => $this->personId, 'accompanyingPeriod' => $this->period])
+                ;
 
-        if (NULL !== $participation) {
-            $em->remove($participation);
-            $em->flush();
+            if (NULL !== $participation) {
+                $em->remove($participation);
+                $em->flush();
+            }
+            $this->personId = NULL;
+            $this->period   = NULL;
+        } elseif ($this->period) {
+            $period = $em
+                ->getRepository(AccompanyingPeriod::class)
+                ->find($this->period->getId()) ;
+
+            if ($period !== NULL) {
+                $em->remove($period);
+                $em->flush();
+            }
+
+            $this->period = null;
+        }
+    }
+
+    public function dataGenerateRandomAccompanyingCourseWithSocialIssue()
+    {
+        // note about max result for person query, and maxGenerated:
+        // 
+        // in the final loop, an id is popped out of the personIds array twice:
+        // 
+        // * one for getting the person, which will in turn provide his accompanying period;
+        // * one for getting the personId to populate to the data manager
+        //
+        // Ensure to keep always $maxGenerated to the double of $maxResults. x8 is a good compromize :)
+        $maxGenerated = 3;
+        $maxResults = $maxGenerated * 8;
+
+        static::bootKernel();
+        $em = static::$container->get(EntityManagerInterface::class);
+        $center = $em->getRepository(Center::class)
+            ->findOneBy(array('name' => 'Center A'));
+
+        $personIds = $em->createQuery("SELECT p.id FROM ".
+            Person::class." p ".
+            " WHERE p.center = :center")
+            ->setParameter('center', $center)
+            ->setMaxResults($maxResults)
+            ->getScalarResult();
+        
+        // create a random order
+        shuffle($personIds);
+
+        $socialIssues = $em->createQuery("SELECT s FROM ".
+            SocialIssue::class." s ")
+            ->setMaxResults(10)
+            ->getResult();
+
+        $nbGenerated = 0;
+        while ($nbGenerated < $maxGenerated) {
+            $id = \array_pop($personIds)["id"];
+
+            $person = $em->getRepository(Person::class)
+                ->find($id);
+            $periods = $person->getAccompanyingPeriods();
+
+            yield [$periods[\array_rand($periods)], $socialIssues[\array_rand($socialIssues)] ];
+
+            $nbGenerated++;
         }
     }
 
@@ -211,4 +576,39 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
             $nbGenerated++;
         }
     }
+
+    public function dataGenerateNewAccompanyingCourse()
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $period = new AccompanyingPeriod(new \DateTime('1 week ago'));
+        $user = $em->getRepository(User::class)
+            ->findOneByUsernameCanonical('center a_social');
+        $period->setCreatedBy($user);
+        //$period->setCreatedAt(new \DateTime('yesterday'));
+
+        $center = $em->getRepository(Center::class)
+            ->findOneBy(array('name' => 'Center A'));
+
+        $personIds = $em->createQuery("SELECT p.id FROM ".
+            Person::class." p ".
+            " WHERE p.center = :center")
+            ->setParameter('center', $center)
+            ->setMaxResults(100)
+            ->getScalarResult();
+        
+        // create a random order
+        shuffle($personIds);
+
+        for ($i = 0; $i<2; $i++) {
+            $person = $em->getRepository(Person::class)->find(\array_pop($personIds));
+            $period->addPerson($person);
+        }
+
+        $em->persist($period);
+        $em->flush();
+
+        yield [ $period ];
+    }
 }