Merge branch 'ameliorations_composants_vue' of gitlab.com:Chill-Projet/chill-bundles into ameliorations_composants_vue

src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php

@@ -6,10 +6,12 @@ use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Repository\Household\HouseholdRepository;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Symfony\Component\Routing\Annotation\Route;
 
 class HouseholdApiController extends ApiController
 {
@@ -50,4 +52,45 @@ class HouseholdApiController extends ApiController
         return $this->json($collection, Response::HTTP_OK, [],
             [ "groups" => ["read"]]);
     }
+
+    /**
+     * @Route("/api/1.0/person/address/suggest/by-household/{household_id}.{_format}",
+     *  name="chill_person_address_suggest_by_household",
+     *  requirements={
+     *     "_format"="json"
+     *     }
+     *  )
+     *  @ParamConverter("household", options={"id" = "household_id"})
+     */
+    public function suggestAddressByHousehold(Household $household, string $_format)
+    {
+        // TODO add acl
+
+        $addresses = [];
+        // collect addresses from location in courses
+        foreach ($household->getCurrentPersons() as $person) {
+            foreach ($person->getAccompanyingPeriodParticipations() as $participation) {
+                if (null !== $participation->getAccompanyingPeriod()->getAddressLocation()) {
+                    $a = $participation->getAccompanyingPeriod()->getAddressLocation();
+                    $addresses[$a->getId()] = $a;
+                }
+                if (null !== $personLocation = $participation
+                    ->getAccompanyingPeriod()->getPersonLocation()) {
+                    $a = $personLocation->getCurrentHouseholdAddress();
+                    if (null !== $a) {
+                        $addresses[$a->getId()] = $a;
+                    }
+                }
+            }
+        }
+
+        // remove the actual address
+        $actual = $household->getCurrentAddress();
+        if (null !== $actual) {
+            $addresses = \array_filter($addresses, fn($a) => $a !== $actual);
+        }
+
+        return $this->json(\array_values($addresses), Response::HTTP_OK, [],
+            [ 'groups' => [ 'read' ] ]);
+    }
 }

src/Bundle/ChillPersonBundle/Controller/PersonApiController.php

@@ -18,12 +18,15 @@
 namespace Chill\PersonBundle\Controller;
 
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Chill\MainBundle\Entity\Address;
+use Symfony\Component\Routing\Annotation\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 
 class PersonApiController extends ApiController
 {
@@ -54,4 +57,41 @@ class PersonApiController extends ApiController
         return $this->addRemoveSomething('address', $id, $request, $_format, 'address', Address::class, [ 'groups' => [ 'read' ] ]);
     }
 
+    /**
+     * @Route("/api/1.0/person/address/suggest/by-person/{person_id}.{_format}",
+     *  name="chill_person_address_suggest_by_person",
+     *  requirements={
+     *     "_format"="json"
+     *     }
+     *  )
+     *  @ParamConverter("person", options={"id" = "person_id"})
+     */
+    public function suggestAddress(Person $person, Request $request, string $_format): Response
+    {
+        $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
+
+        $addresses = [];
+        // collect addresses from location in courses
+        foreach ($person->getAccompanyingPeriodParticipations() as $participation) {
+            if (null !== $participation->getAccompanyingPeriod()->getAddressLocation()) {
+                $a = $participation->getAccompanyingPeriod()->getAddressLocation();
+                $addresses[$a->getId()] = $a;
+            }
+            if (null !== $personLocation = $participation
+                ->getAccompanyingPeriod()->getPersonLocation()) {
+                $a = $personLocation->getCurrentHouseholdAddress();
+                if (null !== $a) {
+                    $addresses[$a->getId()] = $a;
+                }
+            }
+        }
+
+        // remove the actual address
+        $actual = $person->getCurrentHouseholdAddress();
+        if (null !== $actual) {
+            $addresses = \array_filter($addresses, fn($a) => $a !== $actual);
+        }
+
+        return $this->json(\array_values($addresses), Response::HTTP_OK, [], [ 'groups' => [ 'read' ]]);
+    }
 }

src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php

@@ -3,8 +3,12 @@
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Doctrine\ORM\Hydration\FlatHierarchyEntityHydrator;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use DateTimeImmutable;
+use Doctrine\ORM\Query;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 class SocialIssueApiController extends ApiController
 {
@@ -16,6 +20,25 @@ class SocialIssueApiController extends ApiController
                 $query->expr()->isNull('e.desactivationDate')
             )
         );
-        $query->setParameter('now', new \DateTimeImmutable());
+        $query->setParameter('now', new DateTimeImmutable());
+    }
+
+    protected function getQueryResult(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query)
+    {
+        // In order to work, this hydrator only works with
+        // entities having the field "children" set up.
+        return $query
+            ->getQuery()
+            ->setHint(Query::HINT_INCLUDE_META_COLUMNS, true)
+            ->getResult(FlatHierarchyEntityHydrator::LIST);
+    }
+
+    protected function onPostIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query): ?Response
+    {
+        $query
+            ->orderBy("GET_JSON_FIELD_BY_KEY(e.title, :locale)", 'ASC')
+            ->setParameter(':locale', $request->getLocale());
+
+        return null;
     }
 }

src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminEvaluationController.php

@@ -0,0 +1,33 @@
+<?php
+/*
+ * 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\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+
+/**
+ * Class AdminSocialIssueController
+ * Controller for social issues
+ *
+ * @package Chill\PersonBundle\Controller
+ */
+class AdminEvaluationController extends CRUDController
+{
+}

src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminGoalController.php

@@ -0,0 +1,33 @@
+<?php
+/*
+ * 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\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+
+/**
+ * Class AdminSocialIssueController
+ * Controller for social issues
+ *
+ * @package Chill\PersonBundle\Controller
+ */
+class AdminGoalController extends CRUDController
+{
+}

src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminResultController.php

@@ -0,0 +1,33 @@
+<?php
+/*
+ * 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\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+
+/**
+ * Class AdminSocialIssueController
+ * Controller for social issues
+ *
+ * @package Chill\PersonBundle\Controller
+ */
+class AdminResultController extends CRUDController
+{
+}

src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialActionController.php

@@ -0,0 +1,33 @@
+<?php
+/*
+ * 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\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+
+/**
+ * Class AdminSocialIssueController
+ * Controller for social issues
+ *
+ * @package Chill\PersonBundle\Controller
+ */
+class AdminSocialActionController extends CRUDController
+{
+}

src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialIssueController.php

@@ -0,0 +1,33 @@
+<?php
+/*
+ * 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\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+
+/**
+ * Class AdminSocialIssueController
+ * Controller for social issues
+ *
+ * @package Chill\PersonBundle\Controller
+ */
+class AdminSocialIssueController extends CRUDController
+{
+}

src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+
+class SocialWorkEvaluationApiController extends AbstractController
+{
+    private PaginatorFactory $paginatorFactory;
+
+    /**
+     * @param PaginatorFactory $paginatorFactory
+     */
+    public function __construct(PaginatorFactory $paginatorFactory)
+    {
+        $this->paginatorFactory = $paginatorFactory;
+    }
+
+    /**
+     * @Route("/api/1.0/person/social-work/evaluation/by-social-action/{action_id}.json",
+     *     name="chill_person_evaluation_index_by_social_action",
+     *     requirements={
+     *          "_format": "json"
+     *     }
+     * )
+     * @ParamConverter("action", options={"id": "action_id"})
+     * @param SocialAction $action
+     * @return Response
+     */
+    public function listEvaluationBySocialAction(SocialAction $action): Response
+    {
+        $pagination = $this->paginatorFactory->create($action->getEvaluations()->count());
+
+        $evaluations = $action->getEvaluations()->slice($pagination->getCurrentPageFirstItemNumber(),
+            $pagination->getItemsPerPage());
+        $collection = new Collection($evaluations, $pagination);
+
+        return $this->json($collection, Response::HTTP_OK, [], [ 'groups' => [ 'read' ]]);
+    }
+}

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

@@ -1,88 +0,0 @@
-<?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/LoadAccompanyingPeriodNotifications.php

@@ -6,7 +6,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait;
-use Chill\PersonBundle\DataFixtures\ORM\LoadAccompanyingPeriod;
 
 /**
  * Load notififications into database
@@ -19,7 +18,7 @@ class LoadAccompanyingPeriodNotifications extends AbstractFixture implements Dep
         [
             'message' => 'Hello !',
             'entityClass' => AccompanyingPeriod::class,
-            'entityRef' => LoadAccompanyingPeriod::ACCOMPANYING_PERIOD,
+            'entityRef' => null,
             'sender' => 'center a_social',
             'addressees' => [
                 'center a_social',
@@ -30,10 +29,15 @@ class LoadAccompanyingPeriodNotifications extends AbstractFixture implements Dep
         ]
     ];
 
+    protected function getEntityRef()
+    {
+        return null;
+    }
+
     public function getDependencies()
     {
         return [
-            LoadAccompanyingPeriod::class,
+            LoadPeople::class,
         ];
     }
 }

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

@@ -0,0 +1,140 @@
+<?php
+
+namespace Chill\PersonBundle\DataFixtures\ORM;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
+use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Doctrine\Persistence\ObjectManager;
+use Chill\PersonBundle\DataFixtures\ORM\LoadPeople;
+
+class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Doctrine\Common\DataFixtures\DependentFixtureInterface
+{
+    private AccompanyingPeriodRepository $periodRepository;
+    private EvaluationRepository $evaluationRepository;
+
+    /**
+     * @var Evaluation[]|array
+     */
+    private array $cacheEvaluations = [];
+
+    /**
+     * @param AccompanyingPeriodRepository $periodRepository
+     */
+    public function __construct(
+        AccompanyingPeriodRepository $periodRepository,
+        EvaluationRepository $evaluationRepository
+    ) {
+        $this->periodRepository = $periodRepository;
+        $this->evaluationRepository = $evaluationRepository;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getDependencies()
+    {
+        return [
+            LoadPeople::class
+        ];
+    }
+
+    private function getRandomAction(SocialIssue $socialIssue): ?SocialAction
+    {
+        $actions = $socialIssue->getRecursiveSocialActions()->toArray();
+
+        if (0 === count($actions)) {
+            return null;
+        }
+
+        return $actions[\array_rand($actions)];
+    }
+
+    private function getRandomEvaluation(): Evaluation
+    {
+       if (0 === count($this->cacheEvaluations)) {
+           $this->cacheEvaluations = $this->evaluationRepository
+               ->findAll();
+       }
+
+       return $this->cacheEvaluations[\array_rand($this->cacheEvaluations)];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function load(ObjectManager $manager)
+    {
+        // load all the period which are confirmed
+        $periods = $this->periodRepository
+            ->findBy(['step' => AccompanyingPeriod::STEP_CONFIRMED])
+            ;
+
+        $i = 0;
+        while (null !== $period = \array_pop($periods)) {
+           /** @var AccompanyingPeriod $period */
+           $i++;
+           if (0 === $i % 15) {
+               $manager->flush();
+           }
+           if (0 === $period->getSocialIssues()->count()) {
+               continue;
+           }
+           $work = new AccompanyingPeriod\AccompanyingPeriodWork();
+           $action = $this->getRandomAction($period->getSocialIssues()->first());
+
+           if (null !== $action) {
+               $work
+                   ->setAccompanyingPeriod($period)
+                   ->setSocialAction($action)
+                   ->setStartDate(new \DateTimeImmutable('today'))
+                   ->addPerson($period->getPersons()->first())
+                   ->setCreatedAt(new \DateTimeImmutable())
+                   ->setCreatedBy($this->getReference('center a_social'))
+                   ->setUpdatedAt(new \DateTimeImmutable())
+                   ->setUpdatedBy($this->getReference('center a_social'));
+               $manager->persist($work);
+
+               if ($action->getEvaluations()->count() > 0) {
+                   $ev = $action->getEvaluations()->first();
+                   $evaluation = new AccompanyingPeriod\AccompanyingPeriodWorkEvaluation();
+                   $evaluation->setAccompanyingPeriodWork($work)
+                       ->setEvaluation($ev);
+                   $manager->persist($evaluation);
+               }
+           }
+
+           // 1 of 10, force an evaluation
+           if (0 === $i % 10) {
+               $evaluation = $this->getRandomEvaluation();
+               $action = $evaluation->getSocialAction();
+               $issue = $action->getIssue();
+
+               $period->addSocialIssue($issue);
+               $work
+                   ->setAccompanyingPeriod($period)
+                   ->setSocialAction($action)
+                   ->setStartDate(new \DateTimeImmutable('today'))
+                   ->addPerson($period->getPersons()->first())
+                   ->setCreatedAt(new \DateTimeImmutable())
+                   ->setCreatedBy($this->getReference('center a_social'))
+                   ->setUpdatedAt(new \DateTimeImmutable())
+                   ->setUpdatedBy($this->getReference('center a_social'))
+               ;
+               $manager->persist($work);
+               $ev = new AccompanyingPeriod\AccompanyingPeriodWorkEvaluation();
+               $ev->setAccompanyingPeriodWork($work)
+                   ->setEvaluation($evaluation);
+               $manager->persist($ev);
+           }
+
+        }
+
+        $manager->flush();
+    }
+}

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

@@ -33,7 +33,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
     public function load(ObjectManager $manager)
     {
-        // generate two times the participation. This will lead to 
+        // generate two times the participation. This will lead to
         // some movement in participation (same people in two differents
         // households)
 
@@ -110,7 +110,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
         $i = 0;
         while ($i < $nb) {
             $address = $this->createAddress();
-            $address->setValidFrom(\DateTime::createFromImmutable($date)); 
+            $address->setValidFrom(\DateTime::createFromImmutable($date));
 
             if (\random_int(0, 20) < 1) {
                 $date = $date->add(new \DateInterval('P'.\random_int(8, 52).'W'));
@@ -157,6 +157,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
             ->setParameter('center', 'Center A')
             ->getScalarResult()
             ;
+
         \shuffle($this->personIds);
     }
 

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

@@ -21,54 +21,91 @@
 
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Country;
+use Chill\MainBundle\Entity\PostalCode;
+use Chill\MainBundle\Repository\CenterRepository;
+use Chill\MainBundle\Repository\CountryRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\MaritalStatus;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Repository\MaritalStatusRepository;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 use Chill\PersonBundle\Entity\Person;
+use Faker\Factory;
+use Faker\Generator;
+use Nelmio\Alice\Faker\GeneratorFactory;
+use Nelmio\Alice\Loader\NativeLoader;
+use Nelmio\Alice\ObjectSet;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Doctrine\Model\Point;
+use Symfony\Component\Workflow\Registry;
+use Symfony\Component\Workflow\Workflow;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 
 /**
  * Load people into database
  *
- * @author Julien Fastré <julien arobase fastre point info>
- * @author Marc Ducobu <marc@champs-libres.coop>
  */
 class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
-
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
-    protected $faker;
+    protected Generator $faker;
 
-    public function __construct()
-    {
-        $this->faker = \Faker\Factory::create('fr_FR');
-    }
+    protected Registry $workflowRegistry;
 
-    public function prepare()
-    {
-        //prepare days, month, years
-        $y = 1950;
-        do {
-            $this->years[] = $y;
-            $y = $y +1;
-        } while ($y >= 1990);
+    protected SocialIssueRepository $socialIssueRepository;
 
-        $m = 1;
-        do {
-            $this->month[] = $m;
-            $m = $m +1;
-        } while ($m >= 12);
+    protected CountryRepository $countryRepository;
+
+    protected NativeLoader $loader;
+
+    /**
+     * @var array|SocialIssue[]
+     */
+    protected array $cacheSocialIssues = [];
+
+    /**
+     * @var array|Country[]
+     */
+    protected array $cacheCountries = [];
+
+    /**
+     * @var array|Center[]
+     */
+    protected array $cacheCenters = [];
+
+    protected CenterRepository $centerRepository;
+
+    /**
+     * @var array|MaritalStatus[]
+     */
+    protected array $cacheMaritalStatuses = [];
+
+    protected MaritalStatusRepository $maritalStatusRepository;
+
+    public function __construct(
+        Registry $workflowRegistry,
+        SocialIssueRepository $socialIssueRepository,
+        CenterRepository $centerRepository,
+        CountryRepository $countryRepository,
+        MaritalStatusRepository $maritalStatusRepository
+    ) {
+        $this->faker = Factory::create('fr_FR');
+        $this->faker->addProvider($this);
+        $this->workflowRegistry = $workflowRegistry;
+        $this->socialIssueRepository = $socialIssueRepository;
+        $this->centerRepository = $centerRepository;
+        $this->countryRepository = $countryRepository;
+        $this->maritalStatusRepository = $maritalStatusRepository;
+        $this->loader = new NativeLoader($this->faker);
 
-        $d = 1;
-        do {
-            $this->day[] = $d;
-            $d = $d + 1;
-        } while ($d <= 28);
     }
 
     public function getOrder()
@@ -78,8 +115,8 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
 
     public function load(ObjectManager $manager)
     {
-        $this->loadRandPeople($manager);
         $this->loadExpectedPeople($manager);
+        $this->loadRandPeople($manager);
 
         $manager->flush();
     }
@@ -88,153 +125,148 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
     {
         echo "loading expected people...\n";
 
-        foreach ($this->peoples as $person) {
-            $this->addAPerson($this->fillWithDefault($person), $manager);
+
+        foreach ($this->peoples as $personDef) {
+            $person = $this->createExpectedPerson($personDef);
+            $this->addAPerson($person, $manager);
         }
     }
 
-    public function loadRandPeople(ObjectManager $manager)
+    protected function loadRandPeople(ObjectManager $manager)
     {
         echo "loading rand people...\n";
+        $persons = $this->createRandPerson()->getObjects();
 
-        $this->prepare();
-
-        $chooseLastNameOrTri = array('tri', 'tri', 'name', 'tri');
-
-        $i = 0;
-
-        do {
-            $i++;
-
-            $sex = $this->genders[array_rand($this->genders)];
-
-            if ($chooseLastNameOrTri[array_rand($chooseLastNameOrTri)] === 'tri' ) {
-                $length = rand(2, 3);
-                $lastName = '';
-                for ($j = 0; $j <= $length; $j++) {
-                    $lastName .= $this->lastNamesTrigrams[array_rand($this->lastNamesTrigrams)];
-                }
-                $lastName = ucfirst($lastName);
-            } else {
-                $lastName = $this->lastNames[array_rand($this->lastNames)];
-            }
-
-            if ($sex === Person::MALE_GENDER) {
-                $firstName = $this->firstNamesMale[array_rand($this->firstNamesMale)];
-            } else {
-                $firstName = $this->firstNamesFemale[array_rand($this->firstNamesFemale)];
-            }
-
-            // add an address on 80% of the created people
-            if (rand(0,100) < 80) {
-                $address = $this->getRandomAddress();
-                // on 30% of those person, add multiple addresses
-                if (rand(0,10) < 4) {
-                    $address = array(
-                       $address,
-                       $this->getRandomAddress()
-                    );
-                }
-            } else {
-                $address = null;
-            }
-
-            $person = array(
-                'FirstName' => $firstName,
-                'LastName' => $lastName,
-                'Gender' => $sex,
-                'Nationality' => (rand(0,100) > 50) ? NULL: 'BE',
-                'center' => (rand(0,1) == 0) ? 'centerA': 'centerB',
-                'Address' => $address,
-                'maritalStatus' => $this->maritalStatusRef[array_rand($this->maritalStatusRef)]
-            );
-
-            $this->addAPerson($this->fillWithDefault($person), $manager);
-
-        } while ($i <= 100);
+        foreach ($persons as $person) {
+            $this->addAPerson($person, $manager);
+        }
     }
 
-    /**
-     * fill a person array with default value
-     *
-     * @param string[] $specific
-     */
-    private function fillWithDefault(array $specific)
+    private function createRandPerson(): ObjectSet
     {
-        return array_merge(array(
-                'Birthdate' => "1960-10-12",
-                'PlaceOfBirth' => "Ottignies Louvain-La-Neuve",
-                'Gender' => Person::MALE_GENDER,
-                'Email' => "Email d'un ami: roger@tt.com",
-                'CountryOfBirth' => 'BE',
-                'Nationality' => 'BE',
-                'CFData' => array(),
-                'Address' => null
-            ), $specific);
+        return $this->loader->loadData([
+            Person::class => [
+                'persons{1..300}' => [
+                    'firstName' => '<firstname()>',
+                    'lastName' => '<lastname()>',
+                    'gender' => '<getRandomGender()>',
+                    'nationality' => '<getRandomCountry()>',
+                    'center' => '<getRandomCenter()>',
+                    'maritalStatus' => '<getRandomMaritalStatus()>',
+                    'birthdate' => '<dateTimeBetween("-75 years", "-1 tears")>',
+                    'placeOfBirth' => '<city()>',
+                    'email' => '<freeEmail()>',
+                    'countryOfBirth' => '<getRandomCountry(80)>',
+                ]
+            ]
+        ]);
+    }
+
+    private function createExpectedPerson($default): Person
+    {
+        $person = $this->loader->loadData([
+            Person::class => [
+                "person" => [
+                    'firstName' => $default['firstName'] ?? '<firstname()>',
+                    'lastName' => $default['lastName'] ?? '<lastname()>',
+                    'gender' => '<getRandomGender()>',
+                    'nationality' => '<getRandomCountry()>',
+                    'center' => '<getRandomCenter()>',
+                    'maritalStatus' => '<getRandomMaritalStatus()>',
+                    'birthdate' => '<dateTimeBetween("-75 years", "-1 tears")>',
+                    'placeOfBirth' => '<city()>',
+                    'email' => '<freeEmail()>',
+                    'countryOfBirth' => '<getRandomCountry(80)>',
+                ],
+            ]
+        ])->getObjects()['person'];
+
+        // force some values
+        foreach ($default as $key => $value) {
+            switch ($key) {
+                case 'birthdate':
+                    $person->setBirthdate(new \DateTime($value));
+                    break;
+                case 'center':
+                    $person->setCenter($this->centerRepository
+                        ->findOneBy(['name' => $value]));
+                    break;
+                case 'countryOfBirth':
+                case 'nationality':
+                    $country = $this->countryRepository
+                        ->findOneBy(['countryCode' => $value]);
+                    $person->{'set'.\ucfirst($key)}($country);
+                    break;
+                case 'maritalStatus':
+                    $person->setMaritalStatus($this->maritalStatusRepository
+                        ->find($value));
+                    break;
+            }
+        }
+
+        return $person;
     }
 
     /**
      * create a new person from array data
      *
-     * @param array $person
-     * @param ObjectManager $manager
      * @throws \Exception
      */
-    private function addAPerson(array $person, ObjectManager $manager)
+    private function addAPerson(Person $person, ObjectManager $manager)
     {
-        $p = new Person();
-        $p->addAccompanyingPeriod(
-            new AccompanyingPeriod(
-                (new \DateTime())
-                    ->sub(
-                        new \DateInterval('P'.\random_int(0, 180).'D')
-                    )
-            )
+        $accompanyingPeriod = new AccompanyingPeriod(
+            (new \DateTime())
+                ->sub(
+                    new \DateInterval('P' . \random_int(0, 180) . 'D')
+                )
         );
+        $person->addAccompanyingPeriod($accompanyingPeriod);
+        $accompanyingPeriod->addSocialIssue($this->getRandomSocialIssue());
 
-        foreach ($person as $key => $value) {
-            switch ($key) {
-                case 'CountryOfBirth':
-                case 'Nationality':
-                    $value = $this->getCountry($value);
-                    break;
-                case 'Birthdate':
-                    $value = new \DateTime($value);
-                    break;
-                case 'center':
-                case 'maritalStatus':
-                    $value = $this->getReference($value);
-                    break;
-                case 'accompanyingPeriods':
-                    $this->addAccompanyingPeriods($p, $value, $manager);
-                    break;
-            }
-
-            //try to add the data using the setSomething function,
-            // if not possible, fallback to addSomething function
-            if (method_exists($p, 'set'.$key)) {
-                call_user_func(array($p, 'set'.$key), $value);
-            } elseif (method_exists($p, 'add'.$key)) {
-                // if we have a "addSomething", we may have multiple items to add
-                // so, we set the value in an array if it is not an array, and
-                // will call the function addSomething multiple times
-                if (!is_array($value)) {
-                    $value = array($value);
-                }
-
-                foreach($value as $v) {
-                    if ($v !== NULL) {
-                        call_user_func(array($p, 'add'.$key), $v);
-                    }
-                }
-
-            }
+        if (\random_int(0, 10) > 3) {
+            $accompanyingPeriod->setAddressLocation($this->createAddress());
+            $manager->persist($accompanyingPeriod->getAddressLocation());
+            $workflow = $this->workflowRegistry->get($accompanyingPeriod);
+            $workflow->apply($accompanyingPeriod, 'confirm');
         }
 
-        $manager->persist($p);
-        echo "add person'".$p->__toString()."'\n";
+        $manager->persist($person);
+        echo "add person'".$person->__toString()."'\n";
     }
 
+    private function createAddress(): Address
+    {
+        $objectSet = $this->loader->loadData([
+            Address::class => [
+                'address' => [
+                    'street' => '<fr_FR:streetName()>',
+                    'streetNumber' => '<fr_FR:buildingNumber()>',
+                    'validFrom' => '<dateTimeBetween(\'-1 year\', \'now\')>',
+                    'postCode' => $this->getPostalCode()
+                ],
+            ],
+        ]);
+
+        return $objectSet->getObjects()['address'];
+    }
+
+
+
+    private function getRandomSocialIssue(): SocialIssue
+    {
+        if (0 === count($this->cacheSocialIssues)) {
+            $this->cacheSocialIssues = $this->socialIssueRepository->findAll();
+        }
+
+        return $this->cacheSocialIssues[\array_rand($this->cacheSocialIssues)];
+    }
+
+    private function getPostalCode(): PostalCode
+    {
+        $ref = LoadPostalCodes::$refs[\array_rand(LoadPostalCodes::$refs)];
+
+        return $this->getReference($ref);
+    }
 
     /**
      * Create a random point
@@ -250,7 +282,6 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         return Point::fromLonLat($lon, $lat);
     }
 
-
     /**
      * Create a random address
      *
@@ -273,53 +304,77 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         ;
     }
 
-    private function getCountry($countryCode)
+    /**
+     * @internal This method is public and called by faker as a custom generator
+     * @return Center
+     */
+    public function getRandomCenter(): Center
     {
-        if ($countryCode === NULL) {
-            return NULL;
+        if (0 === count($this->cacheCenters)) {
+            $this->cacheCenters = $this->centerRepository->findAll();
         }
-        return $this->container->get('doctrine.orm.entity_manager')
-              ->getRepository('ChillMainBundle:Country')
-              ->findOneByCountryCode($countryCode);
+
+        return $this->cacheCenters[\array_rand($this->cacheCenters)];
     }
 
-    private $maritalStatusRef = ['ms_single', 'ms_married', 'ms_widow', 'ms_separat',
-        'ms_divorce', 'ms_legalco', 'ms_unknown'];
+    /**
+     * @internal This method is public and called by faker as a custom generator
+     * @param int $nullPercentage
+     * @return Country|null
+     * @throws \Exception
+     */
+    public function getRandomCountry(int $nullPercentage = 20): ?Country
+    {
+        if (0 === count($this->cacheCountries)) {
+            $this->cacheCountries = $this->countryRepository->findAll();
+        }
 
-    private $firstNamesMale = array("Jean", "Mohamed", "Alfred", "Robert", "Justin", "Brian",
-        "Compère", "Jean-de-Dieu", "Charles", "Pierre", "Luc", "Mathieu", "Alain", "Etienne", "Eric",
-        "Corentin", "Gaston", "Spirou", "Fantasio", "Mahmadou", "Mohamidou", "Vursuv", "Youssef" );
+        if ($nullPercentage < \random_int(0, 100)) {
+            return NULL;
+        }
 
-    private $firstNamesFemale = array("Svedana", "Sevlatina", "Irène", "Marcelle",
-        "Corentine", "Alfonsine", "Caroline", "Solange", "Gostine", "Fatoumata", "Nicole",
-        "Groseille", "Chana", "Oxana", "Ivana", "Julie", "Tina", "Adèle" );
+        return $this->cacheCountries [\array_rand($this->cacheCountries)];
+    }
 
-    private $lastNames = array("Diallo", "Bah", "Gaillot", "Martin");
+    /**
+     * @internal This method is public and called by faker as a custom generator
+     * @return string
+     */
+    public function getRandomGender(): string
+    {
+        return $this->genders[array_rand($this->genders)];
+    }
 
-    private $lastNamesTrigrams = array("fas", "tré", "hu", 'blart', 'van', 'der', 'lin', 'den',
-        'ta', 'mi', 'net', 'gna', 'bol', 'sac', 'ré', 'jo', 'du', 'pont', 'cas', 'tor', 'rob', 'al',
-        'ma', 'gone', 'car',"fu", "ka", "lot", "no", "va", "du", "bu", "su", "jau", "tte", 'sir',
-        "lo", 'to', "cho", "car", 'mo','zu', 'qi', 'mu');
+    /**
+     * @internal This method is public and called by faker as a custom generator
+     * @param int $nullPercentage
+     * @return MaritalStatus|null
+     * @throws \Exception
+     */
+    public function getRandomMaritalStatus(int $nullPercentage = 50): ?MaritalStatus
+    {
+        if (0 === count($this->cacheMaritalStatuses)) {
+            $this->cacheMaritalStatuses = $this->maritalStatusRepository->findAll();
+        }
 
-    private $genders = array(Person::MALE_GENDER, Person::FEMALE_GENDER);
+        if ($nullPercentage < \random_int(0, 100)) {
+            return NULL;
+        }
 
-    private $years = array();
+        return $this->cacheMaritalStatuses[array_rand($this->cacheMaritalStatuses)];
+    }
 
-    private $month = array();
-
-    private $day = array();
+    private $genders = array(Person::MALE_GENDER, Person::FEMALE_GENDER, Person::BOTH_GENDER);
 
     private $peoples = array(
         array(
-            'LastName' => "Depardieu",
-            'FirstName' => "Gérard",
-            'Birthdate' => "1948-12-27",
-            'PlaceOfBirth' => "Châteauroux",
-            'Gender' => Person::MALE_GENDER,
-            'CountryOfBirth' => 'FR',
-            'Nationality' => 'RU',
-            'center' => 'centerA',
-            'maritalStatus' => 'ms_divorce',
+            'lastName' => "Depardieu",
+            'firstName' => "Gérard",
+            'birthdate' => "1948-12-27",
+            'placeOfBirth' => "Châteauroux",
+            'nationality' => 'RU',
+            'gender' => Person::MALE_GENDER,
+            'center' => 'Center A',
             'accompanyingPeriods' => [
                 [
                     'from' => '2015-02-01',
@@ -338,67 +393,123 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         ),
         array(
             //to have a person with same firstname as Gérard Depardieu
-            'LastName' => "Depardieu",
-            'FirstName' => "Jean",
-            'Birthdate' => "1960-10-12",
-            'CountryOfBirth' => 'FR',
-            'Nationality' => 'FR',
-            'center' => 'centerA',
+            'lastName' => "Depardieu",
+            'firstName' => "Jean",
+            'birthdate' => "1960-10-12",
+            'countryOfBirth' => 'FR',
+            'nationality' => 'FR',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_divorce'
         ),
         array(
             //to have a person with same birthdate of Gérard Depardieu
-            'LastName' => 'Van Snick',
-            'FirstName' => 'Bart',
-            'Birthdate' => '1948-12-27',
-            'center' => 'centerA',
+            'lastName' => 'Van Snick',
+            'firstName' => 'Bart',
+            'birthdate' => '1948-12-27',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_legalco'
         ),
         array(
             //to have a woman with Depardieu as FirstName
-            'LastName' => 'Depardieu',
-            'FirstName' => 'Charline',
-            'Gender' => Person::FEMALE_GENDER,
-            'center' => 'centerA',
+            'lastName' => 'Depardieu',
+            'firstName' => 'Charline',
+            'gender' => Person::FEMALE_GENDER,
+            'center' => 'Center A',
             'maritalStatus' => 'ms_legalco'
         ),
         array(
             //to have a special character in lastName
-            'LastName' => 'Manço',
-            'FirstName' => 'Étienne',
-            'center' => 'centerA',
+            'lastName' => 'Manço',
+            'firstName' => 'Étienne',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_unknown'
         ),
         array(
             //to have true duplicate person
-            'LastName' => "Depardieu",
-            'FirstName' => "Jean",
-            'Birthdate' => "1960-10-12",
-            'CountryOfBirth' => 'FR',
-            'Nationality' => 'FR',
-            'center' => 'centerA',
+            'lastName' => "Depardieu",
+            'firstName' => "Jean",
+            'birthdate' => "1960-10-12",
+            'countryOfBirth' => 'FR',
+            'nationality' => 'FR',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_divorce'
         ),
         array(
             //to have false duplicate person
-            'LastName' => "Depardieu",
-            'FirstName' => "Jeanne",
-            'Birthdate' => "1966-11-13",
-            'CountryOfBirth' => 'FR',
-            'Nationality' => 'FR',
-            'center' => 'centerA',
+            'lastName' => "Depardieu",
+            'firstName' => "Jeanne",
+            'birthdate' => "1966-11-13",
+            'countryOfBirth' => 'FR',
+            'nationality' => 'FR',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_legalco'
         ),
+        [
+            'lastName' => 'Diallo',
+            'firstName' => "Fatoumata Binta"
+        ],
+        [
+            'lastName' => 'Diallo',
+            'firstName' => 'Abdoulaye',
+        ],
+        [
+            'lastName' => 'Diallo',
+            'firstName' => 'Diakite',
+        ],
+        [
+            'lastName' => 'Diallo',
+            'firstName' => 'Mohamed',
+        ],
+        [
+            'lastName' => 'Diallo',
+            'firstName' => 'Fatou',
+        ],
+        [
+            'lastName' => 'Diallo',
+            'firstName' => 'Fanta',
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => "Fatoumata Binta"
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => 'Abdoulaye',
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => 'Diakite',
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => 'Mohamed',
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => 'Fatou',
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => 'Fanta',
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => 'Gaston',
+        ],
+        [
+            'lastName' => 'Gaillot',
+            'firstName' => 'Adèle',
+        ],
     );
 
-
+/*
     private function addAccompanyingPeriods(Person $person, array $periods, ObjectManager $manager)
     {
         foreach ($periods as $period) {
 
             echo "adding new past Accompanying Period..\n";
 
-            /** @var AccompanyingPeriod $accompanyingPeriod */
+            /** @var AccompanyingPeriod $accompanyingPeriod
             $accompanyingPeriod = new AccompanyingPeriod(new \DateTime($period['from']));
             $accompanyingPeriod
                 ->setClosingDate(new \DateTime($period['to']))
@@ -408,4 +519,5 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
             $person->addAccompanyingPeriod($accompanyingPeriod);
         }
     }
+    */
 }

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

@@ -1,82 +0,0 @@
-<?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

@@ -1,70 +0,0 @@
-<?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

@@ -1,90 +0,0 @@
-<?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

@@ -1,94 +0,0 @@
-<?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/DataFixtures/ORM/LoadSocialWorkMetadata.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Chill\PersonBundle\DataFixtures\ORM;
+
+use Chill\PersonBundle\Service\Import\SocialWorkMetadata;
+use Doctrine\Persistence\ObjectManager;
+use League\Csv\Reader;
+
+class LoadSocialWorkMetadata extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Doctrine\Common\DataFixtures\OrderedFixtureInterface
+{
+    private SocialWorkMetadata $importer;
+
+    /**
+     * @param SocialWorkMetadata $importer
+     */
+    public function __construct(SocialWorkMetadata $importer)
+    {
+        $this->importer = $importer;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function load(ObjectManager $manager)
+    {
+        try {
+            $csv = Reader::createFromPath(__DIR__.'/data/social_work_metadata.csv');
+        } catch (Throwable $e) {
+            throw new Exception('Error while loading CSV.',0, $e);
+        }
+
+        $csv->setDelimiter(";");
+
+        $this->importer->import($csv);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder()
+    {
+        return 9500;
+    }
+}

src/Bundle/ChillPersonBundle/DataFixtures/ORM/data/social_work_metadata.csv

@@ -0,0 +1,420 @@
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;ACCES AUX DROITS;Informer, conseiller;;;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;ACCES AUX DROITS;Aider à l'inclusion numérique;;;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;ACCES AUX DROITS;Demander une aide juridictionnelle;;;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;ACCES AUX DROITS;Aider à l'ouverture aux droits;;;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;ACCES AUX DROITS;Demander une aide alimentaire;;;;Demande aide alimentaire
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Informer, conseiller;;;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : Centre Communal d’Action Sociale;;Demande aide impayé CCAS
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : CAF/MSA - Secours d’urgence;;Demande aide impayé CAF
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : CAF/MSA - Aide financière;;Demande aide impayé CAF
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : Caisse Primaire d’Assurance Maladie;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : FSL Maintien - Impayés de loyer;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : FSL Maintien - Énergie / Fluides;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : FSL Maintien - Impayés télécommunication;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : FSL Maintien - Impayés aire d'accueil GDV ;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : FSL Maintien - Lié à la COVID;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : Secours exceptionnels;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Instruire le dossier de surendettement;;;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une mesure de protection adulte;;Objectif : Sauvegarde de justice;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une mesure de protection adulte;;Objectif : Mesure d'Accompagnement Judiciaire (MAJ);;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une mesure de protection adulte;;Objectif : Signalement personne vulnérable;;Formulaire signalement personne vulnérable
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une mesure de protection adulte;;Objectif : Mesure de protection personne majeure (tutelle, curatelle);;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Faire une demande auprès des associations caritatives;;;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Instruire des formulaires auprès d'autres organismes (Locapass, Fastt, …);;;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Instruire une première demande d'AEB;;;;Demande AEB
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander un renouvellement d'AEB;;Objectif : Dans l'attente d'une mesure de protection ;;Renouvellement AEB
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander un renouvellement d'AEB;;Objectif : Pour poursuivre les objectifs engagés;;Renouvellement AEB
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Instruire une première demande de MASP;;;;Demande MAPS
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander un renouvellement MASP;;Objectif : Dans l'attente d'une mesure de protection ;;Renouvellement MASP
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander un renouvellement MASP;;Objectif : Pour poursuivre les objectifs engagés;;Renouvellement MASP
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Soutenir dans les démarches administratives;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Aider au tri, au classement et à l’archivage des documents administratifs;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Soutenir les ménages dans l’apurement des dettes, accompagner les ménages endettées, surendettées;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Accompagner les ménages dans leur gestion budgétaire;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Aider les ménages à se questionner sur leur mode de consommation;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Assurer une fonction de médiation;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Soutenir les ménages dans les démarches liées au logement;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Aider à l'accès aux droits;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Aider à l'inclusion numérique;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Instruire des formulaires d'autres organismes non référencés…;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Instruire le dossier de surendettement ;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Demander ou renouveler la couverture santé (ACS);;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide alimentaire;;;Demande aide alimentaire
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : Centre Communal d’Action Sociale;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : CAF/MSA - Secours d’urgence;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : CAF/MSA - Aide financière;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : Caisse Primaire d’Assurance Maladie ;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Cautionnement;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Dépôt de garantie;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - 1er loyer;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Frais d’agence;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Assurances;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Déménagement;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Aide à l’installation;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Facture résiliation énergie (nv logement);;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Impayés de loyer;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Énergie / Fluides;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Impayés télécommunication;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Impayés aire d'accueil GDV ;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Lié à la COVID;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : Secours exceptionnels;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : Mesure ASLL;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Faire une demande auprès de Association caritative;;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une mesure de protection ;Objectif : Sauvegarde de justice;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une mesure de protection ;Objectif : Signalement personne vulnérable;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une mesure de protection ;Objectif : Mesure de protection personne majeure (tutelle, curatelle);;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une mesure de protection ;Objectif : Mesure d'Accompagnement Judiciaire (MAJ);;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une mesure de protection ;Objectif : Mesure Judiciaire d'Aide à la Gestion du Budget Familial (MJAGBF);;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Arrêt à l'initiative du ménage pour déménagement;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Suspension momentanée de l'accompagnement par le ménage ou le professionnel;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Arrêt pour absence d'adhésion;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Arrêt à l'initiative du ménage pour séparation;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Arrêt à l'initiative du professionnel pour absence d'avancée ;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Retour à l'autonomie;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Transmission pour mesure judiciaire d'aide à la gestion du budget familial;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Orientation vers une MASP;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Transmission pour une mesure d'accompagnement judiciaire ;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Renouvellement de l'AEB dans l'attente d'une mesure de protection ;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Renouvellement de l'AEB pour poursuivre les objectifs engagés;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Soutenir dans les démarches administratives;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Aider au tri, au classement et à l’archivage des documents administratifs;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Soutenir les ménages dans l’apurement des dettes, accompagner les ménages endettées, surendettées;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Accompagner les ménages dans leur gestion budgétaire;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Aider les ménages à se questionner sur leur mode de consommation;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Assurer une fonction de médiation;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Soutenir les ménages dans les démarches liées au logement;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Aider à l'accès aux droits;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Aider à l'inclusion numérique;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Instruire des formulaires d'autres organismes non référencés…;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Instruire le dossier de surendettement ;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Demander ou renouveler la couverture santé (ACS);;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide alimentaire;;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : Centre Communal d’Action Sociale;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : CAF/MSA - Secours d’urgence;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : CAF/MSA - Aide financière;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : Caisse Primaire d’Assurance Maladie ;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Cautionnement;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Dépôt de garantie;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - 1er loyer;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Frais d’agence;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Assurances;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Déménagement;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Aide à l’installation;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Facture résiliation énergie (nv logement);;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Impayés de loyer;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Énergie / Fluides;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Impayés télécommunication;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Impayés aire d'accueil GDV ;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Lié à la COVID;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : Secours exceptionnels;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : Mesure ASLL;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une mesure de protection adulte;Objectif : Sauvegarde de justice;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une mesure de protection adulte;Objectif : Signalement personne vulnérable;;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une mesure de protection adulte;Objectif : Mesure de protection personne majeure (tutelle, curatelle);;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une mesure de protection adulte;Objectif : Mesure d'Accompagnement Judiciaire (MAJ);;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une mesure de protection adulte;Objectif : Mesure Judiciaire d'Aide à la Gestion du Budget Familial (MJAGBF);;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Arrêt à l'initiative du ménage pour déménagement;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Suspension momentanée de l'accompagnement par le ménage ou le professionnel;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Arrêt pour absence d'adhésion;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Arrêt à l'initiative du ménage pour séparation;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Arrêt à l'initiative du professionnel pour absence d'avancée ;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Retour à l'autonomie;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Transmission pour mesure judiciaire d'aide à la gestion du budget familial;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Transmission pour une mesure d'accompagnement judiciaire ;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Renouvellement de MASP dans l'attente d'une mesure de protection ;
+AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Renouvellement de MASP pour poursuivre les objectifs engagés;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Informer, conseiller;;;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Cautionnement;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Dépôt de garantie;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - 1er loyer;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Frais d’agence;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Assurances;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Déménagement;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Aide à l’installation;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Facture résiliation énergie (nv logement);;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Mesure ASLL;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Demander auprès des Bailleurs sociaux, mairies, partenaires;;;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Instruire une demande DALO, DAHO;;;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Instruire une demande SIAO;;;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Instruire une demande ASLL;;;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Instruire une demande au Contingent préfectoral;;;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Instruire une demande au 115;;;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Intervenir au commandement de payer;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Instruire la fiche Assignation;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Répondre au commandement de quitter les lieux;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Répondre au concours de la force publique;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Demander une aide financière FSL pour impayé de loyer;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Déposer un dossier de surendettement;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Demander auprès des Bailleurs sociaux, mairies, partenaires;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Instruire une demande DALO, DAHO;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Instruire une demande SIAO;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Instruire une demande ASLL;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Instruire une demande au Contingent préfectoral;;
+AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Instruire une demande au 115;;
+AD - LOGEMENT;HABITAT INDIGNE;Informer, conseiller;;;;
+AD - LOGEMENT;HABITAT INDIGNE;Demander une aide pour incurie;;Objectif : FSL maintien - aide incurie;;
+AD - LOGEMENT;HABITAT INDIGNE;Instruire la grille de signalement;;;;
+AD - LOGEMENT;HABITAT INDIGNE;Faire intervenir d'autres partenaires;;;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Informer, conseiller;;;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Demander un accompagnement psychologue insertion;;;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Exercer l'accompagnement psychologue insertion;;;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Renouveller l'accompagnement psychologue insertion;;;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Réorienter l'usager vers autres structures pour un accompagnement psychologique;;;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Demander l'accompagnement global;;Objectif : Axe 2;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Exercer l'accompagnement global;;Objectif : Axe 2;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Renouveller l'accompagnement global;;Objectif : Axe 2;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Demander l'accompagnement global;;Objectif : Axe 3 (agent d'insertion);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Exercer l'accompagnement global;;Objectif : Axe 3 (agent d'insertion);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Renouveller l'accompagnement global;;Objectif : Axe 3 (agent d'insertion);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Instruire une demande MOVEA;;;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Informer, conseiller;;;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;"Aider à l'ouverture de droits
+";;;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renseigner la plateforme INCLUSION@COM pour les chantiers d'insertion;;;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Soutenir le parcours professionnel (emploi, formation, …);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement global Axe 2 (orientation Pôle Emploi);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Orienter vers une structure de l'insertion (chantier, AI, ETTI, …);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Demander la médiation emploi;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Création d'entreprise;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement travailleur non salarié;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement ASR CEIDRE;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Déposer un dossier MDPH;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Déposer un dossier retraite;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Soutenir l'accès au logement;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Accompagner le budget;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Soutenir la mobilité (MOVEA, transport solidaire, PST, …);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Demander le psychologue insertion;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Etre accompagné dans la parentalité;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Initier ou maintenir un parcours santé (cure, hospitalisation, CMP, …);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Solliciliter un FAII;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Demander un réorientation Pôle Emploi;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Autre;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Soutenir le parcours professionnel (emploi, formation, …);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement global Axe 2 (orientation Pôle Emploi);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Orienter vers une structure de l'insertion (chantier, AI, ETTI, …);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Demander la médiation emploi;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Création d'entreprise;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement travailleur non salarié;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement ASR CEIDRE;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Déposer un dossier MDPH;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Déposer un dossier retraite;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Soutenir l'accès au logement;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Accompagner le budget;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Soutenir la mobilité (MOVEA, transport solidaire, PST, …);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Demander le psychologue insertion;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Etre accompagné dans la parentalité;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Initier ou maintenir un parcours santé;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Solliciliter un FAII;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Demander un réorientation Pôle Emploi;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Autre;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Soutenir le parcours professionnel (emploi, formation, …);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement global Axe 2 (orientation Pôle Emploi);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Orienter vers une structure de l'insertion (chantier, AI, ETTI, …);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Demander la médiation emploi;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Création d'entreprise;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement travailleur non salarié;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement ASR CEIDRE;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Déposer un dossier MDPH;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Déposer un dossier retraite;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Soutenir l'accès au logement;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Accompagner le budget;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Soutenir la mobilité (MOVEA, transport solidaire, PST, …);;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Demander le psychologue insertion;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Etre accompagné dans la parentalité;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Initié ou maintenir un parcours santé;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Solliciliter un FAII;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Demander un réorientation Pôle Emploi;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Autre;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Informer, conseiller;;;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Demander une aide FAJ;;Objectif : SU bons alimentaires;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Demander une aide FAJ;;Objectif : SU bons hygiène;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Demander une aide FAJ;;Objectif : SU bons carburant;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Demander une aide FAJ;;Objectif : SU virement;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Solliciter le comité FAJ;;Objectif : Aide financière;;
+AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Solliciter le comité FAJ;;Objectif : Action d’accompagnement;;
+AD - SANTE;;Informer, conseiller;;;;
+AD - SANTE;;Orienter vers une structure de soins (CMP, psychologue, cure, …);;;;
+AD - SANTE;;Instruire un dossier MDPH;;;;
+AD - SANTE;;Accompagner le dépôt de dossier de pension d'invalidité;;;;
+AD - SANTE;;Instruire le dossier Complémentaire santé ACS;;;;
+AD – ACCOMPAGNEMENT SPECIFIQUE;;Informer, conseiller;;;;
+AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Procéder à une élection de domicile;;
+AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Demander une aide financière;;
+AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Demander un interprète;;
+AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Prendre contact avec le CADA;;
+AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Aider à la constitution de dossier auprès de la préfecture;;
+AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Faire le lien avec les associations;;
+AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Demander une aide médicale d'état;;
+AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Demander une carte mobilité;;
+AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Accompagner pour la scolarité des enfants (crèches, collège, péri scolaire, cantine…);;
+AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Aider à la compréhension du français;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Informer, conseiller;;;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Orienter vers une autre structure;;;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Instruire une première demande d'Accompagnement Educatif de Prevention;;;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Demander le renouvellement de l'Accompagnement Educatif de Prévention;;;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique :  : Conduite à risque / Passage à l'acte isolé de l'enfant/adolescent;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : Comportement de l'enfant/adolescent en difficulté avec les limites, les interdits, les règles sociales;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : Difficultés de l'enfant en milieu scolaire ou extra-scolaire;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : Difficultés liées à la prise d'autonomie;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : Evènement - Traumatisme qui affecte l'équilibre familial;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : Problème de communication intrafamiliale;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : Parents démunis sur le plan éducatif;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : conflits parentaux ayant des résonnances sur l'enfant/l'adolescent;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : travailler la place de chacun;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : Conseiller et soutenir le positionnement éducatif;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : Accompagner la relation parent-enfant;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : Accompagner les parents en lien avec les lieux de scolarisation et de socialisation de leurs enfants;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : Accompagner/orienter les parents en lien avec les lieux de soins ;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : Accompagnement d’un jeune majeur;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : évaluation / Orientation;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : mise en place TISF;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : Mise en place AED;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : Mise en place CJM;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : Mise en place d'un AP;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : Transmission judiciaire pour AEMO;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : Tramsmission judiciaire pour MJIE;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : Transmission judiciaire pour une mesure de protection;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Arrêt à l’initiative de la famille;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Souhait interruption momentanée de l’accompagnement par la famille ;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Orientation vers un partenaire extérieur;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Relais avec AS et/ou Puér;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Arrêt à échéance;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Transmission à l’ASE pour une mesure administrative;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Transmission à l’ASE pour une mesure judiciaire;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Renouvellement de l’AEP dans l’attente d’une mesure ASE;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Renouvellement de l’AEP pour poursuivre les objectifs engagés;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Réaliser une permanence éducative;;;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Médiatiser les relations familiales;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander le passage en IRCP;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une mise en place TISF;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander le renouvellement TISF;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une mise en place AED;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une mise en place AESF;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une mise en place d'un AP (accueil provisoire);;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une mesure ASMI;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une entrée en centre maternelle;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une entrée en centre parental;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une entrée en Unité Mère Enfant (UME);;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une MJAGBF;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une AED TDC;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander la désignation un TDC;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander un CAP ASE;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une AMAE (allocation mensuelle d'aide éducative);;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une allocation socio-éducatif spécifique;;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander un CAFI (aides fi);;
+ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une autre aide (associations…);;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;Motif : arrêt de l'adhésion des parents à l'accompagnement du soutien à la parentalité;;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;Motif : violence intra-familiale;;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;Motif : suite à une ISG;;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;;Faire une FRIP;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;;Demander une MJIE;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;;Demander une mesure de protection;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;;Demander un OPP;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;;Demander un placement;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;Motif : arrêt de l'adhésion des parents à l'accompagnement du soutien à la parentalité;;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;Motif : violence intra-familiale;;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;Motif : suite à une ISG;;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;;Demander une MJIE;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;;Demander une mesure de protection;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;;Demander un OPP;
+ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;;Demander un placement;
+ENFANT / FAMILLE;ENFANT PREVENTION;Répondre à Eléments en votre possession;;;;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Evaluation sans suite;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Evaluation demande d'accompagnement médico-sociale;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Evaluation pur demande de MJIE;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Evaluation pour demande d'AEMO;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Evaluation pour demande de  placement;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Evaluation pour demande d'OPP;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Note complémentaire actualisation;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Evaluation sans suite;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Evaluation demande d'accompagnement médico-sociale;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Evaluation pur demande de MJIE;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Evaluation pour demande d'AEMO;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Evaluation pour demande de  placement;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Evaluation pour demande d'OPP;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Note complémentaire actualisation;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander un AEP;;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander une mise en place AED;;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander une mise en place TISF;;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander la mise en place d'un Accueil Provisoire;;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander l'orientation vers d'autres structures (soins, MDA, …);;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander l'entrée en centre maternel ;;
+ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander l'entrée unité mère / enfant;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Informer, conseiller;;;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Orienter vers SOS femme;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Proposer un conseiller ou une thérapie conjugale;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Proposer une médiation familiale;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Aider au dépôt de plainte;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Signaler un adulte vulnérable au procureur ;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Demander une mesure de protection majeur;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Faire une FRIP pour enfant en danger;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Instruire la fiche VIF;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Conseiller  ;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Problématique : VIF;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Problématique : Difficultés éducatives;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Problématique : Protection de l’enfance;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Problématique : Violences sexuelles;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Problématique : Information suite à une séparation;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Orienter vers l'AS de secteur;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Orienter vers SOS femme;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Orienter vers un accompagnement CMP/libéral;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Orienter vers un conseiller ou thérapeute conjugal;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Aider au dépôt de plainte;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Signaler un adulte vulnérable au procureur ;;
+ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Demander une mesure de protection majeur;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Accompagner le lieu d'accueil;;;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Mettre en place un soutien parental;;Mise en place TISF;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Mettre en place un soutien parental;;Demande aide financière / SU;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Mettre en place un soutien parental;;Demande SU;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Mettre en place un soutien parental;;Participation à des actions collectives;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Mettre en place un soutien parental;;Mise en place d'un loisir familial ;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Mettre en place un soutien parental;;Mise en place d'une aide transport;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Accompagner le mineur;;Demande mise en place d'un accompagnement psychologique;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Accompagner le mineur;;Construire le PPE;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Accompagner le mineur;;Mise en place CJM;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Accompagner le mineur;;Demande MDPH ;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Accompagner le mineur;;Organiser la mise en place d'un loisir;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Elaborer le lien partenarial;;;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Demander une protection majeur vulnérable;;;;
+ENFANT PROTECTION;ACCUEIL PROVISOIRE;Demande de MJIE (mesure judiciaire d'investigation éducative);;;;
+ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Accompagner le lieu d'accueil;;;;
+ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Mettre en place un soutien parental;;Mise en place TISF;;
+ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Mettre en place un soutien parental;;Demande aide financière;;
+ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Mettre en place un soutien parental;;Demande SU;;
+ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Mettre en place un soutien parental;;Demande de protection majeur vulnérable;;
+ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Accompagner le mineur;;;;
+ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Elaborer le lien partenarial;;;;
+ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT CHEZ LE PARENT;Mettre en place un soutien parental;;;;
+ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT CHEZ LE PARENT;Accompagner le mineur;;Construire le PPE;;
+ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT CHEZ LE PARENT;Accompagner le mineur;;Mise en place CJM;;
+ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT CHEZ LE PARENT;Accompagner le mineur;;Organiser la participation à un camp de vacances;;
+ENFANT PROTECTION;DELEGATION D'AUTORITE PARENTALE;Accompagner le lieu d'accueil;;;;
+ENFANT PROTECTION;DELEGATION D'AUTORITE PARENTALE;Accompagner le mineur;;;;
+ENFANT PROTECTION;DELEGATION D'AUTORITE PARENTALE;Elaborer le lien partenarial;;;;
+ENFANT PROTECTION;TUTELLE DEPARTEMENTALE;;;;;
+ENFANT PROTECTION;TUTELLE D'ETAT;Accompagner le lieu d'accueil;;;;
+ENFANT PROTECTION;TUTELLE D'ETAT;Accompagner le mineur;;;;
+ENFANT PROTECTION;TUTELLE D'ETAT;Elaborer le lien partenarial;;;;
+ENFANT PROTECTION;AEMO TDC;Accompagner le lieu d'accueil;;;;
+ENFANT PROTECTION;AEMO TDC;Mettre en place un soutien parental;;;;
+ENFANT PROTECTION;AEMO TDC;Accompagner le mineur;;;;
+ENFANT PROTECTION;AEMO TDC;Elaborer le lien partenarial;;;;
+ENFANT PROTECTION;AEMO FAMILLE;Mettre en place un soutien parental;;;;
+ENFANT PROTECTION;AEMO FAMILLE;Accompagner le mineur;;;;
+ENFANT PROTECTION;AEMO FAMILLE;Elaborer le lien partenarial;;;;
+AGREMENT;ASSISTANT MATERNEL;Instruire une première demande;;;;
+AGREMENT;ASSISTANT MATERNEL;Instruire un renouvellement;;;;
+AGREMENT;ASSISTANT MATERNEL;Instruire une modification;;;;
+AGREMENT;ASSISTANT MATERNEL;Suivre un(e) ASSMAT;;;;
+AGREMENT;ASSISTANT MATERNEL;Contrôler un(e) ASSMAT;;;;
+AGREMENT;ASSISTANT MATERNEL;Accompagner un(e) ASSMAT;;;;
+AGREMENT;ASSISTANT FAMILIAL;Instruire une première demande;;;;
+AGREMENT;ASSISTANT FAMILIAL;Instruire un renouvellement;;;;
+AGREMENT;ASSISTANT FAMILIAL;Instruire une modification;;;;
+AGREMENT;ASSISTANT FAMILIAL;Suivre un(e) ASSFAM;;;;
+AGREMENT;ASSISTANT FAMILIAL;Contrôler un(e) ASSFAM;;;;
+AGREMENT;ASSISTANT FAMILIAL;Accompagner un(e) ASSFAM;;;;
+AGREMENT;FAMILLE D'ACCUEIL PA/PH;Contribuer à l'évaluation si Famille d'Accueil connue;;Première demande;;
+AGREMENT;FAMILLE D'ACCUEIL PA/PH;Contribuer à l'évaluation si Famille d'Accueil connue;;Renouvellement;;
+AGREMENT;FAMILLE D'ACCUEIL PA/PH;Contribuer à l'évaluation si Famille d'Accueil connue;;Modification;;
+AGREMENT;FAMILLE D'ACCUEIL PA/PH;Contribuer à l'évaluation si Famille d'Accueil connue;;Suivi;;

src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php

@@ -345,6 +345,111 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ]
                     ]
                 ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\SocialWork\SocialIssue::class,
+                    'name' => 'social_issue',
+                    'base_path' => '/admin/social-work/social-issue',
+                    'form_class' => \Chill\PersonBundle\Form\SocialWork\SocialIssueType::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminSocialIssueController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/SocialIssue/index.html.twig',
+                        ],
+                        'new'   => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/new.html.twig',
+                        ],
+                        'edit'  => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/edit.html.twig',
+                        ]
+                    ]
+                ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\SocialWork\SocialAction::class,
+                    'name' => 'social_action',
+                    'base_path' => '/admin/social-work/social-action',
+                    'form_class' => \Chill\PersonBundle\Form\SocialWork\SocialActionType::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminSocialActionController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/SocialAction/index.html.twig',
+                        ],
+                        'new'   => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/new.html.twig',
+                        ],
+                        'edit'  => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/edit.html.twig',
+                        ]
+                    ]
+                ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\SocialWork\Goal::class,
+                    'name' => 'social_goal',
+                    'base_path' => '/admin/social-work/goal',
+                    'form_class' => \Chill\PersonBundle\Form\SocialWork\GoalType::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminGoalController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/Goal/index.html.twig',
+                        ],
+                        'new'   => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/new.html.twig',
+                        ],
+                        'edit'  => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/edit.html.twig',
+                        ]
+                    ]
+                ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\SocialWork\Result::class,
+                    'name' => 'social_result',
+                    'base_path' => '/admin/social-work/result',
+                    'form_class' => \Chill\PersonBundle\Form\SocialWork\ResultType::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminResultController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/Result/index.html.twig',
+                        ],
+                        'new'   => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/new.html.twig',
+                        ],
+                        'edit'  => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/edit.html.twig',
+                        ]
+                    ]
+                ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\SocialWork\Evaluation::class,
+                    'name' => 'social_evaluation',
+                    'base_path' => '/admin/social-work/evaluation',
+                    'form_class' => \Chill\PersonBundle\Form\SocialWork\EvaluationType::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminEvaluationController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/Evaluation/index.html.twig',
+                        ],
+                        'new'   => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/new.html.twig',
+                        ],
+                        'edit'  => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/SocialWork/edit.html.twig',
+                        ]
+                    ]
+                ],
             ],
             'apis' => [
                 [

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -25,6 +25,7 @@ namespace Chill\PersonBundle\Entity;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\Address;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
@@ -291,6 +292,22 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      */
     private Collection $works;
 
+    /**
+     * @ORM\ManyToOne(
+     *  targetEntity=Person::class,
+     *  inversedBy="periodLocatedOn"
+     * )
+     */
+    private ?Person $personLocation = null;
+
+
+    /**
+     * @ORM\ManyToOne(
+     *  targetEntity=Address::class
+     * )
+     */
+    private ?Address $addressLocation = null;
+
     /**
      * AccompanyingPeriod constructor.
      *
@@ -824,7 +841,9 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
 
     public function addSocialIssue(SocialIssue $socialIssue): self
     {
-        $this->socialIssues[] = $socialIssue;
+        if (!$this->socialIssues->contains($socialIssue)) {
+            $this->socialIssues[] = $socialIssue;
+        }
 
         return $this;
     }
@@ -931,4 +950,67 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
 
         return $this;
     }
+
+    public function getAddressLocation(): ?Address
+    {
+        return $this->addressLocation;
+    }
+
+    /**
+     * @Groups({"write"})
+     */
+    public function setAddressLocation(?Address $addressLocation = null): self
+    {
+        $this->addressLocation = $addressLocation;
+
+        return $this;
+    }
+
+    /**
+     * @Groups({"read"})
+     */
+    public function getPersonLocation(): ?Person
+    {
+        return $this->personLocation;
+    }
+
+    /**
+     * @Groups({"write"})
+     */
+    public function setPersonLocation(?Person $person = null): self
+    {
+        $this->personLocation = $person;
+
+        return $this;
+    }
+
+    /**
+     * Get the location, taking precedence into account
+     *
+     * @Groups({"read"})
+     */
+    public function getLocation(\DateTimeImmutable $at = null): ?Address
+    {
+        if ($this->getPersonLocation() instanceof Person) {
+           return $this->getPersonLocation()->getCurrentHouseholdAddress($at);
+        }
+
+        return $this->getAddressLocation();
+    }
+
+    /**
+     * Get where the location is
+     *
+     * @Groups({"read"})
+     */
+    public function getLocationStatus(): string
+    {
+        if ($this->getPersonLocation() instanceof Person) {
+            return 'person';
+        } elseif ($this->getAddressLocation() instanceof Address) {
+            return 'address';
+        } else {
+            return 'none';
+        }
+    }
 }

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

@@ -160,12 +160,26 @@ use Symfony\Component\Validator\Constraints as Assert;
      */
     private Collection $persons;
 
+     /**
+      * @var Collection
+      * @ORM\OneToMany(
+      *     targetEntity=AccompanyingPeriodWorkEvaluation::class,
+      *     mappedBy="accompanyingPeriodWork",
+      *     cascade={"persist"},
+      *     orphanRemoval=true
+      * )
+      * @Serializer\Groups({"read"})
+      * @internal /!\ the serialization for read / write evaluations is handled in `AccompanyingPeriodWorkDenormalizer`
+      */
+    private Collection $accompanyingPeriodWorkEvaluations;
+
     public function __construct()
     {
         $this->goals = new ArrayCollection();
         $this->results = new ArrayCollection();
         $this->thirdParties = new ArrayCollection();
         $this->persons = new ArrayCollection();
+        $this->accompanyingPeriodWorkEvaluations = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -388,6 +402,11 @@ use Symfony\Component\Validator\Constraints as Assert;
         return $this->thirdParties;
     }
 
+    public function getThirdPartys(): Collection
+    {
+        return $this->getThirdParties();
+    }
+
     public function addThirdParty(ThirdParty $thirdParty): self
     {
         if (!$this->thirdParties->contains($thirdParty)) {
@@ -424,4 +443,31 @@ use Symfony\Component\Validator\Constraints as Assert;
 
         return $this;
     }
+
+     /**
+      * @return Collection
+      */
+     public function getAccompanyingPeriodWorkEvaluations()
+     {
+         return $this->accompanyingPeriodWorkEvaluations;
+     }
+
+     public function addAccompanyingPeriodWorkEvaluation(AccompanyingPeriodWorkEvaluation $evaluation): self
+     {
+         if (!$this->accompanyingPeriodWorkEvaluations->contains($evaluation)) {
+             $this->accompanyingPeriodWorkEvaluations[] = $evaluation;
+             $evaluation->setAccompanyingPeriodWork($this);
+         }
+
+         return $this;
+     }
+
+     public function removeAccompanyingPeriodWorkEvaluation(AccompanyingPeriodWorkEvaluation $evaluation): self
+     {
+         $this->accompanyingPeriodWorkEvaluations
+             ->removeElement($evaluation);
+         $evaluation->setAccompanyingPeriodWork(null);
+
+         return $this;
+     }
 }

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

@@ -0,0 +1,369 @@
+<?php
+
+namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
+
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use DateInterval;
+use DateTimeImmutable;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("chill_person_accompanying_period_work_evaluation")
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
+ *        "accompanying_period_work_evaluation"=AccompanyingPeriodWorkEvaluation::class,
+ *     })
+ */
+class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCreationInterface
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity=AccompanyingPeriodWork::class,
+     *     inversedBy="accompanyingPeriodWorkEvaluations"
+     * )
+     */
+    private ?AccompanyingPeriodWork $accompanyingPeriodWork = null;
+
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity=Evaluation::class
+     * )
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     */
+    private ?Evaluation $evaluation = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     */
+    private ?DateTimeImmutable $startDate = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     */
+    private ?DateTimeImmutable $endDate = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     */
+    private ?DateTimeImmutable $maxDate = null;
+
+    /**
+     * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     */
+    private ?DateInterval $warningInterval = null;
+
+    /**
+     * @var string
+     * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     */
+    private string $comment = '';
+
+   /**
+     * @ORM\ManyToOne(
+     *     targetEntity=User::class
+     * )
+    * @Serializer\Groups({"read"})
+    */
+    private ?User $createdBy = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
+     */
+    private ?DateTimeImmutable $createdAt = null;
+
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity=User::class
+     * )
+     * @Serializer\Groups({"read"})
+     */
+    private ?User $updatedBy = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
+     */
+    private ?DateTimeImmutable $updatedAt = null;
+
+    /**
+     * @var Collection
+     * @ORM\OneToMany(
+     *     targetEntity=AccompanyingPeriodWorkEvaluationDocument::class,
+     *     mappedBy="accompanyingPeriodWorkEvaluation"
+     *     )
+     * @Serializer\Groups({"read"})
+     */
+    private Collection $documents;
+
+    public function __construct()
+    {
+        $this->documents = new ArrayCollection();
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return AccompanyingPeriodWork|null
+     */
+    public function getAccompanyingPeriodWork(): ?AccompanyingPeriodWork
+    {
+        return $this->accompanyingPeriodWork;
+    }
+
+    /**
+     * @param AccompanyingPeriodWork|null $accompanyingPeriodWork
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setAccompanyingPeriodWork(?AccompanyingPeriodWork $accompanyingPeriodWork): AccompanyingPeriodWorkEvaluation
+    {
+        if (
+            $accompanyingPeriodWork instanceof AccompanyingPeriodWork
+            && $this->accompanyingPeriodWork instanceof AccompanyingPeriodWork
+            && $this->accompanyingPeriodWork->getId() !== $accompanyingPeriodWork->getId()) {
+            throw new \RuntimeException("Changing the ".
+            "accompanyingPeriodWork is not allowed");
+        }
+
+        $this->accompanyingPeriodWork = $accompanyingPeriodWork;
+        return $this;
+    }
+
+    /**
+     * @return Evaluation|null
+     */
+    public function getEvaluation(): ?Evaluation
+    {
+        return $this->evaluation;
+    }
+
+    /**
+     * @param Evaluation|null $evaluation
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setEvaluation(?Evaluation $evaluation): AccompanyingPeriodWorkEvaluation
+    {
+        if (
+            ($evaluation instanceof Evaluation
+                && $this->evaluation instanceof Evaluation
+                && $evaluation->getId() !== $this->evaluation->getId())
+            ||
+            ($this->evaluation instanceof Evaluation
+                && null === $evaluation)
+        ) {
+            throw new \LogicException("once set, an ${self::class} cannot
+                change or remove the linked Evaluation::class");
+        }
+
+        $this->evaluation = $evaluation;
+
+        return $this;
+    }
+
+    /**
+     * @return DateTimeImmutable|null
+     */
+    public function getStartDate(): ?DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    /**
+     * @param DateTimeImmutable|null $startDate
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setStartDate(?DateTimeImmutable $startDate): AccompanyingPeriodWorkEvaluation
+    {
+        $this->startDate = $startDate;
+        return $this;
+    }
+
+    /**
+     * @return DateTimeImmutable|null
+     */
+    public function getEndDate(): ?DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    /**
+     * @param DateTimeImmutable|null $endDate
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setEndDate(?DateTimeImmutable $endDate): AccompanyingPeriodWorkEvaluation
+    {
+        $this->endDate = $endDate;
+        return $this;
+    }
+
+    /**
+     * @return DateTimeImmutable|null
+     */
+    public function getMaxDate(): ?DateTimeImmutable
+    {
+        return $this->maxDate;
+    }
+
+    /**
+     * @param DateTimeImmutable|null $maxDate
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setMaxDate(?DateTimeImmutable $maxDate): AccompanyingPeriodWorkEvaluation
+    {
+        $this->maxDate = $maxDate;
+        return $this;
+    }
+
+    /**
+     * @return DateInterval|null
+     */
+    public function getWarningInterval(): ?DateInterval
+    {
+        return $this->warningInterval;
+    }
+
+    /**
+     * @param DateInterval|null $warningInterval
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setWarningInterval(?DateInterval $warningInterval): AccompanyingPeriodWorkEvaluation
+    {
+        $this->warningInterval = $warningInterval;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getComment(): string
+    {
+        return $this->comment;
+    }
+
+    /**
+     * @param string $comment
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setComment(string $comment): AccompanyingPeriodWorkEvaluation
+    {
+        $this->comment = $comment;
+        return $this;
+    }
+
+    /**
+     * @return User|null
+     */
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    /**
+     * @param User|null $createdBy
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setCreatedBy(?User $createdBy): AccompanyingPeriodWorkEvaluation
+    {
+        $this->createdBy = $createdBy;
+        return $this;
+    }
+
+    /**
+     * @return DateTimeImmutable|null
+     */
+    public function getCreatedAt(): ?DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+
+    /**
+     * @param DateTimeImmutable|null $createdAt
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setCreatedAt(\DateTimeInterface $createdAt): self
+    {
+        $this->createdAt = $createdAt;
+        return $this;
+    }
+
+    /**
+     * @return User|null
+     */
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
+    /**
+     * @param User|null $updatedBy
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setUpdatedBy(?User $updatedBy): AccompanyingPeriodWorkEvaluation
+    {
+        $this->updatedBy = $updatedBy;
+        return $this;
+    }
+
+    /**
+     * @return DateTimeImmutable|null
+     */
+    public function getUpdatedAt(): ?DateTimeImmutable
+    {
+        return $this->updatedAt;
+    }
+
+    /**
+     * @param DateTimeImmutable|null $updatedAt
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setUpdatedAt(\DateTimeInterface $updatedAt): self
+    {
+        $this->updatedAt = $updatedAt;
+        return $this;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getDocuments()
+    {
+        return $this->documents;
+    }
+
+
+}

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

@@ -0,0 +1,175 @@
+<?php
+
+namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("chill_person_accompanying_period_work_evaluation_document")
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
+ *     "accompanying_period_work_evaluation_document"=AccompanyingPeriodWorkEvaluationDocument::class
+ *     })
+ */
+class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doctrine\Model\TrackCreationInterface, \Chill\MainBundle\Doctrine\Model\TrackUpdateInterface
+{
+    /**
+     * @var int|null
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     *
+     * @internal the default name exceeds 64 characters, we must set manually:
+     * @ORM\SequenceGenerator(sequenceName="chill_person_social_work_eval_doc_id_seq", allocationSize=1, initialValue=1000)
+     * @Serializer\Groups({"read"})
+     */
+    private ?int $id;
+
+    /**
+     * @var AccompanyingPeriodWorkEvaluation|null
+     * @ORM\ManyToOne(
+     *     targetEntity=AccompanyingPeriodWorkEvaluation::class,
+     *     inversedBy="documents"
+     * )
+     */
+    private ?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation;
+
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity=User::class
+     * )
+     * @Serializer\Groups({"read"})
+     */
+    private ?User $createdBy;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
+     */
+    private ?\DateTimeImmutable $createdAt;
+
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity=User::class
+     * )
+     * @Serializer\Groups({"read"})
+     */
+    private ?User $updatedBy;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
+     */
+    private ?DateTimeImmutable $updatedAt;
+
+    // TODO: indiquer le document généré par le module "document"
+    private ?StoredObject $storedObject;
+
+    // TODO: ajouter gabarit
+
+    /**
+     * @return AccompanyingPeriodWorkEvaluation|null
+     */
+    public function getAccompanyingPeriodWorkEvaluation(): ?AccompanyingPeriodWorkEvaluation
+    {
+        return $this->accompanyingPeriodWorkEvaluation;
+    }
+
+    /**
+     * @param AccompanyingPeriodWorkEvaluation|null $accompanyingPeriodWorkEvaluation
+     * @return AccompanyingPeriodWorkEvaluationDocument
+     */
+    public function setAccompanyingPeriodWorkEvaluation(?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation): AccompanyingPeriodWorkEvaluationDocument
+    {
+        $this->accompanyingPeriodWorkEvaluation = $accompanyingPeriodWorkEvaluation;
+        return $this;
+    }
+
+    /**
+     * @return StoredObject|null
+     */
+    public function getStoredObject(): ?StoredObject
+    {
+        return $this->storedObject;
+    }
+
+    /**
+     * @param StoredObject|null $storedObject
+     * @return AccompanyingPeriodWorkEvaluationDocument
+     */
+    public function setStoredObject(?StoredObject $storedObject): AccompanyingPeriodWorkEvaluationDocument
+    {
+        $this->storedObject = $storedObject;
+        return $this;
+    }
+
+    public function setCreatedBy(User $user): \Chill\MainBundle\Doctrine\Model\TrackCreationInterface
+    {
+        $this->createdBy = $user;
+        return $this;
+    }
+
+    public function setCreatedAt(\DateTimeInterface $datetime): \Chill\MainBundle\Doctrine\Model\TrackCreationInterface
+    {
+        $this->createdAt = $datetime;
+        return $this;
+    }
+
+    public function setUpdatedBy(User $user): \Chill\MainBundle\Doctrine\Model\TrackUpdateInterface
+    {
+        $this->updatedBy = $user;
+        return $this;
+    }
+
+    public function setUpdatedAt(\DateTimeInterface $datetime): \Chill\MainBundle\Doctrine\Model\TrackUpdateInterface
+    {
+        $this->updatedAt = $datetime;
+        return $this;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return User|null
+     */
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    /**
+     * @return \DateTimeImmutable|null
+     */
+    public function getCreatedAt(): ?\DateTimeInterface
+    {
+        return $this->createdAt;
+    }
+
+    /**
+     * @return User|null
+     */
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
+    /**
+     * @return DateTimeImmutable|null
+     */
+    public function getUpdatedAt(): ?\DateTimeInterface
+    {
+        return $this->updatedAt;
+    }
+
+}

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

@@ -99,6 +99,22 @@ class Household
         return $this;
     }
 
+    /**
+     * Force an address starting at the current day
+     * on the Household.
+     *
+     * This will force the startDate's address on today.
+     *
+     * Used on household creation.
+     *
+     * @Serializer\Groups({"create"})
+     */
+    public function setForceAddress(Address $address)
+    {
+       $address->setValidFrom(new \DateTime('today'));
+       $this->addAddress($address);
+    }
+
     /**
      * @param Address $address
      */
@@ -128,7 +144,7 @@ class Household
         $at = $at === null ? new \DateTime('today') : $at;
 
         $addrs = $this->getAddresses()->filter(function (Address $a) use ($at) {
-            return $a->getValidFrom() < $at && (
+            return $a->getValidFrom() <= $at && (
                 NULL === $a->getValidTo() || $at < $a->getValidTo()
             );
         });

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -30,6 +30,7 @@ use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\MaritalStatus;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\Address;
@@ -379,6 +380,19 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     private Collection $householdAddresses;
 
+    /**
+     * @ORM\OneToMany(
+     *  targetEntity=AccompanyingPeriod::class,
+     *  mappedBy="personLocation"
+     * )
+     */
+    private Collection $periodLocatedOn;
+
+    /**
+     * Person constructor.
+     *
+     * @param \DateTime|null $opening
+     */
     public function __construct()
     {
         $this->accompanyingPeriodParticipations = new ArrayCollection();

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

@@ -3,10 +3,14 @@
 namespace Chill\PersonBundle\Entity\SocialWork;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_person_social_work_evaluation")
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
+ *     "social_work_evaluation"=Evaluation::class
+ *     })
  */
 class Evaluation
 {
@@ -14,26 +18,33 @@ class Evaluation
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
      */
     private $id;
 
     /**
      * @ORM\Column(type="json")
+     * @Serializer\Groups({"read"})
      */
     private $title = [];
 
     /**
-     * @ORM\Column(type="dateinterval", nullable=true)
+     * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
      */
     private $delay;
 
     /**
-     * @ORM\Column(type="dateinterval")
+     * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
      */
     private $notificationDelay;
 
     /**
-     * @ORM\ManyToOne(targetEntity=SocialAction::class)
+     * @ORM\ManyToOne(
+     *     targetEntity=SocialAction::class,
+     *     inversedBy="evaluations"
+     * )
      */
     private $socialAction;
 

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

@@ -68,6 +68,15 @@ class SocialAction
      */
     private $results;
 
+    /**
+     * @var Collection
+     * @ORM\OneToMany(
+     *     targetEntity=Evaluation::class,
+     *     mappedBy="socialAction"
+     * )
+     */
+    private Collection $evaluations;
+
     public function __construct()
     {
         $this->children = new ArrayCollection();
@@ -257,4 +266,12 @@ class SocialAction
 
         return $this;
     }
+
+    /**
+     * @return Collection
+     */
+    public function getEvaluations(): Collection
+    {
+        return $this->evaluations;
+    }
 }

src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php

@@ -0,0 +1,71 @@
+<?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\Form\SocialWork;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+
+/**
+ * Class EvaluationType
+ *
+ * @package Chill\PersonBundle\Form
+ */
+class EvaluationType extends AbstractType
+{
+    /**
+     *
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper) {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('title', TranslatableStringFormType::class, [
+                'label' => 'Nom',
+            ])
+            ->add('delay')
+
+            ->add('notificationDelay');
+    }
+
+    /**
+     * @param OptionsResolver $resolver
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', Evaluation::class)
+            ;
+    }
+}

src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php

@@ -0,0 +1,85 @@
+<?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\Form\SocialWork;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+
+/**
+ * Class GoalType
+ *
+ * @package Chill\PersonBundle\Form
+ */
+class GoalType extends AbstractType
+{
+    /**
+     *
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper) {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('title', TranslatableStringFormType::class, [
+                'label' => 'Nom'
+            ])
+
+            ->add('socialActions', EntityType::class, [
+                'class' => SocialAction::class,
+                'required'   => false,
+                'multiple' => true,
+                'choice_label' => function (SocialAction $issue) {
+                    return $this->translatableStringHelper->localize($issue->getTitle());
+                }
+            ])
+
+            ->add('desactivationDate', DateType::class, [
+                'attr'  => array('class' => 'datepicker'),
+                'widget'=> 'single_text',
+                'format' => 'dd-MM-yyyy',
+                'required' => false,
+            ]);
+}
+
+    /**
+     * @param OptionsResolver $resolver
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', Goal::class)
+            ;
+    }
+}

src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php

@@ -0,0 +1,76 @@
+<?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\Form\SocialWork;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\PersonBundle\Entity\SocialWork\Result;
+
+/**
+ * Class ResultType
+ *
+ * @package Chill\PersonBundle\Form
+ */
+class ResultType extends AbstractType
+{
+    /**
+     *
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper) {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('title', TranslatableStringFormType::class, [
+                'label' => 'Nom'
+            ])
+            ->add('accompanyingPeriodWorks')
+            ->add('accompanyingPeriodWorkGoals')
+            ->add('desactivationDate', DateType::class, [
+                'attr'  => array('class' => 'datepicker'),
+                'widget'=> 'single_text',
+                'format' => 'dd-MM-yyyy',
+                'required' => false,
+            ]);
+}
+
+    /**
+     * @param OptionsResolver $resolver
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', Result::class)
+            ;
+    }
+}

src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php

@@ -0,0 +1,90 @@
+<?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\Form\SocialWork;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+
+
+/**
+ * Class SocialActionType
+ *
+ * @package Chill\PersonBundle\Form
+ */
+class SocialActionType extends AbstractType
+{
+    /**
+     *
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper) {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('title', TranslatableStringFormType::class, [
+                'label' => 'Nom'
+            ])
+            ->add('issue', EntityType::class, [
+                'class' => SocialIssue::class,
+                'choice_label' => function (SocialIssue $issue) {
+                    return $this->translatableStringHelper->localize($issue->getTitle());
+                }
+            ])
+            ->add('parent', EntityType::class, [
+                'class' => SocialAction::class,
+                'required'   => false,
+                'choice_label' => function (SocialAction $issue) {
+                    return $this->translatableStringHelper->localize($issue->getTitle());
+                }
+            ])
+            ->add('defaultNotificationDelay')
+            ->add('desactivationDate', DateType::class, [
+                'attr'  => array('class' => 'datepicker'),
+                'widget'=> 'single_text',
+                'format' => 'dd-MM-yyyy',
+                'required' => false,
+            ]);
+}
+
+    /**
+     * @param OptionsResolver $resolver
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', SocialIssue::class)
+            ;
+    }
+}

src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php

@@ -0,0 +1,83 @@
+<?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\Form\SocialWork;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+
+/**
+ * Class SocialIssueType
+ *
+ * @package Chill\PersonBundle\Form
+ */
+class SocialIssueType extends AbstractType
+{
+    /**
+     *
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper) {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('title', TranslatableStringFormType::class, [
+                'label' => 'Nom'
+            ])
+
+            ->add('parent', EntityType::class, [
+                'class' => SocialIssue::class,
+                'required'   => false,
+                'choice_label' => function (SocialIssue $issue) {
+                    return $this->translatableStringHelper->localize($issue->getTitle());
+                }
+            ])
+
+            ->add('desactivationDate', DateType::class, [
+                'attr'  => ['class' => 'datepicker'],
+                'widget'=> 'single_text',
+                'format' => 'dd-MM-yyyy',
+                'required' => false,
+            ]);
+}
+
+    /**
+     * @param OptionsResolver $resolver
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', SocialIssue::class)
+            ;
+    }
+}

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php

@@ -25,6 +25,7 @@ namespace Chill\PersonBundle\Repository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
 final class AccompanyingPeriodRepository implements ObjectRepository
@@ -48,7 +49,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): ?AccompanyingPeriod
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -62,5 +63,4 @@ final class AccompanyingPeriodRepository implements ObjectRepository
     {
         return AccompanyingPeriod::class;
     }
-
 }

src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Chill\PersonBundle\Repository;
+
+use Chill\PersonBundle\Entity\MaritalStatus;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
+use UnexpectedValueException;
+
+class MaritalStatusRepository implements ObjectRepository
+{
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(MaritalStatus::class);
+    }
+    public function find($id): ?MaritalStatus
+    {
+        return $this->repository->find($id);
+    }
+
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?MaritalStatus
+    {
+        return $this->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return MaritalStatus::class;
+    }
+}

src/Bundle/ChillPersonBundle/Repository/PersonRepository.php

@@ -18,11 +18,13 @@
 
 namespace Chill\PersonBundle\Repository;
 
+
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 
+
 final class PersonRepository
 {
     private EntityRepository $repository;
@@ -113,11 +115,20 @@ final class PersonRepository
         $qb->setParameter('phonenumber', '%'.$phonenumber.'%');
     }
 
+
+    /**
+     * @param $phonenumber
+     * @return string
+     */
     protected function parsePhoneNumber(string $phonenumber): string
     {
         return \str_replace(' ', '', $phonenumber);
     }
 
+    /**
+     * @param QueryBuilder $qb
+     * @param array $centers
+     */
     protected function addByCenters(QueryBuilder $qb, array $centers): void
     {
         if (count($centers) > 0) {

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

@@ -1,6 +1,25 @@
 <?php
 
 declare(strict_types=1);
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2021, 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\Repository\SocialWork;
 

src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss

@@ -4,29 +4,24 @@
 /*
 *  PERSON CONTEXT
 */
-
-div#header-person-name {
-   background: none repeat scroll 0 0 $chill-green-dark;
-   color: #FFF;
-   padding-top: 1em;
-   padding-bottom: 1em;
-}
-
-div#header-person-details {
-   background: none repeat scroll 0 0 $chill-green;
-   color: #FFF;
-   padding-top: 1em;
-   padding-bottom: 1em;
-   div.contact {
-      & > * {
-         margin-right: 1em;
-      }
-   }
-}
-
-div#person_details_container {
-   padding-top: 20px;
-   padding-bottom: 20px;
+div.banner {
+    div#header-person-name {
+        background: none repeat scroll 0 0 $chill-green-dark;
+        color: $white;
+        padding-top: 1em;
+        padding-bottom: 1em;
+    }
+    div#header-person-details {
+        background: none repeat scroll 0 0 $chill-green;
+        color: $white;
+        padding-top: 1em;
+        padding-bottom: 1em;
+        div.contact {
+            & > * {
+                margin-right: 1em;
+            }
+        }
+    }
 }
 
 div.person-view {
@@ -83,80 +78,77 @@ div.person-view {
  *  ACCOMPANYING_COURSE CONTEXT
  *  Header custom for Accompanying Course
  */
+$chill-accourse-context: #718596;
 
-div#header-accompanying_course-name {
-  background: none repeat scroll 0 0 #718596;
-  color: #FFF;
-  h1 {
-    margin: 0.4em 0;
-  }
-  span {
-    a {
-      color: white;
+div.banner {
+    div#header-accompanying_course-name {
+        background: none repeat scroll 0 0 $chill-accourse-context;
+        color: $white;
+        h1 {
+            margin: 0.4em 0;
+        }
+        span {
+            a {
+                color: $white;
+            }
+            a:hover {
+                text-decoration: underline;
+            }
+        }
     }
-    a:hover {
-      text-decoration: underline;
+    div#header-accompanying_course-details {
+        background: none repeat scroll 0 0 tint-color($chill-accourse-context, 20%);
+        color: $white;
+        padding-top: 1em;
+        padding-bottom: 1em;
     }
-  }
-}
-div#header-accompanying_course-details {
-  background: none repeat scroll 0 0 #718596ab;
-  color: #FFF;
-  padding-top: 1em;
-  padding-bottom: 1em;
 }
 
 /*
  *  HOUSEHOLD CONTEXT
  *  Header custom for Household
  */
+$chill-household-context: #929d69;
 
-div#header-household-name {
-   background: none repeat scroll 0 0 #929d69; //#b97a7a;
-   color: #FFF;
-
-   h1 {
-     margin: 0.4em 0;
-   }
-   span {
-     a {
-       color: white;
-     }
-     a:hover {
-       text-decoration: underline;
-     }
-   }
+div.banner {
+    div#header-household-name {
+        background: none repeat scroll 0 0 $chill-household-context;
+        color: $white;
+        h1 {
+            margin: 0.4em 0;
+        }
+        span {
+            a {
+                color: $white;
+            }
+            a:hover {
+                text-decoration: underline;
+            }
+        }
+        div.household-members {
+            display: flex;
+            flex-direction: row;
+            flex-wrap: wrap;
+            span.badge-member {
+                flex-shrink: 0; flex-grow: 0; flex-basis: auto;
+                color: $white;
+                border: 1px solid #ffffff3b;
+                border-radius: 8px;
+                padding: 0.4em 0.8em;
+                margin-bottom: 0.2em;
+                margin-right: 0.3em;
+                &.holder { order: -1; }
+                &.child { order: 2; }
+            }
+        }
+    }
+    div#header-household-details {
+        background: none repeat scroll 0 0 tint-color($chill-household-context, 15%);
+        color: $white;
+        padding-top: 1em;
+        padding-bottom: 1em;
+        span.current-members-explain {
+            font-weight: bold;
+        }
+    }
 }
-div#header-household-details {
-   background: none repeat scroll 0 0 #b0b984; //#d29791;
-   color: #FFF;
-   padding-top: 1em;
-   padding-bottom: 1em;
-   span.current-members-explain {
-      font-weight: bold;
-   }
-}
-
-div.household-members {
-   display: flex;
-   flex-direction: row;
-   flex-wrap: wrap;
-   //justify-content: flex-end;
-   span.badge-member {
-      flex-shrink: 0; flex-grow: 0; flex-basis: auto;
-      border: 1px solid #ffffff3b;
-      color: #ffffff;
-      padding: 0.4em 0.8em;
-      margin-bottom: 0.2em;
-      margin-right: 0.3em;
-      border-radius: 8px;
-      &.holder {
-         order: -1;
-      }
-      &.child {
-         order: 2;
-      }
-   }
-}
-
-

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

@@ -8,6 +8,7 @@ require('./scss/household_banner.scss');
 require('./scss/accompanying_period_work.scss');
 require('./scss/person_by_phonenumber.scss');
 require('./scss/render_box.scss');
+require('./scss/flex_table.scss');
 require('./scss/address_history.scss');
 
 require('./svg/phone-alt-solid.svg');

src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss

@@ -0,0 +1,31 @@
+/*
+ *  flex-table overwrite: precision and exceptions
+ */
+
+///
+div.accompanyingcourse-resume {
+    div.associated-persons {
+        .flex-table .item-row .item-col:first-child {
+            flex-basis: 33%;
+        }
+    }
+}
+
+///
+div.accompanyingcourse-list, div.household-members {
+    .flex-table .item-bloc .item-row {
+        &:nth-child(2) {
+            flex-direction: row;
+        }
+        &:last-child {
+            flex-direction: column;
+        }
+    }
+}
+
+///
+div.list-with-period {
+    div.flex-table div.item-row div.item-col:first-child {
+        flex-basis: 33%;
+    }
+}

src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss

@@ -1,10 +1,7 @@
-/// complete and overwrite flex-table in chillmain.scss
-div.list-with-period,
-div.list-household-members {
 
-   div.comment {
-      // for the comment for household-members
-   }
+///
+div.list-with-period, div.list-household-members {
+
    div.periods {
       div.header,
       div.list-content {
@@ -13,7 +10,7 @@ div.list-household-members {
       }
       div.header {
          position: relative;
-         a.sc-button {
+         a.btn {
             position: absolute;
             width: 30px;
             height: 30px;

src/Bundle/ChillPersonBundle/Resources/public/vuejs/<

@@ -0,0 +1,374 @@
+import { createStore } from 'vuex';
+import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod, fetchAddressSuggestionByPerson} from './../api.js';
+import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
+
+const debug = process.env.NODE_ENV !== 'production';
+
+const concerned = window.household_members_editor_data.persons.map(p => {
+  return {
+    person: p,
+    position: null,
+    allowRemove: false,
+    holder: false,
+    comment: "",
+  };
+});
+
+console.log('expand suggestions', window.household_members_editor_expand_suggestions === 1);
+
+const store = createStore({
+  strict: debug,
+  state: {
+    concerned,
+    household: window.household_members_editor_data.household,
+    positions: window.household_members_editor_data.positions.sort((a, b) => {
+        if (a.ordering < b.ordering) {
+          return -1;
+        }
+        if (a.ordering > b.ordering) {
+          return 1;
+        }
+        return 0;
+      }),
+    startDate: new Date(),
+    allowHouseholdCreate: window.household_members_editor_data.allowHouseholdCreate,
+    allowHouseholdSearch: window.household_members_editor_data.allowHouseholdSearch,
+    allowLeaveWithoutHousehold: window.household_members_editor_data.allowLeaveWithoutHousehold,
+    forceLeaveWithoutHousehold: false,
+    householdSuggestionByAccompanyingPeriod: [],
+    showHouseholdSuggestion: window.household_members_editor_expand_suggestions === 1,
+    addressesSuggestion: [],
+    warnings: [],
+    errors: []
+  },
+  getters: {
+    isHouseholdNew(state) {
+      if (state.household === null) {
+        return false;
+      }
+      return !Number.isInteger(state.household.id);
+    },
+    hasHousehold(state) {
+      return state.household !== null;
+    },
+    hasHouseholdOrLeave(state) {
+      return state.household !== null || state.forceLeaveWithoutHousehold;
+    },
+    hasHouseholdSuggestion(state, getters) {
+      return getters.filterHouseholdSuggestionByAccompanyingPeriod.length > 0;
+    },
+    countHouseholdSuggestion(state, getters) {
+      return getters.filterHouseholdSuggestionByAccompanyingPeriod.length;
+    },
+    filterHouseholdSuggestionByAccompanyingPeriod(state) {
+      if (state.household === null) {
+        return state.householdSuggestionByAccompanyingPeriod;
+      }
+
+      return state.householdSuggestionByAccompanyingPeriod
+        .filter(h => h.id !== state.household.id)
+        ;
+    },
+    hasPersonsWellPositionnated(state, getters) {
+      return getters.needsPositionning === false
+        || (getters.persons.length > 0 && getters.concUnpositionned.length === 0);
+    },
+    persons(state) {
+      return state.concerned.map(conc => conc.person);
+    },
+    concUnpositionned(state) {
+      return state.concerned
+        .filter(conc => conc.position === null)
+      ;
+    },
+    positions(state) {
+      return state.positions;
+    },
+    personByPosition: (state) => (position_id) => {
+      return state.concerned
+        .filter(conc =>
+          conc.position !== null ? conc.position.id === position_id : false
+        )
+        .map(conc => conc.person)
+      ;
+    },
+    concByPosition: (state) => (position_id) => {
+      return state.concerned
+        .filter(conc =>
+          conc.position !== null ? conc.position.id === position_id : false
+        )
+      ;
+    },
+    concByPersonId: (state) => (person_id) => {
+      return state.concerned
+        .find(conc => conc.person.id === person_id)
+      ;
+    },
+    needsPositionning(state) {
+      return state.forceLeaveWithoutHousehold === false;
+    },
+    buildPayload: (state) => {
+      let
+        conc,
+        payload_conc,
+        payload = {
+          concerned: [],
+          destination: null
+        }
+      ;
+
+      if (state.forceLeaveWithoutHousehold === false) {
+        payload.destination = {
+            id: state.household.id,
+            type: state.household.type
+          };
+      }
+
+      for (let i in state.concerned) {
+        conc = state.concerned[i];
+        payload_conc = {
+          person: {
+            id: conc.person.id,
+            type: conc.person.type
+          },
+          start_date: {
+            datetime: datetimeToISO(state.startDate)
+          }
+        };
+
+        if (state.forceLeaveWithoutHousehold === false) {
+          payload_conc.position = {
+            id: conc.position.id,
+            type: conc.position.type
+          };
+          payload_conc.holder = conc.holder;
+          payload_conc.comment = conc.comment;
+        }
+
+        payload.concerned.push(payload_conc);
+      }
+
+      return payload;
+    },
+  },
+  mutations: {
+    addConcerned(state, person) {
+      let persons = state.concerned.map(conc => conc.person.id);
+      if (!persons.includes(person.id)) {
+        state.concerned.push({
+          person,
+          position: null,
+          allowRemove: true,
+          holder: false,
+          comment: "",
+        });
+      } else {
+        console.err("person already included");
+      }
+    },
+    markPosition(state, { person_id, position_id}) {
+      let
+        position = state.positions.find(pos => pos.id === position_id),
+        conc = state.concerned.find(c => c.person.id === person_id);
+      conc.position = position;
+    },
+    setComment(state, {conc, comment}) {
+      conc.comment = comment;
+    },
+    toggleHolder(state, conc) {
+      conc.holder = !conc.holder;
+    },
+    removePosition(state, conc) {
+      conc.holder = false;
+      conc.position = null;
+    },
+    removeConcerned(state, conc) {
+      state.concerned = state.concerned.filter(c =>
+        c.person.id !== conc.person.id
+      )
+    },
+    createHousehold(state) {
+      state.household = { type: 'household', members: [], current_address: null, 
+        current_members_id: [] };
+      state.forceLeaveWithoutHousehold = false;
+    },
+    removeHousehold(state) {
+      state.household = null;
+      state.forceLeaveWithoutHousehold = false;
+    },
+    setHouseholdAddress(state, address) {
+      if (null === state.household) {
+        console.error("no household");
+        throw new Error("No household");
+      }
+
+      state.household.current_address = address;
+      state.household.force_new_address = address;
+    },
+    forceLeaveWithoutHousehold(state) {
+      state.household = null;
+      state.forceLeaveWithoutHousehold = true;
+    },
+    selectHousehold(state, household) {
+      state.household = household;
+      state.forceLeaveWithoutHousehold = false;
+    },
+    setHouseholdSuggestionByAccompanyingPeriod(state, households) {
+      let existingIds = state.householdSuggestionByAccompanyingPeriod
+        .map(h => h.id);
+      for (let i in households) {
+        if (!existingIds.includes(households[i].id)) {
+          state.householdSuggestionByAccompanyingPeriod.push(households[i]);
+        }
+      }
+    },
+    setStartDate(state, dateI) {
+      state.startDate = dateI;
+    },
+    toggleHouseholdSuggestion(state) {
+      state.showHouseholdSuggestion = !state.showHouseholdSuggestion;
+    },
+    setWarnings(state, warnings) {
+      state.warnings = warnings;
+      // reset errors, which should come from servers
+      state.errors.splice(0, state.errors.length);
+    },
+    setErrors(state, errors) {
+      state.errors = errors;
+    },
+    addAddressesSuggestion(state, addresses) {
+      let existingIds = state.addressesSuggestion
+        .map(a => a.id);
+
+      for (let i in addresses) {
+        if (!existingIds.includes(addresses[i].id)) {
+          state.addressesSuggestion.push(addresses[i]);
+        }
+      }
+    }
+  },
+  actions: {
+    addConcerned({ commit, dispatch }, person) {
+      commit('addConcerned', person);
+      dispatch('computeWarnings');
+      dispatch('fetchAddressSuggestions');
+    },
+    markPosition({ commit, state, dispatch }, { person_id, position_id }) {
+      commit('markPosition', { person_id, position_id });
+      dispatch('computeWarnings');
+    },
+    toggleHolder({ commit, dispatch }, conc) {
+      commit('toggleHolder', conc);
+      dispatch('computeWarnings');
+    },
+    removePosition({ commit, dispatch }, conc) {
+      commit('removePosition', conc);
+      dispatch('computeWarnings');
+    },
+    removeConcerned({ commit, dispatch }, conc) {
+      commit('removeConcerned', conc);
+      dispatch('computeWarnings');
+      dispatch('fetchAddressSuggestions');
+    },
+    removeHousehold({ commit, dispatch }) {
+      commit('removeHousehold');
+      dispatch('computeWarnings');
+    },
+    createHousehold({ commit, dispatch }) {
+      commit('createHousehold');
+      dispatch('computeWarnings');
+    },
+    forceLeaveWithoutHousehold({ commit, dispatch }) {
+      commit('forceLeaveWithoutHousehold');
+      dispatch('computeWarnings');
+    },
+    selectHousehold({ commit }, h) {
+      commit('selectHousehold', h);
+      dispatch('computeWarnings');
+    },
+    setStartDate({ commit, dispatch }, date) {
+      commit('setStartDate', date);
+      dispatch('computeWarnings');
+    },
+    setComment({ commit }, payload) {
+      commit('setComment', payload);
+    },
+    fetchHouseholdSuggestionForConcerned({ commit, state }, person) {
+      fetchHouseholdSuggestionByAccompanyingPeriod(person.id)
+        .then(households => {
+          commit('setHouseholdSuggestionByAccompanyingPeriod', households);
+        });
+    },
+    fetchAddressSuggestions({ commit, state }) {
+      for (let i in state.concerned) {
+        fetchAddressSuggestionByPerson(state.concerned[i].person.id)
+          .then(addresses => {
+            commit('addAddressesSuggestion', addresses);
+          })
+          .catch(e => {
+            console.log(e);
+          });
+      }
+    },
+    computeWarnings({ commit, state, getters }) {
+      let warnings = [],
+        payload;
+
+      if (!getters.hasHousehold && !state.forceLeaveWithoutHousehold) {
+        warnings.push({ m: 'household_members_editor.add_destination', a: {} });
+      }
+
+      if (state.concerned.length === 0) {
+        warnings.push({ m: 'household_members_editor.add_at_least_onePerson', a: {} });
+      }
+
+      if (getters.concUnpositionned.length > 0
+        && !state.forceLeaveWithoutHousehold) {
+        warnings.push({ m: 'household_members_editor.give_a_position_to_every_person', a: {} })
+      }
+
+      commit('setWarnings', warnings);
+    },
+    confirm({ getters, state, commit }) {
+      let payload = getters.buildPayload,
+        errors = [],
+        person_id,
+        household_id,
+        error
+      ;
+
+        householdMove(payload).then(household => {
+          if (household === null) {
+            person_id = getters.persons[0].id;
+            window.location.replace(`/fr/person/${person_id}/general`);
+          } else {
+            if (household.type === 'household') {
+              household_id = household.id;
+              // nothing to do anymore here, bye-bye !
+              window.location.replace(`/fr/person/household/${household_id}/summary`);
+            } else {
+              // we assume the answer was 422...
+              error = household;
+              for (let i in error.violations) {
+                let e = error.violations[i];
+                errors.push(e.title);
+              }
+
+              commit('setErrors', errors);
+            }
+          }
+      });
+    },
+  }
+});
+
+store.dispatch('computeWarnings');
+store.dispatch('fetchAddressSuggestions');
+
+if (concerned.length > 0) {
+  concerned.forEach(c => {
+    store.dispatch('fetchHouseholdSuggestionForConcerned', c.person);
+  });
+}
+
+export { store };

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

@@ -6,6 +6,7 @@
    <h1 v-else>{{ $t('course.title.active') }}</h1>
 
    <persons-associated></persons-associated>
+   <course-location></course-location>
    <origin-demand></origin-demand>
    <requestor></requestor>
    <social-issue></social-issue>
@@ -14,6 +15,12 @@
    <comment v-if="accompanyingCourse.step === 'DRAFT'"></comment>
    <confirm v-if="accompanyingCourse.step === 'DRAFT'"></confirm>
 
+    <div v-for="error in errorMsg" class="vue-component errors alert alert-danger">
+       <p>
+          <span>{{ error.sta }} {{ error.txt }}</span><br>
+          <span>{{ $t(error.msg) }}</span>
+       </p>
+    </div>
 </template>
 
 <script>
@@ -24,6 +31,7 @@ import OriginDemand from './components/OriginDemand.vue';
 import PersonsAssociated from './components/PersonsAssociated.vue';
 import Requestor from './components/Requestor.vue';
 import SocialIssue from './components/SocialIssue.vue';
+import CourseLocation from './components/CourseLocation.vue';
 import Referrer from './components/Referrer.vue';
 import Resources from './components/Resources.vue';
 import Comment from './components/Comment.vue';
@@ -38,18 +46,24 @@ export default {
       PersonsAssociated,
       Requestor,
       SocialIssue,
+      CourseLocation,
       Referrer,
       Resources,
       Comment,
       Confirm,
    },
    computed: mapState([
-      'accompanyingCourse'
+      'accompanyingCourse',
+      'addressContext',
+      'errorMsg'
    ])
 };
 </script>
 
 <style lang="scss">
+   @import 'ChillMainAssets/module/bootstrap/shared';
+   $chill-accourse-context: #718596;
+
    div#accompanying-course {
       div.vue-component {
          h2 {
@@ -59,7 +73,7 @@ export default {
                position: absolute;
                content: "\f142";  //ellipsis-v
                font-family: "ForkAwesome";
-               color: #718596ab;
+               color: tint-color($chill-accourse-context, 10%);
                left: -22px;
                top: 4px;
             }
@@ -70,10 +84,10 @@ export default {
          }
          padding: 0em 0em;
          margin: 1em 0;
-         border: 1px dotted #718596ab;
+         border: 1px dotted tint-color($chill-accourse-context, 10%);
          border-radius: 5px;
-         border-left: 1px dotted #718596ab;
-         border-right: 1px dotted #718596ab;
+         border-left: 1px dotted tint-color($chill-accourse-context, 10%);
+         border-right: 1px dotted tint-color($chill-accourse-context, 10%);
          dd {
             margin-left: 1em;
          }
@@ -83,7 +97,16 @@ export default {
                margin: 1em 0 0;
             }
          }
-      }
 
-}
+         &.errors {
+            //display: flex;
+            //position: sticky;
+            //bottom: 0.3em;
+            //z-index: 1000;
+            margin: 1em 0;
+            padding: 1em;
+            border-radius: 0;
+         }
+      }
+   }
 </style>

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

@@ -4,12 +4,12 @@
 *
 *  @id   integer - id of accompanyingCourse
 */
-const getAccompanyingCourse = (id) => { 
+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'); 
+         throw { msg: 'Error while retriving AccompanyingPeriod Course.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
 };
 
@@ -20,8 +20,8 @@ const getAccompanyingCourse = (id) => {
 *  @id     integer - id of accompanyingCourse
 *  @body   Object - dictionary with changes to post
 */
-const patchAccompanyingCourse = (id, body) => { 
-   console.log('body', body);
+const patchAccompanyingCourse = (id, body) => {
+   //console.log('body', body);
    const url = `/api/1.0/person/accompanying-course/${id}.json`;
    return fetch(url, {
          method: 'PATCH',
@@ -32,7 +32,8 @@ const patchAccompanyingCourse = (id, body) => {
       })
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+          console.log(response);
+         throw { msg: 'Error while updating AccompanyingPeriod Course.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
 };
 
@@ -47,24 +48,24 @@ const confirmAccompanyingCourse = (id) => {
       })
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw { msg: 'Error while confirming AccompanyingPeriod Course.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
 };
 
 /*
-* Endpoint 
+* 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'); 
+         throw { msg: 'Error while retriving Social Issues.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
 };
 
 /*
-* Endpoint v.2 chill_api_single_accompanying_course_participation, 
+* Endpoint v.2 chill_api_single_accompanying_course_participation,
 * method POST/DELETE, add/close a participation to the accompanyingCourse
 *
 *  @id               integer - id of accompanyingCourse
@@ -83,12 +84,12 @@ const postParticipation = (id, payload, method) => {
       })
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw { msg: 'Error while sending AccompanyingPeriod Course participation.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
 };
 
 /*
-* Endpoint v.2 chill_api_single_accompanying_course_requestor, 
+* Endpoint v.2 chill_api_single_accompanying_course_requestor,
 * method POST/DELETE, add/close a requestor to the accompanyingCourse
 *
 *  @id               integer - id of accompanyingCourse
@@ -109,12 +110,12 @@ const postRequestor = (id, payload, method) => {
       })
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw { msg: 'Error while sending AccompanyingPeriod Course requestor', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
 };
 
 /*
-* Endpoint v.2 chill_api_single_accompanying_course_resource, 
+* Endpoint v.2 chill_api_single_accompanying_course_resource,
 * method POST/DELETE, add/remove a resource to the accompanyingCourse
 *
 *  @id               integer - id of accompanyingCourse
@@ -126,11 +127,11 @@ const postResource = (id, payload, method) => {
    const body = { type: "accompanying_period_resource" };
    switch (method) {
       case 'DELETE':
-         body['id'] = payload.id; 
+         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, {
@@ -142,7 +143,7 @@ const postResource = (id, payload, method) => {
       })
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw { msg: 'Error while sending AccompanyingPeriod Course resource.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
 };
 
@@ -150,7 +151,7 @@ const postResource = (id, payload, method) => {
 * Endpoint to Add/remove SocialIssue
 */
 const postSocialIssue = (id, body, method) => {
-   //console.log('api body and method', 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,
@@ -161,7 +162,7 @@ const postSocialIssue = (id, body, method) => {
       })
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw { msg: 'Error while updating SocialIssue.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
 };
 
@@ -170,7 +171,7 @@ const getUsers = () => {
    return fetch(url)
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw { msg: 'Error while retriving users.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
 };
 
@@ -179,7 +180,7 @@ const whoami = () => {
    return fetch(url)
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw { msg: 'Error while getting whoami.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
 };
 
@@ -188,11 +189,11 @@ const getListOrigins = () => {
    return fetch(url)
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw { msg: 'Error while retriving origin\'s list.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
 }
 
-export { 
+export {
    getAccompanyingCourse,
    patchAccompanyingCourse,
    confirmAccompanyingCourse,

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

@@ -5,7 +5,8 @@
    </teleport>
 
    <teleport to="#header-accompanying_course-name #banner-status">
-      <span v-if="accompanyingCourse.step === 'DRAFT'" class="d-md-block">
+      <span v-if="accompanyingCourse.step === 'DRAFT'"
+         class="text-md-end d-md-block">
          <span class="badge bg-secondary">
             {{ $t('course.step.draft') }}
          </span>

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

@@ -0,0 +1,68 @@
+<template>
+   <li>
+      <button class="btn btn-sm btn-secondary"
+         @click="modal.showModal = true"
+         :title="$t('courselocation.assign_course_address')">
+         <i class="fa fa-map-marker"></i>
+      </button>
+   </li>
+
+   <teleport to="body">
+      <modal v-if="modal.showModal" :modalDialogClass="modal.modalDialogClass" @close="modal.showModal = false">
+         <template v-slot:header>
+            <h2 class="modal-title">{{ $t('courselocation.sure') }}</h2>
+         </template>
+         <template v-slot:body>
+            <show-address :address="person.current_household_address"></show-address>
+            <p>{{ $t('courselocation.sure_description') }}</p>
+         </template>
+         <template v-slot:footer>
+            <button class="btn btn-danger" @click="assignAddress">
+               {{ $t('courselocation.ok') }}
+            </button>
+         </template>
+      </modal>
+   </teleport>
+</template>
+
+<script>
+import {mapState} from "vuex";
+import Modal from 'ChillMainAssets/vuejs/_components/Modal';
+import ShowAddress from "ChillMainAssets/vuejs/Address/components/ShowAddress";
+
+export default {
+   name: "ButtonLocation",
+   components: {
+      ShowAddress,
+      Modal,
+   },
+   props: ['person'],
+   data() {
+      return {
+         modal: {
+            showModal: false,
+            modalDialogClass: "modal-dialog-centered modal-md"
+         }
+      }
+   },
+   computed: {
+      ...mapState({
+         context: state => state.addressContext
+      }),
+   },
+   methods: {
+      assignAddress() {
+        //console.log('assignAddress id', this.person.current_household_address);
+         let payload = {
+            entity: this.context.entity.type,
+            entityId: this.context.entity.id,
+            locationStatusTo: 'person',
+            personId: this.person.id
+         };
+         this.$store.dispatch('updateLocation', payload);
+         window.location.assign('#section-20');
+         this.modal.showModal = false;
+      }
+   }
+}
+</script>

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

@@ -1,57 +1,65 @@
 <template>
    <div class="vue-component">
-      <h2><a name="section-60"></a>{{ $t('comment.title') }}</h2>
-      
+      <h2><a name="section-80"></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" 
+
+            <label class="col-form-label" for="content">{{ $t('comment.label') }}</label>
+
+            <ckeditor
+               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="btn btn-save">{{ $t('action.save') }}</button>
-               </li>
-               <li v-if="initialComment !== null">
-                  <a class="btn btn-delete" 
-                     @click="removeComment">
-                     {{ $t('action.delete') }}
-                  </a>
-               </li>
-            </ul>
-            
+               :editor="editor"
+               v-model="content"
+               tag-name="textarea">
+            </ckeditor>
+
+            <div v-if="initialComment" class="metadata">
+               {{ $t('comment.created_by', [
+               initialComment.creator.text,
+               $d(initialComment.createdAt.datetime, 'long')
+            ]) }}
+            </div>
+
+            <div>
+               <ul class="record_actions">
+                  <li>
+                     <button type="submit" class="btn btn-save">{{ $t('action.save') }}</button>
+                  </li>
+                  <li v-if="initialComment !== null">
+                     <a class="btn btn-delete"
+                        @click="removeComment">
+                        {{ $t('action.delete') }}
+                     </a>
+                  </li>
+               </ul>
+            </div>
+
          </form>
       </div>
-      
+
    </div>
 </template>
 
 <script>
+import CKEditor from '@ckeditor/ckeditor5-vue';
+import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+
 export default {
    name: "Comment",
+   components: {
+      ckeditor: CKEditor.component,
+   },
    data() {
       return {
-         formdata: { 
+         editor: ClassicEditor,
+         formdata: {
             type: "accompanying_period_comment",
             content: ''
          }
@@ -66,7 +74,7 @@ export default {
             this.formdata.content = value;
          },
          get() {
-            return (this.initialComment)? this.initialComment.content : null;
+            return (this.initialComment)? this.initialComment.content : {};
          }
       },
       errors() {
@@ -75,12 +83,12 @@ export default {
    },
    methods: {
       submitform() {
-         console.log('submit');
+        //console.log('submit');
          this.$store.dispatch('postFirstComment', this.formdata);
       },
       removeComment() {
-         console.log('remove');
-         this.$store.dispatch('postFirstComment', null);
+        //console.log('remove');
+         this.$store.dispatch('postFirstComment', {});
       }
    }
 }
@@ -88,12 +96,11 @@ export default {
 * 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 lang="scss">
+div.ck-editor.ck-reset {
+   margin: 0.6em 0;
+}
 </style>

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

@@ -1,26 +1,45 @@
 <template>
 <div class="vue-component">
-   <h2><a name="section-70"></a>
+   <h2><a name="section-90"></a>
       {{ $t('confirm.title') }}
    </h2>
-
    <div>
-      <p>
-         {{ $t('confirm.text_draft') }}
-         <span class="badge bg-secondary">{{ $t('course.step.draft') }}</span>
-      </p>
-      <p>
-         {{ $t('confirm.text_active') }}
-         <span class="badge bg-primary">{{ $t('course.step.active') }}</span>
-      </p>
-      
-      <ul class="record_actions">
-         <li>
-            <button class="btn btn-save" @click="modal.showModal = true">
-               {{ $t('confirm.ok') }}
-            </button>
-         </li>
-      </ul>
+      <p v-html="$t('confirm.text_draft', [$t('course.step.draft')])"></p>
+
+      <div v-if="!isValidToBeConfirmed">
+         <div class="alert alert-warning">
+            {{ $t('confirm.alert_validation') }}
+            <ul class="mt-2">
+               <li v-for="k in validationKeys">
+                  {{ $t(notValidMessages[k].msg) }}
+                  <a :href="notValidMessages[k].anchor">
+                     <i class="fa fa-level-up fa-fw"></i>
+                  </a>
+               </li>
+            </ul>
+         </div>
+         <ul class="record_actions">
+            <li>
+               <button class="btn btn-save" disabled>
+                  {{ $t('confirm.ok') }}
+               </button>
+            </li>
+         </ul>
+      </div>
+
+      <div v-else>
+         <p v-html="$t('confirm.text_active', [$t('course.step.active')])"></p>
+         <ul class="record_actions">
+            <li>
+               <button
+                  class="btn btn-save"
+                  @click="modal.showModal = true">
+                  {{ $t('confirm.ok') }}
+               </button>
+            </li>
+         </ul>
+      </div>
+
    </div>
 
    <teleport to="body">
@@ -43,6 +62,7 @@
 </template>
 
 <script>
+import {mapGetters, mapState} from "vuex";
 import Modal from 'ChillMainAssets/vuejs/_components/Modal';
 
 export default {
@@ -55,26 +75,41 @@ export default {
          modal: {
             showModal: false,
             modalDialogClass: "modal-dialog-centered modal-md"
+         },
+         notValidMessages: {
+            participation: {
+               msg: 'confirm.participation_not_valid',
+               anchor: '#section-10'
+            },
+            location: {
+               msg: 'confirm.location_not_valid',
+               anchor: '#section-20' //
+            },
+            socialIssue: {
+               msg: 'confirm.socialIssue_not_valid',
+               anchor: '#section-50'
+            }
          }
       }
    },
    computed: {
-      accompanyingCourse() {
-         return this.$store.state.accompanyingCourse
-      }
+      ...mapState([
+         'accompanyingCourse'
+      ]),
+      ...mapGetters([
+         'isParticipationValid',
+         'isSocialIssueValid',
+         'isLocationValid',
+         'validationKeys',
+         'isValidToBeConfirmed'
+      ])
    },
    methods: {
       confirmCourse() {
-         console.log('@@ CLICK confirmCourse');
+        //console.log('@@ CLICK confirmCourse');
          this.$store.dispatch('confirmAccompanyingCourse');
-         console.log('confirm last');
+        //console.log('confirm last');
       }
    }
 }
 </script>
-
-<style lang="scss" scoped>
-div.vue-component > div {
-    //margin: 1em;
-}
-</style>

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

@@ -0,0 +1,158 @@
+<template>
+   <div class="vue-component">
+      <h2><a name="section-20"></a>
+         {{ $t('courselocation.title') }}
+      </h2>
+
+      <!-- {# include vue_address component #} -->
+      <div v-for="error in displayErrors" class="alert alert-danger my-2">
+         {{ error }}
+      </div>
+
+      <div v-if="hasNoLocation">
+         <label class="chill-no-data-statement">
+            {{ $t('courselocation.no_address') }}
+         </label>
+      </div>
+
+      <div v-if="isPersonLocation">
+         <label class="col-form-label">
+            {{ $t('courselocation.person_locator', [ accompanyingCourse.personLocation.text ]) }}
+         </label>
+      </div>
+
+      <show-address
+         v-if="accompanyingCourse.location"
+         :address="accompanyingCourse.location">
+      </show-address>
+
+      <div v-if="isTemporaryAddress" class="alert alert-warning">
+         <p>{{ $t('courselocation.temporary_address_must_be_changed') }}</p>
+      </div>
+
+      <div>
+         <ul class="record_actions">
+            <li>
+               <add-address
+                  v-if="!isPersonLocation"
+                  :context="context"
+                  :key="addAddress.type"
+                  :options="addAddress.options"
+                  :result="addAddress.result"
+                  @submitAddress="submitTemporaryAddress"
+                  ref="addAddress">
+               </add-address>
+            </li>
+            <li v-if="isPersonLocation">
+               <button
+                  class="btn btn-remove"
+                  @click="removeAddress"
+                  :title="$t('courselocation.remove_button')">
+               </button>
+            </li>
+         </ul>
+      </div>
+
+   </div>
+</template>
+
+<script>
+import { mapState } from "vuex";
+import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
+
+export default {
+   name: "CourseLocation",
+   components: {
+      AddAddress,
+      ShowAddress
+   },
+   data() {
+      return {
+         addAddress: {
+            type: 'accompanying_course_location',
+            options: {
+               /// Options override default.
+               /// null value take default component value
+               button: {
+                  text:  {
+                     create: 'courselocation.add_temporary_address',
+                     edit: 'courselocation.edit_temporary_address'
+                  }
+               },
+               title: {
+                  create: 'courselocation.add_temporary_address',
+                  edit: 'courselocation.edit_temporary_address'
+               },
+               /// Display each step in page or Modal
+               bindModal: {
+                  //step1: false, step2: false
+               },
+               hideDateFrom: true
+            }
+         }
+      }
+   },
+   computed: {
+      ...mapState({
+         accompanyingCourse: state => state.accompanyingCourse,
+         context: state => state.addressContext
+      }),
+      isTemporaryAddress() {
+         return this.accompanyingCourse.locationStatus === 'address';
+      },
+      isPersonLocation() {
+         return this.accompanyingCourse.locationStatus === 'person';
+      },
+      hasNoLocation() {
+         return this.accompanyingCourse.locationStatus === 'none';
+      },
+      isContextEdit() {
+         return this.context.edit;
+      }
+   },
+   methods: {
+      initAddressContext() {
+         let context = {
+            entity: {
+               type: this.accompanyingCourse.type,
+               id: this.accompanyingCourse.id
+            },
+            edit: false,
+            addressId: null
+         }
+         if (this.accompanyingCourse.location) {
+            context['edit'] = true;
+            context['addressId'] = this.accompanyingCourse.location.address_id
+         }
+         this.$store.commit('setAddressContext', context);
+      },
+      removeAddress() {
+        //console.log('remove address');
+         let payload = {
+            entity: this.context.entity.type,
+            entityId: this.context.entity.id,
+            locationStatusTo: 'none'
+         };
+         this.$store.dispatch('updateLocation', payload);
+      },
+      displayErrors() {
+         return this.$refs.addAddress.errorMsg;
+      },
+      submitTemporaryAddress() {
+        //console.log('@@@ click on Submit Temporary Address Button');
+         let payload = this.$refs.addAddress.submitNewAddress();
+         payload['locationStatusTo'] = 'address'; // <== temporary, not none, not person
+         this.$store.dispatch('updateLocation', payload);
+         this.$store.commit('setEditContextTrue');
+      }
+   },
+   mounted() {
+      this.initAddressContext();
+
+     //console.log('ac.locationStatus', this.accompanyingCourse.locationStatus);
+     //console.log('ac.location (temporary location)', this.accompanyingCourse.location);
+     //console.log('ac.personLocation', this.accompanyingCourse.personLocation);
+   }
+}
+</script>

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

@@ -1,8 +1,8 @@
 <template>
    <div class="vue-component">
-      <h2><a name="section-15"></a>{{ $t('origin.title') }}</h2>
-     
-      <div class="my-4">
+      <h2><a name="section-30"></a>{{ $t('origin.title') }}</h2>
+
+      <div class="mb-4">
          <label for="selectOrigin">
             {{ $t('origin.label') }}
          </label>

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

@@ -1,41 +1,26 @@
 <template>
 <div class="vue-component">
    <h2><a name="section-10"></a>{{ $t('persons_associated.title')}}</h2>
-   
-   <div>
+
+   <div v-if="participations.length > 0">
       <label class="col-form-label">{{ $tc('persons_associated.counter', counter) }}</label>
    </div>
-<div class="flex-table mb-3">
-   <participation-item
-   v-for="participation in participations"
-   v-bind:participation="participation"
-   v-bind:key="participation.id"
-   @remove="removeParticipation"
-   @close="closeParticipation">
-   </participation-item>
-</div>   
-   <!-- <table class="table table-bordered table-striped border-dark align-middle" v-if="participations.length > 0">
-      <thead>
-         <tr>
-            <th class="chill-orange">{{ $t('persons_associated.name') }}</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>
-         <participation-item
-            v-for="participation in participations"
-            v-bind:participation="participation"
-            v-bind:key="participation.id"
-            @remove="removeParticipation"
-            @close="closeParticipation">
-         </participation-item>
-      </tbody>
-   </table> -->
+   <div v-else>
+      <label class="chill-no-data-statement">{{ $tc('persons_associated.counter', counter) }}</label>
+   </div>
+
+   <div class="flex-table mb-3">
+      <participation-item
+         v-for="participation in participations"
+         v-bind:participation="participation"
+         v-bind:key="participation.id"
+         @remove="removeParticipation"
+         @close="closeParticipation">
+      </participation-item>
+   </div>
 
    <div>
-      <add-persons 
+      <add-persons
          buttonTitle="persons_associated.add_persons"
          modalTitle="add_persons.title"
          v-bind:key="addPersons.key"
@@ -77,15 +62,15 @@ export default {
    }),
    methods: {
       removeParticipation(item) {
-         console.log('@@ CLICK remove participation: item', item);
+        //console.log('@@ CLICK remove participation: item', item);
          this.$store.dispatch('removeParticipation', item);
       },
       closeParticipation(item) {
-         console.log('@@ CLICK close participation: item', item);
+        //console.log('@@ CLICK close participation: item', item);
          this.$store.dispatch('closeParticipation', item);
       },
       addNewPersons({ selected, modal }) {
-         console.log('@@@ CLICK button addNewPersons', selected);
+        //console.log('@@@ CLICK button addNewPersons', selected);
          selected.forEach(function(item) {
                this.$store.dispatch('addParticipation', item);
             }, this

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

@@ -1,5 +1,4 @@
 <template>
-
    <person-render-box
       :options="{
                addInfo : true,
@@ -10,9 +9,8 @@
                addAge : false,
                hLevel : 1
             }"
-      :person="participation.person"
-   >
-   
+      :person="participation.person">
+
       <template v-slot:record-actions>
          <ul class="record_actions">
             <li>
@@ -31,46 +29,70 @@
             </li>
             <!-- <li>
                <button class="btn btn-delete"
-                  :title="$t('action.delete')" 
+                  :title="$t('action.delete')"
                   @click.prevent="$emit('remove', participation)">
                </button>
             </li> -->
             <li>
                <button v-if="!participation.endDate"
-                  class="btn btn-remove"
-                  v-bind:title="$t('action.remove')" 
+                  class="btn btn-sm btn-remove"
+                  v-bind:title="$t('action.remove')"
                   @click.prevent="$emit('close', participation)">
                </button>
-               <button v-else class="btn btn-remove disabled"></button>
+               <button v-else class="btn btn-sm btn-remove disabled"></button>
             </li>
          </ul>
-      </template>
 
+      </template>
    </person-render-box>
 
+   <!-- dates of participation
+      <tr>
+         <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>
+      </tr>
+   -->
 </template>
 
-
-<!-- <tr>
-   <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>
-</tr> -->
-
 <script>
 import OnTheFly from 'ChillMainAssets/vuejs/_components/OnTheFly.vue';
-import PersonRenderBox from '../../../_components/Entity/PersonRenderBox.vue';
+import ButtonLocation from '../ButtonLocation.vue';
+import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 
 export default {
    name: 'ParticipationItem',
    components: {
       OnTheFly,
+      ButtonLocation,
       PersonRenderBox
    },
    props: ['participation'],
    emits: ['remove', 'close'],
+   data() {
+      return {
+         PersonRenderBox: {
+            participation: 'participation',
+            options: {
+               addInfo: false,
+               addId: true,
+               addAge: false,
+               hLevel: 1
+            }
+         }
+      }
+   },
+   computed: {
+      hasCurrentHouseholdAddress() {
+         if ( !this.participation.endDate
+            && this.participation.person.current_household_address !== null ) {
+            return true;
+         }
+         return false;
+      }
+   }
 }
 </script>

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

@@ -1,8 +1,8 @@
 <template>
 <div class="vue-component">
-   <h2><a name="section-40"></a>{{ $t('referrer.title') }}</h2>
+   <h2><a name="section-60"></a>{{ $t('referrer.title') }}</h2>
 
-   <div class="my-4">
+   <div>
       <label class="col-form-label" for="selectReferrer">
          {{ $t('referrer.label') }}
       </label>
@@ -18,10 +18,12 @@
          v-bind:options="options"
          @select="updateReferrer">
       </VueMultiselect>
+   </div>
 
+   <div>
       <ul class="record_actions">
          <li>
-            <button 
+            <button
                class="btn btn-create"
                type="button"
                name="button"
@@ -30,8 +32,8 @@
             </button>
          </li>
       </ul>
-
    </div>
+
 </div>
 </template>
 

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

@@ -1,12 +1,12 @@
 <template>
 <div class="vue-component">
-   
-   <h2><a name="section-20"></a>{{ $t('requestor.title') }}</h2>
-   
+
+   <h2><a name="section-40"></a>{{ $t('requestor.title') }}</h2>
+
    <div v-if="accompanyingCourse.requestor" class="flex-table">
-      
+
       <label>
-         <input type="checkbox" v-model="isAnonymous" class="me-2" /><!--  :value="value" -->
+         <input type="checkbox" v-model="isAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
       
@@ -30,31 +30,32 @@
             addInfo: true
             }"
       ></person-render-box>
+      
       <!-- </div> -->
          <!-- <h4>
             <span class="badge rounded-pill bg-secondary">{{ accompanyingCourse.requestor.type }}</span>
             {{ accompanyingCourse.requestor.text }}
-         </h4>   
-         
+         </h4>
+
          <dl class="content-bloc" v-if="accompanyingCourse.requestor.type === 'person'">
-            
-            <dt>{{ $t('requestor.birthdate') }}</dt>   
+
+            <dt>{{ $t('requestor.birthdate') }}</dt>
             <dd>{{ $d(accompanyingCourse.requestor.birthdate.datetime, 'short') }}</dd>
-            
-            <dt>{{ $t('requestor.center') }}</dt>   
+
+            <dt>{{ $t('requestor.center') }}</dt>
             <dd>{{ accompanyingCourse.requestor.center.name }}</dd>
-            
-            <dt>{{ $t('requestor.phonenumber') }}</dt>   
+
+            <dt>{{ $t('requestor.phonenumber') }}</dt>
             <dd>{{ accompanyingCourse.requestor.phonenumber }}</dd>
-            <dt>{{ $t('requestor.mobilenumber') }}</dt>   
+            <dt>{{ $t('requestor.mobilenumber') }}</dt>
             <dd>{{ accompanyingCourse.requestor.mobilenumber }}</dd>
          </dl>
-         
+
          <dl class="content-bloc" v-if="accompanyingCourse.requestor.type === 'thirdparty'">
-            
+
             <dt>{{ $t('requestor.address') }}</dt>
             <dd>{{ accompanyingCourse.requestor.address.text }}</dd>
-            
+
             <dt>{{ $t('requestor.location') }}</dt>
             <dd>{{ accompanyingCourse.requestor.address.postcode.name }}</dd>
          </dl>
@@ -79,17 +80,17 @@
       <ul class="record_actions">
          <li>
             <button class="btn btn-remove"
-               :title="$t('action.remove')" 
+               :title="$t('action.remove')"
                @click="removeRequestor">
                {{ $t('action.remove') }}
             </button>
          </li>
       </ul>
-   </div> 
+   </div>
    <div v-else>
-      <label>{{ $t('requestor.counter') }}</label>
-   </div>  
-   
+      <label class="chill-no-data-statement">{{ $t('requestor.counter') }}</label>
+   </div>
+
    <div>
       <add-persons v-if="accompanyingCourse.requestor === null"
          buttonTitle="requestor.add_requestor"
@@ -163,7 +164,7 @@ export default {
 
 div.flex-table {
    margin: 1em 0 0 !important;
-   & > label, 
+   & > label,
    & > ul.record_actions {
       margin: 1em 3em 0 !important;
    }

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

@@ -1,21 +1,15 @@
 <template>
 <div class="vue-component">
-  
-   <h2><a name="section-50"></a>{{ $t('resources.title')}}</h2>
-   
-   <div>
+
+   <h2><a name="section-70"></a>{{ $t('resources.title')}}</h2>
+
+   <div v-if="resources.length > 0">
       <label class="col-form-label">{{ $tc('resources.counter', counter) }}</label>
    </div>
-   
-   <table class="table table-bordered table-striped border-dark align-middle" 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>
-   </table>
+   <div v-else>
+      <label class="chill-no-data-statement">{{ $tc('resources.counter', counter) }}</label>
+   </div>
+
    <div class="flex-table mb-3">
       <resource-item
          v-for="resource in resources"
@@ -25,7 +19,7 @@
       </resource-item>
    </div>
    <div>
-      <add-persons 
+      <add-persons
         buttonTitle="resources.add_resources"
         modalTitle="resources.add_resources"
         v-bind:key="addPersons.key"
@@ -67,11 +61,11 @@ export default {
    }),
    methods: {
       removeResource(item) {
-         console.log('@@ CLICK remove resource: item', item);
+        //console.log('@@ CLICK remove resource: item', item);
          this.$store.dispatch('removeResource', item);
       },
       addNewPersons({ selected, modal }) {
-         console.log('@@@ CLICK button addNewPersons', selected);
+        //console.log('@@@ CLICK button addNewPersons', selected);
          selected.forEach(function(item) {
                this.$store.dispatch('addResource', item);
             }, this

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

@@ -1,24 +1,4 @@
 <template>
-<!-- <tr> -->
-   
-   <!-- <td>
-      <span class="badge rounded-pill bg-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> -->
       <third-party-render-box
          :options="{
             addLink : false,
@@ -46,32 +26,38 @@
                </li>
                <li>
                   <button
-                     class="btn btn-remove"
-                     v-bind:title="$t('action.remove')" 
+                     class="btn btn-sm btn-remove"
+                     v-bind:title="$t('action.remove')"
                      @click.prevent="$emit('remove', resource)">
                   </button>
                </li>
             </ul>
          </template>
-      
-      
       </third-party-render-box>
-      
-   <!-- </td>
-</tr> -->
 </template>
 
 <script>
 import OnTheFly from 'ChillMainAssets/vuejs/_components/OnTheFly.vue';
-import ThirdPartyRenderBox from '../../../../../../../ChillThirdPartyBundle/Resources/public/vuejs/_components/ThirdPartyRenderbox.vue'
+import ButtonLocation from '../ButtonLocation.vue';
+import ThirdPartyRenderBox from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyRenderBox.vue'
 
 export default {
    name: 'ResourceItem',
    components: {
       OnTheFly,
+      ButtonLocation,
       ThirdPartyRenderBox
    },
    props: ['resource'],
-   emits: ['remove']
+   emits: ['remove'],
+   computed: {
+      hasCurrentHouseholdAddress() {
+         if ( this.resource.resource.type === 'person'
+            && this.resource.resource.current_household_address !== null ) {
+            return true;
+         }
+         return false;
+      }
+   }
 }
 </script>

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

@@ -1,15 +1,15 @@
 <template>
   <div class="vue-component">
-     <h2><a name="section-30"></a>{{ $t('social_issue.title') }}</h2>
-     
+     <h2><a name="section-50"></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" 
+           :allow-empty="true"
+           :show-labels="false"
            track-by="id"
            label="text"
            :multiple="true"
@@ -20,7 +20,7 @@
            :options="options">
         </VueMultiselect>
      </div>
-     
+
   </div>
 </template>
 
@@ -51,7 +51,7 @@ export default {
             //console.log('get socialIssues', response.results);
             this.options = response.results;
             resolve();
-         })).catch(error => this.$store.commit('catchError', error));        
+         })).catch(error => this.$store.commit('catchError', error));
       },
       updateSocialIssues(value) {
          this.$store.dispatch('updateSocialIssues', this.transformValue(value));
@@ -60,7 +60,7 @@ export default {
          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 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);

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

@@ -1,15 +1,15 @@
 <template>
-   <a 
-      v-if="item.key <= 5"
-      :href="item.name" 
+   <a
+      v-if="item.key <= 7"
+      :href="item.name"
       :class="{ 'active': isActive }"
       >
       <i class="fa fa-fw fa-square"></i>
       <span>{{ item.key }}</span>
    </a>
-   <a 
+   <a
       v-else-if="step === 'DRAFT'"
-      :href="item.name" 
+      :href="item.name"
       :class="{ 'active': isActive }"
       >
       <i class="fa fa-fw fa-square"></i>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/composer.json

@@ -0,0 +1,14 @@
+{
+  "name": "vendor_name/AccompanyingCourse",
+  "description": "description",
+  "minimum-stability": "stable",
+  "license": "proprietary",
+  "authors": [
+    {
+      "name": "mat",
+      "email": "email@example.com"
+    }
+  ],
+  "require": {
+  }
+}

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

@@ -12,11 +12,10 @@ const root = window.vueRootComponent;
 *  Load all App component, for AccompanyingCourse edition page
 */
 if (root === 'app') {
-   
    initPromise.then(store => {
-      
+
       const i18n = _createI18n(appMessages);
-      
+
       const app = createApp({
          template: `<app></app>`,
       })
@@ -31,11 +30,10 @@ if (root === 'app') {
 *  Load only Banner sub-component, for all others AccompanyingCourse page
 */
 if (root === 'banner') {
-
    initPromise.then(store => {
-      
+
       const i18n = _createI18n(appMessages);
-      
+
       const app = createApp({
          template: `<banner></banner>`,
       })
@@ -44,5 +42,5 @@ if (root === 'banner') {
       .component('banner', Banner)
       .mount('#banner-accompanying-course');
    });
-   
+
 }

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

@@ -1,4 +1,5 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n';
 
 const appMessages = {
    fr: {
@@ -20,7 +21,7 @@ const appMessages = {
             active: "En file active"
          },
          open_at: "ouvert le ",
-         by: "par ", 
+         by: "par ",
          emergency: "urgent",
          confidential: "confidentiel",
          regular: "régulier",
@@ -33,7 +34,7 @@ const appMessages = {
       },
       persons_associated: {
          title: "Usagers concernés",
-         counter: "Il n'y a pas encore d'usager | 1 usager | {count} usagers",
+         counter: "Il n'y a pas encore d'usagers | 1 usager | {count} usagers",
          firstname: "Prénom",
          lastname: "Nom",
          name: "Nom",
@@ -63,6 +64,19 @@ const appMessages = {
          title: "Problématiques sociales",
          label: "Choisir les problématiques sociales",
       },
+      courselocation: {
+         title: "Localisation du parcours",
+         add_temporary_address: "Ajouter une adresse temporaire",
+         edit_temporary_address: "Modifier l'adresse temporaire",
+         assign_course_address: "Désigner comme l'adresse du parcours",
+         remove_button: "Enlever l'adresse",
+         temporary_address_must_be_changed: "Cette addresse est temporaire et devrait être remplacée par celle d'un usager de référence.",
+         sure: "Êtes-vous sûr ?",
+         sure_description: "Voulez-vous faire de cette adresse l'adresse du parcours ?",
+         ok: "Désigner comme adresse du parcours",
+         person_locator: "Parcours localisé auprès de {0}",
+         no_address: "Il n'y a pas d'adresse associée au parcours"
+      },
       referrer: {
          title: "Référent du parcours",
          label: "Vous pouvez choisir un TMS ou vous assigner directement comme référent",
@@ -80,21 +94,36 @@ const appMessages = {
          title: "Observations",
          label: "Ajout d'une note",
          content: "Rédigez une première note…",
-         created_by: "créé par {0}, le {1}" 
+         created_by: "créé par {0}, 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 ",
+         text_draft: "Le parcours est actuellement à l'état de <b>{0}</b>.",
+         text_active: "En validant cette étape, vous lui donnez le statut <b>{0}</b>.",
+         alert_validation: "Certaines conditions ne sont pas remplies pour pouvoir confirmer le parcours :",
+         participation_not_valid: "sélectionnez au minimum 1 usager",
+         socialIssue_not_valid: "sélectionnez au minimum une problématique sociale",
+         location_not_valid: "indiquez au minimum une localisation temporaire du parcours",
          sure: "Êtes-vous sûr ?",
-         sure_description: "Une fois le changement confirmé, il n'est plus possible de le remettre à l'état de brouillon !",
+         sure_description: "Une fois le changement confirmé, il ne sera plus possible de le remettre à l'état de brouillon !",
          ok: "Confirmer le parcours"
       },
-
+      // catch errors
+      'Error while updating AccompanyingPeriod Course.': "Erreur du serveur lors de la mise à jour du parcours d'accompagnement.",
+      'Error while retriving AccompanyingPeriod Course.': "Erreur du serveur lors du chargement du parcours d'accompagnement.",
+      'Error while confirming AccompanyingPeriod Course.': "Erreur du serveur lors de la confirmation du parcours d'accompagnement.",
+      'Error while retriving Social Issues.': "Erreur du serveur lors du chargement des problématique sociales.",
+      'Error while sending AccompanyingPeriod Course participation.': "Erreur du serveur lors de l'envoi des infos d'un usager.",
+      'Error while sending AccompanyingPeriod Course requestor': "Erreur du serveur lors de l'envoi des infos du demandeur.",
+      'Error while sending AccompanyingPeriod Course resource.': "Erreur du serveur lors de l'envoi des infos d'un interlocuteur privilégié.",
+      'Error while updating SocialIssue.': "Erreur du serveur lors de la mise à jour d'une problématique sociale.",
+      'Error while retriving users.': "Erreur du serveur lors du chargement de la liste des travailleurs.",
+      'Error while getting whoami.': "Erreur du serveur lors de la requête 'qui suis-je ?'",
+      'Error while retriving origin\'s list.': "Erreur du serveur lors du chargement de la liste des origines de la demande.",
    }
 };
 
-Object.assign(appMessages.fr, personMessages.fr);
+Object.assign(appMessages.fr, personMessages.fr, addressMessages.fr);
 
 export {
    appMessages

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

@@ -1,32 +1,58 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
-import { getAccompanyingCourse, 
+import { getAccompanyingCourse,
    patchAccompanyingCourse,
    confirmAccompanyingCourse,
-   postParticipation, 
+   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,
+            addressContext: {},
             errorMsg: []
          },
          getters: {
+            isParticipationValid(state) {
+               return state.accompanyingCourse.participations.length > 0;
+            },
+            isSocialIssueValid(state) {
+               return state.accompanyingCourse.socialIssues.length > 0;
+            },
+            isLocationValid(state) {
+               return state.accompanyingCourse.location !== null;
+            },
+            validationKeys(state, getters) {
+               let keys = [];
+               if (!getters.isParticipationValid) { keys.push('participation'); }
+               if (!getters.isLocationValid) { keys.push('location'); }
+               if (!getters.isSocialIssueValid) { keys.push('socialIssue'); }
+               //console.log('getter keys', keys);
+               return keys;
+            },
+            isValidToBeConfirmed(state, getters) {
+               if (getters.validationKeys.length === 0) {
+                  return true;
+               }
+               return false;
+            }
          },
          mutations: {
             catchError(state, error) {
-               state.errorMsg.push(error); 
+               console.log('### mutation: a new error have been catched and pushed in store !', error);
+               state.errorMsg.push(error);
             },
             removeParticipation(state, participation) {
                //console.log('### mutation: remove participation', participation.id);
@@ -77,7 +103,7 @@ let initPromise = getAccompanyingCourse(id)
             postFirstComment(state, comment) {
                //console.log('### mutation: postFirstComment', comment);
                state.accompanyingCourse.initialComment = comment;
-            }, 
+            },
             updateSocialIssues(state, value) {
                state.accompanyingCourse.socialIssues = value;
             },
@@ -92,6 +118,20 @@ let initPromise = getAccompanyingCourse(id)
             confirmAccompanyingCourse(state, response) {
                //console.log('### mutation: confirmAccompanyingCourse: response', response);
                state.accompanyingCourse.step = response.step;
+            },
+            setAddressContext(state, context) {
+               //console.log('define location context');
+               state.addressContext = context;
+            },
+            updateLocation(state, r) {
+              //console.log('### mutation: set location attributes', r);
+               state.accompanyingCourse.location = r.location;
+               state.accompanyingCourse.locationStatus = r.locationStatus;
+               state.accompanyingCourse.personLocation = r.personLocation;
+            },
+            setEditContextTrue(state) {
+              //console.log('### mutation: set edit context = true');
+               state.addressContext.edit = true;
             }
          },
          actions: {
@@ -105,7 +145,7 @@ let initPromise = getAccompanyingCourse(id)
                .then(participation => new Promise((resolve, reject) => {
                   commit('closeParticipation', { participation, payload });
                   resolve();
-               })).catch((error) => { commit('catchError', error) }); 
+               })).catch((error) => { commit('catchError', error) });
             },
             addParticipation({ commit }, payload) {
                //console.log('## action: fetch post participation (select item): payload', payload);
@@ -113,7 +153,7 @@ let initPromise = getAccompanyingCourse(id)
                .then(participation => new Promise((resolve, reject) => {
                   commit('addParticipation', participation);
                   resolve();
-               })).catch((error) => { commit('catchError', error) }); 
+               })).catch((error) => { commit('catchError', error) });
             },
             removeRequestor({ commit, dispatch }) {
                //console.log('## action: fetch delete requestor');
@@ -122,7 +162,7 @@ let initPromise = getAccompanyingCourse(id)
                   commit('removeRequestor');
                   dispatch('requestorIsAnonymous', false);
                   resolve();
-               })).catch((error) => { commit('catchError', error) }); 
+               })).catch((error) => { commit('catchError', error) });
             },
             addRequestor({ commit }, payload) {
                //console.log('## action: fetch post requestor: payload', payload);
@@ -130,7 +170,7 @@ let initPromise = getAccompanyingCourse(id)
                .then(requestor => new Promise((resolve, reject) => {
                   commit('addRequestor', requestor);
                   resolve();
-               })).catch((error) => { commit('catchError', error) }); 
+               })).catch((error) => { commit('catchError', error) });
             },
             requestorIsAnonymous({ commit }, payload) {
                //console.log('## action: fetch patch AccompanyingCourse: payload', payload);
@@ -209,6 +249,30 @@ let initPromise = getAccompanyingCourse(id)
                   resolve();
                })).catch((error) => { commit('catchError', error) });
             },
+            updateLocation({ commit }, payload) {
+              //console.log('## action: updateLocation', payload.locationStatusTo);
+               let body = { 'type': payload.entity, 'id': payload.entityId };
+               let location = {};
+               if (payload.locationStatusTo === 'person') { // patch for person address (don't remove addressLocation)
+                  location = { 'personLocation': { 'type': 'person', 'id': payload.personId }};
+               }
+               else if (payload.locationStatusTo === 'address') { // patch for temporary address
+                  location = { 'personLocation': null, 'addressLocation': { 'id': payload.addressId }};
+               }
+               else { // patch to remove person address
+                  location = { 'personLocation': null };
+               }
+               Object.assign(body, location);
+               patchAccompanyingCourse(payload.entityId, body)
+                  .then(accompanyingCourse => new Promise((resolve, reject) => {
+                     commit('updateLocation', {
+                        location: accompanyingCourse.location,
+                        locationStatus: accompanyingCourse.locationStatus,
+                        personLocation: accompanyingCourse.personLocation
+                     });
+                     resolve();
+                  })).catch((error) => { commit('catchError', error) });
+            },
             confirmAccompanyingCourse({ commit }) {
                //console.log('## action: confirmAccompanyingCourse');
                confirmAccompanyingCourse(id)

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue

@@ -0,0 +1,99 @@
+<template>
+   <div>
+      <div class="item-title" @click="removeEvaluation(e)">
+         <i class="fa fa-fw fa-times"></i>
+         {{ evaluation.evaluation.title.fr }}
+      </div>
+      <div v-if="!editEvaluation">
+         <dl class="item-details definition-inline">
+
+            <dt v-if="evaluation.startDate">{{ $t('startDate') }} :</dt>
+            <dd v-if="evaluation.startDate">{{ $d(evaluation.startDate.datetime, 'short') }}</dd>
+
+            <dt v-if="evaluation.endDate">{{ $t('endDate') }} :</dt>
+            <dd v-if="evaluation.endDate">{{ $d(evaluation.endDate.datetime, 'short') }}</dd>
+
+            <dt v-if="evaluation.maxDate">{{ $t('maxDate') }} :</dt>
+            <dd v-if="evaluation.maxDate">{{ $d(evaluation.maxDate.datetime, 'short') }}</dd>
+
+            <dt v-if="evaluation.warningInterval">{{ $t('warningInterval') }} :</dt>
+            <dd v-if="evaluation.warningInterval">{{ evaluation.warningInterval }}</dd>
+
+            <dt v-if="evaluation.documents && evaluation.documents.length > 0">{{ $t('documents') }} :</dt>
+            <dd v-if="evaluation.documents && evaluation.documents.length > 0">{{ evaluation.documents.length }}</dd>
+
+         </dl>
+         <dl class="item-details">
+
+            <dt v-if="evaluation.comment">{{ $t('comment') }} :</dt>
+            <dd v-if="evaluation.comment">{{ evaluation.comment }}</dd>
+
+         </dl>
+         <ul class="record_actions">
+            <li>
+               <a class="btn btn-sm btn-update" @click="toggleEditEvaluation(e)">{{ $t('action.edit') }}</a>
+            </li>
+         </ul>
+      </div>
+      <div v-if="editEvaluation">
+         <form-evaluation ref="FormEvaluation" :key="evaluation.id" :evaluation="evaluation"></form-evaluation>
+         <ul class="record_actions">
+            <li>
+               <button class="btn btn-sm btn-update" @click="submitForm">{{ $t('action.save') }}</button>
+            </li>
+         </ul>
+      </div>
+   </div>
+</template>
+
+<script>
+import FormEvaluation from './FormEvaluation.vue';
+
+const i18n = {
+   messages: {
+      fr: {
+         no_evaluation_associated: "Aucune évaluation associée",
+         add_an_evaluation: "Évaluations disponibles",
+         evaluation_has_no_evaluation: "Aucune évaluation disponible",
+         startDate: "Date d'ouverture",
+         endDate: "Date de fin",
+         maxDate: "Date d'échéance",
+         warningInterval: "Rappel (jours)",
+         comment: "Note publique",
+         documents: "Documents",
+      }
+   }
+};
+
+export default {
+   name: "AddEvaluation",
+   components: {
+      FormEvaluation
+   },
+   props: ['evaluation'],
+   i18n,
+   data() {
+      return {
+         editEvaluation: false,
+      };
+   },
+   computed: {
+      pickedEvaluations() {
+         return this.$store.state.evaluationsPicked;
+      }
+   },
+   methods: {
+      removeEvaluation(e) {
+         this.$store.commit('removeEvaluation', e);
+         return;
+      },
+      toggleEditEvaluation(e) {
+         this.editEvaluation = !this.editEvaluation;
+      },
+      submitForm() {
+         this.$refs.FormEvaluation.saveEvaluation();
+         this.toggleEditEvaluation();
+      }
+   }
+}
+</script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue

@@ -1,166 +1,128 @@
 <template>
-  <div class="addResult" v-if="hasResult">
-    <p class="chill-no-data-statement" v-if="pickedResults.length ===0">
-      Aucun résultat associé
-    </p>
-    <ul class="list-results">
-      <li v-for="r in pickedResults" @click="removeResult(r)" class="badge bg-primary">
-        <i class="fa fa-times"></i>
-        {{ r.title.fr }}
-      </li>
-      <template v-if="isExpanded">
-        <li v-for="r in availableForCheckResults" @click="addResult(r)" class="badge bg-primary">
-          <i class="fa fa-plus"></i>
-          {{ r.title.fr }}
-        </li>
-      </template>
-    </ul>
-    <ul class="record_actions">
-      <li v-if="isExpanded">
-        <button @click="toggleSelect" class="btn btn-hide" >
-          <i class="fa fa-eye-slash"></i>
-          Masquer résultats et orientations disponibles
-        </button>
-      </li>
-      <li v-else>
-        <button @click="toggleSelect" class="btn btn-show">
-          Afficher résultats et orientations disponibles
-        </button>
-      </li>
-    </ul>
-  </div>
-  <div class="noResult" v-if="!hasResult">
-    <div class="chill-no-data-statement">
-      {{ $t('goal_has_no_result') }}
-    </div>
-  </div>
+   <div v-if="hasResult" class="addResult">
+      <p v-if="pickedResults.length ===0" class="chill-no-data-statement">
+         Aucun résultat associé
+      </p>
+      <ul class="list-results">
+         <li v-for="r in pickedResults" class="badge bg-primary" @click="removeResult(r)">
+            <i class="fa fa-times"></i>
+            {{ r.title.fr }}
+         </li>
+         <template v-if="isExpanded">
+            <li v-for="r in availableForCheckResults" class="badge bg-primary" @click="addResult(r)">
+               <i class="fa fa-plus"></i>
+               {{ r.title.fr }}
+            </li>
+         </template>
+      </ul>
+      <ul class="record_actions">
+         <li v-if="isExpanded">
+            <button class="btn btn-hide" @click="toggleSelect">
+               <i class="fa fa-eye-slash"></i>
+               Masquer résultats et orientations disponibles
+            </button>
+         </li>
+         <li v-else>
+            <button class="btn btn-show" @click="toggleSelect">
+               Afficher résultats et orientations disponibles
+            </button>
+         </li>
+      </ul>
+   </div>
+   <div v-if="!hasResult" class="noResult">
+      <div class="chill-no-data-statement">
+         {{ $t('goal_has_no_result') }}
+      </div>
+   </div>
 </template>
 
-<style lang="scss">
-
-button.hide {
-  background-color: rgb(51, 77, 92);
-}
-
-ul.list-results {
-  list-style-type: none;
-  padding: 0;
-
-  li {
-    margin: 0.5rem;
-  }
-
-  li.badge {
-    padding-bottom: 0;
-    padding-top: 0;
-    padding-left: 0;
-
-    i.fa {
-      /*border-radius: 0.25rem; */
-      padding: 0.25rem;
-    }
-
-    i.fa-plus {
-      background-color: green;
-    }
-
-    i.fa-times {
-      background-color: red;
-      color: white;
-    }
-  }
-}
-
-</style>
-
 <script>
-
 const i18n = {
-  messages: {
-    fr: {
-      add_a_result: "Résultat - orientation disponibles",
-      goal_has_no_result: "Aucun résultat - orientation disponible",
-    }
-  }
+   messages: {
+      fr: {
+         add_a_result: "Résultat - orientation disponibles",
+         goal_has_no_result: "Aucun résultat - orientation disponible",
+      }
+   }
 };
 
 export default {
-  name: "AddResult",
-  props: [ 'destination', 'goal' ],
-  i18n,
-  data() {
-    return {
-      isExpanded: false,
-    };
-  },
-  computed: {
-    hasResult() {
-      if (this.destination === 'action') {
-        return this.$store.state.resultsForAction.length > 0;
-      } else if (this.destination === 'goal') {
-        return this.$store.getters.resultsForGoal(this.goal).length > 0;
-      }
+   name: "AddResult",
+   props: ['destination', 'goal', 'availableResults'],
+   i18n,
+   data() {
+      return {
+         isExpanded: false,
+      };
+   },
+   computed: {
+      hasResult() {
+         if (this.destination === 'action') {
+            return this.$store.state.resultsForAction.length > 0;
+         } else if (this.destination === 'goal') {
+            return this.$store.getters.resultsForGoal(this.goal).length > 0;
+         }
 
-      throw Error(`this.destination is not implemented: ${this.destination}`);
-    },
-    pickedResults() {
-      console.log('get checked');
-      console.log('this.destination', this.destination);
-      console.log('this.goal', this.goal);
-      if (this.destination === 'action') {
-        return this.$store.state.resultsPicked;
-      } else if (this.destination === 'goal') {
-        return this.$store.getters.resultsPickedForGoal(this.goal);
-      }
+         throw Error(`this.destination is not implemented: ${this.destination}`);
+      },
+      pickedResults() {
+         //console.log('get checked');
+         //console.log('this.destination', this.destination);
+         //console.log('this.goal', this.goal);
+         if (this.destination === 'action') {
+            return this.$store.state.resultsPicked;
+         } else if (this.destination === 'goal') {
+            return this.$store.getters.resultsPickedForGoal(this.goal);
+         }
 
-      throw Error(`this.destination is not implemented: ${this.destination}`);
-    },
-    availableForCheckResults() {
-      console.log('availableForCheckResults');
-      console.log('this.destination', this.destination);
-      console.log('this.goal', this.goal);
-      if (this.destination === 'action') {
-        let pickedIds = this.$store.state.resultsPicked.map(r => r.id);
-        console.log('picked ids', pickedIds);
+         throw Error(`this.destination is not implemented: ${this.destination}`);
+      },
+      availableForCheckResults() {
+         //console.log('availableForCheckResults');
+         //console.log('this.destination', this.destination);
+         //console.log('this.goal', this.goal);
+         if (this.destination === 'action') {
+            let pickedIds = this.$store.state.resultsPicked.map(r => r.id);
+            //console.log('picked ids', pickedIds);
 
-        return this.$store.state.resultsForAction.filter(r => !pickedIds.includes(r.id));
-      } else if (this.destination === 'goal') {
-        console.log('results picked for goal', this.$store.getters.resultsPickedForGoal(this.goal));
-        let pickedIds = this.$store.getters.resultsPickedForGoal(this.goal).map(r => r.id);
+            return this.$store.state.resultsForAction.filter(r => !pickedIds.includes(r.id));
+         } else if (this.destination === 'goal') {
+            //console.log('results picked for goal', this.$store.getters.resultsPickedForGoal(this.goal));
+            let pickedIds = this.$store.getters.resultsPickedForGoal(this.goal).map(r => r.id);
 
-        return this.$store.getters.resultsForGoal(this.goal).filter(r => !pickedIds.includes(r.id));
-      }
+            return this.$store.getters.resultsForGoal(this.goal).filter(r => !pickedIds.includes(r.id));
+         }
 
-      throw Error(`this.destination is not implemented: ${this.destination}`);
-    }
-  },
-  methods: {
-    toggleSelect() {
-      this.isExpanded = !this.isExpanded; 
-    },
-    addResult(r) {
-      console.log('addResult', r);
-      if (this.destination === 'action') {
-        this.$store.commit('addResultPicked', r);
-        return;
-      } else if (this.destination === 'goal') {
-        this.$store.commit('addResultForGoalPicked', { goal: this.goal, result: r });
-        return;
+         throw Error(`this.destination is not implemented: ${this.destination}`);
       }
-      throw Error(`this.destination is not implemented: ${this.destination}`);
-    },
-    removeResult(r) {
-      console.log('removeresult', r);
-      if (this.destination === 'action') {
-        this.$store.commit('removeResultPicked', r);
-        return;
-      } else if (this.destination === 'goal') {
-        this.$store.commit('removeResultForGoalPicked', { goal: this.goal, result: r });
-        return;
+   },
+   methods: {
+      toggleSelect() {
+         this.isExpanded = !this.isExpanded;
+      },
+      addResult(r) {
+         //console.log('addResult', r);
+         if (this.destination === 'action') {
+            this.$store.commit('addResultPicked', r);
+            return;
+         } else if (this.destination === 'goal') {
+            this.$store.commit('addResultForGoalPicked', {goal: this.goal, result: r});
+            return;
+         }
+         throw Error(`this.destination is not implemented: ${this.destination}`);
+      },
+      removeResult(r) {
+         //console.log('removeresult', r);
+         if (this.destination === 'action') {
+            this.$store.commit('removeResultPicked', r);
+            return;
+         } else if (this.destination === 'goal') {
+            this.$store.commit('removeResultForGoalPicked', {goal: this.goal, result: r});
+            return;
+         }
+         throw Error(`this.destination is not implemented: ${this.destination}`);
       }
-      throw Error(`this.destination is not implemented: ${this.destination}`);
-    }
-  }
+   }
 }
 
 </script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue

@@ -0,0 +1,217 @@
+<template>
+<div>
+   <!--h2>
+      {{ $t('evaluation_title') }}
+   </h2-->
+
+   <div class="m-md-3">
+      <!--div class="row mb-3">
+         <label class="col-sm-4 col-form-label">{{ $t('evaluation_status') }}</label>
+         <div class="col-sm-8">
+            <select class="form-select form-select-sm" v-model="status">
+               <option disabled value="">{{ $t('evaluation_choose_a_status') }}</option>
+               <option v-for="s in listAllStatus" :value="s.id">
+                  {{ s.id }}
+               </option>
+            </select>
+         </div>
+      </div-->
+
+      <div class="row mb-3">
+         <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+            {{ $t('evaluation_startdate') }}
+         </label>
+         <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+            <input class="form-control form-control-sm" type="date" v-model="startDate"/>
+         </div>
+
+         <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+            {{ $t('evaluation_enddate') }}
+         </label>
+         <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+            <input class="form-control form-control-sm" type="date" v-model="endDate"/>
+         </div>
+      </div>
+
+      <div class="row mb-3">
+         <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+            {{ $t('evaluation_maxdate') }}
+         </label>
+         <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+            <input class="form-control form-control-sm" type="date" v-model="maxDate"/>
+         </div>
+
+         <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+            {{ $t('evaluation_warning_interval') }}
+         </label>
+         <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+            <input class="form-control form-control-sm" type="number" v-model.number="warningInterval"/>
+         </div>
+      </div>
+
+      <div class="row mb-3">
+         <label class="col-sm-4 col-form-label">{{ $t('evaluation_public_comment') }}</label>
+         <div class="col-sm-8">
+            <ckeditor
+               :editor="editor"
+               :placeholder="$t('evaluation_comment_placeholder')"
+               v-model="comment"
+               tag-name="textarea"
+            ></ckeditor>
+         </div>
+      </div>
+
+      <div class="row mb-3">
+         <label class="col-sm-4 col-form-label">{{ $t('evaluation_generate_a_document') }}</label>
+         <div class="col-sm-8">
+            <div class="input-group">
+               <select class="form-select form-select-sm" v-model="template">
+                  <option disabled value="">{{ $t('evaluation_choose_a_template') }}</option>
+                  <option>A</option>
+               </select>
+               <button class="btn btn-update btn-sm change-icon" type="button"><i class="fa fa-fw fa-cog"></i></button>
+            </div>
+         </div>
+      </div>
+
+      <!--div class="row mb-3">
+         <label class="col-sm-4 col-form-label">{{ $t('evaluation_add_a_document') }}</label>
+         <div class="col-sm-8">
+            <button class="btn btn-create btn-sm" @click="documents"></button>
+         </div>
+      </div-->
+   </div>
+</div>
+</template>
+
+<script>
+import {dateToISO, ISOToDate, ISOToDatetime} from 'ChillMainAssets/chill/js/date.js';
+import CKEditor from '@ckeditor/ckeditor5-vue';
+import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
+
+const i18n = {
+   messages: {
+      fr: {
+         evaluation_title: "Ecrire une évaluation",
+         evaluation_status: "Statut",
+         evaluation_choose_a_status: "Choisir un statut",
+         evaluation_startdate: "Date d'ouverture",
+         evaluation_enddate: "Date de fin",
+         evaluation_maxdate: "Date d'échéance",
+         evaluation_warning_interval: "Rappel (jours)",
+         evaluation_public_comment: "Note publique",
+         evaluation_comment_placeholder: "Commencez à écrire ...",
+         evaluation_generate_a_document: "Générer un document",
+         evaluation_choose_a_template: "Choisir un gabarit",
+         evaluation_add_a_document: "Ajouter un document",
+         evaluation_add: "Ajouter une évaluation"
+      }
+   }
+};
+
+export default {
+   name: "FormEvaluation",
+   props: ['evaluation'],
+   components: {
+      ckeditor: CKEditor.component,
+   },
+   i18n,
+   data() {
+      return {
+         editor: ClassicEditor,
+         //evaluation: {
+         //   status: null,
+         //   startDate: null,
+         //   endDate: null,
+         //   maxDate: null,
+         //   warningInterval: null,
+         //   comment: null,
+         //   template: null,
+         //   //documents: null
+         //}
+      }
+   },
+   computed: {
+      /*
+      status: {
+         get() { return this.evaluation.status; },
+         set(v) { this.evaluation.status = v; }
+      },
+      */
+      startDate: {
+         get() {
+            if (this.evaluation.startDate) {
+               return this.evaluation.startDate.datetime.split('T')[0];
+            }
+            return null;
+         },
+         set(v) {
+            this.evaluation.startDate.datetime = `${v}T00:00:00+0100`;
+         }
+      },
+      endDate: {
+         get() {
+            if (this.evaluation.endDate) {
+               return this.evaluation.endDate.datetime.split('T')[0];
+            }
+            return null;
+         },
+         set(v) {
+            this.evaluation.endDate.datetime = `${v}T00:00:00+0100`;
+         }
+      },
+      maxDate: {
+         get() {
+            if (this.evaluation.maxDate) {
+               return this.evaluation.maxDate.datetime.split('T')[0];
+            }
+            return null;
+         },
+         set(v) {
+            this.evaluation.maxDate.datetime = `${v}T00:00:00+0100`;
+         }
+      },
+      warningInterval: {
+         get() { return this.evaluation.warningInterval; },
+         set(v) { this.evaluation.warningInterval = v; }
+      },
+      comment: {
+         get() { return this.evaluation.comment; },
+         set(v) { this.evaluation.comment = v; }
+      },
+      template: {
+         get() { return this.evaluation.template; },
+         set(v) { this.evaluation.template = v; }
+      },
+      /*
+      documents: {
+         get() { return this.evaluation.documents; },
+         set(v) { this.evaluation.documents = v; }
+      }
+      */
+   },
+   methods: {
+      listAllStatus() {
+         console.log('load all status');
+         let url = `/api/`;
+         fetch(url)
+         .then(response => {
+            if (response.ok) {
+               return response.json();
+            }
+            throw { m: 'yeeah', s: response.status, b: response.body };
+         })
+         ;
+      },
+      saveEvaluation() {
+         console.log('save evaluation');
+
+         console.log('dispatch action: post/patch/put evaluation');
+         console.log('commit mutation: update state.mutation');
+      }
+   },
+   mounted() {
+      //this.listAllStatus();
+   }
+}
+</script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js

@@ -5,7 +5,7 @@ import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
 
 const debug = process.env.NODE_ENV !== 'production';
 
-console.log(window.accompanyingCourseWork);
+console.log('acw', window.accompanyingCourseWork);
 
 const store = createStore({
   strict: debug,
@@ -16,10 +16,12 @@ const store = createStore({
       ISOToDatetime(window.accompanyingCourseWork.endDate.datetime) : null),
     note: window.accompanyingCourseWork.note,
     goalsPicked: window.accompanyingCourseWork.goals,
+    goalsForAction: [],
     resultsPicked: window.accompanyingCourseWork.results,
     resultsForAction: [],
-    goalsForAction: [],
     resultsForGoal: [],
+    evaluationsPicked: window.accompanyingCourseWork.accompanyingPeriodWorkEvaluations,
+    evaluationsForAction: [],
     personsPicked: window.accompanyingCourseWork.persons,
     personsReachables: window.accompanyingCourseWork.accompanyingPeriod.participations.filter(p => p.endDate == null)
       .map(p => p.person),
@@ -79,11 +81,28 @@ const store = createStore({
             },
             results: g.results.map(r => ({id: r.id, type: r.type})),
           };
-
           if (g.id !== undefined) {
             o.id = g.id;
           }
-
+          return o;
+        }),
+        accompanyingPeriodWorkEvaluations: state.evaluationsPicked.map(e => {
+          let o = {
+            type: e.type,
+            evaluation: {
+              id: e.evaluation.id,
+              type: e.evaluation.type
+            },
+            startDate: e.startDate,
+            endDate: e.endDate,
+            maxDate: e.maxDate,
+            warningInterval: e.warningInterval,
+            comment: e.comment,
+            documents: e.documents
+          };
+          if (e.id !== undefined) {
+            o.id = e.id;
+          }
           return o;
         })
       };
@@ -97,19 +116,24 @@ const store = createStore({
       state.endDate = date;
     },
     setResultsForAction(state, results) {
-      console.log('set results for action', results);
+      //console.log('set results for action', results);
       state.resultsForAction = results;
     },
     setResultsForGoal(state, { goal, results }) {
-      console.log('set results for goal', results);
+      //console.log('set results for goal', results);
       state.goalsForAction.push(goal);
       for (let i in results) {
         let r = results[i];
         r.goalId = goal.id;
-        console.log('adding result', r);
+        //console.log('adding result', r);
         state.resultsForGoal.push(r);
       }
     },
+    setEvaluationsForAction(state, results) {
+      //console.log('set evaluations for action', results);
+      state.evaluationsForAction = results;
+      console.log('e4a', state.evaluationsForAction);
+    },
     addResultPicked(state, result) {
       state.resultsPicked.push(result);
     },
@@ -130,10 +154,10 @@ const store = createStore({
     },
     addResultForGoalPicked(state, { goal, result}) {
       let found = state.goalsPicked.find(g => g.goal.id === goal.id);
-      console.log('adResultForGoalPicked');
-      console.log('found', found);
-      console.log('goal', goal);
-      console.log('result', result);
+      //console.log('adResultForGoalPicked');
+      //console.log('found', found);
+      //console.log('goal', goal);
+      //console.log('result', result);
 
       if (found === undefined) {
         return;
@@ -150,8 +174,26 @@ const store = createStore({
 
       found.results = found.results.filter(r => r.id !== result.id);
     },
+    addEvaluation(state, evaluation) {
+      let e = {
+        type: "accompanying_period_work_evaluation",
+        evaluation: evaluation,
+        //startDate,
+        //endDate,
+        //maxDate,
+        //warningInterval
+        //comment,
+        //documents,
+      }
+      state.evaluationsPicked.push(e);
+      console.log('ep', state.evaluationsPicked);
+    },
+    removeEvaluation(state, evaluation) {
+      state.evaluationsPicked = state.evaluationsPicked.filter(e => e.id !== evaluation.id);
+      console.log('ep', state.evaluationsPicked);
+    },
     setPersonsPickedIds(state, ids) {
-      console.log('persons ids', ids);
+      //console.log('persons ids', ids);
       state.personsPicked = state.personsReachables
         .filter(p => ids.includes(p.id))
     },
@@ -162,11 +204,11 @@ const store = createStore({
       state.handlingThirdParty = thirdParty;
     },
     addThirdParties(state, thirdParties) {
-      console.log('addThirdParties', thirdParties);
+      //console.log('addThirdParties', thirdParties);
       // filter to remove existing thirdparties
       let ids = state.thirdParties.map(t => t.id);
       let unexistings = thirdParties.filter(t => !ids.includes(t.id));
-      console.log('unexisting third parties', unexistings);
+      //console.log('unexisting third parties', unexistings);
       for (let i in unexistings) {
         state.thirdParties.push(unexistings[i]);
       }
@@ -176,7 +218,7 @@ const store = createStore({
         .filter(t => t.id !== thirdParty.id);
     },
     setErrors(state, errors) {
-      console.log('handling errors', errors);
+      //console.log('handling errors', errors);
       state.errors = errors;
     },
     setIsPosting(state, st) {
@@ -185,14 +227,12 @@ const store = createStore({
   },
   actions: {
     getReachablesGoalsForAction({ getters, commit, dispatch }) {
-      console.log('getReachablesGoalsForAction');
+      //console.log('getReachablesGoalsForAction');
       let
         socialActionId = getters.socialAction.id,
         url = `/api/1.0/person/social-work/goal/by-social-action/${socialActionId}.json`
       ;
-
-      console.log(url);
-
+      //console.log(url);
       window
         .fetch(
           url
@@ -210,13 +250,11 @@ const store = createStore({
         });
     },
     getReachablesResultsForGoal({ commit }, goal) {
-      console.log('getReachablesResultsForGoal');
+      //console.log('getReachablesResultsForGoal');
       let
         url = `/api/1.0/person/social-work/result/by-goal/${goal.id}.json`
       ;
-
-      console.log(url);
-
+      //console.log(url);
       window.fetch(url)
         .then(response => {
           if (response.ok) {
@@ -226,19 +264,17 @@ const store = createStore({
           throw { m: 'Error while retriving results for goal', s: response.status, b: response.body };
         })
         .then(data => {
-          console.log('data');
+          //console.log('data');
           commit('setResultsForGoal', { goal, results: data.results });
         });
     },
     getReachablesResultsForAction({ getters, commit }) {
-      console.log('getReachablesResultsForAction');
+      //console.log('getReachablesResultsForAction');
       let
         socialActionId = getters.socialAction.id,
         url = `/api/1.0/person/social-work/result/by-social-action/${socialActionId}.json`
       ;
-
-      console.log(url);
-
+      //console.log(url);
       window.fetch(url)
         .then(response => {
           if (response.ok) {
@@ -248,20 +284,35 @@ const store = createStore({
           throw { m: 'Error while retriving results for social action', s: response.status, b: response.body };
         })
         .then(data => {
-          console.log('data retrived', data);
+          //console.log('data retrived', data);
           commit('setResultsForAction', data.results);
         });
     },
+    getReachablesEvaluationsForAction({ getters, commit }) {
+      //console.log('getReachablesEvaluationsForAction');
+      let
+        socialActionId = getters.socialAction.id,
+        url = `/api/1.0/person/social-work/evaluation/by-social-action/${socialActionId}.json`
+      ;
+      window.fetch(url)
+        .then(response => {
+          if (response.ok) {
+            return response.json();
+          }
+          throw { m: 'Error while retriving evaluations for social action', s: response.status, b: response.body };
+        })
+        .then(data => {
+          commit('setEvaluationsForAction', data.results);
+        });
+    },
     submit({ getters, state, commit }) {
       let
         payload = getters.buildPayload,
         url = `/api/1.0/person/accompanying-course/work/${state.work.id}.json`,
         errors = []
       ;
-
-      console.log('action subitting', payload, url);
+      //console.log('action submitting', payload, url);
       commit('setIsPosting', true);
-
       window.fetch(url, {
         method: 'PUT',
         headers: {
@@ -295,6 +346,9 @@ const store = createStore({
     initAsync({ dispatch }) {
       dispatch('getReachablesResultsForAction');
       dispatch('getReachablesGoalsForAction');
+      dispatch('getReachablesEvaluationsForAction');
+
+      console.log('ep', this.state.evaluationsPicked);
     },
   }
 });

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

@@ -1,155 +0,0 @@
-<template>
-   <div class='household__address-move'>
-      <div class='household__address-move__create'>
-         <div>
-            <h2 v-if="!edit">{{ $t('create_a_new_address') }}</h2>
-            <h2 v-else>{{ $t('edit_a_new_address') }}</h2>
-            <add-address
-               @addNewAddress="addNewAddress">
-            </add-address>
-         </div>
-         <div>
-            <show-address
-               v-if="newAddress"
-               v-bind:address="newAddress">
-            </show-address>
-         </div>
-      </div>
-      <div v-if="!edit" class='household__address-move__valid'>
-         <h2>{{ $t('move_date') }}</h2>
-         
-         <div class="input-group mb-3">
-            <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
-            <input type="date" class="form-control form-control-lg" name="validFrom"
-               v-bind:placeholder="$t('validFrom')"
-               v-model="validFrom"
-               aria-describedby="validFrom" />
-         </div>
-         
-         <div v-if="errors.length > 0">
-            {{ errors }}
-         </div>
-         <div v-if="loading">
-            {{ $t('loading') }}
-         </div>
-         <div v-if="success && !edit">
-            {{ $t('household_address_move_success') }}
-         </div>
-      </div>
-      <div v-if="success && edit">
-         {{ $t('household_address_edit_success') }}
-      </div>
-      <div>
-         <ul class="record_actions sticky-form-buttons">
-            <li class="cancel">
-               <a :href="backUrl" class="btn btn-cancel">{{ $t('back_to_the_list') }}</a>
-            </li>
-            <li v-if="!edit">
-               <button type="submit" class="btn btn-update" @click="addToHousehold">
-                  {{ $t('add_an_address_to_household') }}
-               </button>
-            </li>
-         </ul>
-      </div>
-   </div>
-</template>
-
-<script>
-
-import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
-import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
-
-export default {
-   name: 'App',
-   components: {
-      AddAddress,
-      ShowAddress
-   },
-   data() {
-      return {
-         edit: window.mode === 'edit',
-         householdId: window.householdId,
-         addressId: window.addressId,
-         backUrl: `/fr/person/household/${householdId}/addresses`, //TODO better way to pass this
-         validFrom: new Date().toISOString().split('T')[0]
-      }
-   },
-   computed: {
-      newAddress() {
-         return this.$store.state.newAddress;
-      },
-      errors() {
-         return this.$store.state.errorMsg;
-      },
-      loading() {
-         return this.$store.state.loading;
-      },
-      success() {
-         return this.$store.state.success;
-      }
-   },
-   methods: {
-      addNewAddress({ address, modal }) {
-         console.log('@@@ CLICK button addNewAdress', address);
-
-         let createdAddress = {
-            'isNoAddress': address.isNoAddress,
-            'street': address.isNoAddress ? '' : address.street,
-            'streetNumber': address.isNoAddress ? '' : address.streetNumber,
-            'postcode': {'id': address.selected.city.id},
-            'floor': address.floor,
-            'corridor': address.corridor,
-            'steps': address.steps,
-            'flat': address.flat,
-            'buildingName': address.buildingName,
-            'distribution': address.distribution,
-            'extra': address.extra
-         };
-
-         if (address.selected.address.point !== undefined){
-            createdAddress = Object.assign(createdAddress, {
-               'point': address.selected.address.point.coordinates
-            });
-         }
-
-         if(address.writeNewPostalCode){
-            let newPostalCode = address.newPostalCode;
-            newPostalCode = Object.assign(newPostalCode, {
-                'country': {'id': address.selected.country.id },
-            });
-            createdAddress = Object.assign(createdAddress, {
-               'newPostalCode': newPostalCode
-            });
-         }
-
-         if (this.edit){
-            this.$store.dispatch('updateAddress', {
-               addressId: this.addressId,
-               newAddress: createdAddress
-            });
-         } else {
-            this.$store.dispatch('addAddress', createdAddress);
-         }
-
-         modal.showModal = false;
-      },
-      addToHousehold() {
-         this.$store.dispatch('addDateToAddressAndAddressToHousehold', {
-            householdId: this.householdId,
-            addressId: this.$store.state.newAddress.address_id,
-            body: { validFrom: {datetime: `${this.validFrom}T00:00:00+0100`}},
-            backUrl: this.backUrl
-         })
-      },
-      getEditAddress() {
-         this.$store.dispatch('getEditAddress', this.addressId);
-      }
-   },
-   mounted() {
-      if (this.edit) {
-         this.getEditAddress();
-      }
-   },
-};
-
-</script>

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

@@ -1,23 +0,0 @@
-/*
-* Endpoint household
-* method POST, post Household instance
-*
-*  @id     integer - id of household
-*  @body   Object - dictionary with changes to post
-*/
-export const postAddressToHousehold = (householdId, addressId) => {
-   const body = {
-      'id': addressId
-   };
-   const url = `/api/1.0/person/household/${householdId}/address.json`
-   return fetch(url, {
-         method: 'POST',
-         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');
-      });
-};
-

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/components/SelectHouseholdAddress.vue

@@ -1,47 +0,0 @@
-<template>
-   <div class="container">
-      <VueMultiselect
-         v-model="value"
-         @select="selectAddress"
-         name="field"
-         track-by="id"
-         label="value"
-         :custom-label="transName"
-         :multiple="false"
-         :placeholder="$t('select_address')"
-         :options="addresses">
-      </VueMultiselect>
-   </div>
-</template>
-
-<script>
-import VueMultiselect from 'vue-multiselect';
-
-export default {
-   name: 'SelectHouseholdAddress',
-   components: { VueMultiselect },
-   props: ['address'],
-   data() {
-      return {
-         value: null
-      }
-   },
-   computed: {
-      addresses() {
-         return this.address.loaded.addresses;
-      }
-   },
-   methods: {
-      transName(value) {
-         return `${value.text} ${value.postcode.name}`
-      },
-      selectAddress(value) {
-         this.address.selected.address = value;
-      }
-   }
-};
-</script>
-
-<style src="vue-multiselect/dist/vue-multiselect.css"></style>
-
-

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

@@ -1,25 +0,0 @@
-import { createApp } from 'vue'
-import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
-import { appMessages } from './js/i18n'
-import { store } from './store'
-
-import App from './App.vue';
-
-const root = window.vueRootComponent;
-
-/*
-*  Load all App component, for Household edition page
-*/
-
-const i18n = _createI18n(appMessages);
-
-const app = createApp({
-   template: `<app></app>`,
-})
-.use(store)
-.use(i18n)
-.component('app', App)
-.mount('#household-address');
-
-
-

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

@@ -1,4 +1,4 @@
-import { addressMessages } from 'ChillMainAssets/vuejs/Address/js/i18n'
+import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n'
 
 const appMessages = {
    fr: {

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

@@ -1,160 +0,0 @@
-import 'es6-promise/auto';
-import { createStore } from 'vuex';
-
-import { postAddress, postPostalCode, patchAddress, getAddress } from 'ChillMainAssets/vuejs/Address/api';
-import { postAddressToHousehold } from '../api';
-
-const debug = process.env.NODE_ENV !== 'production';
-
-const store = createStore({
-   strict: debug,
-   state: {
-      newAddress: {},
-      editAddress: {}, //TODO or should be newAddress?
-      household: {},
-      validFrom: {},
-      errorMsg: [],
-      loading: false,
-      success: false
-   },
-   getters: {
-   },
-   mutations: {
-      catchError(state, error) {
-         state.errorMsg.push(error);
-      },
-      addAddress(state, address) {
-         console.log('@M addAddress address', address);
-         state.newAddress = address;
-      },
-      updateAddress(state, address) {
-         console.log('@M updateAddress address', address);
-         state.newAddress = address;
-      },
-      addAddressToHousehold(state, household) {
-         console.log('@M addAddressToHousehold household', household);
-         state.household = household;
-      },
-      addDateToAddress(state, validFrom) {
-         console.log('@M addDateToAddress address.validFrom', validFrom);
-         state.validFrom = validFrom;
-      },
-      getEditAddress(state, address) {
-         console.log('@M getEditAddress address', address);
-         state.editAddress = address;
-      },
-      setLoading(state, b) {
-         state.loading = b;
-      },
-      setSuccess(state, b) {
-         state.success = b;
-      }
-   },
-   actions: {
-      addAddress({ commit }, payload) {
-         console.log('@A addAddress payload', payload);
-         commit('setLoading', true);
-         if('newPostalCode' in payload){
-            postPostalCode(payload.newPostalCode)
-               .then(postalCode => {
-                  let body = payload;
-                  body.postcode = {'id': postalCode.id },
-                  postAddress(body)
-                     .then(address => new Promise((resolve, reject) => {
-                        commit('addAddress', address);
-                        resolve();
-                        commit('setLoading', false);
-                     }))
-                     .catch((error) => {
-                        commit('catchError', error);
-                        commit('setLoading', false);
-                     });
-               })
-
-         } else {
-            postAddress(payload)
-               .then(address => new Promise((resolve, reject) => {
-                  commit('addAddress', address);
-                  resolve();
-                  commit('setLoading', false);
-               }))
-               .catch((error) => {
-                  commit('catchError', error);
-                  commit('setLoading', false);
-               });
-         }
-      },
-      addDateToAddressAndAddressToHousehold({ commit }, payload) {
-         console.log('@A addDateToAddressAndAddressToHousehold payload', payload);
-         commit('setLoading', true);
-         patchAddress(payload.addressId, payload.body)
-            .then(address => new Promise((resolve, reject) => {
-               commit('addDateToAddress', address.validFrom);
-               resolve();
-            }).then(
-               postAddressToHousehold(payload.householdId, payload.addressId)
-                  .then(household => new Promise((resolve, reject) => {
-                     commit('addAddressToHousehold', household);
-                     commit('setSuccess', true);
-                     commit('setLoading', false);
-                     window.location.assign(payload.backUrl);
-                     resolve();
-               }))
-               .catch((error) => {
-                  commit('catchError', error);
-                  commit('setLoading', false);
-               })
-            ))
-            .catch((error) => {
-               commit('catchError', error);
-               commit('setLoading', false);
-            });
-      },
-      updateAddress({ commit }, payload) {
-         console.log('@A updateAddress payload', payload);
-
-         if('newPostalCode' in payload.newAddress){ // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
-            let postalCodeBody = payload.newAddress.newPostalCode;
-            postalCodeBody = Object.assign(postalCodeBody, {'origin': 3});
-            postPostalCode(postalCodeBody)
-               .then(postalCode => {
-                  let body = payload.newAddress;
-                  body.postcode = {'id': postalCode.id },
-                  patchAddress(payload.addressId, body)
-                     .then(address => new Promise((resolve, reject) => {
-                        commit('updateAddress', address);
-                        commit('setSuccess', true);
-                        resolve();
-                     }))
-                     .catch((error) => {
-                        commit('catchError', error);
-                     });
-               })
-
-         } else {
-            patchAddress(payload.addressId, payload.newAddress)
-               .then(address => new Promise((resolve, reject) => {
-                  commit('updateAddress', address);
-                  commit('setSuccess', true);
-                  resolve();
-               }))
-               .catch((error) => {
-                  commit('catchError', error);
-               });
-         }
-      },
-      getEditAddress({ commit }, payload) {
-         console.log('@A getEditAddress payload', payload);
-
-         getAddress(payload).then(address => new Promise((resolve, reject) => {
-            commit('getEditAddress', address);
-            resolve();
-         }))
-         .catch((error) => {
-            commit('catchError', error);
-         });
-      },
-   }
-});
-
-export { store };

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

@@ -37,7 +37,20 @@ const fetchHouseholdSuggestionByAccompanyingPeriod = (personId) => {
   ;
 };
 
+const fetchAddressSuggestionByPerson = (personId) => {
+  const url = `/api/1.0/person/address/suggest/by-person/${personId}.json`;
+  return window.fetch(url)
+    .then(response => {
+      if (response.ok) {
+        return response.json();
+      }
+
+      throw Error({m: 'Error while fetch address suggestion', status: response.status});
+    });
+}
+
 export { 
   householdMove,
   fetchHouseholdSuggestionByAccompanyingPeriod,
+  fetchAddressSuggestionByPerson,
 };

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue

@@ -22,8 +22,8 @@
         class="item-bloc"
         v-bind:key="conc.person.id"
       >
-        <div class="item-row person">
-          <div class="item-col box-person">
+        <div class="item-row">
+          <div class="item-col">
             <div>
               <person :person="conc.person"></person>
             </div>
@@ -33,7 +33,7 @@
             </div>
 
           </div>
-          <div class="item-col box-where">
+          <div class="item-col">
             <ul class="list-content fa-ul">
               <li>
                 <i class="fa fa-li fa-map-marker"></i>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue

@@ -5,6 +5,38 @@
     <div>
       <household-viewer :household="household"></household-viewer>
     </div>
+    <div v-if="isHouseholdNew && !hasHouseholdAddress">
+
+      <h3>À quelle adresse habite ce ménage ?</h3>
+
+      <ul v-if="filterAddressesSuggestion.length > 0">
+        <li v-for="a in filterAddressesSuggestion">
+          <show-address :address="a"></show-address> 
+          <button class="btn" @click="setHouseholdAddress(a)">
+            Le ménage habite cette adresse
+          </button>
+        </li>
+      </ul>
+
+      <ul class="record_actions">
+        <li >
+          <button class="btn">
+            Créer une adresse
+          </button>
+        </li>
+      </ul>
+      
+    </div>
+    <div v-if="isHouseholdNew && hasHouseholdAddress">
+      <ul class="record_actions">
+        <li >
+          <button class="btn" @click="removeHouseholdAddress">
+            Supprimer cette adresse
+          </button>
+        </li>
+      </ul>
+      
+    </div>
   </div>
   <div v-else-if="isForceLeaveWithoutHousehold">
       {{ $t('household_members_editor.household.will_leave_any_household') }}
@@ -23,7 +55,7 @@
           countHouseholdSuggestion) }}
       </button>
     </li>
-    <li v-if="showHouseholdSuggestion">
+    <li v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
       <button
         class="btn btn-misc"
         @click="toggleHouseholdSuggestion"
@@ -46,10 +78,15 @@
         <i class="fa fa-sign-out"></i>{{ $t('household_members_editor.household.leave_without_household') }}
       </button>
     </li>
+    <li v-if="allowRemoveHousehold">
+      <button @click="removeHousehold" class="btn">
+        {{ $t('household_members_editor.household.change') }}
+      </button>
+    </li>
   </ul>
 
   <div class="householdSuggestions">
-    <div v-if="showHouseholdSuggestion">
+    <div v-if="showHouseholdSuggestion && hasHouseholdSuggestion">
       <p>{{ $t('household_members_editor.household_for_participants_accompanying_period') }}:</p>
       <div class="householdSuggestionList">
         <div
@@ -98,11 +135,13 @@
 
 import { mapGetters, mapState } from 'vuex';
 import HouseholdViewer from 'ChillPersonAssets/vuejs/_components/Household/Household.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
 export default {
   name: 'Household',
   components: {
     HouseholdViewer,
+    ShowAddress,
   },
   computed: {
     ...mapGetters([
@@ -111,6 +150,8 @@ export default {
       'hasHouseholdSuggestion',
       'countHouseholdSuggestion',
       'filterHouseholdSuggestionByAccompanyingPeriod',
+      'filterAddressesSuggestion',
+      'hasHouseholdAddress',
     ]),
     ...mapState([
       'showHouseholdSuggestion',
@@ -119,14 +160,22 @@ export default {
       return this.$store.state.household;
     },
     allowHouseholdCreate() {
-      return this.$store.state.allowHouseholdCreate;
+      return this.$store.state.allowHouseholdCreate && !this.$store.getters.hasHousehold;
     },
     allowHouseholdSearch() {
       return false;
-      return this.$store.state.allowHouseholdSearch;
+      return this.$store.state.allowHouseholdSearch && !this.$store.getters.hasHousehold;
     },
     allowLeaveWithoutHousehold() {
-      return this.$store.state.allowLeaveWithoutHousehold;
+      return this.$store.state.allowLeaveWithoutHousehold && !this.$store.getters.hasHousehold;
+    },
+    allowRemoveHousehold() {
+      return this.$store.getters.hasHousehold &&
+        (
+          this.allowHouseholdCreate || this.allowHouseholdSearch || 
+            this.allowLeaveWithoutHousehold
+        )
+      ;
     },
     allowChangeHousehold() {
       return this.allowHouseholdCreate || this.allowHouseholdSearch || 
@@ -148,6 +197,15 @@ export default {
     },
     selectHousehold(h) {
       this.$store.dispatch('selectHousehold', h);
+    },
+    removeHousehold() {
+      this.$store.dispatch('removeHousehold');
+    },
+    setHouseholdAddress(a) {
+      this.$store.commit('setHouseholdAddress', a);
+    },
+    removeHouseholdAddress() {
+      this.$store.commit('removeHouseholdAddress');
     }
   },
 };

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="item-bloc">
-    <div class="item-row person">
-      <div class="item-col box-person">
+    <div class="item-row">
+      <div class="item-col">
         <div>
           <person :person="conc.person"></person>
           <span v-if="isHolder" class="badge bg-primary holder">
@@ -10,7 +10,7 @@
         </div>
         <div v-if="conc.person.birthdate !== null">{{ $t('person.born', {'gender': conc.person.gender} ) }}</div>
       </div>
-      <div class="item-col box-where">
+      <div class="item-col">
         <ul class="list-content fa-ul">
           <li>
             <i class="fa fa-li fa-map-marker"></i>

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

@@ -1,5 +1,5 @@
 import { createStore } from 'vuex';
-import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod } from './../api.js';
+import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod, fetchAddressSuggestionByPerson} from './../api.js';
 import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
 
 const debug = process.env.NODE_ENV !== 'production';
@@ -37,6 +37,7 @@ const store = createStore({
     forceLeaveWithoutHousehold: false,
     householdSuggestionByAccompanyingPeriod: [],
     showHouseholdSuggestion: window.household_members_editor_expand_suggestions === 1,
+    addressesSuggestion: [],
     warnings: [],
     errors: []
   },
@@ -47,6 +48,12 @@ const store = createStore({
       }
       return !Number.isInteger(state.household.id);
     },
+    hasHouseholdAddress(state) {
+      if (null === state.household) {
+        return false;
+      }
+      return state.household.current_address !== null;
+    },
     hasHousehold(state) {
       return state.household !== null;
     },
@@ -68,6 +75,18 @@ const store = createStore({
         .filter(h => h.id !== state.household.id)
         ;
     },
+    filterAddressesSuggestion(state) {
+      if (state.household === null) {
+        return state.addressesSuggestion;
+      }
+
+      if (state.household.current_address === null) {
+        return state.addressesSuggestion;
+      }
+
+      return state.addressesSuggestion
+        .filter(a => a.address_id !== state.household.current_address.address_id);
+    },
     hasPersonsWellPositionnated(state, getters) {
       return getters.needsPositionning === false
         || (getters.persons.length > 0 && getters.concUnpositionned.length === 0);
@@ -106,7 +125,7 @@ const store = createStore({
     needsPositionning(state) {
       return state.forceLeaveWithoutHousehold === false;
     },
-    buildPayload: (state) => {
+    buildPayload: (state, getters) => {
       let
         conc,
         payload_conc,
@@ -119,8 +138,13 @@ const store = createStore({
       if (state.forceLeaveWithoutHousehold === false) {
         payload.destination = {
             id: state.household.id,
-            type: state.household.type
+            type: state.household.type,
           };
+
+        if (getters.isHouseholdNew && state.household.current_address !== null) {
+          console.log(state.household);
+          payload.destination.forceAddress = { id: state.household.current_address.address_id };
+        }
       }
 
       for (let i in state.concerned) {
@@ -187,9 +211,29 @@ const store = createStore({
       )
     },
     createHousehold(state) {
-      state.household = { type: 'household', members: [], current_address: null }
+      state.household = { type: 'household', members: [], current_address: null, current_members_id: [] }
       state.forceLeaveWithoutHousehold = false;
     },
+    removeHousehold(state) {
+      state.household = null;
+      state.forceLeaveWithoutHousehold = false;
+    },
+    setHouseholdAddress(state, address) {
+      if (null === state.household) {
+        console.error("no household");
+        throw new Error("No household");
+      }
+
+      state.household.current_address = address;
+    },
+    removeHouseholdAddress(state, address) {
+      if (null === state.household) {
+        console.error("no household");
+        throw new Error("No household");
+      }
+
+      state.household.current_address = null;
+    },
     forceLeaveWithoutHousehold(state) {
       state.household = null;
       state.forceLeaveWithoutHousehold = true;
@@ -221,11 +265,22 @@ const store = createStore({
     setErrors(state, errors) {
       state.errors = errors;
     },
+    addAddressesSuggestion(state, addresses) {
+      let existingIds = state.addressesSuggestion
+        .map(a => a.address_id);
+
+      for (let i in addresses) {
+        if (!existingIds.includes(addresses[i].address_id)) {
+          state.addressesSuggestion.push(addresses[i]);
+        }
+      }
+    }
   },
   actions: {
     addConcerned({ commit, dispatch }, person) {
       commit('addConcerned', person);
       dispatch('computeWarnings');
+      dispatch('fetchAddressSuggestions');
     },
     markPosition({ commit, state, dispatch }, { person_id, position_id }) {
       commit('markPosition', { person_id, position_id });
@@ -242,6 +297,11 @@ const store = createStore({
     removeConcerned({ commit, dispatch }, conc) {
       commit('removeConcerned', conc);
       dispatch('computeWarnings');
+      dispatch('fetchAddressSuggestions');
+    },
+    removeHousehold({ commit, dispatch }) {
+      commit('removeHousehold');
+      dispatch('computeWarnings');
     },
     createHousehold({ commit, dispatch }) {
       commit('createHousehold');
@@ -268,6 +328,17 @@ const store = createStore({
           commit('setHouseholdSuggestionByAccompanyingPeriod', households);
         });
     },
+    fetchAddressSuggestions({ commit, state }) {
+      for (let i in state.concerned) {
+        fetchAddressSuggestionByPerson(state.concerned[i].person.id)
+          .then(addresses => {
+            commit('addAddressesSuggestion', addresses);
+          })
+          .catch(e => {
+            console.log(e);
+          });
+      }
+    },
     computeWarnings({ commit, state, getters }) {
       let warnings = [],
         payload;
@@ -321,6 +392,7 @@ const store = createStore({
 });
 
 store.dispatch('computeWarnings');
+store.dispatch('fetchAddressSuggestions');
 
 if (concerned.length > 0) {
   concerned.forEach(c => {

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

@@ -0,0 +1,51 @@
+
+/*
+* Endpoint chill_api_single_person_address
+* method POST, post Person instance
+*
+*  @id     integer - id of Person
+*  @body   Object - dictionary with changes to post
+*/
+const postAddressToPerson = (personId, addressId) => {
+    //console.log(personId);
+    //console.log(addressId);
+    const body = {
+        'id': addressId
+    };
+    const url = `/api/1.0/person/person/${personId}/address.json`
+    return fetch(url, {
+        method: 'POST',
+        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 household
+* method POST, post Household instance
+*
+*  @id     integer - id of household
+*  @body   Object - dictionary with changes to post
+*/
+const postAddressToHousehold = (householdId, addressId) => {
+    const body = {
+        'id': addressId
+    };
+    const url = `/api/1.0/person/household/${householdId}/address.json`
+    return fetch(url, {
+        method: 'POST',
+        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 { postAddressToPerson, postAddressToHousehold };

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

@@ -1,9 +1,8 @@
 <template>
    <ul class="record_actions">
       <li class="add-persons">
-         <a class="btn btn-create" @click="openModal">
-            {{ $t(buttonTitle) }}
-         </a>
+         <a class="btn" :class="getClassButton" :title="$t(buttonTitle)"
+            @click="openModal"><span v-if="displayTextButton">{{ $t(buttonTitle) }}</span></a>
       </li>
    </ul>
 
@@ -19,7 +18,7 @@
          <template v-slot:body-head>
             <div class="modal-body">
                <div class="search">
-                  
+
                   <label class="col-form-label" style="float: right;">
                      {{ $tc('add_persons.suggested_counter', suggestedCounter) }}
                   </label>
@@ -66,17 +65,17 @@
 
                <div class="create-button">
                   <on-the-fly
-                     v-if="query.length >= 3" 
+                     v-if="query.length >= 3"
                      v-bind:buttonText="$t('onthefly.create.button', {q: query})"
                      action="create"><!-- TODO first close this modal -->
                   </on-the-fly>
                </div>
-               
+
             </div>
          </template>
 
          <template v-slot:footer>
-            <button class="btn btn-create" 
+            <button class="btn btn-create"
                @click.prevent="$emit('addNewPersons', { selected, modal })">
                {{ $t('action.add')}}
             </button>
@@ -150,13 +149,19 @@ export default {
          ];
          let union = [...new Set([
             ...this.suggested.slice().reverse(),
-            ...this.selected.slice().reverse(), 
+            ...this.selected.slice().reverse(),
          ])];
          return uniqBy(union, k => k.key);
       },
-      //options() {
-      //   return this.options;
-      //},
+      getClassButton() {
+         let size = (typeof this.options.button !== 'undefined' && typeof this.options.button.size !== 'undefined') ? this.options.button.size : '';
+         let type = (typeof this.options.button !== 'undefined' && typeof this.options.button.type !== 'undefined') ? this.options.button.type : 'btn-create';
+         return size ? size + ' ' + type : type;
+      },
+      displayTextButton() {
+         return (typeof this.options.button !== 'undefined' && typeof this.options.button.display !== 'undefined') ?
+            this.options.button.display : true;
+      },
       checkUniq() {
          if (this.options.uniq === true) {
             return 'radio';
@@ -184,7 +189,7 @@ export default {
             this.loadSuggestions([]);
          }
       },
-      loadSuggestions(suggested) { 
+      loadSuggestions(suggested) {
          //console.log('suggested', suggested);
          this.search.suggested = suggested;
          this.search.suggested.forEach(function(item) {
@@ -230,7 +235,7 @@ export default {
          margin: auto 4em;
          div.search {
             position: relative;
-            input { 
+            input {
                width: 100%;
                padding: 1.2em 1.5em 1.2em 2.5em;
                //margin: 1em 0;
@@ -239,7 +244,7 @@ export default {
                position: absolute;
                opacity: 0.5;
                padding: 0.65em 0;
-               top: 50%; 
+               top: 50%;
             }
             i.fa-search {
                left: 0.5em;

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue

@@ -63,9 +63,9 @@
         <div class="item-col">
             <ul class="list-content fa-ul">
                 <!-- ADDRESS -->
-                <li v-if="person.current_household_address" class="chill-entity entity-address">
+                <li v-if="person.current_household_address">
                     <i class="fa fa-li fa-map-marker"></i>
-                    <show-address :address="person.current_household_address" :multiline="false"></show-address>
+                    <show-address :address="person.current_household_address" :isMultiline="false"></show-address>
                 </li>
                 <!-- PHONENUMBER -->
                 <!-- todo: change href for phonenumbers and format phone number? -->

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue

@@ -1,13 +1,13 @@
 <template>
 <div v-if="action === 'show'">
-   
+
    <div class="flex-table">
       <div class="item-bloc">
          <div class="item-row">
             <div class="item-col">
                <h3 :title="person.id">{{ person.text }}</h3>
                <p>
-                  <i class="fa fa-fw" 
+                  <i class="fa fa-fw"
                      :class="genderClass">
                      <!--
                      :title="$t(genderTranslation)"
@@ -20,27 +20,27 @@
                </p>
             </div>
             <div class="item-col">
-               <dl class="list-content"> 
+               <dl class="list-content">
                   <dt>{{ $t('person.firstname') }}</dt>
                   <dd>{{ person.firstName }}</dd>
-                  
+
                   <dt>{{ $t('person.lastname') }}</dt>
                   <dd>{{ person.lastName }}</dd>
-                  
+
                   <dt>{{ $t('person.altnames') }}</dt>
                   <dd>{{ person.altNames }}</dd>
-                  
+
                   <span v-if="person.center">
                      <dt>{{ $t('person.center_name') }}</dt>
                      <dd :title="person.center.id">{{ person.center.name }}</dd>
                   </span>
-                     
+
                   <dt>{{ $t('person.phonenumber') }}</dt>
                   <dd>{{ person.phonenumber }}</dd>
-                  
+
                   <dt>{{ $t('person.mobilenumber') }}</dt>
                   <dd>{{ person.mobilenumber }}</dd>
-                  
+
                   <dt>{{ $t('person.gender.title') }}</dt>
                   <!--
                   <dd>{{ $t(genderTranslation) }}</dd>
@@ -49,61 +49,61 @@
             </div>
          </div>
       </div>
-   </div>   
-   
+   </div>
+
 </div>
 <div v-else-if="action === 'edit' || action === 'create'">
-   
+
    <div class="form-floating mb-3">
       <input class="form-control form-control-lg" id="firstname" v-model="firstName" v-bind:placeholder="$t('person.firstname')" />
       <label for="firstname">{{ $t('person.firstname') }}</label>
    </div>
-   
+
    <div class="form-floating mb-3">
       <input class="form-control form-control-lg" id="lastname" v-model="lastName" v-bind:placeholder="$t('person.lastname')" />
       <label for="lastname">{{ $t('person.lastname') }}</label>
    </div>
-   
-   <!--  TODO fix placeholder if undefined 
+
+   <!--  TODO fix placeholder if undefined
    -->
    <div class="form-floating mb-3">
       <select class="form-select form-select-lg" id="gender" v-model="gender">
-         <option selected disabled >{{ $t('person.gender.placeholder') }}</option> 
+         <option selected disabled >{{ $t('person.gender.placeholder') }}</option>
          <option value="woman">{{ $t('person.gender.woman') }}</option>
          <option value="man">{{ $t('person.gender.man') }}</option>
-         <option value="neuter">{{ $t('person.gender.neuter') }}</option>  
+         <option value="neuter">{{ $t('person.gender.neuter') }}</option>
       </select>
       <label for="gender">{{ $t('person.gender.title') }}</label>
    </div>
-   
+
    <div class="input-group mb-3">
       <span class="input-group-text" id="birthdate"><i class="fa fa-fw fa-birthday-cake"></i></span>
-      <input type="date" 
-         class="form-control form-control-lg" 
-         id="chill_personbundle_person_birthdate" 
-         name="chill_personbundle_person[birthdate]" 
+      <input type="date"
+         class="form-control form-control-lg"
+         id="chill_personbundle_person_birthdate"
+         name="chill_personbundle_person[birthdate]"
          v-model="birthDate"
          aria-describedby="birthdate" />
    </div>
-   
+
    <div class="input-group mb-3">
       <span class="input-group-text" id="phonenumber"><i class="fa fa-fw fa-phone"></i></span>
-      <input class="form-control form-control-lg" 
-         v-model="phonenumber" 
-         v-bind:placeholder="$t('person.phonenumber')" 
-         v-bind:aria-label="$t('person.phonenumber')" 
+      <input class="form-control form-control-lg"
+         v-model="phonenumber"
+         v-bind:placeholder="$t('person.phonenumber')"
+         v-bind:aria-label="$t('person.phonenumber')"
          aria-describedby="phonenumber" />
    </div>
-   
+
    <div class="input-group mb-3">
       <span class="input-group-text" id="mobilenumber"><i class="fa fa-fw fa-mobile"></i></span>
-      <input class="form-control form-control-lg" 
-         v-model="mobilenumber" 
+      <input class="form-control form-control-lg"
+         v-model="mobilenumber"
          v-bind:placeholder="$t('person.mobilenumber')"
-         v-bind:aria-label="$t('person.mobilenumber')" 
+         v-bind:aria-label="$t('person.mobilenumber')"
          aria-describedby="mobilenumber" />
    </div>
-   
+
 </div>
 </template>
 
@@ -131,19 +131,19 @@ export default {
       },
       gender: {
          set(value) { this.person.gender = value; },
-         get() { return this.person.gender; } 
+         get() { return this.person.gender; }
       },
       birthDate: {
-         set(value) { 
+         set(value) {
             if (this.person.birthdate) {
-               this.person.birthdate.datetime = value + "T00:00:00+0100"; 
+               this.person.birthdate.datetime = value + "T00:00:00+0100";
             } else {
                this.person.birthdate = { datetime: value + "T00:00:00+0100"};
             }
          },
-         get() { 
-            return (this.person.birthdate) ? this.person.birthdate.datetime.split('T')[0] : ''; 
-         } 
+         get() {
+            return (this.person.birthdate) ? this.person.birthdate.datetime.split('T')[0] : '';
+         }
       },
       phonenumber: {
          set(value) { this.person.phonenumber = value; },
@@ -174,7 +174,7 @@ export default {
          }
       },
       feminized() {
-         return (this.person.gender === 'woman')? 'e' : ''; 
+         return (this.person.gender === 'woman')? 'e' : '';
       }
    },
    mounted() {

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

@@ -0,0 +1,5 @@
+<div class="alert alert-danger alert-with-actions mb-0">
+    <div class="message">
+        {{ 'This course is located at a temporarily address. You should locate this course to an user'|trans }}
+    </div>
+</div>

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

@@ -8,7 +8,7 @@
     {% if person.isSharingHousehold %}
         <li>
             <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': person.getCurrentHousehold.id }) }}"
-               class="btn btn-chill-pink" title="{{ 'Show household'|trans ~ ' n° ' ~ person.getCurrentHousehold.id }}">
+               class="btn btn-sm btn-chill-pink" title="{{ 'Show household'|trans ~ ' n° ' ~ person.getCurrentHousehold.id }}">
                 <i class="fa fa-home"></i>
             </a>
         </li>
@@ -19,7 +19,7 @@
 <div class="accompanyingcourse-resume">
 
     {% if 'DRAFT' == accompanyingCourse.step %}
-        <div class="col-8 alert alert-danger flash_message mb-5">
+        <div class="alert alert-danger flash_message mb-5">
             <span>
                 {{ 'This accompanying course is still a draft'|trans }}
                 <a href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id } ) }}">
@@ -27,8 +27,15 @@
                 </a>
             </span>
         </div>
+        {% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %}
+            <div class="alert alert-danger">
+                {{ 'This course is located at a temporarily address. You should locate this course to an user'|trans }}
+            </div>
+        {% endif %}
     {% endif %}
 
+    <h1>{{ 'Resume Accompanying Course'|trans }}</h1>
+
     <div class="associated-persons mb-5">
         <h2 class="mb-3">{{ 'Associated peoples'|trans }}</h2>
         <div class="flex-table mb-3">
@@ -36,15 +43,20 @@
                 {% if participation.enddate is null %}
                     <div class="item-bloc">
                         {{ participation.person|chill_entity_render_box({
-                            'render': 'bloc', 'addLink': false, 'addInfo': true,
+                            'render': 'bloc', 'addLink': false, 'addInfo': true, 'addAltNames': false,
                             'customButtons': { 'before': _self.button_person(participation.person) }
                         }) }}
                     </div>
                 {% endif %}
             {% endfor %}
         </div>
-        {% if withoutHousehold|length > 0 %}
-            {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' with {} %}
+        {% if 'DRAFT' != accompanyingCourse.step %}
+            {% if withoutHousehold|length > 0 %}
+                {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' with {} %}
+            {% endif %}
+            {% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %}
+                {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' with {} %}
+            {% endif %}
         {% endif %}
     </div>
 
@@ -63,7 +75,7 @@
             <div class="flex-bloc row row-cols-1 g-0">
                 <div class="item-bloc col">
                 {{ requestor|chill_entity_render_box({
-                    'render': 'bloc', 'addLink': false, 'addEntity': true, 'addInfo': info
+                    'render': 'bloc', 'addLink': false, 'addEntity': true, 'addInfo': info, 'addAltNames': false
                 }) }}
                 </div>
             </div>
@@ -80,7 +92,7 @@
                 <div class="item-bloc col">
                     {% if r.person %}
                         {{ r.person|chill_entity_render_box({
-                            'render': 'bloc', 'addLink': false, 'addEntity': true, 'addInfo': true
+                            'render': 'bloc', 'addLink': false, 'addEntity': true, 'addInfo': true, 'addAltNames': false
                         }) }}
                     {% endif %}
                     {% if r.thirdParty %}
@@ -119,8 +131,21 @@
     </div>
 
     {% block contentActivity %}
-    <div class="activity mb-5">
+    <div class="activities mb-5">
         {% set person = null %}
+
+        {% set person_id = null %}
+        {% if person %}
+            {% set person_id = person.id %}
+        {% endif %}
+
+        {% set accompanying_course_id = null %}
+        {% if accompanyingCourse %}
+            {% set accompanying_course_id = accompanyingCourse.id %}
+        {% endif %}
+
+        <h2>{{ 'Activity list' |trans }}</h2>
+
         {% include 'ChillActivityBundle:Activity:list.html.twig' with { 'context': 'accompanyingCourse' } %}
     </div>
     {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/edit.html.twig

@@ -6,9 +6,9 @@
 {% block content %}
 <div class="accompanying_course_work-edit">
 
-            <h1>{{ block('title') }}</h1>
+    <h1>{{ block('title') }}</h1>
 
-            <div id="accompanying_course_work_edit"></div>
+    <div id="accompanying_course_work_edit"></div>
 
 </div>
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig

@@ -1,94 +1,92 @@
 {% block content %}
-
-    {% for accompanying_period in accompanying_periods %}
     <div class="flex-table">
-        <div class="item-bloc">
-            <div class="item-row">
-                <div class="item-col">
-                    {{'period'|trans}} <b>#{{ accompanying_period.id }}</b>
-                    {% if accompanying_period.emergency %}
-                    &nbsp;
-                    <span class="badge bg-primary">
-                        {{- 'Emergency'|trans|upper -}}
-                    </span>
-                    {% endif %}
-                    {% if accompanying_period.confidential %}
-                    &nbsp;
-                    <span class="badge bg-primary">
-                        {{- 'Confidential'|trans|upper -}}
-                    </span>
-                    {% endif %}
-                    {% if accompanying_period.step == 'DRAFT' %}
-                    &nbsp;
-                    <span class="badge bg-primary">
-                        {{- 'Draft'|trans|upper -}}
-                    </span>
-                    {% else %}
-                    <span class="badge bg-primary">
-                        {{- 'Confirmed'|trans|upper -}}
-                    </span>
-                    {% endif %}
-                </div>
+        {% for accompanying_period in accompanying_periods %}
+            <div class="item-bloc">
 
-                <div class="item-col">
-                {% if chill_accompanying_periods.fields.user == 'visible'  %}
-                    {% if accompanying_period.user %}
-                    {{ accompanying_period.user.username }}
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'No accompanying user'|trans }}</span>
-                    {% endif %}
-                {% endif %}
-                </div>
-
-            </div>
-            <div class="item-row">
-                {% if accompanying_period.closingDate == null %}
-                    {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long') } ) }}
-                {% else %}
-                    {{ 'accompanying_period.dates_from_%opening_date%_to_%closing_date%'|trans({
-                        '%opening_date%': accompanying_period.openingDate|format_date('long'),
-                        '%closing_date%': accompanying_period.closingDate|format_date('long')}
-                    ) }}
-
-                    {% if accompanying_period.isOpen == false %}
-                        <dl class="chill_view_data">
-                            <dt>{{ 'Closing motive'|trans }}&nbsp;:</dt>
-                            <dd>{{ accompanying_period.closingMotive|chill_entity_render_box }}</dd>
-                        </dl>
-                    {% endif %}
-
-                {% endif %}
-            </div>
-
-                <div class="item-col">
-                    <h3>{{ 'Participants'|trans }}</h3>
-                    {% if accompanying_period.participations.count > 0 %}
-                        {% for p in accompanying_period.participations %}
-                        <p>
-                            <a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}">
-                                {{ p.person.firstname ~ ' ' ~ p.person.lastname }}
-                            </a>
-                        </p>
-                        {% endfor %}
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
-                    {% endif %}
-                </div>
-                <div class="item-col">
-                    <h3>{{ 'Requestor'|trans }}</h3>
-                    {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
-                        {% if accompanying_period.requestorPerson is not null %}
-                        <p>{{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}</p>
+                <div class="item-row">
+                    <div class="item-col">
+                        <span class="h3">
+                            <i class="fa fa-fw fa-random"></i>
+                            <b>{{ accompanying_period.id }}</b>
+                        </span>
+                        {% if accompanying_period.step == 'DRAFT' %}
+                            <span class="badge bg-secondary">{{- 'Draft'|trans|upper -}}</span>
+                        {% else %}
+                            <span class="badge bg-success">{{- 'Confirmed'|trans|upper -}}</span>
                         {% endif %}
-                        {% if accompanying_period.requestorThirdParty is not null %}
-                        <p>{{ accompanying_period.requestorThirdParty.name }}</p>
+                        {% if accompanying_period.emergency %}
+                            <span class="badge bg-danger">{{- 'Emergency'|trans|upper -}}</span>
                         {% endif %}
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
-                    {% endif %}
+                        {% if accompanying_period.confidential %}
+                            <span class="badge bg-warning">{{- 'Confidential'|trans|upper -}}</span>
+                        {% endif %}
+                    </div>
+                    <div class="item-col"></div>
+                </div>
+                <div class="item-row">
+                    <div class="item-col">
+                        {% if accompanying_period.closingDate == null %}
+                            {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long') } ) }}
+                        {% else %}
+                            {{ 'accompanying_period.dates_from_%opening_date%_to_%closing_date%'|trans({
+                                '%opening_date%': accompanying_period.openingDate|format_date('long'),
+                                '%closing_date%': accompanying_period.closingDate|format_date('long')}
+                            ) }}
+                            {% if accompanying_period.isOpen == false %}
+                                <dl class="chill_view_data">
+                                    <dt>{{ 'Closing motive'|trans }}&nbsp;:</dt>
+                                    <dd>{{ accompanying_period.closingMotive|chill_entity_render_box }}</dd>
+                                </dl>
+                            {% endif %}
+                        {% endif %}
+                    </div>
+                    <div class="item-col">
+                        {% if chill_accompanying_periods.fields.user == 'visible'  %}
+                            {% if accompanying_period.user %}
+                                {{ accompanying_period.user.username }}
+                            {% else %}
+                                <span class="chill-no-data-statement">{{ 'No accompanying user'|trans }}</span>
+                            {% endif %}
+                        {% endif %}
+                    </div>
                 </div>
 
-                <div class="item-col">
+                <div class="item-row separator">
+                    <div class="item-col"><h3>{{ 'Participants'|trans }}</h3></div>
+                    <div class="item-col">
+                        {% if accompanying_period.participations.count > 0 %}
+                            {% for p in accompanying_period.participations %}
+                            <p>
+                                <a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}">
+                                    {{ p.person.firstname ~ ' ' ~ p.person.lastname }}
+                                </a>
+                            </p>
+                            {% endfor %}
+                        {% else %}
+                            <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                        {% endif %}
+                    </div>
+                </div>
+                <div class="item-row">
+                    <div class="item-col"><h3>{{ 'Requestor'|trans }}</h3></div>
+                    <div class="item-col">
+                        {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
+                            {% if accompanying_period.requestorPerson is not null %}
+                                <p>
+                                    {{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}
+                                </p>
+                            {% endif %}
+                            {% if accompanying_period.requestorThirdParty is not null %}
+                                <p>
+                                    {{ accompanying_period.requestorThirdParty.name }}
+                                </p>
+                            {% endif %}
+                        {% else %}
+                            <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                        {% endif %}
+                    </div>
+                </div>
+                <div class="item-row">
                     <h3>{{ 'Social issues'|trans }}</h3>
                     {% if accompanying_period.socialIssues.count > 0 %}
                         {% for si in accompanying_period.socialIssues %}
@@ -99,42 +97,46 @@
                     {% endif %}
                 </div>
 
-            <div class="item-row">
-                <ul class="record_actions">
-                    {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
-                    <li>
-                        <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}"
-                           class="btn btn-primary" title="{{ 'See accompanying period'|trans }}">
-                            <i class="fa fa-random"></i>
-                            {{ 'See this period'|trans }}
-                        </a>
-                    </li>
-                    {#
-                    <li>
-                        <a  href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}" class="btn btn-update no-content"></a>
-                    </li>
-                    {% if accompanying_period.isOpen == true %}
-                    <li>
-                        <a href="{{ path('chill_person_accompanying_period_close', {'person_id' : person.id}) }}" class="btn btn-update has-hidden change-icon">
-                            <i class="fa fa-lock" aria-hidden="true"></i><span class="show-on-hover">{{'Close accompanying period'|trans }}</span>
-                        </a>
-                    </li>
-                    {% endif %}
-                    {% if accompanying_period.canBeReOpened(person) == true %}
-                    <li>
-                        <a href="{{ path('chill_person_accompanying_period_re_open', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}" class="btn btn-create change-icon has-hidden">
-                            <i class="fa fa-unlock" aria-hidden="true"></i><span class="show-on-hover">{{'Re-open accompanying period'|trans }}</span>
-                        </a>
-                    </li>
-                    {% endif %}
-                    #}
-                </ul>
+                <div class="item-row separator">
+                    <ul class="record_actions">
+
+                        {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
+                        <li>
+                            <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}"
+                               class="btn btn-sm btn-show" title="{{ 'See accompanying period'|trans }}">{# {{ 'See this period'|trans }} #}</a>
+                        </li>
+
+                        {% if person is defined %}
+                            <li>
+                                <a  href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}"
+                                    class="btn btn-sm btn-update" title="{{ 'Edit accompanying period'|trans }}"></a>
+                            </li>
+                            {% if accompanying_period.isOpen == true %}
+                                <li>
+                                    <a href="{{ path('chill_person_accompanying_period_close', {'person_id' : person.id}) }}"
+                                       class="btn btn-sm btn-update change-icon">
+                                        <i class="fa fa-fw fa-lock" aria-hidden="true"></i>
+                                        {{'Close accompanying period'|trans }}
+                                    </a>
+                                </li>
+                            {% endif %}
+                            {% if accompanying_period.canBeReOpened(person) == true %}
+                                <li>
+                                    <a href="{{ path('chill_person_accompanying_period_re_open', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}"
+                                       class="btn btn-sm btn-create change-icon">
+                                        <i class="fa fa-fw fa-unlock" aria-hidden="true"></i>
+                                        {{'Re-open accompanying period'|trans }}
+                                    </a>
+                                </li>
+                            {% endif %}
+                        {% elseif household is defined %}
+                            {# TODO buttons specific for household ? #}
+                        {% endif %}
+
+                    </ul>
+                </div>
+
             </div>
-
-        </div>
+        {% endfor %}
     </div>
-    <p></p>
-    {% endfor %}
-
-
 {% endblock content %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig

@@ -2,39 +2,47 @@
 
 {% set activeRouteKey = 'chill_person_accompanying_period_list' %}
 
-{% block title %}{{ 'Person accompanying period - %name%'|trans({ '%name%' : person.__toString}) }}{% endblock title %}
+{% block title %}{{ 'Accompanying period list'|trans }}{% endblock title %}
 
 {% block personcontent %}
-<h1>{{ 'Accompanying period list'|trans }}</h1>
+<div class="accompanyingcourse-list">
 
-{% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
+    <h1>{{ 'Accompanying period list'|trans }}</h1>
 
-<ul class="record_actions sticky-form-buttons">
-    <li class="cancel">
-        <a href="{{ path ('chill_person_view', {'person_id' : person.id } ) }}" class="btn btn-cancel">
-            {{ 'Person details'|trans }}
-        </a>
-    </li>
-    <li>
-        <a href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" class="btn btn-create">
-          {{ 'Create an accompanying period'|trans }}
-        </a>
-    </li>
-    {#
-    <li>
-        <a href="{{ path ('chill_person_accompanying_period_create', {'person_id' : person.id } ) }}" class="btn btn-create has-hidden">
-            <span class="show-on-hover">{{ 'Add an accompanying period in the past'|trans }}</span>
-        </a>
-    </li>
-    {% if person.isOpen == false %}
-    <li>
-        <a href="{{ path('chill_person_accompanying_period_open', {'person_id' : person.id} ) }}" class="btn btn-create change-icon has-hidden">
-            <i class="fa fa-unlock" aria-hidden="true"></i>
-            <span class="show-on-hover">{{'Begin a new accompanying period'|trans }}</span>
-        </a>
-    </li>
-    {% endif %}
-    #}
-</ul>
+    {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
 
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ path ('chill_person_view', {'person_id' : person.id } ) }}"
+               class="btn btn-cancel">{{ 'Person details'|trans }}
+            </a>
+        </li>
+        <li class="dropdown">
+            <a class="btn btn-create change-icon dropdown-toggle"
+               href="#" role="button" id="newAccompanyingPeriod" data-bs-toggle="dropdown" aria-expanded="false">
+                {{ 'Create an accompanying period'|trans }}
+            </a>
+            <ul class="dropdown-menu" aria-labelledby="newAccompanyingPeriod">
+                <li>
+                    <a class="dropdown-item" href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}">
+                        <i class="fa fa-fw fa-plus"></i> {{ 'Create an accompanying period'|trans }}
+                    </a>
+                </li>
+                <li>
+                    <a class="dropdown-item" href="{{ path ('chill_person_accompanying_period_create', {'person_id' : person.id } ) }}">
+                        <i class="fa fa-fw fa-reply"></i> {{ 'Add an accompanying period in the past'|trans }}
+                    </a>
+                </li>
+                {% if person.isOpen == false %}
+                <li>
+                    <a class="dropdown-item" href="{{ path('chill_person_accompanying_period_open', {'person_id' : person.id} ) }}">
+                        <i class="fa fa-fw fa-unlock"></i> {{'Begin a new accompanying period'|trans }}
+                    </a>
+                </li>
+                {% endif %}
+            </ul>
+        </li>
+    </ul>
+
+</div>
 {% endblock %}

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

@@ -0,0 +1,72 @@
+{#
+    This Twig template include load vue_address component.
+    It push all variables from context in Address/App.vue.
+
+    OPTIONS
+    * mode          string ['edit*'|'new'|'create']
+    * address_id    integer
+    * backUrl       twig route:   path('route', {parameters})
+    * modalTitle    twig translated chain
+    * buttonText    twig translated chain
+    * buttonSize    bootstrap class like 'btn-sm'
+
+#}
+<div id="address"></div>
+
+<script type="text/javascript">
+    window.vueRootComponent = 'app';
+
+    {% if person is defined %}
+        window.entityType = 'person';
+        window.entityId = {{ person.id|e('js') }};
+    {% elseif household is defined %}
+        window.entityType = 'household';
+        window.entityId = {{ household.id|e('js') }};
+    {% endif %}
+
+    {% if 'edit' in app.request.get('_route') %}
+        window.addressId = {{ app.request.get('address_id')|e('js') }};
+        window.mode = 'edit';
+    {% elseif mode is defined and mode == 'edit' %}
+        window.addressId = {{ address_id|e('js') }};
+        window.mode = 'edit';
+    {% endif %}
+
+    {% if backUrl is not defined %}
+        {% if person is defined %}
+            window.backUrl = '{{ path('chill_person_address_list', { 'person_id': person.id })|e('js') }}';
+        {% elseif household is defined %}
+            window.backUrl = '{{ path('chill_person_household_addresses', { 'household_id': household.id })|e('js') }}';
+        {% endif %}
+    {% else %}
+        window.backUrl = '{{ backUrl|e('js') }}';
+    {% endif %}
+
+    {% if modalTitle is defined %}
+        window.modalTitle = '{{ modalTitle|trans|e('js') }}';
+    {% endif %}
+
+
+    {% if buttonText is defined %}
+        window.buttonText = '{{ buttonText|trans|e('js') }}';
+    {% endif %}
+
+    {% if buttonSize is defined %}
+        window.buttonSize = '{{ buttonSize|e('js') }}';
+    {% endif %}
+
+    {% if buttonDisplayText is defined and buttonDisplayText == false %}
+        window.buttonDisplayText = false;
+    {% endif %}
+
+    {% if binModalStep1 is defined and binModalStep1 == false %}
+        window.binModalStep1 = false;
+    {% endif %}
+
+    {% if binModalStep2 is defined and binModalStep2 == false %}
+        window.binModalStep2 = false;
+    {% endif %}
+</script>
+
+{{ encore_entry_script_tags('vue_address') }}
+{{ encore_entry_link_tags('vue_address') }}

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

@@ -18,29 +18,21 @@
 
 {% set activeRouteKey = '' %}
 
-{% block title 'Modify address for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) %}
+{% block title 'Edit an address'|trans %}
 
 {% block personcontent %}
-<div class="address-new">
-            
-            {% block content %}
-                <h1>{{ block('title') }}</h1>
-                <div id="address"></div>
-            {% endblock %}
+<div class="address-edit">
+
+    {% block content %}
+        <h1>{{ block('title') }}</h1>
+
+        {# include vue_address component #}
+        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+            binModalStep1: false,
+            binModalStep2: false,
+        } %}
+
+    {% endblock %}
 
 </div>
 {% endblock %}
-
-{% block css %}
-    {{ encore_entry_link_tags('vue_address') }}
-{% endblock %}
-
-{% block js %}
-    <script type="text/javascript">
-        window.personId = {{ person.id|e('js') }};
-        window.addressId = {{ address.id|e('js') }};
-        window.mode = 'edit';
-        window.vueRootComponent = 'app';
-    </script>
-    {{ encore_entry_script_tags('vue_address') }}
-{% endblock %}

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

@@ -27,10 +27,15 @@
 
     <ul class="record_actions my-3">
         <li style="margin: auto;">
-            <a class="btn btn-lg btn-create"
-               href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}">
-                {{ 'Add an address'|trans }}
-            </a>
+
+            {# include vue_address component #}
+            {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                mode: 'new',
+                buttonSize: 'btn-lg',
+                buttonText: 'Add an address',
+                modalTitle: 'Add an address',
+            } %}
+
         </li>
     </ul>
 
@@ -58,10 +63,32 @@
             {% set row = row + 1 %}
             {% if address.validTo is not empty and address.validTo < previousRowFrom %}
                 <div class="{{ 'row' ~ row ~ ' ' }}col-a action">
+
+                    {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                    {#
+                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                            address_id: address.id,
+                            mode: 'edit',
+                            binModalStep1: false,
+                            binModalStep2: false,
+                        } %}
+                    #}
+
                 <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
                 <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
+
+                    {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                    {#
+                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                            address_id: address.id,
+                            mode: 'edit',
+                            binModalStep1: false,
+                            binModalStep2: false,
+                        } %}
+                    #}
+
                 <div class="date">
                     {% if address.validTo is not empty %}
                         {{ address.validTo|format_date('short') }}
@@ -81,7 +108,10 @@
                         'has_no_address': true
                     }) }}
                     <ul class="record_actions">
+
+                        {# include vue_address component #}
                         <li><a href="{{ path('chill_person_address_edit', { 'person_id': person.id, 'address_id' : address.id } ) }}" class="btn btn-edit"></a></li>
+
                     </ul>
                 </div>
             {# endif #}
@@ -130,6 +160,7 @@
             </a>
         </li>
         <li>
+            {# include vue_address component #}
             <a class="btn btn-create"
                 href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}">
                 {{ 'Add an address'|trans }}

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

@@ -18,28 +18,22 @@
 
 {% set activeRouteKey = '' %}
 
-{% block title %}{{ 'New address for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}{% endblock %}
+{% block title %}{{ 'New address'|trans }}{% endblock %}
 
 {% block personcontent %}
 <div class="address-new">
 
-            {% block content %}
-                <h1>{{ block('title') }}</h1>
-                <div id="address"></div>
-            {% endblock %}
-            
+    {% block content %}
+        <h1>{{ block('title') }}</h1>
+
+        {# include vue_address component #}
+        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+            binModalStep1: false,
+            binModalStep2: false,
+        } %}
+
+    {% endblock %}
+
 </div>
 {% endblock %}
 
-{% block css %}
-    {{ encore_entry_link_tags('vue_address') }}
-{% endblock %}
-
-{% block js %}
-    <script type="text/javascript">
-        window.personId = {{ person.id|e('js') }};
-        window.mode = 'new';
-        window.vueRootComponent = 'app';
-    </script>
-    {{ encore_entry_script_tags('vue_address') }}
-{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig

@@ -8,7 +8,9 @@
     * addId         bool
     * addInfo       bool
     * addAge        bool
+    * addCenter     bool
     * hLevel        integer
+    * address_multiline     bool
     * customButtons [
         'before'    Twig\Markup, (injected with macro)
         'replace'   Twig\Markup,
@@ -32,7 +34,6 @@
 
 {% macro label(person, options) %}
     <div class="entity-label">
-
         <div class="denomination {{ 'h' ~ options['hLevel'] }}">
             {%- if options['addLink'] and is_granted('CHILL_PERSON_SEE', person) -%}
                 <a href="{{ chill_path_add_return_path('chill_person_view', { 'person_id': person.id }) }}">
@@ -57,6 +58,15 @@
                 (person.gender == 'man') ? 'man' : 'neuter' %}
             <p class="moreinfo">
                 <i class="fa fa-fw {{ gender }}" title="{{ genderTitle|trans }}"></i>
+
+            {%- if person.deathdate is not null -%}
+
+                <time datetime="{{ person.deathdate|date('Y-m-d') }}" title="{{ 'Deathdate'|trans }}">
+                    {{ 'Date of death'|trans({'deathdate': person.deathdate|format_date("medium") }) }}
+                </time>
+
+
+            {%- else -%}
                 <time datetime="{{ person.birthdate|date('Y-m-d') }}" title="{{ 'Birthdate'|trans }}">
                 {{ 'Born the date'|trans({'gender': person.gender,
                     'birthdate': person.birthdate|format_date("medium") }) }}
@@ -66,6 +76,8 @@
                         {{ 'years_old'|trans({ 'age': person.age }) }}
                     </span>
                 {%- endif -%}
+
+            {%- endif -%}
             </p>
         {%- endif -%}
     {#- tricks to remove easily whitespace after template -#}
@@ -74,7 +86,9 @@
 
 
 {%- if render == 'raw' -%}
-    {{ _self.raw(person, options) }}
+    <span class="entity-raw">
+        {{ _self.raw(person, options) }}
+    </span>
 {%- endif -%}
 
 {%- if render == 'label' -%}
@@ -86,12 +100,13 @@
     <div class="item-col">
         {{ _self.label(person, options) }}
     </div>
-    <div class="item-col">
+    <div class="item-col separator">
         <ul class="list-content fa-ul">
+            {% set multiline = (options['address_multiline']) ? true : false %}
             {{ person.getLastAddress|chill_entity_render_box({
                 'render': 'list',
                 'with_picto': true,
-                'multiline': false,
+                'multiline': multiline,
                 'with_valid_from': false
             }) }}
             <li>
@@ -110,19 +125,26 @@
                     {% endif %}
                 {% endif %}
             </li>
+            {% if options['addCenter'] %}
+                <li>
+                    <i class="fa fa-li fa-long-arrow-right"></i>
+                    {{ person.center }}
+                </li>
+            {% endif %}
         </ul>
         <ul class="record_actions">
             {% if options['customButtons']['before'] is defined %}
                 {{ options['customButtons']['before'] }}
             {% endif %}
 
-            {%- if options['customButtons']['replace'] is not defined and is_granted('CHILL_PERSON_SEE', person) -%}
+            {%- if options['customButtons']['replace'] is defined -%}
+                {{ options['customButtons']['replace'] }}
+            {%- elseif is_granted('CHILL_PERSON_SEE', person) -%}
                 <li>
-                    <a class="btn btn-show" target="_blank" title="{{ 'Show person'|trans }}"
+                    <a class="btn btn-sm btn-show" target="_blank" title="{{ 'Show person'|trans }}"
                     href="{{ path('chill_person_view', { person_id: person.id }) }}"></a>
                 </li>
             {%- else -%}
-                {{ options['customButtons']['replace'] }}
             {%- endif -%}
 
             {% if options['customButtons']['after'] is defined %}

src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig

@@ -5,24 +5,24 @@
 {% block content %}
 <div class="household-members">
 
-            <h1>{{ block('title') }}</h1>
+    <h1>{{ block('title') }}</h1>
 
-            {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
+    {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
 
-            <div class="form_control">
-                <ul class="record_actions">
-                    <li class="cancel">
-                        <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
-                            {{ 'Household summary'|trans }}
-                        </a>
-                    </li>
-                    {#<li>
-                        <a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create">
-                          {{ 'Create an accompanying period'|trans }}
-                        </a>
-                    </li>#}
-                </ul>
-            </div>
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
+                {{ 'Household summary'|trans }}
+            </a>
+        </li>
+        {#
+        <li>
+            <a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create">
+              {{ 'Create an accompanying period'|trans }}
+            </a>
+        </li>
+        #}
+    </ul>
 
 </div>
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig

@@ -6,21 +6,11 @@
     <h1>{{ block('title') }}</h1>
 
     <div>
-        <div id="household-address"></div>
+        {# include vue_address component #}
+        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+            binModalStep1: false,
+            binModalStep2: false,
+        } %}
     </div>
 
-    {% block stylesheets %}
-        {{ encore_entry_link_tags('vue_address') }}
-    {% endblock %}
-
-    {% block js %}
-       <script type="text/javascript">
-            window.householdId = {{ household.id|e('js') }};
-            window.addressId = {{ address.id|e('js') }};
-            window.mode = 'edit';
-            window.vueRootComponent = 'app';
-        </script>
-        {{ encore_entry_script_tags('vue_household_address') }}
-    {% endblock %}
-
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig

@@ -6,19 +6,11 @@
     <h1>{{ block('title') }}</h1>
 
     <div>
-        <div id="household-address"></div>
+        {# include vue_address component #}
+        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+            binModalStep1: false,
+            binModalStep2: false,
+        } %}
     </div>
 
-    {% block stylesheets %}
-        {{ encore_entry_link_tags('vue_address') }}
-    {% endblock %}
-
-    {% block js %}
-       <script type="text/javascript">
-            window.householdId = {{ household.id|e('js') }};
-            window.vueRootComponent = 'app';
-        </script>
-        {{ encore_entry_script_tags('vue_household_address') }}
-    {% endblock %}
-
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig

@@ -7,22 +7,28 @@
 
     <h1>{{ block('title') }}</h1>
 
-    <ul class="record_actions my-3">
-        <li style="margin: auto;">
-            <a class="btn btn-lg btn-create"
-               href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
-                {{ 'Move household'|trans }}
-            </a>
-        </li>
-    </ul>
+    {% if household.addresses|length == 0 %}
+        <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+    {% else %}
 
-    <div class="address-timeline grid">
+        <ul class="record_actions my-3">
+            <li style="margin: auto;">
 
-        {% if household.addresses|length == 0 %}
-            <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
-        {% else %}
-            <div class="top"><i class="fa fa-caret-up fa-3x"></i></div>
-        {% endif %}
+                {# include vue_address component #}
+                {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                    mode: 'new',
+                    backUrl: chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }),
+                    buttonSize: 'btn-lg',
+                    buttonText: 'Move household',
+                    modalTitle: 'Move household',
+                } %}
+
+            </li>
+        </ul>
+
+        <div class="address-timeline grid">
+
+        <div class="top"><i class="fa fa-caret-up fa-3x"></i></div>
 
         {% set row = 0 %}
         {% set previousRowFrom = null %}
@@ -34,7 +40,10 @@
 
                 <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
                 <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
+
+                    {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+
                 <div class="date">
                     {% if address.validTo is not empty %}
                         {{ address.validTo|format_date('short') }}
@@ -54,7 +63,11 @@
                 }) }}
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}" class="btn btn-edit"></a>
+
+                        {# include vue_address component #}
+                        <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}"
+                           class="btn btn-edit"></a>
+
                     </li>
                 </ul>
             </div>
@@ -68,6 +81,7 @@
             {% set previousRowFrom = address.validFrom %}
         {% endfor %}
     </div>
+    {% endif %}
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
@@ -76,10 +90,13 @@
             </a>
         </li>
         <li>
+
+            {# include vue_address component #}
             <a class="btn btn-create"
-            href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
-            {{ 'Move household'|trans }}
+                href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
+                {{ 'Move household'|trans }}
             </a>
+
         </li>
     </ul>
 

src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig

@@ -85,8 +85,8 @@
     <div class="flex-table list-household-members">
       {% for m in members %}
         <div class="item-bloc">
-          <div class="item-row person">
-            <div class="item-col box-person">
+          <div class="item-row">
+            <div class="item-col">
               <div>
                 {{ m.person|chill_entity_render_box({'addLink': true}) }}
                 {% if m.holder %}
@@ -97,7 +97,7 @@
                 {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
               </div>
             </div>
-            <div class="item-col box-where">
+            <div class="item-col">
               <ul class="list-content fa-ul">
                 {% if m.startDate is not empty %}
                   <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
@@ -155,8 +155,8 @@
       <div class="flex-table list-household-members">
         {% for m in members %}
           <div class="item-bloc">
-            <div class="item-row person">
-              <div class="item-col box-person">
+            <div class="item-row">
+              <div class="item-col">
                 <div>
                   {{ m.person|chill_entity_render_box({'addLink': true}) }}
                   {% if m.holder %}
@@ -167,7 +167,7 @@
                   {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
                 </div>
               </div>
-              <div class="item-col box-where">
+              <div class="item-col">
                 <ul class="list-content fa-ul">
                   {% if m.startDate is not empty %}
                     <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>

src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig

@@ -14,105 +14,107 @@
  * 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/>.
 #}
-<h2>{{ title|default('Person search results')|trans }}</h2>
+<div class="list-person">
+    <h2>{{ title|default('Person search results')|trans }}</h2>
 
-<p>
-    {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
-    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
-                <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
-    </a>
-</p>
+    <p>
+        {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
+        <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
+                    <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
+        </a>
+    </p>
 
-<p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}</p>
+    <p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}</p>
 
-{% if persons|length > 0 %}
+    {% if persons|length > 0 %}
 
-    <table>
-        <thead>
-            <tr>
-              <th class="chill-red">{% trans %}Name{% endtrans %}</th>
-                <th class="chill-green">{% trans %}Date of birth{% endtrans %}</th>
-                <th class="chill-orange">{% trans %}Nationality{% endtrans %}</th>
-                <th>&nbsp;</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for person in persons %}
+        <table class="table table-bordered border-dark align-middle">
+            <thead>
                 <tr>
-                    <td>
-                      {% set is_open = person.isOpen() %}
-                      <a href="{{ path('chill_person_view', { person_id : person.getId }) }}" {% if chill_person.fields.accompanying_period == 'visible' %}{% if is_open %} alt="{{ 'An accompanying period is open'|trans|e('html_attr') }}"{% else %} alt="{{ 'Any accompanying periods are open'|trans|e('html_attr') }}" {% endif %}{% endif %}>
-                            {{ person|chill_entity_render_box }}
-                            {% apply spaceless %}
-                                {% if chill_person.fields.accompanying_period == 'visible' %}
-                                  {% if is_open == false %}
-                                  <i class="fa fa-lock" ></i>
-                                  {% else %}
-                                  <i class="fa fa-unlock" ></i>
-                                  {% endif %}
-                                {% endif %}
-                            {% endapply %}
-                        </a>
-                    </td>
-                    <td>
-                        {% if person.birthdate is not null %}
-                            {{ person.birthdate|format_date('long') }}
-                        {% else %}{{  'Unknown date of birth'|trans }}{% endif %}
-                    </td>
-                    <td>
-                        {% if person.nationality is not null %}
-                            {{person.nationality.name | localize_translatable_string }}
-                        {% else %}
-                            {{ 'Without nationality'|trans }}
-                        {% endif %}
-                    </td>
-                    <td>
-                        <ul class="record_actions">
-                            <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
-                            {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-                            <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
+                  <th class="chill-orange">{% trans %}Name{% endtrans %}</th>
+                    <th class="chill-orange">{% trans %}Date of birth{% endtrans %}</th>
+                    <th class="chill-orange">{% trans %}Nationality{% endtrans %}</th>
+                    <th>&nbsp;</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for person in persons %}
+                    <tr>
+                        <td>
+                          {% set is_open = person.isOpen() %}
+                          <a href="{{ path('chill_person_view', { person_id : person.getId }) }}" {% if chill_person.fields.accompanying_period == 'visible' %}{% if is_open %} alt="{{ 'An accompanying period is open'|trans|e('html_attr') }}"{% else %} alt="{{ 'Any accompanying periods are open'|trans|e('html_attr') }}" {% endif %}{% endif %}>
+                                {{ person|chill_entity_render_box }}
+                                {% apply spaceless %}
+                                    {% if chill_person.fields.accompanying_period == 'visible' %}
+                                      {% if is_open == false %}
+                                      <i class="fa fa-lock" ></i>
+                                      {% else %}
+                                      <i class="fa fa-unlock" ></i>
+                                      {% endif %}
+                                    {% endif %}
+                                {% endapply %}
+                            </a>
+                        </td>
+                        <td>
+                            {% if person.birthdate is not null %}
+                                {{ person.birthdate|format_date('long') }}
+                            {% else %}{{  'Unknown date of birth'|trans }}{% endif %}
+                        </td>
+                        <td>
+                            {% if person.nationality is not null %}
+                                {{person.nationality.name | localize_translatable_string }}
+                            {% else %}
+                                {{ 'Without nationality'|trans }}
                             {% endif %}
-                        </ul>
-                    </td>
-                </tr>         
-            {% endfor %}
-        </tbody>
-    </table>
-            
-            <ul class="record_actions">
-                {% if is_granted('CHILL_PERSON_CREATE') %}
-                <li>
-                    <a href="{{ path('chill_person_new') }}" class="btn btn-create">
-                        {{ 'Add a person'|trans }}
-                    </a>
-                </li>
-                {% endif %}
+                        </td>
+                        <td>
+                            <ul class="record_actions">
+                                <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
+                                {% if is_granted('CHILL_PERSON_UPDATE', person) %}
+                                <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
+                                {% endif %}
+                            </ul>
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
 
-                {% if search_name != "person_similarity" %}
-                <li>
-                    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action">
-                        <i class="fa fa-search" aria-hidden="true"></i> {{ 'Advanced search'|trans }}
-                    </a>
-                </li>
-                {% endif %}
-                {% if preview == true and persons|length < total %}
-                <li>
-                    <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
-                        {{ 'See all results'|trans }}
-                    </a>
-                </li>
-                {% endif %}
-            </ul>
-{% else %}
-    <ul class="record_actions">
-        <li>
-            <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action">
-                <i class="fa fa-search" aria-hidden="true"></i> {{ 'Advanced search'|trans }}
-            </a>
-        </li>
-    </ul>
-{% endif %}
+                <ul class="record_actions">
+                    {% if is_granted('CHILL_PERSON_CREATE') %}
+                    <li>
+                        <a href="{{ path('chill_person_new') }}" class="btn btn-create">
+                            {{ 'Add a person'|trans }}
+                        </a>
+                    </li>
+                    {% endif %}
 
-{% if preview == false %}
-{{ chill_pagination(paginator) }}
-{% endif %}
+                    {% if search_name != "person_similarity" %}
+                    <li>
+                        <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action">
+                            <i class="fa fa-search" aria-hidden="true"></i> {{ 'Advanced search'|trans }}
+                        </a>
+                    </li>
+                    {% endif %}
+                    {% if preview == true and persons|length < total %}
+                    <li>
+                        <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
+                            {{ 'See all results'|trans }}
+                        </a>
+                    </li>
+                    {% endif %}
+                </ul>
+    {% else %}
+        <ul class="record_actions">
+            <li>
+                <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-action">
+                    <i class="fa fa-search" aria-hidden="true"></i> {{ 'Advanced search'|trans }}
+                </a>
+            </li>
+        </ul>
+    {% endif %}
+
+    {% if preview == false %}
+    {{ chill_pagination(paginator) }}
+    {% endif %}
+</div>

src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig

@@ -14,94 +14,96 @@
  * 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/>.
 #}
-<h2>{{ title|default('Person search results by phonenumber')|trans }}</h2>
+<div class="list-by-phonenumber">
+    <h2>{{ title|default('Person search results by phonenumber')|trans }}</h2>
 
-<p>
-    {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
-    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
-                <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
-    </a>
-</p>
+    <p>
+        {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
+        <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
+                    <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
+        </a>
+    </p>
 
-<p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}</p>
+    <p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}</p>
 
-{% if persons|length > 0 %}
+    {% if persons|length > 0 %}
 
-    <table class="person-list__--by-phonenumber">
-        <thead>
-            <tr>
-              <th class="chill-red">{% trans %}Name{% endtrans %}</th>
-                <th class="chill-green">{% trans %}Date of birth{% endtrans %}</th>
-                <th class="chill-orange">{% trans %}Phonenumber{% endtrans %}</th>
-                <th>&nbsp;</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for person in persons %}
+        <table class="table table-bordered border-dark align-middle">
+            <thead>
                 <tr>
-                    <td>
-                      {% set is_open = person.isOpen() %}
-                      <a href="{{ path('chill_person_view', { person_id : person.getId }) }}" {% if chill_person.fields.accompanying_period == 'visible' %}{% if is_open %} alt="{{ 'An accompanying period is open'|trans|e('html_attr') }}"{% else %} alt="{{ 'Any accompanying periods are open'|trans|e('html_attr') }}" {% endif %}{% endif %}>
-                            {{person.firstName}} {{person.lastName}}
-                            {% apply spaceless %}
-                                {% if chill_person.fields.accompanying_period == 'visible' %}
-                                  {% if is_open == false %}
-                                  <i class="fa fa-lock" ></i>
-                                  {% else %}
-                                  <i class="fa fa-unlock" ></i>
-                                  {% endif %}
+                  <th class="chill-orange">{% trans %}Name{% endtrans %}</th>
+                    <th class="chill-orange">{% trans %}Date of birth{% endtrans %}</th>
+                    <th class="chill-orange">{% trans %}Phonenumber{% endtrans %}</th>
+                    <th>&nbsp;</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for person in persons %}
+                    <tr>
+                        <td>
+                          {% set is_open = person.isOpen() %}
+                          <a href="{{ path('chill_person_view', { person_id : person.getId }) }}" {% if chill_person.fields.accompanying_period == 'visible' %}{% if is_open %} alt="{{ 'An accompanying period is open'|trans|e('html_attr') }}"{% else %} alt="{{ 'Any accompanying periods are open'|trans|e('html_attr') }}" {% endif %}{% endif %}>
+                                {{person.firstName}} {{person.lastName}}
+                                {% apply spaceless %}
+                                    {% if chill_person.fields.accompanying_period == 'visible' %}
+                                      {% if is_open == false %}
+                                      <i class="fa fa-lock" ></i>
+                                      {% else %}
+                                      <i class="fa fa-unlock" ></i>
+                                      {% endif %}
+                                    {% endif %}
+                                {% endapply %}
+                            </a>
+                        </td>
+                        <td>
+                            {% if person.birthdate is not null %}{{person.birthdate|format_date('long') }}{% else %}{{  'Unknown date of birth'|trans }}{% endif %}
+                        </td>
+                        <td class="person-list__--by-phonenumber__phones">
+                            <ul>
+                                {% if person.phonenumber is not empty %}
+                                    <li>
+                                        <a href="tel:{{ person.phonenumber }}"><img src="{{ asset('build/images/mobile-alt-solid.svg') }}">&nbsp;<pre>{{ person.phonenumber|chill_format_phonenumber }}</pre></a>
+                                    </li>
                                 {% endif %}
-                            {% endapply %}
-                        </a>
-                    </td>
-                    <td>
-                        {% if person.birthdate is not null %}{{person.birthdate|format_date('long') }}{% else %}{{  'Unknown date of birth'|trans }}{% endif %}
-                    </td>
-                    <td class="person-list__--by-phonenumber__phones">
-                        <ul>
-                            {% if person.phonenumber is not empty %}
-                                <li>
-                                    <a href="tel:{{ person.phonenumber }}"><img src="{{ asset('build/images/mobile-alt-solid.svg') }}">&nbsp;<pre>{{ person.phonenumber|chill_format_phonenumber }}</pre></a>
-                                </li>
-                            {% endif %}
-                            {% if person.mobilenumber is not empty%}
-                                <li>
-                                    <a href="tel:{{ person.mobilenumber }}"><img src="{{ asset('build/images/phone-alt-solid.svg') }}">&nbsp;<pre>{{ person.mobilenumber|chill_format_phonenumber }}</pre></a>
-                                </li>
-                            {% endif %}
-                        </ul>
-                    </td>
-                    <td>
-                        <ul class="record_actions">
-                            <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
-                            {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-                            <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
-                            {% endif %}
-                        </ul>
-                    </td>
-                </tr>         
-            {% endfor %}
-        </tbody>
-    </table>
-            
-            <ul class="record_actions">
-                {% if is_granted('CHILL_PERSON_CREATE') %}
-                <li>
-                    <a href="{{ path('chill_person_new') }}" class="btn btn-create">
-                        {{ 'Add a person'|trans }}
-                    </a>
-                </li>
-                {% endif %}
-                {% if preview == true and persons|length < total %}
-                <li>
-                    <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
-                        {{ 'See all results'|trans }}
-                    </a>
-                </li>
-                {% endif %}
-            </ul>
-{% endif %}
+                                {% if person.mobilenumber is not empty%}
+                                    <li>
+                                        <a href="tel:{{ person.mobilenumber }}"><img src="{{ asset('build/images/phone-alt-solid.svg') }}">&nbsp;<pre>{{ person.mobilenumber|chill_format_phonenumber }}</pre></a>
+                                    </li>
+                                {% endif %}
+                            </ul>
+                        </td>
+                        <td>
+                            <ul class="record_actions">
+                                <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
+                                {% if is_granted('CHILL_PERSON_UPDATE', person) %}
+                                <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
+                                {% endif %}
+                            </ul>
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
 
-{% if preview == false %}
-{{ chill_pagination(paginator) }}
-{% endif %}
+                <ul class="record_actions">
+                    {% if is_granted('CHILL_PERSON_CREATE') %}
+                    <li>
+                        <a href="{{ path('chill_person_new') }}" class="btn btn-create">
+                            {{ 'Add a person'|trans }}
+                        </a>
+                    </li>
+                    {% endif %}
+                    {% if preview == true and persons|length < total %}
+                    <li>
+                        <a href="{{ path('chill_main_search', { "name": search_name|default('abcd'), "q" : pattern }) }}" class="btn btn-misc">
+                            {{ 'See all results'|trans }}
+                        </a>
+                    </li>
+                    {% endif %}
+                </ul>
+    {% endif %}
+
+    {% if preview == false %}
+    {{ chill_pagination(paginator) }}
+    {% endif %}
+</div>