allow to close editor

Integration of wopi bundle with controller

See merge request Chill-Projet/chill-bundles!133

.gitlab-ci.yml

@@ -5,11 +5,13 @@ image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
 cache:
   paths:
     - tests/app/vendor/
+    - .composer
 
 before_script:
   # add extensions to postgres
   - PGPASSWORD=$POSTGRES_PASSWORD psql -U $POSTGRES_USER -h db -c "CREATE EXTENSION IF NOT EXISTS unaccent; CREATE EXTENSION IF NOT EXISTS pg_trgm;"
   # Install and run Composer
+  - mkdir -p $COMPOSER_HOME
   - curl -sS https://getcomposer.org/installer | php
   - php -d memory_limit=2G composer.phar install
   - php tests/app/bin/console doctrine:migrations:migrate -n
@@ -34,6 +36,10 @@ variables:
   REDIS_HOST: redis
   REDIS_PORT: 6379
   REDIS_URL: redis://redis:6379
+  # change vendor dir to make the app install into tests/apps
+  COMPOSER_VENDOR_DIR: tests/app/vendor
+  # cache some composer data
+  COMPOSER_HOME: .composer
 
 
 # Run our tests

composer.json

@@ -21,7 +21,9 @@
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
             "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
-            "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle"
+            "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
+            "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle",
+            "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src"
         }
     },
     "autoload-dev": {
@@ -29,8 +31,12 @@
             "App\\": "tests/app/src/"
         }
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "require": {
         "champs-libres/async-uploader-bundle": "dev-sf4",
+        "champs-libres/wopi-bundle": "dev-master",
+        "nyholm/psr7": "^1.4",
         "graylog2/gelf-php": "^1.5",
         "symfony/form": "4.*",
         "symfony/twig-bundle": "^4.4",

src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php

@@ -13,7 +13,7 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Entity
  * @ORM\Table(schema="chill_asideactivity")
  */
-final class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
+class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
 {
     /**
      * @ORM\Id

src/Bundle/ChillCalendarBundle/.gitignore

@@ -0,0 +1,11 @@
+composer.lock
+vendor/*
+parameters.yml
+*~
+*.DS_Store
+*.sass-cache
+Resources/node_modules/
+Tests/Fixtures/App/app/config/parameters.yml
+/nbproject/private/
+Resources/test/Fixtures/App/bootstrap.php.cache
+

src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Chill\CalendarBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class ChillCalendarBundle extends Bundle
+{
+}

src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Chill\CalendarBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Symfony\Component\HttpFoundation\Request;
+
+
+class CalendarAPIController extends ApiController
+{
+
+
+    protected function getContextForSerialization(string $action, Request $request, string $_format, $entity): array
+    {
+        switch($action) {
+            case '_index':
+                switch ($request->getMethod()) {
+                    case Request::METHOD_GET:
+                        return [ 'groups' => [ 'calendar:read' ] ];
+                }
+        }
+        return parent::getContextForSerialization($action, $request, $_format, $entity);
+    }
+
+    protected function customizeQuery(string $action, Request $request, $qb): void
+    {
+        if ($request->query->has('main_user')) {
+
+            $qb->where('e.mainUser = :main_user')
+               ->setParameter('main_user', $request->query->get('main_user'));
+        }
+    }
+
+}

src/Bundle/ChillCalendarBundle/Controller/CalendarController.php

@@ -0,0 +1,388 @@
+<?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\CalendarBundle\Controller;
+
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\Form;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\Role\Role;
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Form\CalendarType;
+use Chill\MainBundle\Entity\User;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * Class CalendarController
+ *
+ * @package Chill\CalendarBundle\Controller
+ */
+class CalendarController extends AbstractController
+{
+    protected EventDispatcherInterface $eventDispatcher;
+
+    protected AuthorizationHelper $authorizationHelper;
+
+    protected LoggerInterface $logger;
+
+    protected SerializerInterface $serializer;
+
+    public function __construct(
+        EventDispatcherInterface $eventDispatcher,
+        AuthorizationHelper $authorizationHelper,
+        LoggerInterface $logger,
+        SerializerInterface $serializer
+    ) {
+        $this->eventDispatcher = $eventDispatcher;
+        $this->authorizationHelper = $authorizationHelper;
+        $this->logger = $logger;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Lists all Calendar entities.
+     * @Route("/{_locale}/calendar/", name="chill_calendar_calendar")
+     */
+    public function listAction(Request $request): Response
+    {
+        $em = $this->getDoctrine()->getManager();
+        $view = null;
+
+        [$user, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($user instanceof User) {
+
+            // $calendar = $em->getRepository(Calendar::class)
+            //     ->findByUser($user)
+            //     ;
+
+            // $view = 'ChillCalendarBundle:Calendar:listByUser.html.twig';
+        } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $calendarItems = $em->getRepository(Calendar::class)->findBy(
+                ['accompanyingPeriod' => $accompanyingPeriod]
+            );
+
+            $view = 'ChillCalendarBundle:Calendar:listByAccompanyingCourse.html.twig';
+        }
+
+        return $this->render($view, [
+            'calendarItems' => $calendarItems,
+            'user' => $user,
+            'accompanyingCourse' => $accompanyingPeriod,
+        ]);
+    }
+
+    /**
+     * Create a new calendar item
+     * @Route("/{_locale}/calendar/new", name="chill_calendar_calendar_new")
+     */
+    public function newAction(Request $request): Response
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        [$user, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillCalendarBundle:Calendar:newAccompanyingCourse.html.twig';
+        } 
+        // elseif ($user instanceof User) {
+        //     $view = 'ChillCalendarBundle:Calendar:newUser.html.twig';
+        // }
+
+        $entity = new Calendar();
+        $entity->setUser($this->getUser());
+        $entity->setStatus($entity::STATUS_VALID);
+
+        // if ($user instanceof User) {
+        //     $entity->setPerson($user);
+        // }
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $entity->setAccompanyingPeriod($accompanyingPeriod);
+        }
+
+        $form = $this->createForm(CalendarType::class, $entity, [
+            'accompanyingPeriod' => $accompanyingPeriod,
+        ])->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $em->persist($entity);
+            $em->flush();
+
+            $this->addFlash('success', $this->get('translator')->trans('Success : calendar item created!'));
+
+            $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
+
+            return $this->redirectToRoute('chill_calendar_calendar', $params);
+        } elseif ($form->isSubmitted() and !$form->isValid()) {
+            $this->addFlash('error', $this->get('translator')->trans('This form contains errors'));
+        }
+
+
+        if ($view === null) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        $entity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
+        
+        return $this->render($view, [
+            'user' => $user,
+            'accompanyingCourse' => $accompanyingPeriod,
+            'entity' => $entity,
+            'form' => $form->createView(),
+            'entity_json' => $entity_array
+        ]);
+    }
+
+    /**
+     * Show a calendar item
+     * @Route("/{_locale}/calendar/{id}/show", name="chill_calendar_calendar_show")
+     */
+    public function showAction(Request $request, $id): Response
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        [$user, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillCalendarBundle:Calendar:showAccompanyingCourse.html.twig';
+        } 
+        // elseif ($person instanceof Person) {
+        //     $view = 'ChillCalendarBundle:Calendar:showPerson.html.twig';
+        // }
+
+        $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find Calendar entity.');
+        }
+        
+        if (null !== $accompanyingPeriod) {
+           $entity->personsAssociated = $entity->getPersonsAssociated();
+           $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
+        }
+
+        // $deleteForm = $this->createDeleteForm($id, $accompanyingPeriod);
+
+        if ($view === null) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        return $this->render($view, [
+            //'person'      => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
+            'entity'      => $entity,
+            //'delete_form' => $deleteForm->createView(),
+        ]);
+    }
+
+
+
+     /**
+     * Edit a calendar item
+     * @Route("/{_locale}/calendar/{id}/edit", name="chill_calendar_calendar_edit")
+     */
+    public function editAction($id, Request $request): Response
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        [$user, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillCalendarBundle:Calendar:editAccompanyingCourse.html.twig';
+        }
+        //  elseif ($person instanceof Person) {
+        //     $view = 'ChillCalendarBundle:Calendar:editPerson.html.twig';
+        // }
+
+        $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find Calendar entity.');
+        }
+
+        $form = $this->createForm(CalendarType::class, $entity, [
+            'accompanyingPeriod' => $accompanyingPeriod,
+        ])->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $em->persist($entity);
+            $em->flush();
+
+            $this->addFlash('success', $this->get('translator')->trans('Success : calendar item updated!'));
+
+            $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
+            return $this->redirectToRoute('chill_calendar_calendar', $params);
+        } elseif ($form->isSubmitted() and !$form->isValid()) {
+            $this->addFlash('error', $this->get('translator')->trans('This form contains errors'));
+        }
+
+        $deleteForm = $this->createDeleteForm($id, $user, $accompanyingPeriod);
+
+        if ($view === null) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        $entity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
+        
+        return $this->render($view, [
+            'entity' => $entity,
+            'form' => $form->createView(),
+            'delete_form' => $deleteForm->createView(),
+            'accompanyingCourse' => $accompanyingPeriod,
+            'entity_json' => $entity_array
+        ]);
+    }
+
+     /**
+     * Delete a calendar item
+     * @Route("/{_locale}/calendar/{id}/delete", name="chill_calendar_calendar_delete")
+     */
+    public function deleteAction(Request $request, $id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        [$user, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillCalendarBundle:Calendar:confirm_deleteAccompanyingCourse.html.twig';
+        } 
+        // elseif ($person instanceof Person) {
+        //     $view = 'ChillCalendarBundle:Calendar:confirm_deletePerson.html.twig';
+        // }
+
+        /* @var $entity Calendar */
+        $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find Calendar entity.');
+        }
+
+        $form = $this->createDeleteForm($id, $user, $accompanyingPeriod);
+
+        if ($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+
+                $this->logger->notice("A calendar event has been removed", [
+                   'by_user' => $this->getUser()->getUsername(),
+                   'calendar_id' => $entity->getId()
+                ]);
+
+                $em->remove($entity);
+                $em->flush();
+
+                $this->addFlash('success', $this->get('translator')
+                      ->trans("The calendar item has been successfully removed."));
+
+                $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
+                return $this->redirectToRoute('chill_calendar_calendar', $params);
+            }
+        }
+
+        if ($view === null) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        return $this->render($view, [
+           'calendar' => $entity,
+           'delete_form' => $form->createView(),
+           'accompanyingCourse' => $accompanyingPeriod,
+        ]);
+    }
+
+    /**
+     * Creates a form to delete a Calendar entity by id.
+     */
+    private function createDeleteForm(int $id, ?Person $person, ?AccompanyingPeriod $accompanyingPeriod): Form
+    {
+        $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+        $params['id'] = $id;
+
+        return $this->createFormBuilder()
+            ->setAction($this->generateUrl('chill_calendar_calendar_delete', $params))
+            ->setMethod('DELETE')
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm()
+        ;
+    }
+
+    private function getEntity(Request $request): array
+    {
+        $em = $this->getDoctrine()->getManager();
+        $user = $accompanyingPeriod = null;
+
+        if ($request->query->has('user_id')) {
+            $user_id = $request->get('user_id');
+            $user = $em->getRepository(User::class)->find($user_id);
+
+            if ($user === null) {
+                throw $this->createNotFoundException('User not found');
+            }
+
+            $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $user);
+        } elseif ($request->query->has('accompanying_period_id')) {
+            $accompanying_period_id = $request->get('accompanying_period_id');
+            $accompanyingPeriod = $em->getRepository(AccompanyingPeriod::class)->find($accompanying_period_id);
+
+            if ($accompanyingPeriod === null) {
+                throw $this->createNotFoundException('Accompanying Period not found');
+            }
+
+            // TODO Add permission
+            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+        } else {
+            throw $this->createNotFoundException("Person or Accompanying Period not found");
+        }
+
+        return [
+            $user, $accompanyingPeriod
+        ];
+    }
+
+    private function buildParamsToUrl(
+        ?User $user,
+        ?AccompanyingPeriod $accompanyingPeriod
+    ): array {
+        $params = [];
+
+        if ($user) {
+            $params['user_id'] = $user->getId();
+        }
+
+        if ($accompanyingPeriod) {
+            $params['accompanying_period_id'] = $accompanyingPeriod->getId();
+        }
+
+        return $params;
+    }
+}

src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Chill\CalendarBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\HttpFoundation\Response;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+
+class CalendarRangeAPIController extends ApiController
+{
+
+    /**
+     * @Route("/api/1.0/calendar/calendar-range-available.{_format}", name="chill_api_single_calendar_range_available")
+     */
+    public function availableRanges(Request $request, string $_format): JsonResponse
+    {
+        if ($request->query->has('user')) {
+            $user = $request->query->get('user');
+        }
+
+        $em = $this->getDoctrine()->getManager();
+
+        $query = $em->createQuery(
+            'SELECT c FROM ChillCalendarBundle:CalendarRange c 
+            WHERE NOT EXISTS (SELECT cal.id FROM ChillCalendarBundle:Calendar cal WHERE cal.calendarRange = c.id)')
+        ;
+
+        $results = $query->getResult();
+
+        return $this->json(['count' => count($results), 'results' => $results], Response::HTTP_OK, [], [ 'groups' => [ 'read' ]]);
+        //TODO use also the paginator, eg return $this->serializeCollection('get', $request, $_format, $paginator, $results);
+    }
+
+}

src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace Chill\CalendarBundle\DataFixtures\ORM;
+
+use Chill\CalendarBundle\Entity\CalendarRange;
+use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
+use Chill\MainBundle\Entity\User;
+use DateTimeImmutable;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ObjectManager;
+
+
+class LoadCalendarRange extends Fixture implements FixtureGroupInterface, OrderedFixtureInterface
+{
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->userRepository = $em->getRepository(User::class);
+    }
+
+    public function getOrder(): int
+    {
+        return 40003;
+    }
+
+    public static function getGroups(): array
+    {
+        return ['calendar'];
+    }
+
+    public static $references = [];
+
+    public function load(ObjectManager $manager): void
+    {
+        $arr = range(-50, 50);
+        
+        print "Creating calendar range ('plage de disponibilités')\n";
+
+        $users = $this->userRepository->findAll();
+
+        $days = [
+            '2021-08-23',
+            '2021-08-24',
+            '2021-08-25',
+            '2021-08-26',
+            '2021-08-30',
+            '2021-08-31',
+            '2021-09-01',
+            '2021-09-02',
+        ];
+
+        $hours = [
+            '10:00:00',
+            '11:30:00',
+            '13:30:00',
+            '15:00:00'
+        ];
+
+        foreach ($users as $u) {
+            foreach ($days as $d) {
+                foreach ($hours as $h){
+                    $event = $d.' '.$h;
+                    $startEvent = new DateTimeImmutable($event);
+                    $endEvent = new DateTimeImmutable($event.' + 1 hours');
+                    $calendarRange= (new CalendarRange())
+                        ->setUser($u)
+                        ->setStartDate($startEvent)
+                        ->setEndDate($endEvent);
+        
+                    $manager->persist($calendarRange);
+                }
+
+            }
+
+        }
+        $manager->flush();
+    }
+}

src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Chill\CalendarBundle\DataFixtures\ORM;
+
+use Chill\CalendarBundle\Entity\CancelReason;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Persistence\ObjectManager;
+
+
+class LoadCancelReason extends Fixture implements FixtureGroupInterface
+{
+    public function getOrder(): int
+    {
+        return 40001;
+    }
+
+    public static function getGroups(): array
+    {
+        return ['calendar'];
+    }
+
+    public static $references = [];
+
+    public function load(ObjectManager $manager): void
+    {
+        $arr = [
+            ['name' => CancelReason::CANCELEDBY_USER],
+            ['name' => CancelReason::CANCELEDBY_PERSON],
+            ['name' => CancelReason::CANCELEDBY_DONOTCOUNT],
+        ];
+
+        foreach ($arr as $a) {
+            print "Creating calendar cancel reason : " . $a['name'] . "\n";
+            $cancelReason= (new CancelReason())
+                ->setCanceledBy($a['name'])
+                ->setActive(true);
+            $manager->persist($cancelReason);
+            $reference = 'CancelReason_'.$a['name'];
+            $this->addReference($reference, $cancelReason);
+            static::$references[] = $reference;
+        }
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Chill\CalendarBundle\DataFixtures\ORM;
+
+use Chill\CalendarBundle\Entity\Invite;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Persistence\ObjectManager;
+
+
+class LoadInvite extends Fixture implements FixtureGroupInterface
+{
+    public function getOrder(): int
+    {
+        return 40002;
+    }
+
+    public static function getGroups(): array
+    {
+        return ['calendar'];
+    }
+
+    public static $references = [];
+
+    public function load(ObjectManager $manager): void
+    {
+        $arr = [
+            ['name' => ['fr' => 'Rendez-vous décliné']],
+            ['name' => ['fr' => 'Rendez-vous accepté']],
+        ];
+
+        foreach ($arr as $a) {
+            print "Creating calendar invite : " . $a['name']['fr'] . "\n";
+            $invite= (new Invite())
+                ->setStatus($a['name']);
+            $manager->persist($invite);
+            $reference = 'Invite_'.$a['name']['fr'];
+            $this->addReference($reference, $invite);
+            static::$references[] = $reference;
+        }
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php

@@ -0,0 +1,106 @@
+<?php
+
+namespace Chill\CalendarBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * This is the class that loads and manages your bundle configuration.
+ *
+ * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
+ */
+class ChillCalendarExtension extends Extension implements PrependExtensionInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $configuration = new Configuration();
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('services.yml');
+        $loader->load('services/controller.yml');
+        $loader->load('services/fixtures.yml');
+        $loader->load('services/form.yml');
+    }
+
+    public function prepend(ContainerBuilder $container)
+    {
+        $this->preprendRoutes($container);
+        $this->prependCruds($container);
+    }
+    
+    protected function preprendRoutes(ContainerBuilder $container)
+    {
+
+        $container->prependExtensionConfig('chill_main', [
+           'routing' => [
+              'resources' => [
+                 '@ChillCalendarBundle/Resources/config/routing.yml'
+              ]
+           ]
+        ]);
+    }
+    
+    /**
+     * @param ContainerBuilder $container
+     */
+    protected function prependCruds(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('chill_main', [
+            'apis' => [
+                [
+                    'controller' => \Chill\CalendarBundle\Controller\CalendarRangeAPIController::class,
+                    'class' => \Chill\CalendarBundle\Entity\CalendarRange::class,
+                    'name' => 'calendar_range',
+                    'base_path' => '/api/1.0/calendar/calendar-range',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_index' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true
+                            ],
+                        ],
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true
+                            ]
+                        ],
+                    ]
+                ],
+                [
+                    'controller' => \Chill\CalendarBundle\Controller\CalendarAPIController::class,
+                    'class' => \Chill\CalendarBundle\Entity\Calendar::class,
+                    'name' => 'calendar',
+                    'base_path' => '/api/1.0/calendar/calendar',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_index' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true
+                            ],
+                        ],
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true
+                            ]
+                        ],
+                    ]
+                ]
+            ]
+        ]);
+    }
+
+
+}

src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Chill\CalendarBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+/**
+ * This is the class that validates and merges configuration from your app/config files.
+ *
+ * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/configuration.html}
+ */
+class Configuration implements ConfigurationInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder('chill_calendar');
+        $rootNode = $treeBuilder->getRootNode('chill_calendar');
+
+        // Here you should define the parameters that are allowed to
+        // configure your bundle. See the documentation linked above for
+        // more information on that topic.
+
+        return $treeBuilder;
+    }
+}

src/Bundle/ChillCalendarBundle/Entity/Calendar.php

@@ -0,0 +1,405 @@
+<?php
+
+namespace Chill\CalendarBundle\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\CalendarBundle\Entity\CancelReason;
+use Chill\CalendarBundle\Entity\CalendarRange;
+use Chill\CalendarBundle\Entity\Invite;
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\CalendarBundle\Repository\CalendarRepository;
+use DateInterval;
+use DateTimeImmutable;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\Constraints\Range;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+/**
+ * @ORM\Table(name="chill_calendar.calendar")
+ * @ORM\Entity(repositoryClass=CalendarRepository::class)
+ */
+class Calendar
+{
+    const STATUS_VALID = 'valid';
+    const STATUS_CANCELED = 'canceled';
+    const STATUS_MOVED = 'moved';
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     * @Groups({"read"})
+     */
+    private User $user;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
+     */
+    private AccompanyingPeriod $accompanyingPeriod;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     * @Serializer\Groups({"calendar:read"})
+     */
+    private ?User $mainUser;
+
+    /**
+     *
+     * @ORM\ManyToMany(
+     *     targetEntity="Chill\PersonBundle\Entity\Person",
+     *     cascade={"persist", "remove", "merge", "detach"})
+     * @ORM\JoinTable(name="chill_calendar.calendar_to_persons")
+     * @Groups({"read"})
+     */
+    private Collection $persons;
+
+    /**
+     *
+     * @ORM\ManyToMany(
+     *     targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty",
+     *     cascade={"persist", "remove", "merge", "detach"})
+     * @ORM\JoinTable(name="chill_calendar.calendar_to_thirdparties")
+     * @Groups({"read"})
+     */
+    private Collection $professionals;
+
+    /**
+     *
+     * @ORM\ManyToMany(
+     *     targetEntity="Invite",
+     *     cascade={"persist", "remove", "merge", "detach"})
+     * @ORM\JoinTable(name="chill_calendar.calendar_to_invites")
+     * @Groups({"read"})
+     */
+    private Collection $invites;
+
+    /**
+     * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="comment_")
+     */
+    private CommentEmbeddable $comment;
+
+    /**
+     * @ORM\Column(type="datetimetz_immutable")
+     * @Serializer\Groups({"calendar:read"})
+     */
+    private \DateTimeImmutable $startDate;
+
+    /**
+     * @ORM\Column(type="datetimetz_immutable")
+     * @Serializer\Groups({"calendar:read"})
+     */
+    private \DateTimeImmutable $endDate;
+
+    //TODO Lieu
+
+    /**
+     * @ORM\Column(type="string", length=255)
+     */
+    private string $status;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="CancelReason")
+     */
+    private ?CancelReason $cancelReason = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="CalendarRange", inversedBy="calendars")
+     */
+    private ?CalendarRange $calendarRange = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\Activity")
+     */
+    private Activity $activity;
+
+    /**
+     * @ORM\Column(type="boolean", nullable=true)
+     */
+    private ?bool $sendSMS;
+
+    public function __construct()
+    {
+        $this->comment = new CommentEmbeddable();
+        $this->persons = new ArrayCollection();
+        $this->professionals = new ArrayCollection();
+        $this->invites = new ArrayCollection();
+    }
+
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getSendSMS(): ?bool
+    {
+        return $this->sendSMS;
+    }
+
+    public function setSendSMS(?bool $sendSMS): self
+    {
+        $this->sendSMS = $sendSMS;
+
+        return $this;
+    }
+
+    public function getComment(): CommentEmbeddable
+    {
+        return $this->comment;
+    }
+
+    public function setComment(CommentEmbeddable $comment): self
+    {
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    public function getStartDate(): ?\DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function setStartDate(\DateTimeImmutable $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+
+    public function getEndDate(): ?\DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function setEndDate(\DateTimeImmutable $endDate): self
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
+
+    public function getStatus(): ?string
+    {
+        return $this->status;
+    }
+
+    public function setStatus(string $status): self
+    {
+        $this->status = $status;
+
+        return $this;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function setUser(?User $user): self
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    public function getAccompanyingPeriod(): ?AccompanyingPeriod
+    {
+        return $this->accompanyingPeriod;
+    }
+
+    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
+    {
+        $this->accompanyingPeriod = $accompanyingPeriod;
+
+        return $this;
+    }
+
+    public function getMainUser(): ?User
+    {
+        return $this->mainUser;
+    }
+
+    public function setMainUser(?User $mainUser): self
+    {
+        $this->mainUser = $mainUser;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection|Person[]
+     */
+    public function getPersons(): Collection
+    {
+        return $this->persons;
+    }
+
+    public function addPerson(?Person $person): self
+    {
+        if (null !== $person) {
+            $this->persons[] = $person;
+        }
+
+        return $this;
+    }
+
+    public function removePerson(Person $person): self
+    {
+        $this->persons->removeElement($person);
+
+        return $this;
+    }
+
+    /**
+     * @return Collection|ThirdParty[]
+     */
+    public function getProfessionals(): Collection
+    {
+        return $this->professionals;
+    }
+
+    public function addProfessional(?ThirdParty $professional): self
+    {
+        if (null !== $professional) {
+            $this->professionals[] = $professional;
+        }
+
+        return $this;
+    }
+
+    public function removeProfessional(ThirdParty $professional): self
+    {
+        $this->professionals->removeElement($professional);
+
+        return $this;
+    }
+
+    /**
+     * @return Collection|Invite[]
+     */
+    public function getInvites(): Collection
+    {
+        return $this->invites;
+    }
+
+    public function addInvite(?Invite $invite): self
+    {
+        if (null !== $invite) {
+            $this->invites[] = $invite;
+        }
+
+        return $this;
+    }
+
+    public function removeInvite(Invite $invite): self
+    {
+        $this->invites->removeElement($invite);
+
+        return $this;
+    }
+
+    public function getCancelReason(): ?CancelReason
+    {
+        return $this->cancelReason;
+    }
+
+    public function setCancelReason(?CancelReason $cancelReason): self
+    {
+        $this->cancelReason = $cancelReason;
+
+        return $this;
+    }
+
+    public function getCalendarRange(): ?CalendarRange
+    {
+        return $this->calendarRange;
+    }
+
+    public function setCalendarRange(?CalendarRange $calendarRange): self
+    {
+        $this->calendarRange = $calendarRange;
+
+        return $this;
+    }
+
+    public function getActivity(): ?Activity
+    {
+        return $this->activity;
+    }
+
+    public function setActivity(?Activity $activity): self
+    {
+        $this->activity = $activity;
+
+        return $this;
+    }
+
+    public function getPersonsAssociated(): array 
+    {
+        if (null !== $this->accompanyingPeriod) {
+            $personsAssociated = [];
+            foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
+                if ($this->persons->contains($participation->getPerson())) {
+                    $personsAssociated[] = $participation->getPerson();
+                }
+            }
+            return $personsAssociated; 
+        }
+        return [];
+    }
+    
+    public function getPersonsNotAssociated(): array
+    {
+        if (null !== $this->accompanyingPeriod) {
+            $personsNotAssociated = [];
+            foreach ($this->persons as $person) {
+                if (!in_array($person, $this->getPersonsAssociated())) {
+                     $personsNotAssociated[] = $person;
+                }
+            }
+            return $personsNotAssociated;
+        }
+        return [];
+    }
+
+
+    public function getThirdParties(): Collection
+    {
+        return $this->getProfessionals();
+    }
+
+    public function getusers(): Collection
+    {
+        return $this->getInvites(); //TODO get users of the invite
+    }
+
+    public static function loadValidatorMetadata(ClassMetadata $metadata): void
+    {
+        $metadata->addPropertyConstraint('startDate', new NotBlank());
+        $metadata->addPropertyConstraint('startDate', new Range([
+            'min' => '2 years ago',
+            'max' => '+ 2 years',
+        ]));
+        $metadata->addPropertyConstraint('endDate', new NotBlank());
+        $metadata->addPropertyConstraint('endDate', new Range([
+            'min' => '2 years ago',
+            'max' => '+ 2 years',
+        ]));
+    }
+
+}

src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace Chill\CalendarBundle\Entity;
+
+use Chill\CalendarBundle\Repository\CalendarRangeRepository;
+use Chill\MainBundle\Entity\User;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Groups;
+
+/**
+ * @ORM\Table(name="chill_calendar.calendar_range")
+ * @ORM\Entity(repositoryClass=CalendarRangeRepository::class)
+ */
+class CalendarRange
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @groups({"read"})
+     */
+    private $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     * @Groups({"read"})
+     */
+    private User $user;
+
+    /**
+     * @ORM\Column(type="datetimetz_immutable")
+     * @groups({"read"})
+     */
+    private \DateTimeImmutable $startDate;
+
+    /**
+     * @ORM\Column(type="datetimetz_immutable")
+     * @groups({"read"})
+     */
+    private \DateTimeImmutable $endDate;
+
+    /**
+     * @ORM\OneToMany(targetEntity=Calendar::class,
+     *  mappedBy="calendarRange")
+     */
+    private Collection $calendars;
+
+    //TODO Lieu
+
+    public function __construct()
+    {
+        $this->calendars = new ArrayCollection();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getStartDate(): ?\DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function setStartDate(\DateTimeImmutable $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+
+    public function getEndDate(): ?\DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function setEndDate(\DateTimeImmutable $endDate): self
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function setUser(?User $user): self
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+
+}

src/Bundle/ChillCalendarBundle/Entity/CancelReason.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace Chill\CalendarBundle\Entity;
+
+use Chill\CalendarBundle\Repository\CancelReasonRepository;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Table(name="chill_calendar.cancel_reason")
+ * @ORM\Entity(repositoryClass=CancelReasonRepository::class)
+ */
+class CancelReason
+{
+
+    const CANCELEDBY_USER = 'CANCELEDBY_USER';
+    const CANCELEDBY_PERSON = 'CANCELEDBY_PERSON';
+    const CANCELEDBY_DONOTCOUNT = 'CANCELEDBY_DONOTCOUNT';
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private $id;
+
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private $active;
+
+    /**
+     * @ORM\Column(type="string", length=255)
+     */
+    private $canceledBy;
+
+    /**
+     * @ORM\Column(type="json_array")
+     */
+    private $name = [];
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getActive(): ?bool
+    {
+        return $this->active;
+    }
+
+    public function setActive(bool $active): self
+    {
+        $this->active = $active;
+
+        return $this;
+    }
+
+    public function getCanceledBy(): ?string
+    {
+        return $this->canceledBy;
+    }
+
+    public function setCanceledBy(string $canceledBy): self
+    {
+        $this->canceledBy = $canceledBy;
+
+        return $this;
+    }
+
+    public function getName(): ?array
+    {
+        return $this->name;
+    }
+
+    public function setName(array $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+}

src/Bundle/ChillCalendarBundle/Entity/Invite.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Chill\CalendarBundle\Entity;
+
+use Chill\CalendarBundle\Repository\InviteRepository;
+use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Table(name="chill_calendar.invite")
+ * @ORM\Entity(repositoryClass=InviteRepository::class)
+ */
+class Invite
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     */
+    private User $user;
+
+    /**
+     * @ORM\Column(type="json_array")
+     */
+    private array $status = [];
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getStatus(): ?array
+    {
+        return $this->status;
+    }
+
+    public function setStatus(array $status): self
+    {
+        $this->status = $status;
+
+        return $this;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function setUser(?User $user): self
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+}

src/Bundle/ChillCalendarBundle/Form/CalendarType.php

@@ -0,0 +1,228 @@
+<?php
+
+namespace Chill\CalendarBundle\Form;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Doctrine\Persistence\ObjectManager;
+use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+
+use Chill\MainBundle\Form\Type\CommentType;
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CalendarRange;
+use Chill\CalendarBundle\Entity\CancelReason;
+use Chill\CalendarBundle\Entity\Invite;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTimeImmutable;
+
+class CalendarType extends AbstractType
+{
+
+    protected TranslatableStringHelper $translatableStringHelper;
+    protected ObjectManager $om;
+
+    public function __construct(
+        TranslatableStringHelper $translatableStringHelper,
+        ObjectManager $om
+    )
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->om = $om;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('comment', CommentType::class, [
+                'required' => false
+            ])
+            // ->add('cancelReason', EntityType::class, [
+            //     'required' => false,
+            //     'class' => CancelReason::class,
+            //     'choice_label' => function (CancelReason $entity) {
+            //         return $entity->getCanceledBy();
+            //     },
+            // ])
+            ->add('sendSMS', ChoiceType::class, [
+                'required' => false,
+                'choices' => [
+                    'Oui' => true,
+                    'Non' => false
+                ],
+                'expanded' => true
+            ])
+            ;
+
+
+        $builder->add('mainUser', HiddenType::class);
+        $builder->get('mainUser')
+            ->addModelTransformer(new CallbackTransformer(
+                function (?User $user): int {
+                    if (NULL !== $user) {
+                        $res = $user->getId();
+                    } else {
+                        $res = -1; //TODO cannot be null in any ways...
+                    }
+                    return $res;
+                },
+                function (?int $userId): User {
+                    return $this->om->getRepository(user::class)->findOneBy(['id' => (int) $userId]);
+                }
+            ))
+        ;
+
+        $builder->add('startDate', HiddenType::class);
+        $builder->get('startDate')
+            ->addModelTransformer(new CallbackTransformer(
+                function (?DateTimeImmutable $dateTimeImmutable): string {
+                    if (NULL !== $dateTimeImmutable) {
+                        $res = date_format($dateTimeImmutable, 'Y-m-d H:i:s');
+                    } else {
+                        $res = '';
+                    }
+                    return $res;
+                },
+                function (?string $dateAsString): DateTimeImmutable {
+                    dump($dateAsString);
+                    return new DateTimeImmutable($dateAsString);
+                }
+            ))
+        ;
+
+        $builder->add('endDate', HiddenType::class);
+        $builder->get('endDate')
+            ->addModelTransformer(new CallbackTransformer(
+                function (?DateTimeImmutable $dateTimeImmutable): string {
+                    if (NULL !== $dateTimeImmutable) {
+                        $res = date_format($dateTimeImmutable, 'Y-m-d H:i:s');
+                    } else {
+                        $res = '';
+                    }
+                    return $res;
+                },
+                function (?string $dateAsString): DateTimeImmutable {
+                    return new DateTimeImmutable($dateAsString);
+                }
+            ))
+        ;
+
+        $builder->add('persons', HiddenType::class);
+        $builder->get('persons')
+            ->addModelTransformer(new CallbackTransformer(
+                function (iterable $personsAsIterable): string {
+                    $personIds = [];
+                    foreach ($personsAsIterable as $value) {
+                        $personIds[] = $value->getId();
+                    }
+                    return implode(',', $personIds);
+                },
+                function (?string $personsAsString): array {
+                    return array_map(
+                        fn(string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]),
+                        explode(',', $personsAsString)
+                    );
+                }
+            ))
+        ;
+
+        $builder->add('professionals', HiddenType::class);
+        $builder->get('professionals')
+            ->addModelTransformer(new CallbackTransformer(
+                function (iterable $thirdpartyAsIterable): string {
+                    $thirdpartyIds = [];
+                    foreach ($thirdpartyAsIterable as $value) {
+                        $thirdpartyIds[] = $value->getId();
+                    }
+                    return implode(',', $thirdpartyIds);
+                },
+                function (?string $thirdpartyAsString): array {
+                    return array_map(
+                        fn(string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]),
+                        explode(',', $thirdpartyAsString)
+                    );
+                }
+            ))
+        ;
+    
+        $builder->add('calendarRange', HiddenType::class);
+        $builder->get('calendarRange')
+            ->addModelTransformer(new CallbackTransformer(
+                function (?CalendarRange $calendarRange): ?int {
+                    if (NULL !== $calendarRange) {
+                        $res = $calendarRange->getId();
+                    } else {
+                        $res = -1;
+                    }
+                    return $res;
+                },
+                function (?string $calendarRangeId): ?CalendarRange {
+                    if (NULL !== $calendarRangeId) {
+                        $res = $this->om->getRepository(CalendarRange::class)->findOneBy(['id' => (int) $calendarRangeId]);
+                    } else {
+                        $res = NULL;
+                    }
+                    return $res;
+                }
+            ))
+        ;
+
+
+    //     $builder->add('invites', HiddenType::class);
+    //     $builder->get('invites')
+    //        ->addModelTransformer(new CallbackTransformer(
+    //            function (iterable $usersAsIterable): string {
+    //                $userIds = [];
+    //                foreach ($usersAsIterable as $value) {
+    //                    $userIds[] = $value->getId();
+    //                }
+    //                return implode(',', $userIds);
+    //            },
+    //            function (?string $usersAsString): array {
+    //                return array_map(
+    //                    fn(string $id): ?Invite => $this->om->getRepository(Invite::class)->findOneBy(['id' => (int) $id]),
+    //                    explode(',', $usersAsString)
+    //                );
+    //            }
+    //        ))
+    //    ;
+
+
+    }/**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => Calendar::class
+        ]);
+
+        $resolver
+            ->setRequired(['accompanyingPeriod'])
+            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null'])
+        ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBlockPrefix()
+    {
+        return 'chill_calendarbundle_calendar';
+    }
+
+
+}
+
+

src/Bundle/ChillCalendarBundle/LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.

src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Chill\CalendarBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
+{
+    protected TokenStorageInterface $tokenStorage;
+
+    protected AuthorizationHelper $authorizationHelper;
+
+    protected TranslatorInterface $translator;
+
+    public function __construct(
+        TokenStorageInterface $tokenStorage,
+        AuthorizationHelper $authorizationHelper,
+        TranslatorInterface $translator
+    ) {
+        $this->translator = $translator;
+        $this->authorizationHelper = $authorizationHelper;
+        $this->tokenStorage = $tokenStorage;
+    }
+    public static function getMenuIds(): array
+    {
+        return ['accompanyingCourse'];
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        $period = $parameters['accompanyingCourse'];
+
+        if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()) {
+            $menu->addChild($this->translator->trans('Calendar list'), [
+                'route' => 'chill_calendar_calendar',
+                'routeParameters' => [
+                    'accompanying_period_id' => $period->getId(),
+                ]])
+                ->setExtras(['order' => 41]);
+        }
+    }
+}

src/Bundle/ChillCalendarBundle/README.md

@@ -0,0 +1,6 @@
+Calendar bundle
+===============
+
+This bundle adds a calendar to chill.
+
+

src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Chill\CalendarBundle\Repository;
+
+use Chill\CalendarBundle\Entity\CalendarRange;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method CalendarRange|null find($id, $lockMode = null, $lockVersion = null)
+ * @method CalendarRange|null findOneBy(array $criteria, array $orderBy = null)
+ * @method CalendarRange[]    findAll()
+ * @method CalendarRange[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class CalendarRangeRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, CalendarRange::class);
+    }
+
+    // /**
+    //  * @return CalendarRange[] Returns an array of CalendarRange objects
+    //  */
+    /*
+    public function findByExampleField($value)
+    {
+        return $this->createQueryBuilder('c')
+            ->andWhere('c.exampleField = :val')
+            ->setParameter('val', $value)
+            ->orderBy('c.id', 'ASC')
+            ->setMaxResults(10)
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+    */
+
+    /*
+    public function findOneBySomeField($value): ?CalendarRange
+    {
+        return $this->createQueryBuilder('c')
+            ->andWhere('c.exampleField = :val')
+            ->setParameter('val', $value)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
+    */
+}

src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Chill\CalendarBundle\Repository;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method Calendar|null find($id, $lockMode = null, $lockVersion = null)
+ * @method Calendar|null findOneBy(array $criteria, array $orderBy = null)
+ * @method Calendar[]    findAll()
+ * @method Calendar[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class CalendarRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Calendar::class);
+    }
+
+    // /**
+    //  * @return Calendar[] Returns an array of Calendar objects
+    //  */
+    /*
+    public function findByExampleField($value)
+    {
+        return $this->createQueryBuilder('c')
+            ->andWhere('c.exampleField = :val')
+            ->setParameter('val', $value)
+            ->orderBy('c.id', 'ASC')
+            ->setMaxResults(10)
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+    */
+
+    /*
+    public function findOneBySomeField($value): ?Calendar
+    {
+        return $this->createQueryBuilder('c')
+            ->andWhere('c.exampleField = :val')
+            ->setParameter('val', $value)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
+    */
+}

src/Bundle/ChillCalendarBundle/Repository/CancelReasonRepository.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Chill\CalendarBundle\Repository;
+
+use Chill\CalendarBundle\Entity\CancelReason;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method CancelReason|null find($id, $lockMode = null, $lockVersion = null)
+ * @method CancelReason|null findOneBy(array $criteria, array $orderBy = null)
+ * @method CancelReason[]    findAll()
+ * @method CancelReason[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class CancelReasonRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, CancelReason::class);
+    }
+
+    // /**
+    //  * @return CancelReason[] Returns an array of CancelReason objects
+    //  */
+    /*
+    public function findByExampleField($value)
+    {
+        return $this->createQueryBuilder('c')
+            ->andWhere('c.exampleField = :val')
+            ->setParameter('val', $value)
+            ->orderBy('c.id', 'ASC')
+            ->setMaxResults(10)
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+    */
+
+    /*
+    public function findOneBySomeField($value): ?CancelReason
+    {
+        return $this->createQueryBuilder('c')
+            ->andWhere('c.exampleField = :val')
+            ->setParameter('val', $value)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
+    */
+}

src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Chill\CalendarBundle\Repository;
+
+use Chill\CalendarBundle\Entity\Invite;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method Invite|null find($id, $lockMode = null, $lockVersion = null)
+ * @method Invite|null findOneBy(array $criteria, array $orderBy = null)
+ * @method Invite[]    findAll()
+ * @method Invite[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class InviteRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Invite::class);
+    }
+
+    // /**
+    //  * @return Invite[] Returns an array of Invite objects
+    //  */
+    /*
+    public function findByExampleField($value)
+    {
+        return $this->createQueryBuilder('i')
+            ->andWhere('i.exampleField = :val')
+            ->setParameter('val', $value)
+            ->orderBy('i.id', 'ASC')
+            ->setMaxResults(10)
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+    */
+
+    /*
+    public function findOneBySomeField($value): ?Invite
+    {
+        return $this->createQueryBuilder('i')
+            ->andWhere('i.exampleField = :val')
+            ->setParameter('val', $value)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
+    */
+}

src/Bundle/ChillCalendarBundle/Resources/config/routing.yml

@@ -1,3 +1,3 @@
-chill_docgen_controllers:
+chill_calendar_controllers:
     resource: '../../Controller/'
     type: annotation

src/Bundle/ChillCalendarBundle/Resources/config/services.yml

@@ -0,0 +1,14 @@
+---
+services:
+
+    Chill\CalendarBundle\Repository\:
+        autowire: true
+        resource: '../../Repository/'
+        tags:
+            - { name: 'doctrine.repository_service' }
+
+    Chill\CalendarBundle\Menu\:
+        autowire: true
+        autoconfigure: true
+        resource: '../../Menu/'
+        tags: ['chill.menu_builder']

src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml

@@ -1,5 +1,5 @@
 services:
-    Chill\DocGeneratorBundle\Controller\:
+    Chill\CalendarBundle\Controller\:
         autowire: true
         resource: '../../../Controller'
         tags: ['controller.service_arguments']

src/Bundle/ChillCalendarBundle/Resources/config/services/fixtures.yml

@@ -0,0 +1,13 @@
+---
+services:
+  Chill\CalendarBundle\DataFixtures\ORM\LoadCancelReason:
+    tags:
+        - { 'name': doctrine.fixture.orm } 
+  Chill\CalendarBundle\DataFixtures\ORM\LoadInvite:
+    tags:
+        - { 'name': doctrine.fixture.orm } 
+  Chill\CalendarBundle\DataFixtures\ORM\LoadCalendarRange:
+    autowire: true
+    autoconfigure: true
+    tags:
+        - { 'name': doctrine.fixture.orm } 

src/Bundle/ChillCalendarBundle/Resources/config/services/form.yml

@@ -0,0 +1,10 @@
+---
+services:    
+    chill.calendar.form.type.calendar:
+        class: Chill\CalendarBundle\Form\CalendarType
+        arguments:
+            - "@chill.main.helper.translatable_string"
+            - "@doctrine.orm.entity_manager"
+
+        tags:
+            - { name: form.type, alias: chill_calendarbundle_calendar }

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

@@ -0,0 +1 @@
+require('./scss/calendar.scss');

src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar.scss

@@ -0,0 +1,10 @@
+div#calendarControls {
+    height: 50%;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+}
+
+div#fullCalendar{
+
+}

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue

@@ -0,0 +1,130 @@
+<template>
+  <concerned-groups></concerned-groups>
+  <teleport to="#calendarControls">
+    <calendar-user-selector 
+      v-bind:users="users"
+      v-bind:calendarEvents="calendarEvents" 
+      v-bind:updateEventsSource="updateEventsSource"
+      v-bind:showMyCalendar="showMyCalendar"
+      v-bind:toggleMyCalendar="toggleMyCalendar" >
+    </calendar-user-selector>
+  </teleport>
+  <teleport to="#fullCalendar">
+    <FullCalendar ref="fullCalendar" :options="calendarOptions">
+      <template v-slot:eventContent='arg'>
+        <b>{{ arg.timeText }}</b>
+      </template>
+    </FullCalendar>
+  </teleport>
+</template>
+
+<script>
+import ConcernedGroups from 'ChillActivityAssets/vuejs/Activity/components/ConcernedGroups.vue';
+import CalendarUserSelector from '../_components/CalendarUserSelector/CalendarUserSelector.vue';
+import '@fullcalendar/core/vdom' // solves problem with Vite
+import frLocale from '@fullcalendar/core/locales/fr';
+import FullCalendar from '@fullcalendar/vue3'
+import dayGridPlugin from '@fullcalendar/daygrid'
+import interactionPlugin from '@fullcalendar/interaction'
+import timeGridPlugin from '@fullcalendar/timegrid'
+import listPlugin from '@fullcalendar/list';
+
+const currentEvent = {
+   events: [{
+      title: 'my_event',
+      start: window.startDate,
+      end: window.endDate
+   }],
+   id: window.mainUser
+};
+
+export default {
+  name: "App",
+  components: {
+    ConcernedGroups,
+    CalendarUserSelector,
+    FullCalendar
+  },
+  data() {
+    return {
+      errorMsg: [],
+      users: {
+        loaded: [],
+        selected: [],
+        logged: null
+      },
+      calendarEvents: {
+         loaded: [],
+         selected: [],
+         user: [],
+         current: currentEvent
+      },
+      showMyCalendar: true,
+      calendarOptions: {
+        locale: frLocale,
+        plugins: [ dayGridPlugin, interactionPlugin, timeGridPlugin, listPlugin ],
+        initialView: 'timeGridWeek',
+        initialDate: window.startDate !== undefined ? window.startDate : new Date(),
+        eventSource: [],
+        selectable: true,
+        select: this.onDateSelect,
+        eventChange: this.onEventChange,
+        eventClick: this.onEventClick,
+      //   eventMouseEnter: this.onEventMouseEnter,
+      //   eventMouseLeave: this.onEventMouseLeave,
+        selectMirror: true,
+        editable: true,
+        headerToolbar: {
+          left: 'prev,next today',
+          center: 'title',
+          right: 'dayGridMonth,timeGridWeek,timeGridDay,listMonth,listWeek,listDay'
+        },
+      }
+    }
+  },
+  methods: {
+    init() {
+      console.log(window.startDate)
+      this.updateEventsSource()
+    },
+    toggleMyCalendar(value) {
+      this.showMyCalendar = value;
+    },
+    updateEventsSource() {
+      this.calendarOptions.eventSources = [];
+      this.calendarOptions.eventSources.push(...this.calendarEvents.selected);
+      console.log(this.calendarOptions.eventSources)
+      if (window.startDate !== undefined) {
+         this.calendarOptions.eventSources.push(currentEvent);
+      }
+      if (this.showMyCalendar) {
+          this.calendarOptions.eventSources.push(this.calendarEvents.user);
+      }
+      console.log(this.calendarOptions.eventSources)
+    },
+    onDateSelect(payload) {
+      Object.assign(payload, {users: this.users});
+      this.$store.dispatch('createEvent', payload);
+    },
+    onEventChange(payload) {
+      console.log(this.calendarOptions.eventSources)
+      this.$store.dispatch('updateEvent', payload);
+    },
+    onEventClick(payload) {
+      payload.event.setProp('backgroundColor','#3788d8');
+      payload.event.setProp('textColor','#ffffff');
+      //this.$store.dispatch('updateEvent', payload);
+    },
+    onEventMouseEnter(payload) {
+      payload.event.setProp('borderColor','#444444');
+    },
+    onEventMouseLeave(payload) {
+      payload.event.setProp('borderColor','#ffffff');
+    }
+  },
+  mounted() {
+    this.init();
+  }
+}
+</script>
+

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/i18n.js

@@ -0,0 +1,23 @@
+import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+import { calendarUserSelectorMessages } from '../_components/CalendarUserSelector/js/i18n';
+
+const appMessages = {
+   fr: {
+      choose_your_date: "Sélectionnez votre plage",
+      activity: {
+         add_persons: "Ajouter des personnes concernées",
+         bloc_persons: "Usagers",
+         bloc_persons_associated: "Usagers du parcours",
+         bloc_persons_not_associated: "Tiers non-pro.",
+         bloc_thirdparty: "Tiers professionnels",
+         bloc_users: "T(M)S",
+      }
+   }
+}
+
+Object.assign(appMessages.fr, personMessages.fr);
+Object.assign(appMessages.fr, calendarUserSelectorMessages.fr);
+
+export {
+   appMessages
+};

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/index.js

@@ -0,0 +1,16 @@
+import { createApp } from 'vue';
+import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
+import { appMessages } from './i18n'
+import store from './store'
+
+import App from './App.vue';
+
+const i18n = _createI18n(appMessages);
+
+const app = createApp({
+   template: `<app></app>`,
+})
+.use(store)
+.use(i18n)
+.component('app', App)
+.mount('#calendar');

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js

@@ -0,0 +1,136 @@
+import 'es6-promise/auto';
+import { createStore } from 'vuex';
+
+const debug = process.env.NODE_ENV !== 'production';
+
+const addIdToValue = (string, id) => {
+   let array = string ? string.split(',') : [];
+   array.push(id.toString());
+   let str = array.join();
+   return str;
+};
+
+const removeIdFromValue = (string, id) => {
+   let array = string.split(',');
+   array = array.filter(el => el !== id.toString());
+   let str = array.join();
+   return str;
+};
+
+/*
+* Assign missing keys for the ConcernedGroups component
+*/
+const mapEntity = (entity) => {
+   Object.assign(entity, {thirdParties: entity.professionals, users: entity.invites});
+   return entity;
+};
+
+const store = createStore({
+   strict: debug,
+   state: {
+     activity: mapEntity(window.entity),
+     currentEvent: null
+   },
+   mutations: {
+      
+      // ConcernedGroups
+      addPersonsInvolved(state, payload) {
+         //console.log('### mutation addPersonsInvolved', payload.result.type);
+         switch (payload.result.type) {
+            case 'person':
+               state.activity.persons.push(payload.result);
+               break;
+            case 'thirdparty':
+               state.activity.thirdParties.push(payload.result);
+               break;
+            case 'user':
+               state.activity.users.push(payload.result); 
+               break;
+         };
+      },
+      removePersonInvolved(state, payload) {
+         //console.log('### mutation removePersonInvolved', payload.type);
+         switch (payload.type) {
+            case 'person':
+               state.activity.persons = state.activity.persons.filter(person => person !== payload);
+               break;
+            case 'thirdparty':
+               state.activity.thirdParties = state.activity.thirdParties.filter(thirdparty => thirdparty !== payload);
+               break;
+            case 'user':
+               state.activity.users = state.activity.users.filter(user => user !== payload); 
+               break;
+         };
+      },
+      // Calendar
+      setEvents(state, payload) {
+         console.log(payload)
+         state.currentEvent = {start: payload.start, end: payload.end}
+      }
+   },
+   actions: {
+      addPersonsInvolved({ commit }, payload) {
+         console.log('### action addPersonsInvolved', payload.result.type);
+         switch (payload.result.type) {
+            case 'person':
+               let aPersons = document.getElementById("chill_calendarbundle_calendar_persons");
+               aPersons.value = addIdToValue(aPersons.value, payload.result.id);
+               break;
+            case 'thirdparty':
+               let aThirdParties = document.getElementById("chill_calendarbundle_calendar_professionals");
+               aThirdParties.value = addIdToValue(aThirdParties.value, payload.result.id);
+               break;
+            case 'user':
+               let aUsers = document.getElementById("chill_calendarbundle_calendar_invites");
+               aUsers.value = addIdToValue(aUsers.value, payload.result.id);
+               break;
+         };
+         commit('addPersonsInvolved', payload);
+      },
+      removePersonInvolved({ commit }, payload) {
+         //console.log('### action removePersonInvolved', payload);
+         switch (payload.type) {
+            case 'person':
+               let aPersons = document.getElementById("chill_calendarbundle_calendar_persons");
+               aPersons.value = removeIdFromValue(aPersons.value, payload.id);
+               break;
+            case 'thirdparty':
+               let aThirdParties = document.getElementById("chill_calendarbundle_calendar_professionals");
+               aThirdParties.value = removeIdFromValue(aThirdParties.value, payload.id);
+               break;
+            case 'user':
+               let aUsers = document.getElementById("chill_calendarbundle_calendar_invites");
+               aUsers.value = removeIdFromValue(aUsers.value, payload.id);
+               break;
+         };
+         commit('removePersonInvolved', payload);
+      },
+
+      // Calendar
+      createEvent({ commit }, payload) {
+         console.log('### action createEvent', payload);
+         let startDateInput = document.getElementById("chill_calendarbundle_calendar_startDate");
+         startDateInput.value = payload.startStr;
+         let endDateInput = document.getElementById("chill_calendarbundle_calendar_endDate");
+         endDateInput.value = payload.endStr;
+         let mainUserInput = document.getElementById("chill_calendarbundle_calendar_mainUser");
+         mainUserInput.value = payload.users.logged.id;
+         commit('setEvents', payload);
+      },
+      updateEvent({ commit }, payload) {
+         console.log('### action updateEvent', payload);
+         let startDateInput = document.getElementById("chill_calendarbundle_calendar_startDate");
+         startDateInput.value = payload.event.start.toISOString();
+         let endDateInput = document.getElementById("chill_calendarbundle_calendar_endDate");
+         endDateInput.value = payload.event.end.toISOString();
+         let calendarRangeInput = document.getElementById("chill_calendarbundle_calendar_calendarRange");
+         calendarRangeInput.value = Number(payload.event.extendedProps.calendarRangeId);
+         let mainUserInput = document.getElementById("chill_calendarbundle_calendar_mainUser");
+         mainUserInput.value = Number(payload.event.source.id);
+         commit('setEvents', payload);
+      },
+
+  }
+});
+
+export default store;

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue

@@ -0,0 +1,207 @@
+<template>
+  <div class="calendar__controls">
+     <h2 class="chill-red">{{ $t('choose_your_calendar_user') }}</h2>
+    <VueMultiselect
+        name="field"
+        id="calendarUserSelector"
+        v-model="value"
+        track-by="id"
+        label="value"
+        :custom-label="transName"
+        :placeholder="$t('select_user')"
+        :multiple="true"
+        :close-on-select="false"
+        :allow-empty="true"
+        :model-value="value"
+        @select="selectUsers"
+        @remove="unSelectUsers"
+        @close="coloriseSelectedValues"
+        :options="options">
+    </VueMultiselect>
+  </div>
+  <div class="form-check">
+    <input type="checkbox" id="myCalendar" class="form-check-input" v-model="showMyCalendarWidget" />
+    <label class="form-check-label" for="myCalendar">{{ $t('show_my_calendar') }}</label>
+  </div>
+</template>
+<script>
+
+import { fetchCalendarRanges, fetchCalendar } from './js/api'
+import VueMultiselect from 'vue-multiselect';
+import { whoami } from 'ChillPersonAssets/vuejs/AccompanyingCourse/api';
+
+const COLORS = [ /* from https://colorbrewer2.org/#type=qualitative&scheme=Set3&n=12 */
+  '#8dd3c7',
+  '#ffffb3',
+  '#bebada',
+  '#fb8072',
+  '#80b1d3',
+  '#fdb462',
+  '#b3de69',
+  '#fccde5',
+  '#d9d9d9',
+  '#bc80bd',
+  '#ccebc5',
+  '#ffed6f'
+];
+
+export default {
+  name: 'CalendarUserSelector',
+  components: { VueMultiselect },
+  props: ['users', 'updateEventsSource', 'calendarEvents', 'showMyCalendar', 'toggleMyCalendar'],
+  data() {
+    return {
+      errorMsg: [],
+      value: [],
+      options: []
+    }
+  },
+  computed: {
+      showMyCalendarWidget: {
+         set(value) {
+            this.toggleMyCalendar(value);
+            this.updateEventsSource();
+         },
+         get() {
+            return this.showMyCalendar;
+         }
+      }
+   },
+  methods: {
+    init() {
+      this.fetchData()
+    },
+    fetchData() {
+      fetchCalendarRanges().then(calendarRanges => new Promise((resolve, reject) => {
+          let results = calendarRanges.results;
+          
+          let users = [];
+
+          results.forEach(i => {
+            if (!(users.some(j => i.user.id === j.id))){
+              let ratio = Math.floor(users.length / COLORS.length);
+              let colorIndex = users.length - ratio * COLORS.length;
+              users.push({
+                id: i.user.id,
+                username: i.user.username,
+                color: COLORS[colorIndex]
+              })
+            }
+          });
+
+          let calendarEvents = [];
+          users.forEach(u => {
+            let arr = results.filter(i => i.user.id === u.id).map(i => 
+              ({
+                start: i.startDate.datetime,
+                end: i.endDate.datetime,
+                calendarRangeId: i.id
+                //display: 'background' // can be an option for the disponibility 
+              })
+            );
+            calendarEvents.push({
+              events: arr,
+              color: u.color,
+              textColor: '#444444',
+              id: u.id
+            })
+          })
+
+          this.users.loaded = users;
+          this.options = users;
+
+          console.log(users)
+          console.log(calendarEvents)
+          
+          this.calendarEvents.loaded = calendarEvents;
+          whoami().then(me => new Promise((resolve, reject) => {
+            this.users.logged = me;
+            let currentUser = users.find(u => u.id === me.id);
+            this.value = currentUser;
+            
+            fetchCalendar(currentUser.id).then(calendar => new Promise((resolve, reject) => {
+              let results = calendar.results;
+              let events = results.map(i => 
+                ({
+                  start: i.startDate.datetime,
+                  end: i.endDate.datetime,
+                })
+              );
+              let calendarEventsCurrentUser = {
+                  events: events,
+                  color: 'darkblue',
+                  id: 1000
+              };
+              this.calendarEvents.user = calendarEventsCurrentUser;
+
+              this.selectUsers(currentUser);
+
+              resolve();
+            }));
+
+            resolve();
+          }));
+
+          resolve();
+      }))
+      .catch((error) => {
+        this.errorMsg.push(error.message);
+      });
+    },
+    transName(value) {
+      return `${value.username}`;
+    },
+    coloriseSelectedValues() {
+      let tags = document.querySelectorAll('div.multiselect__tags-wrap')[0];
+
+      if (tags.hasChildNodes()) {
+        let children = tags.childNodes;
+        for (let i = 0; i < children.length; i++) {
+          let child = children[i];
+          if (child.nodeType === Node.ELEMENT_NODE) {
+            this.users.selected.forEach(u => {
+              if (child.hasChildNodes()) {
+                if (child.firstChild.innerText == u.username) {
+                  child.style.background = u.color;
+                    child.firstChild.style.color = '#444444';
+                  }
+                }
+              }
+            )
+          }
+        }
+      }
+    },
+    selectEvents() {
+      let selectedUsersId = this.users.selected.map(a => a.id);
+      this.calendarEvents.selected = this.calendarEvents.loaded.filter(a => selectedUsersId.includes(a.id));
+    },
+    selectUsers(value) {
+      this.users.selected.push(value);
+      this.coloriseSelectedValues();
+      this.selectEvents();
+      this.updateEventsSource();
+    },
+    unSelectUsers(value) {
+      this.users.selected = this.users.selected.filter(a => a.id != value.id);
+      this.selectEvents();
+      this.updateEventsSource();
+    }
+  },
+  mounted() {
+    this.init();
+  }
+}
+</script>
+
+<style src="vue-multiselect/dist/vue-multiselect.css"></style>
+
+<style lang="scss" scoped>
+  div.calendar__controls {
+    background-color: 'black';
+    height: 50%;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+  }
+</style>

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/api.js

@@ -0,0 +1,32 @@
+/*
+* Endpoint chill_api_single_calendar_range
+* method GET, get Calendar ranges
+* @returns {Promise} a promise containing all Calendar ranges objects
+*/
+const fetchCalendarRanges = () => {
+   const url = `/api/1.0/calendar/calendar-range-available.json`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
+};
+
+/*
+* Endpoint chill_api_single_calendar
+* method GET, get Calendar events, can be filtered by mainUser
+* @returns {Promise} a promise containing all Calendar objects
+*/
+const fetchCalendar = (mainUserId) => {
+   const url = `/api/1.0/calendar/calendar.json?main_user=${mainUserId}&item_per_page=1000`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
+};
+
+export {
+   fetchCalendarRanges,
+   fetchCalendar
+};

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/i18n.js

@@ -0,0 +1,12 @@
+const calendarUserSelectorMessages = {
+    fr: {
+      choose_your_calendar_user: "Afficher les plages de disponibilités",
+      select_user: "Sélectionnez des calendriers",
+      show_my_calendar: "Afficher mon calendrier"
+    }
+ };
+ 
+ export {
+   calendarUserSelectorMessages
+ };
+ 

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteAccompanyingCourse.html.twig

@@ -0,0 +1,16 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_calendar' %}
+
+{% block title  'Remove calendar item'|trans %}
+
+{% block content %}
+    {{ include('@ChillMain/Util/confirmation_template.html.twig',
+        {
+            'title'             : 'Remove calendar item'|trans,
+            'confirm_question'  : 'Are you sure you want to remove the calendar item?'|trans,
+            'cancel_route'      : 'chill_calendar_calendar',
+            'cancel_parameters' : { 'accompanying_course_id' : accompanyingCourse.id, 'id' : calendar.id },
+            'form'              : delete_form
+        } ) }}
+{% endblock %}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deletePerson.html.twig

@@ -0,0 +1,17 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_activity_activity_list' %}
+{% set person = activity.person %}
+
+{% block title  'Remove activity'|trans %}
+
+{% block personcontent %}
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
+    {
+        'title'             : 'Remove activity'|trans,
+        'confirm_question'  : 'Are you sure you want to remove the activity about "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname } ),
+        'cancel_route'      : 'chill_activity_activity_list',
+        'cancel_parameters' : { 'person_id' : activity.person.id, 'id' : activity.id },
+        'form'              : delete_form
+    } ) }}
+{% endblock %}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig

@@ -0,0 +1,73 @@
+<h1>{{ "Update calendar"|trans }}</h1>
+
+{{ form_start(form) }}
+{{ form_errors(form) }}
+
+{%- if form.mainUser is defined -%}
+    {{ form_row(form.mainUser) }}
+{% endif %}
+
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+
+{%- if form.persons is defined -%}
+    {{ form_widget(form.persons) }}
+{% endif %}
+{%- if form.professionals is defined -%}
+    {{ form_widget(form.professionals) }}
+{% endif %}
+{%- if form.nonProfessionals is defined -%}
+    {{ form_widget(form.nonProfessionals) }}
+{% endif %}
+{%- if form.users is defined -%}
+    {{ form_widget(form.users) }}
+{% endif %}
+
+<div id="add-persons"></div>
+
+<h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>
+
+{%- if form.startDate is defined -%}
+    {{ form_row(form.startDate) }}
+{% endif %}
+
+{%- if form.endDate is defined -%}
+    {{ form_row(form.endDate) }}
+{% endif %}
+
+{%- if form.calendarRange is defined -%}
+    {{ form_row(form.calendarRange) }}
+{% endif %}
+
+.. location
+
+{%- if form.comment is defined -%}
+    {{ form_row(form.comment) }}
+{% endif %}
+
+{%- if form.sendSMS is defined -%}
+    {{ form_row(form.sendSMS) }}
+{% endif %}
+
+<div id="fullCalendar"></div>
+
+<ul class="record_actions sticky-form-buttons">
+  <li class="cancel">
+    <a 
+      class="btn btn-cancel"
+      {%- if context == 'person' -%} 
+      href="{{ chill_return_path_or('chill_calendar_calendar', { 'person_id': person.id } )}}"
+      {%- else -%}
+      href="{{ chill_return_path_or('chill_calendar_calendar', { 'accompanying_period_id': accompanyingCourse.id } )}}"
+      {%- endif -%}
+      >
+      {{ 'Cancel'|trans|chill_return_path_label }}
+    </a>
+  </li>
+  <li>
+    <button class="btn btn-create" type="submit">
+      {{ 'Update'|trans }}
+    </button>
+  </li>
+</ul>
+{{ form_end(form) }}
+

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editAccompanyingCourse.html.twig

@@ -0,0 +1,42 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
+
+{% block title  'Update calendar'|trans %}
+
+{% block content %}
+<div class="calendar-edit">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+            
+            <div id="calendar"></div> {# <=== vue component #}
+            {% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'accompanyingCourse'} %}
+            
+        </div>
+    </div>
+</div>
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    <script type="text/javascript">
+        window.addEventListener('DOMContentLoaded', function (e) {
+            chill.displayAlertWhenLeavingModifiedForm('form[name="{{ form.vars.form.vars.name }}"]', 
+            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        });
+        window.entity = {{ entity_json|json_encode|raw }};
+        window.startDate = {{ entity.startDate|date('Y-m-d H:i:s')|json_encode|raw }};
+        window.endDate = {{ entity.endDate|date('Y-m-d H:i:s')|json_encode|raw }};
+        window.mainUser = {{ entity.mainUser.id }};
+    </script>
+    {{ encore_entry_script_tags('vue_calendar') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('vue_calendar') }}
+{% endblock %}
+
+{% block block_post_menu %}
+    <div id="calendarControls"></div>
+{% endblock %}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig

@@ -0,0 +1,145 @@
+{% set user_id = null %}
+{% if user %}
+    {% set user_id = user.id %}
+{% endif %}
+
+{% set accompanying_course_id = null %}
+{% if accompanyingCourse %}
+    {% set accompanying_course_id = accompanyingCourse.id %}
+{% endif %}
+
+<h2>{{ 'Calendar list' |trans }}</h2>
+
+{% if calendarItems|length == 0 %}
+    <p class="chill-no-data-statement">
+        {{ "There is no calendar items."|trans }}
+        <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create button-small"></a>
+    </p>
+{% else %}
+
+<div class="flex-table list-records context-{{ context }}">
+
+    {% for calendar in calendarItems %}
+
+        <div class="item-bloc">
+            <div class="item-row main">
+                <div class="item-col">
+
+
+                    {% if calendar.startDate and calendar.endDate %}
+                        {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
+                            <h3>{{ "From the day"|trans }} {{ calendar.startDate|format_datetime('medium', 'short') }} </h3>
+                            <h3>{{ "to the day"|trans }} {{ calendar.endDate|format_datetime('medium', 'short') }}</h3>
+                        {% else %}
+                            <h3>{{ calendar.startDate|format_date('full') }} </h3>
+                            <h3>{{ calendar.startDate|format_datetime('none', 'short', locale='fr') }} - {{ calendar.endDate|format_datetime('none', 'short', locale='fr') }}</h3>
+
+                            <div class="duration">
+                                <p>
+                                    <i class="fa fa-fw fa-hourglass-end"></i>
+                                    {{ calendar.endDate.diff(calendar.startDate)|date("%H:%M")}}
+                                </p>
+                            </div>
+                        {% endif %}
+
+                    {% endif %}
+
+                    {% if context == 'user' and calendar.accompanyingPeriod is not empty %}
+                      <div class="accompanyingPeriodLink" style="margin-top: 1rem">
+                        <a 
+                           href="{{ chill_path_add_return_path(
+                            "chill_user_accompanying_course_index",
+                            { 'accompanying_period_id': calendar.accompanyingPeriod.id }
+                            ) }}"
+                           >
+                          <i class="fa fa-random"></i>
+                          {{ calendar.accompanyingPeriod.id }}
+                        </a>
+                      </div>
+                    {% endif %}
+                    
+                </div>
+                <div class="item-col">
+                    <ul class="list-content">
+                        {% if calendar.user %}
+                        <li>
+                            <b>{{ 'by'|trans }}{{ calendar.user.usernameCanonical }}</b>
+                        </li>
+                        {% endif %}
+                        
+                        {% if calendar.mainUser is not empty %}
+                        <li>
+                            <b>{{ 'main user concerned'|trans }}: {{ calendar.mainUser.usernameCanonical }}</b>
+                        </li>
+                        {% endif %}
+
+                 
+                        <li>
+                            {%- if calendar.comment.isEmpty -%}
+                                <span class="chill-no-data-statement">{{ 'No comments'|trans }}</span>
+                            {%- else -%}
+                                {{ calendar.comment|chill_entity_render_box }}
+                            {%- endif -%}
+                        </li>
+                        
+                        
+                    </ul>
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ path('chill_calendar_calendar_show', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
+                        </li>
+                        {# TOOD
+                        {% if is_granted('CHILL_ACTIVITY_UPDATE', calendar) %}
+                        #}
+                        <li>
+                            <a href="{{ path('chill_calendar_calendar_edit', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
+                        </li>
+                        {# TOOD
+                        {% endif %}
+                        {% if is_granted('CHILL_ACTIVITY_DELETE', calendar) %}
+                        #}
+                        <li>
+                            <a href="{{ path('chill_calendar_calendar_delete', { 'id': calendar.id, 'user_id' : user_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
+                        </li>
+                        {#
+                        {% endif %}
+                        #}
+                    </ul>
+                </div>
+            </div>
+            
+            {%  
+                if calendar.comment.comment is not empty
+                or calendar.users|length > 0
+                or calendar.thirdParties|length > 0
+                or calendar.users|length > 0 
+            %}
+            <div class="item-row details">
+                <div class="item-col">
+
+                    {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': calendar } %}
+                </div>
+                
+                {% if calendar.comment.comment is not empty %}
+                <div class="item-col comment">
+                    {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
+                </div>
+                {% endif %}
+            </div>
+            {% endif %}
+            
+        </div>
+    {% endfor %}
+</div>
+{% endif %}
+
+{% if context != 'user' %}
+{# TODO set this condition in configuration #}
+  <ul class="record_actions">
+      <li>
+          <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
+              {{ 'Add a new calendar' | trans }}
+          </a>
+      </li>
+  </ul>
+{% endif %}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig

@@ -0,0 +1,9 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
+
+{% block title %}{{ 'Calendar list' |trans }}{% endblock title %}
+
+{% block content %}
+    {% include 'ChillCalendarBundle:Calendar:list.html.twig' with {'context': 'accompanyingCourse'} %}
+{% endblock %}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig

@@ -0,0 +1,68 @@
+<h1>{{ "Calendar item creation"|trans }}</h1>
+
+{{ form_start(form) }}
+{{ form_errors(form) }}
+
+{%- if form.mainUser is defined -%}
+    {{ form_row(form.mainUser) }}
+{% endif %}
+
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+
+{%- if form.persons is defined -%}
+    {{ form_widget(form.persons) }}
+{% endif %}
+{%- if form.professionals is defined -%}
+    {{ form_widget(form.professionals) }}
+{% endif %}
+{%- if form.nonProfessionals is defined -%}
+    {{ form_widget(form.nonProfessionals) }}
+{% endif %}
+{%- if form.users is defined -%}
+    {{ form_widget(form.users) }}
+{% endif %}
+
+<div id="add-persons"></div>
+
+<h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>
+
+{%- if form.startDate is defined -%}
+    {{ form_row(form.startDate) }}
+{% endif %}
+
+{%- if form.endDate is defined -%}
+    {{ form_row(form.endDate) }}
+{% endif %}
+
+.. location
+
+{%- if form.comment is defined -%}
+    {{ form_row(form.comment) }}
+{% endif %}
+
+{%- if form.sendSMS is defined -%}
+    {{ form_row(form.sendSMS) }}
+{% endif %}
+
+<div id="fullCalendar"></div>
+
+<ul class="record_actions sticky-form-buttons">
+  <li class="cancel">
+    <a 
+      class="btn btn-cancel"
+      {%- if context == 'person' -%} 
+      href="{{ chill_return_path_or('chill_calendar_calendar', { 'person_id': person.id } )}}"
+      {%- else -%}
+      href="{{ chill_return_path_or('chill_calendar_calendar', { 'accompanying_period_id': accompanyingCourse.id } )}}"
+      {%- endif -%}
+      >
+      {{ 'Cancel'|trans|chill_return_path_label }}
+    </a>
+  </li>
+  <li>
+    <button class="btn btn-create" type="submit">
+      {{ 'Create'|trans }}
+    </button>
+  </li>
+</ul>
+{{ form_end(form) }}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newAccompanyingCourse.html.twig

@@ -0,0 +1,39 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_calendar_calendar_new' %}
+
+{% block title 'Calendar item creation' |trans %}
+
+{% block content %}
+<div class="calendar-new">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+            
+            <div id="calendar"></div> {# <=== vue component #}
+            {% include 'ChillCalendarBundle:Calendar:new.html.twig' with {'context': 'accompanyingCourse'} %}
+            
+        </div>
+    </div>
+</div>            
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    <script type="text/javascript">
+        window.addEventListener('DOMContentLoaded', function (e) {
+            chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', 
+            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        });
+        window.entity = {{ entity_json|json_encode|raw }}; 
+    </script>
+    {{ encore_entry_script_tags('vue_calendar') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    <link rel="stylesheet" href="{{ asset('build/vue_calendar.css') }}"/>
+{% endblock %}
+
+{% block block_post_menu %}
+    <div id="calendarControls"></div>
+{% endblock %}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig

@@ -0,0 +1,86 @@
+<h1>{{ "Calendar"|trans }}</h1>
+
+<dl class="chill_view_data">
+    <dt class="inline">{{ 'main user concerned'|trans }}</dt>
+    <dd>{{ entity.mainUser }}</dd>
+</dl>
+
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc' } %}
+
+
+<h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>
+
+    {% if entity.endDate.diff(entity.startDate).days >= 1 %}
+        <dt>{{ "From the day"|trans }} {{ entity.startDate|format_datetime('medium', 'short') }}
+        {{ "to the day"|trans }} {{ entity.endDate|format_datetime('medium', 'short') }}
+        </dt>
+        <dd></dd>
+    {% else %}
+        <dt>
+        {{ entity.startDate|format_date('full') }},
+        {{ entity.startDate|format_datetime('none', 'short', locale='fr') }} - {{ entity.endDate|format_datetime('none', 'short', locale='fr') }}
+        </dt>
+        <dd></dd>
+    {% endif %}
+
+    <dt class="inline">{{ 'cancel reason'|trans }}</dt>
+    <dd>
+    {% if entity.cancelReason is not null %}
+    {{ entity.cancelReason.canceledBy|localize_translatable_string }}
+    {% else %}
+    <span class="chill-no-data-statement">{{ 'Unknown'|trans }}</span>
+    {% endif %}
+    </dd>
+
+    <dt class="inline">{{ 'status'|trans }}</dt>
+    <dd>{{ entity.status }}</dd>
+
+    {% if not entity.comment.isEmpty %}
+    <dt class="inline">{{ 'calendar comment'|trans }}</dt>
+    <dd>{{ entity.comment|chill_entity_render_box }}</dd>
+    {% endif %}
+
+    <dt class="inline">{{ 'sendSMS'|trans }}</dt>
+    <dd>
+    {% if entity.sendSMS is not null %}
+        {% if entity.sendSMS %}{{ 'Yes'|trans }}{% else %}{{ 'No'|trans }}{% endif %}
+    {% else %}
+        <span class="chill-no-data-statement">{{ 'Unknown'|trans }}</span>
+    {% endif %}
+    </dd>
+
+
+</dl>
+
+{% set accompanying_course_id = null %}
+{% if accompanyingCourse %}
+    {% set accompanying_course_id = accompanyingCourse.id %}
+{% endif %}
+
+<ul class="record_actions sticky-form-buttons">
+    <li class="cancel">
+        <a class="btn btn-cancel" href="{{ path('chill_calendar_calendar', { 'accompanying_period_id': accompanying_course_id } ) }}">
+            {{ 'Back to the list'|trans }}
+        </a>
+    </li>
+    <li>
+        <a class="btn btn-update" href="{{ path('chill_calendar_calendar_edit', { 'id': entity.id, 'accompanying_period_id': accompanying_course_id }) }}">
+            {{ 'Edit'|trans }}
+        </a>
+    </li>
+    
+    {# TODO
+    {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
+    #}
+    
+    <li>
+        <a href="{{ path('chill_calendar_calendar_delete', { 'id': entity.id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
+            {{ 'Delete'|trans }}
+        </a>
+    </li>
+    
+    {#
+    {% endif %}
+    #}
+</ul>

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showAccompanyingCourse.html.twig

@@ -0,0 +1,15 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
+
+{% block title 'Calendar'|trans %}
+
+{% block content -%}
+<div class="calendar-show">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">           
+            {% include 'ChillCalendarBundle:Calendar:show.html.twig' with {'context': 'accompanyingCourse'} %}
+        </div>
+    </div>
+</div> 
+{% endblock content %}

src/Bundle/ChillCalendarBundle/chill.webpack.config.js

@@ -0,0 +1,10 @@
+// this file loads all assets from the Chill calendar bundle
+module.exports = function(encore, entries) {
+    entries.push(__dirname + '/Resources/public/chill/index.js');
+    
+    encore.addAliases({
+        ChillCalendarAssets: __dirname + '/Resources/public'
+    });
+
+    encore.addEntry('vue_calendar', __dirname + '/Resources/public/vuejs/Calendar/index.js');
+};

src/Bundle/ChillCalendarBundle/composer.json

@@ -0,0 +1,30 @@
+{
+    "name": "chill-project/calendar",
+    "description": "This bundle extends chill for managing a calendar",
+    "type": "symfony-bundle",
+    "license": "AGPL-3.0-or-later",
+    "keywords" : ["chill", "social work"],
+    "homepage" : "hhttps://gitlab.com/Chill-Projet/chill-bundles/",
+    "autoload": {
+        "psr-4": { "Chill\\CalendarBundle\\": "" }
+    },
+    "autoload-dev": {
+        "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
+    },
+    "authors": [
+        {
+            "name": "Champs-Libres",
+            "email": "info@champs-libres.coop"
+        }
+    ],
+    "require": {
+    },
+    "require-dev": {
+    },
+    "extra": {
+        "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
+        "symfony-app-dir": "Test/Fixtures/App/app/"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}

src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php

@@ -0,0 +1,99 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Calendar;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Create the schema chill_calendar and several calendar entities
+ */
+final class Version20210715141731 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create the schema chill_calendar and several calendar entities';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SCHEMA chill_calendar');
+        $this->addSql('CREATE SEQUENCE chill_calendar.calendar_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE chill_calendar.calendar_range_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE chill_calendar.cancel_reason_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE chill_calendar.invite_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_calendar.calendar (id INT NOT NULL, user_id INT DEFAULT NULL, activity_id INT DEFAULT NULL, startDate DATE NOT NULL, endDate DATE NOT NULL, status VARCHAR(255) NOT NULL, sendSMS BOOLEAN DEFAULT NULL, comment_comment TEXT DEFAULT NULL, comment_userId INT DEFAULT NULL, comment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, accompanyingPeriod_id INT DEFAULT NULL, mainUser_id INT DEFAULT NULL, cancelReason_id INT DEFAULT NULL, calendarRange_id INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_712315ACA76ED395 ON chill_calendar.calendar (user_id)');
+        $this->addSql('CREATE INDEX IDX_712315ACD7FA8EF0 ON chill_calendar.calendar (accompanyingPeriod_id)');
+        $this->addSql('CREATE INDEX IDX_712315ACEFCB59C ON chill_calendar.calendar (mainUser_id)');
+        $this->addSql('CREATE INDEX IDX_712315ACE980772F ON chill_calendar.calendar (cancelReason_id)');
+        $this->addSql('CREATE INDEX IDX_712315ACC5CB285D ON chill_calendar.calendar (calendarRange_id)');
+        $this->addSql('CREATE INDEX IDX_712315AC81C06096 ON chill_calendar.calendar (activity_id)');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startDate IS \'(DC2Type:date_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.endDate IS \'(DC2Type:date_immutable)\'');
+        $this->addSql('CREATE TABLE chill_calendar.calendar_to_persons (calendar_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(calendar_id, person_id))');
+        $this->addSql('CREATE INDEX IDX_AEE94715A40A2C8 ON chill_calendar.calendar_to_persons (calendar_id)');
+        $this->addSql('CREATE INDEX IDX_AEE94715217BBB47 ON chill_calendar.calendar_to_persons (person_id)');
+        $this->addSql('CREATE TABLE chill_calendar.calendar_to_non_professionals (calendar_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(calendar_id, person_id))');
+        $this->addSql('CREATE INDEX IDX_FADF2C77A40A2C8 ON chill_calendar.calendar_to_non_professionals (calendar_id)');
+        $this->addSql('CREATE INDEX IDX_FADF2C77217BBB47 ON chill_calendar.calendar_to_non_professionals (person_id)');
+        $this->addSql('CREATE TABLE chill_calendar.calendar_to_thirdparties (calendar_id INT NOT NULL, thirdparty_id INT NOT NULL, PRIMARY KEY(calendar_id, thirdparty_id))');
+        $this->addSql('CREATE INDEX IDX_2BAB7EFDA40A2C8 ON chill_calendar.calendar_to_thirdparties (calendar_id)');
+        $this->addSql('CREATE INDEX IDX_2BAB7EFDC7D3A8E6 ON chill_calendar.calendar_to_thirdparties (thirdparty_id)');
+        $this->addSql('CREATE TABLE chill_calendar.calendar_to_invites (calendar_id INT NOT NULL, invite_id INT NOT NULL, PRIMARY KEY(calendar_id, invite_id))');
+        $this->addSql('CREATE INDEX IDX_FCBEAAAA40A2C8 ON chill_calendar.calendar_to_invites (calendar_id)');
+        $this->addSql('CREATE INDEX IDX_FCBEAAAEA417747 ON chill_calendar.calendar_to_invites (invite_id)');
+        $this->addSql('CREATE TABLE chill_calendar.calendar_range (id INT NOT NULL, user_id INT DEFAULT NULL, startDate DATE NOT NULL, endDate DATE NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_38D57D05A76ED395 ON chill_calendar.calendar_range (user_id)');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startDate IS \'(DC2Type:date_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.endDate IS \'(DC2Type:date_immutable)\'');
+        $this->addSql('CREATE TABLE chill_calendar.cancel_reason (id INT NOT NULL, active BOOLEAN NOT NULL, canceledBy JSON NOT NULL, name JSON NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.name IS \'(DC2Type:json_array)\'');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledBy IS \'(DC2Type:json_array)\'');
+        $this->addSql('CREATE TABLE chill_calendar.invite (id INT NOT NULL, user_id INT DEFAULT NULL, status JSON NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.invite.status IS \'(DC2Type:json_array)\'');
+        $this->addSql('CREATE INDEX IDX_F517FFA7A76ED395 ON chill_calendar.invite (user_id)');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACD7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACEFCB59C FOREIGN KEY (mainUser_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACE980772F FOREIGN KEY (cancelReason_id) REFERENCES chill_calendar.cancel_reason (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACC5CB285D FOREIGN KEY (calendarRange_id) REFERENCES chill_calendar.calendar_range (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315AC81C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_persons ADD CONSTRAINT FK_AEE94715A40A2C8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_persons ADD CONSTRAINT FK_AEE94715217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT FK_FADF2C77A40A2C8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT FK_FADF2C77217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_thirdparties ADD CONSTRAINT FK_2BAB7EFDA40A2C8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_thirdparties ADD CONSTRAINT FK_2BAB7EFDC7D3A8E6 FOREIGN KEY (thirdparty_id) REFERENCES chill_3party.third_party (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites ADD CONSTRAINT FK_FCBEAAAA40A2C8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites ADD CONSTRAINT FK_FCBEAAAEA417747 FOREIGN KEY (invite_id) REFERENCES chill_calendar.invite (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_range ADD CONSTRAINT FK_38D57D05A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.invite ADD CONSTRAINT FK_F517FFA7A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function down(Schema $schema): void
+    {        
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_persons DROP CONSTRAINT FK_AEE94715A40A2C8');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals DROP CONSTRAINT FK_FADF2C77A40A2C8');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_thirdparties DROP CONSTRAINT FK_2BAB7EFDA40A2C8');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites DROP CONSTRAINT FK_FCBEAAAA40A2C8');
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP CONSTRAINT FK_712315ACC5CB285D');
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP CONSTRAINT FK_712315ACE980772F');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites DROP CONSTRAINT FK_FCBEAAAEA417747');
+        $this->addSql('DROP SEQUENCE chill_calendar.calendar_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_calendar.calendar_range_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_calendar.cancel_reason_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_calendar.invite_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_calendar.calendar');
+        $this->addSql('DROP TABLE chill_calendar.calendar_to_persons');
+        $this->addSql('DROP TABLE chill_calendar.calendar_to_non_professionals');
+        $this->addSql('DROP TABLE chill_calendar.calendar_to_thirdparties');
+        $this->addSql('DROP TABLE chill_calendar.calendar_to_invites');
+        $this->addSql('DROP TABLE chill_calendar.calendar_range');
+        $this->addSql('DROP TABLE chill_calendar.cancel_reason');
+        $this->addSql('DROP TABLE chill_calendar.invite');
+        $this->addSql('DROP SCHEMA chill_calendar');
+    }
+}

src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Calendar;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Adapt calendar entities
+ */
+final class Version20210723074557 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Adapt calendar entities';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('DROP TABLE chill_calendar.calendar_to_non_professionals');
+        $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledby TYPE VARCHAR(255)');
+        $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledby DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledBy IS NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE chill_calendar.calendar_to_non_professionals (calendar_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(calendar_id, person_id))');
+        $this->addSql('CREATE INDEX idx_fadf2c77217bbb47 ON chill_calendar.calendar_to_non_professionals (person_id)');
+        $this->addSql('CREATE INDEX idx_fadf2c77a40a2c8 ON chill_calendar.calendar_to_non_professionals (calendar_id)');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT fk_fadf2c77a40a2c8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT fk_fadf2c77217bbb47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledBy TYPE JSON');
+        $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledBy DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledby IS \'(DC2Type:json_array)\'');
+    }
+}

src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Calendar;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Alter startDate and endDate to datetimetz_immutable
+ */
+final class Version20210723142003 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Alter startDate and endDate to datetimetz_immutable';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startdate TYPE TIMESTAMP(0) WITH TIME ZONE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startdate DROP DEFAULT');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER enddate TYPE TIMESTAMP(0) WITH TIME ZONE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER enddate DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startDate IS \'(DC2Type:datetimetz_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.endDate IS \'(DC2Type:datetimetz_immutable)\'');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startDate TYPE DATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startDate DROP DEFAULT');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER endDate TYPE DATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER endDate DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startdate IS \'(DC2Type:date_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.enddate IS \'(DC2Type:date_immutable)\'');
+    }
+}

src/Bundle/ChillCalendarBundle/migrations/Version20210723142842.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Calendar;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Alter startDate and endDate to datetimetz_immutable on calendarRange
+ */
+final class Version20210723142842 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Alter startDate and endDate to datetimetz_immutable on calendarRange';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startdate TYPE TIMESTAMP(0) WITH TIME ZONE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startdate DROP DEFAULT');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER enddate TYPE TIMESTAMP(0) WITH TIME ZONE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER enddate DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startDate IS \'(DC2Type:datetimetz_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.endDate IS \'(DC2Type:datetimetz_immutable)\'');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startDate TYPE DATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startDate DROP DEFAULT');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER endDate TYPE DATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER endDate DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startdate IS \'(DC2Type:date_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.enddate IS \'(DC2Type:date_immutable)\'');
+    }
+}

src/Bundle/ChillCalendarBundle/translations/messages.fr.yml

@@ -0,0 +1,24 @@
+Calendar: Rendez-vous
+Calendar list: Liste des rendez-vous
+There is no calendar items.: Il n'y a pas de rendez-vous
+Remove calendar item: Supprimer le rendez-vous
+Are you sure you want to remove the calendar item?: Êtes-vous sûr de vouloir supprimer le rendez-vous?
+Concerned groups: Parties concernées
+Calendar data: Données du rendez-vous
+Update calendar: Modifier le rendez-vous
+main user concerned: Utilisateur concerné
+Main user: Utilisateur principal
+Calendar item creation: Création du rendez-vous
+start date: début du rendez-vous
+end date: fin du rendez-vous
+cancel reason: motif d'annulation
+status: Statut du rendez-vous
+calendar comment: Remarque sur le rendez-vous
+sendSMS: Envoi d'un SMS
+Send s m s: Envoi d'un SMS ? 
+Cancel reason: Motif d'annulation
+Add a new calendar: Ajouter un nouveau rendez-vous
+"Success : calendar item updated!": "Rendez-vous mis à jour"
+The calendar item has been successfully removed.: Le rendez-vous a été supprimé
+From the day: Du
+to the day: au

src/Bundle/ChillDocGeneratorBundle/Context/HouseholdMemberSelectionContext.php

@@ -3,6 +3,7 @@
 namespace Chill\DocGeneratorBundle\Context;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 
 /**
@@ -21,11 +22,22 @@ class HouseholdMemberSelectionContext implements DocGeneratorContextInterface
      * Generate the form that display
      */
     public function getForm($entity) {
-        // TODO Get FormFactory and create a form
+        throw new \Exception("No implemented yet", 1);
 
+        $choices = [];
+        if(get_class($entity) == AccompanyingPeriodWorkEvaluation::class) {
+            foreach ($entity->getAccompanyingPeriodWork()->getPersons() as $person) {
+                $choices[$person->getId()] = $person->getName();
+            }
+        }
 
-        // access to the house hold for the AccompanyingPeriod pr the SocialAction
+        $builder->add('members', ChoiceType::class, [
-        // and configure the form to select member of the family
+            'choices' => $choices,
+            'placeholder' => 'Choose a person',
+            'label' => 'Person to add'
+        ]);
+
+        return $builder;
     }
 
     /**
@@ -41,17 +53,37 @@ class HouseholdMemberSelectionContext implements DocGeneratorContextInterface
      * Get the data that will be injected to the generated document
      */
     public function getData($entity): array {
-        $ret = [];
+        $datas = array(
+            'setValues' => array(),
+            'cloneRowAndSetValues' => array()
+        );
 
-        if(get_class($entity) == AccompanyingPeriod::class) {
+        $persons = $entity->getAccompanyingPeriodWork()->getPersons();
-            // TODO mettre ça dans un service
+
-            $ret = ['AccompanyingPeriod' =>  $entity];
+        if(sizeof($persons) > 0) {
-        } elseif(get_class($entity) == SocialAction::class) {
+            $firstPerson = $persons[0];
-            $ret = ['SocialAction' => $entity];
+
+            $datas['setValues'][] = array(
+                'firstPersonFirstName' => $firstPerson->getFirstName(),
+                'firstPersonLastName' => $firstPerson->getLastName(),);
         }
 
-        // TODO AJOUTER LES DONNES DU FORMULAIRE
 
-        return $ret;
+        if(get_class($entity) == AccompanyingPeriodWorkEvaluation::class) {
+            $values = array();
+            foreach($entity->getAccompanyingPeriodWork()->getPersons() as $person) {
+                $i = 1;
+                $values[] = array(
+                    'personRowId' => $i,
+                    'personFirstName' => $person->getFirstName(),
+                    'personLastName' => $person->getLastName(),
+                );
+            }
+
+            $datas['cloneRowAndSetValues'][] = array(
+                'personRowId', $values);
+        }
+
+        return $datas;
     }
 }

src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php

@@ -0,0 +1,149 @@
+<?php
+
+namespace Chill\DocGeneratorBundle\Controller;
+
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use GuzzleHttp\Exception\TransferException;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\HeaderUtils;
+use Symfony\Component\Routing\Annotation\Route;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlOpenstackGenerator;
+use PhpOffice\PhpWord\TemplateProcessor;
+use GuzzleHttp\Client;
+
+// TODO à mettre dans services
+use Chill\DocGeneratorBundle\Context\HouseholdMemberSelectionContext;
+
+/**
+ * Class DocGeneratorTemplateController
+ *
+ * @package Chill\DocGeneratorBundle\Controller
+ */
+class DocGeneratorTemplateController extends AbstractController
+{
+    /**
+     * @Route(
+     *     "{_locale}/doc/gen/templates/for/{entityClassName}",
+     *     name="chill_docgenerator_templates_for_entity_api"
+     * )
+     */
+    public function listTemplateApiAction(
+        string $entityClassName, DocGeneratorTemplateRepository $templateRepository): Response
+    {
+        $entities = $templateRepository->findByEntity($entityClassName);
+
+        $ret = array();
+
+        foreach ($entities as $entity) {
+            $ret[] = array(
+                'id' => $entity->getId(),
+                'name' => $entity->getName(),
+                'description' => $entity->getDescription()
+            );
+        }
+
+        return new JsonResponse(["results" => $ret]);
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/doc/gen/generate/from/{template}/for/{entityClassName}/{entityId}",
+     *     name="chill_docgenerator_generate_from_template"
+     * )
+     */
+    public function generateDocFromTemplateAction(
+        \ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface $tempUrlGenerator,
+        DocGeneratorTemplate $template,
+        string $entityClassName,
+        int $entityId,
+        Request $request
+    ): Response {
+        $getUrlGen = $tempUrlGenerator->generate(
+            'GET',
+            $template->getFile());
+
+        $tmpfname = tempnam(sys_get_temp_dir(), 'DOC_TEMPLATE');
+        file_put_contents($tmpfname, file_get_contents($getUrlGen->{"url"}));
+
+        $entity = $this->getDoctrine()->getRepository($entityClassName)->find($entityId);
+
+        if ($template->getContext() == HouseholdMemberSelectionContext::class) {
+            $context = new HouseholdMemberSelectionContext();
+            $datas = $context->getData($entity);
+        } else {
+            throw new \Exception("Not implemented", 1);
+        }
+
+        $templateProcessor = new TemplateProcessor($tmpfname);
+
+        foreach ($datas['setValues'] as $setValuesConf) {
+            $templateProcessor->setValues($setValuesConf);
+        }
+
+        foreach ($datas['cloneRowAndSetValues'] as $cloneRowAndSetValues) {
+            $templateProcessor->cloneRowAndSetValues($cloneRowAndSetValues[0], $cloneRowAndSetValues[1]);
+        }
+
+        $tmpfname2 = tempnam(sys_get_temp_dir(), 'DOC_GENERATED');
+        $templateProcessor->saveAs($tmpfname2);
+
+        unlink($tmpfname);
+
+        $fileContent = fopen($tmpfname2, 'r'); // the generated file content
+
+        $genDocName = 'doc_' . sprintf('%010d', rand()) . '.docx';
+
+        $getUrlGen = $tempUrlGenerator->generate(
+            'PUT',
+            $genDocName);
+
+        unlink($tmpfname2);
+
+        $client = new Client();
+
+        try {
+            $putResponse = $client->request('PUT', $getUrlGen->{'url'}, [
+                'body' => $fileContent
+            ]);
+
+            if ($putResponse->getStatusCode() == 201) {
+                $em = $this->getDoctrine()->getManager();
+                $storedObject = new StoredObject();
+                $storedObject
+                    // currently, only docx is supported
+                    ->setType('application/vnd.openxmlformats-officedocument.wordprocessingml.document')
+                    ->setFilename($genDocName);
+
+                $em->persist($storedObject);
+
+                // Only for evaluation
+                if ($entity instanceof AccompanyingPeriodWorkEvaluation) {
+                    $doc = new AccompanyingPeriodWorkEvaluationDocument();
+                    $doc
+                        ->setStoredObject($storedObject)
+                        ->setTemplate($template)
+                        ;
+                    $entity->addDocument($doc);
+                    $em->persist($doc);
+                }
+
+                $em->flush();
+
+                return $this->redirectToRoute('chill_wopi_file_edit', [
+                    'fileId' => $genDocName,
+                    'returnPath' => $request->query->get('returnPath', "/")
+                ]);
+            }
+        } catch (TransferException $e) {
+            throw $e;
+        }
+    }
+}

src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php

@@ -2,6 +2,7 @@
 
 namespace Chill\DocGeneratorBundle\DataFixtures\ORM;
 
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Persistence\ObjectManager;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
@@ -23,15 +24,15 @@ class LoadDocGeneratorTemplate  extends AbstractFixture
             [
                 'name' => ['fr' => 'FORMULAIRE AEB'],
                 'desc' => 'stocké sur openstack comedienbe',
-                'file' => 'FORMULAIRE_AEB.docx',
+                'file' => 'FORMULAIRE_AEB_WITH_DATA_INJ.docx',
                 'context' => 'Chill\DocGeneratorBundle\Context\HouseholdMemberSelectionContext',
-                'entities' => ['Chill\PersonBundle\Entity\AccompanyingPeriod', 'Chill\PersonBundle\Entity\SocialWork\SocialAction'],
+                'entities' => [AccompanyingPeriodWorkEvaluation::class],
             ], [
                 'name' => ['fr' => 'AIDE ALIMENTAIRE'],
                 'desc' => 'stocké sur openstack comedienbe',
                 'file' => 'AIDE_ALIMENTAIRE.docx',
                 'context' => 'Chill\DocGeneratorBundle\Context\HouseholdMemberSelectionContext',
-                'entities' => ['Chill\PersonBundle\Entity\AccompanyingPeriod', 'Chill\PersonBundle\Entity\SocialWork\SocialAction'],
+                'entities' => ['Chill\PersonBundle\Entity\AccompanyingPeriod', 'Chill\PersonBundle\Entity\SocialWork\SocialAction', AccompanyingPeriodWorkEvaluation::class],
             ],
         ];
 

src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php

@@ -20,14 +20,11 @@ class ChillDocGeneratorExtension extends Extension implements PrependExtensionIn
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $configuration = new Configuration();
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
-        $config = $this->processConfiguration($configuration, $configs);
+        $loader->load('services.yaml');
-
+        $loader->load('services/controller.yaml');
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('services/fixtures.yaml');
-        $loader->load('services.yml');
+        $loader->load('services/form.yaml');
-        $loader->load('services/controller.yml');
-        $loader->load('services/fixtures.yml');
-        $loader->load('services/form.yml');
     }
 
     public function prepend(ContainerBuilder $container)
@@ -41,7 +38,7 @@ class ChillDocGeneratorExtension extends Extension implements PrependExtensionIn
         $container->prependExtensionConfig('chill_main', array(
             'routing' => array(
                 'resources' => array(
-                    '@ChillDocGeneratorBundle/Resources/config/routes.yml'
+                    '@ChillDocGeneratorBundle/config/routes.yaml'
                 )
             )
         ));

src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php

@@ -4,11 +4,11 @@ namespace Chill\DocGeneratorBundle\Entity;
 
 use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
- * @ORM\Entity(repositoryClass=DocGeneratorTemplateRepository::class)
+ * @ORM\Entity
  * @ORM\Table(name="chill_docgen_template")
-
  */
 class DocGeneratorTemplate
 {
@@ -16,11 +16,13 @@ class DocGeneratorTemplate
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
      */
     private int $id;
 
     /**
      * @ORM\Column(type="json_array")
+     * @Serializer\Groups({"read"})
      */
     private array $name = [];
 

src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php

@@ -1,21 +1,62 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\DocGeneratorBundle\Repository;
 
-use App\Entity\DocGeneratorTemplate;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ObjectRepository;
-use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
-/**
+final class DocGeneratorTemplateRepository implements ObjectRepository
- * @method DocGeneratorTemplate|null find($id, $lockMode = null, $lockVersion = null)
- * @method DocGeneratorTemplate|null findOneBy(array $criteria, array $orderBy = null)
- * @method DocGeneratorTemplate[]    findAll()
- * @method DocGeneratorTemplate[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
- */
-class DocGeneratorTemplateRepository extends ServiceEntityRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
     {
-        parent::__construct($registry, DocGeneratorTemplate::class);
+        $this->repository = $entityManager->getRepository(DocGeneratorTemplate::class);
+    }
+
+    public function find($id, $lockMode = null, $lockVersion = null): ?DocGeneratorTemplate
+    {
+        return $this->repository->find($id, $lockMode, $lockVersion);
+    }
+
+    public function findOneBy(array $criteria, array $orderBy = null): ?DocGeneratorTemplate
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    /**
+     * @return DocGeneratorTemplate[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @return DocGeneratorTemplate[]
+     */
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findByEntity($entity) {
+
+        $builder = $this->repository->createQueryBuilder('t');
+
+        $builder
+            ->where('t.entities LIKE :entity')
+            ->setParameter('entity', '%'.addslashes($entity).'%')
+        ;
+
+        return $builder->getQuery()->execute();
+    }
+
+    public function getClassName() {
+        return DocGeneratorTemplate::class;
     }
 }

src/Bundle/ChillDocGeneratorBundle/Resources/config/services.yml

@@ -1,8 +0,0 @@
----
-services:
-
-    Chill\DocGeneratorBundle\Repository\:
-        autowire: true
-        resource: '../../Repository/'
-        tags:
-            - { name: 'doctrine.repository_service' }

src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig

@@ -3,6 +3,7 @@
 {% block layout_wvm_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
+            <th></th>
             <th>{{ 'Title'|trans }}</th>
             <th>{{ 'File'|trans }}</th>
         {% endblock %}
@@ -10,6 +11,7 @@
         {% block table_entities_tbody %}
             {% for entity in entities %}
                 <tr>
+                    <td>{{ entity.id }}</td>
                     <td>{{ entity.name | localize_translatable_string }}</td>
                     <td>{{ entity.file }}</td>
                 </tr>

src/Bundle/ChillDocGeneratorBundle/config/routes.yaml

@@ -0,0 +1,3 @@
+chill_docgen_controllers:
+    resource: '../Controller/'
+    type: annotation

src/Bundle/ChillDocGeneratorBundle/config/services.yaml

@@ -0,0 +1,10 @@
+---
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Chill\DocGeneratorBundle\Repository\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Repository/'

src/Bundle/ChillDocGeneratorBundle/config/services/controller.yaml

@@ -0,0 +1,6 @@
+services:
+    Chill\DocGeneratorBundle\Controller\:
+        autowire: true
+        autoconfigure: true
+        resource: '../../Controller'
+        tags: ['controller.service_arguments']

src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php

@@ -1,18 +1,18 @@
 <?php
-/*
+
- * 
+declare(strict_types=1);
- */
+
 namespace Chill\DocStoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use ChampsLibres\AsyncUploaderBundle\Model\AsyncFileInterface;
 use ChampsLibres\AsyncUploaderBundle\Validator\Constraints\AsyncFileExists;
+use DateTimeInterface;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
- * Represent a document stored in an object store 
+ * Represent a document stored in an object store
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * 
  * @ORM\Entity()
  * @ORM\Table("chill_doc.stored_object")
  * @AsyncFileExists(
@@ -25,53 +25,51 @@ class StoredObject implements AsyncFileInterface
      * @ORM\Id()
      * @ORM\GeneratedValue()
      * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
      */
     private $id;
-    
+
     /**
      * @ORM\Column(type="text")
+     * @Serializer\Groups({"read"})
      */
     private $filename;
-    
+
     /**
      * @ORM\Column(type="json_array", name="key")
-     * @var array
      */
-    private $keyInfos = array();
+    private array $keyInfos = [];
-    
+
     /**
      *
-     * @var int[] 
+     * @var int[]
      * @ORM\Column(type="json_array", name="iv")
      */
-    private $iv = array();
+    private array $iv = [];
-    
+
     /**
-     *
-     * @var \DateTime
      * @ORM\Column(type="datetime", name="creation_date")
+     * @Serializer\Groups({"read"})
      */
-    private $creationDate;
+    private DateTimeInterface $creationDate;
-    
+
     /**
-     *
-     * @var string 
      * @ORM\Column(type="text", name="type")
+     * @Serializer\Groups({"read"})
      */
-    private $type = '';
+    private string $type = '';
-    
+
     /**
-     *
-     * @var array
      * @ORM\Column(type="json_array", name="datas")
+     * @Serializer\Groups({"read"})
      */
-    private $datas = [];
+    private array $datas = [];
-    
+
     public function __construct()
     {
         $this->creationDate = new \DateTime();
     }
-    
+
     public function getId()
     {
         return $this->id;
@@ -100,35 +98,39 @@ class StoredObject implements AsyncFileInterface
     public function setFilename($filename)
     {
         $this->filename = $filename;
-        
+
         return $this;
     }
 
     public function setCreationDate(\DateTime $creationDate)
     {
         $this->creationDate = $creationDate;
+
         return $this;
     }
 
     public function setType($type)
     {
         $this->type = $type;
-        
+
         return $this;
     }
 
     public function setDatas(array $datas)
     {
         $this->datas = $datas;
-        
+
         return $this;
     }
 
+    /**
+     * @deprecated Use method "getFilename()".
+     */
     public function getObjectName()
     {
         return $this->getFilename();
     }
-    
+
     public function getKeyInfos()
     {
         return $this->keyInfos;
@@ -142,14 +144,14 @@ class StoredObject implements AsyncFileInterface
     public function setKeyInfos($keyInfos)
     {
         $this->keyInfos = $keyInfos;
-        
+
         return $this;
     }
 
     public function setIv($iv)
     {
         $this->iv = $iv;
-        
+
         return $this;
     }
 

src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Repository;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
+
+final class StoredObjectRepository implements ObjectRepository
+{
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(StoredObject::class);
+    }
+
+    /**
+     * @return array<int, StoredObject>
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @return array<int, StoredObject>
+     */
+    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): ?StoredObject
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return StoredObject::class;
+    }
+
+    public function find($id, $lockMode = null, $lockVersion = null): ?StoredObject
+    {
+        return $this->repository->find($id, $lockMode, $lockVersion);
+    }
+}

src/Bundle/ChillDocStoreBundle/config/services.yaml

@@ -2,6 +2,12 @@ parameters:
 #    cl_chill_person.example.class: Chill\PersonBundle\Example
 
 services:
+    Chill\DocStoreBundle\Repository\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Repository/'
+        tags: ['doctrine.repository_service']
+
     Chill\DocStoreBundle\Form\DocumentCategoryType:
         class: Chill\DocStoreBundle\Form\DocumentCategoryType
         arguments: ['%kernel.bundles%']

src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php

@@ -26,7 +26,6 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Chill\MainBundle\CRUD\Resolver\Resolver;
@@ -1142,7 +1141,7 @@ class CRUDController extends AbstractController
      */
     protected function getPaginatorFactory(): PaginatorFactory
     {
-        return $this->container->get('chill_main.paginator_factory');
+        return $this->container->get(PaginatorFactory::class);
     }
 
     /**

src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php

@@ -15,6 +15,7 @@ trait LoadAbstractNotificationsTrait
 {
     public function load(ObjectManager $manager)
     {
+        return;
         foreach ($this->notifs as $notif) {
             $entityId = $this->getReference($notif['entityRef'])->getId();
 

src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php

@@ -0,0 +1,67 @@
+<?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\MainBundle\Pagination;
+
+use Twig\Environment;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
+
+/**
+ * add twig function to render pagination
+ *
+ * @author Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
+ * @author Champs Libres <info@champs-libres.coop>
+ */
+class ChillItemsPerPageTwig extends AbstractExtension
+{
+    public function getName()
+    {
+        return 'chill_items_per_page';
+    }
+
+    public function getFunctions()
+    {
+        return array(
+           new TwigFunction(
+                 'chill_items_per_page',
+                 array($this, 'paginationRender'),
+                 array(
+                    'needs_environment' => true,
+                    'is_safe' => ['html']
+                 )
+            )
+        );
+    }
+
+    public function paginationRender(
+          Environment $env,
+          PaginatorInterface $paginator,
+          $template = '@ChillMain/Pagination/items_per_page.html.twig'
+    ) {
+
+        return $env->render($template, array(
+           'paginator' => $paginator,
+           'current' => $paginator->getItemsPerPage()
+        ));
+    }
+}

src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php

@@ -61,7 +61,7 @@ class PaginatorFactory
     public function __construct(
           RequestStack $requestStack,
           RouterInterface $router,
-          $itemPerPage = 50
+          $itemPerPage = 20
     ) {
         $this->itemPerPage = $itemPerPage;
         $this->requestStack = $requestStack;

src/Bundle/ChillMainBundle/Resources/public/chill/js/date.js

@@ -13,15 +13,15 @@
  *
  */
 const dateToISO = (date) => {
-  if (null === date) {
+    if (null === date) {
-    return null;
+        return null;
-  }
+    }
 
-  return [
+    return [
-    date.getFullYear(),
+        date.getFullYear(),
-    (date.getMonth() + 1).toString().padStart(2, '0'),
+        (date.getMonth() + 1).toString().padStart(2, '0'),
-    date.getDate().toString().padStart(2, '0')
+        date.getDate().toString().padStart(2, '0')
-  ].join('-');
+    ].join('-');
 };
 
 /**
@@ -30,10 +30,17 @@ const dateToISO = (date) => {
  * **Experimental**
  */
 const ISOToDate = (str) => {
-  let
+    if (null === str) {
-    [year, month, day] = str.split('-');
+        return null;
-      
+    }
-  return new Date(year, month-1, day);
+    if ("" === str.trim()) {
+        return null;
+    }
+
+    let
+        [year, month, day] = str.split('-');
+
+    return new Date(year, month-1, day);
 }
 
 /**
@@ -41,53 +48,118 @@ const ISOToDate = (str) => {
  *
  */
 const ISOToDatetime = (str) => {
-  if (null === str) {
+    if (null === str) {
-    return null;
+        return null;
-  }
+    }
 
-  let 
+    let
-    [cal, times] = str.split('T'),
+        [cal, times] = str.split('T'),
-    [year, month, date] = cal.split('-'),
+        [year, month, date] = cal.split('-'),
-    [time, timezone] = times.split(times.charAt(8)),
+        [time, timezone] = times.split(times.charAt(8)),
-    [hours, minutes, seconds] = time.split(':')
+        [hours, minutes, seconds] = time.split(':')
-  ;
+    ;
 
-  return new Date(year, month-1, date, hours, minutes, seconds);
+    return new Date(year, month-1, date, hours, minutes, seconds);
 }
 
 /**
  * Convert a date to ISO8601, valid for usage in api
- * 
+ *
  */
 const datetimeToISO = (date) => {
-  let cal, time, offset;
+    let cal, time, offset;
-  cal = [
+    cal = [
-    date.getFullYear(),
+        date.getFullYear(),
-    (date.getMonth() + 1).toString().padStart(2, '0'),
+        (date.getMonth() + 1).toString().padStart(2, '0'),
-    date.getDate().toString().padStart(2, '0')
+        date.getDate().toString().padStart(2, '0')
-  ].join('-');
+    ].join('-');
-  
-  time = [
-    date.getHours().toString().padStart(2, '0'),
-    date.getMinutes().toString().padStart(2, '0'),
-    date.getSeconds().toString().padStart(2, '0')
-  ].join(':');
 
-  offset = [
+    time = [
-    date.getTimezoneOffset() <= 0 ? '+' : '-',
+        date.getHours().toString().padStart(2, '0'),
-    Math.abs(Math.floor(date.getTimezoneOffset() / 60)).toString().padStart(2, '0'),
+        date.getMinutes().toString().padStart(2, '0'),
-    ':',
+        date.getSeconds().toString().padStart(2, '0')
-    Math.abs(date.getTimezoneOffset() % 60).toString().padStart(2, '0'),
+    ].join(':');
-  ].join('');
-  
-  let x = cal + 'T' + time + offset;
 
-  return x;
+    offset = [
+        date.getTimezoneOffset() <= 0 ? '+' : '-',
+        Math.abs(Math.floor(date.getTimezoneOffset() / 60)).toString().padStart(2, '0'),
+        ':',
+        Math.abs(date.getTimezoneOffset() % 60).toString().padStart(2, '0'),
+    ].join('');
+
+    let x = cal + 'T' + time + offset;
+
+    return x;
 };
 
+const intervalDaysToISO = (days) => {
+    if (null === days) {
+        return 'P0D';
+    }
+
+    return `P${days}D`;
+}
+
+const intervalISOToDays = (str) => {
+    if (null === str) {
+        return null
+    }
+
+    if ("" === str.trim()) {
+        return null;
+    }
+
+    let days = 0;
+    let isDate = true;
+    let vstring = "";
+    for (let i = 0; i < str.length; i = i + 1) {
+        if (!isDate) {
+            continue;
+        }
+        switch (str.charAt(i)) {
+            case 'P':
+                isDate = true;
+                break;
+            case 'T':
+                isDate = false;
+                break;
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                vstring = vstring + str.charAt(i);
+                break;
+            case 'Y':
+                days = days + Number.parseInt(vstring) * 365;
+                vstring = "";
+                break;
+            case 'M':
+                days = days + Number.parseInt(vstring) * 30;
+                vstring = "";
+                break;
+            case 'D':
+                days = days + Number.parseInt(vstring);
+                vstring = "";
+                break;
+            default:
+                throw Error("this character should not appears: " + str.charAt(i));
+        }
+    }
+
+    return days;
+}
+
 export {
-  dateToISO,
+    dateToISO,
-  ISOToDate,
+    ISOToDate,
-  ISOToDatetime,
+    ISOToDatetime,
-  datetimeToISO
+    datetimeToISO,
+    intervalISOToDays,
+    intervalDaysToISO,
 };

src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss

@@ -111,3 +111,8 @@ $chill-theme-buttons: (
       }
    }
 }
+
+// fix min-width on small pictos buttons
+.btn-sm, .btn-group-sm > .btn {
+   min-width: 36px;
+}

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

@@ -51,6 +51,7 @@ div.flex-bloc {
         flex-grow: 0; flex-shrink: 1; flex-basis: auto;
         flex-direction: column;
         margin: 0;
+        hyphens: auto;
 
         div.item-row {
             flex-grow: 1; flex-shrink: 1; flex-basis: auto;

src/Bundle/ChillMainBundle/Resources/views/Pagination/items_per_page.html.twig

@@ -0,0 +1,20 @@
+<select class="form-select" aria-label="items Per Page" id="itemsPerPage">
+    <option value="10">10 {{ 'results'|trans }}</option>
+    <option value="20">20 {{ 'results'|trans }}</option>
+    <option value="50">50 {{ 'results'|trans }}</option>
+    <option value="100">100 {{ 'results'|trans }}</option>
+</select>
+<script>
+    let select = document.querySelector("select#itemsPerPage");
+    window.addEventListener('load', () =>
+        select.value = {{ current }}
+    );
+    select.addEventListener('change', () => {
+        let url = new URL(window.location.href);
+        let params = url.searchParams;
+        params.set('page', '1');
+        params.set('item_per_page', select.value);
+        url.search = params.toString();
+        window.location.href = url.toString();
+    });
+</script>

src/Bundle/ChillMainBundle/config/services/pagination.yaml

@@ -15,3 +15,8 @@ services:
         class: Chill\MainBundle\Pagination\ChillPaginationTwig
         tags:
             - { name: twig.extension }
+
+    chill_main.paginator.items_per_page.twig_extensions:
+        class: Chill\MainBundle\Pagination\ChillItemsPerPageTwig
+        tags:
+            - { name: twig.extension }

src/Bundle/ChillMainBundle/config/services/security.yaml

@@ -1,4 +1,8 @@
-services:    
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill.main.security.authorization.helper:
         class: Chill\MainBundle\Security\Authorization\AuthorizationHelper
         arguments:
@@ -6,47 +10,47 @@ services:
             $hierarchy: "%security.role_hierarchy.roles%"
             $em: '@Doctrine\ORM\EntityManagerInterface'
     Chill\MainBundle\Security\Authorization\AuthorizationHelper: '@chill.main.security.authorization.helper'
-            
+
     chill.main.role_provider:
         class: Chill\MainBundle\Security\RoleProvider
-        
+
     chill.main.user_provider:
         class: Chill\MainBundle\Security\UserProvider\UserProvider
-        arguments:
+
-            $em: '@Doctrine\ORM\EntityManagerInterface'
+    Symfony\Component\Security\Core\User\UserProviderInterface: "@chill.main.user_provider"
-            
+
     Chill\MainBundle\Security\Authorization\ChillExportVoter:
         arguments:
             $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
         tags:
             - { name: security.voter }
-            
+
-    Chill\MainBundle\Security\PasswordRecover\TokenManager: 
+    Chill\MainBundle\Security\PasswordRecover\TokenManager:
         arguments:
             $secret: '%kernel.secret%'
             $logger: '@Psr\Log\LoggerInterface'
-    
+
     Chill\MainBundle\Security\PasswordRecover\RecoverPasswordHelper:
         arguments:
             $tokenManager: '@Chill\MainBundle\Security\PasswordRecover\TokenManager'
             $urlGenerator: '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
             $mailer: '@Chill\MainBundle\Notification\Mailer'
             $routeParameters: "%chill_main.notifications%"
-        
+
     Chill\MainBundle\Security\PasswordRecover\PasswordRecoverEventSubscriber:
         arguments:
             $locker: '@Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker'
         tags:
             - { name: kernel.event_subscriber }
-            
+
     Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker:
         arguments:
             $chillRedis: '@Chill\MainBundle\Redis\ChillRedis'
             $logger: '@Psr\Log\LoggerInterface'
-            
+
     Chill\MainBundle\Security\PasswordRecover\PasswordRecoverVoter:
         arguments:
             $locker: '@Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker'
             $requestStack: '@Symfony\Component\HttpFoundation\RequestStack'
         tags:
-            - { name: security.voter }
+            - { name: security.voter }

src/Bundle/ChillMainBundle/translations/messages.fr.yml

@@ -85,6 +85,7 @@ Search %pattern%: Recherche de "%pattern%"
 Results %start%-%end% of %total%: Résultats %start%-%end% sur %total%
 See all results: Voir tous les résultats
 Advanced search: Recherche avancée
+results: résultats
 
 # timeline
 Global timeline: Historique global

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/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,9 +21,15 @@
 
 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;
@@ -31,6 +37,7 @@ 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;
@@ -44,8 +51,6 @@ 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
 {
@@ -57,35 +62,50 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
 
     protected SocialIssueRepository $socialIssueRepository;
 
-    protected array $cacheSocialIssues = array();
+    protected CountryRepository $countryRepository;
 
-    public function __construct(Registry $workflowRegistry, SocialIssueRepository $socialIssueRepository)
+    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);
 
-    public function prepare()
-    {
-        //prepare days, month, years
-        $y = 1950;
-        do {
-            $this->years[] = $y;
-            $y = $y +1;
-        } while ($y >= 1990);
-
-        $m = 1;
-        do {
-            $this->month[] = $m;
-            $m = $m +1;
-        } while ($m >= 12);
-
-        $d = 1;
-        do {
-            $this->day[] = $d;
-            $d = $d + 1;
-        } while ($d <= 28);
     }
 
     public function getOrder()
@@ -95,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();
     }
@@ -105,117 +125,102 @@ 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();
+        foreach ($persons as $person) {
-
+            $this->addAPerson($person, $manager);
-        $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);
     }
 
-    /**
+    private function createRandPerson(): ObjectSet
-     * fill a person array with default value
-     *
-     * @param string[] $specific
-     */
-    private function fillWithDefault(array $specific)
     {
-        return array_merge(array(
+        return $this->loader->loadData([
-                'Birthdate' => "1960-10-12",
+            Person::class => [
-                'PlaceOfBirth' => "Ottignies Louvain-La-Neuve",
+                'persons{1..300}' => [
-                'Gender' => Person::MALE_GENDER,
+                    'firstName' => '<firstname()>',
-                'Email' => "roger@yopmail.com",
+                    'lastName' => '<lastname()>',
-                'CountryOfBirth' => 'BE',
+                    'gender' => '<getRandomGender()>',
-                'Nationality' => 'BE',
+                    'nationality' => '<getRandomCountry()>',
-                'CFData' => array(),
+                    'center' => '<getRandomCenter()>',
-                'Address' => null
+                    'maritalStatus' => '<getRandomMaritalStatus()>',
-            ), $specific);
+                    'birthdate' => '<dateTimeBetween("-75 years", "-1 tears")>',
+                    'placeOfBirth' => '<city()>',
+                    'email' => '<freeEmail()>',
+                    'countryOfBirth' => '<getRandomCountry(80)>',
+                ]
+            ]
+        ]);
     }
 
-    private function getRandomSocialIssue(): SocialIssue
+    private function createExpectedPerson($default): Person
     {
-        if (0 === count($this->cacheSocialIssues)) {
+        $person = $this->loader->loadData([
-            $this->cacheSocialIssues = $this->socialIssueRepository->findAll();
+            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 $this->cacheSocialIssues[\array_rand($this->cacheSocialIssues)];
+        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();
         $accompanyingPeriod = new AccompanyingPeriod(
             (new \DateTime())
                 ->sub(
                     new \DateInterval('P' . \random_int(0, 180) . 'D')
                 )
         );
-        $p->addAccompanyingPeriod($accompanyingPeriod);
+        $person->addAccompanyingPeriod($accompanyingPeriod);
         $accompanyingPeriod->addSocialIssue($this->getRandomSocialIssue());
 
         if (\random_int(0, 10) > 3) {
@@ -225,53 +230,13 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
             $workflow->apply($accompanyingPeriod, 'confirm');
         }
 
-        foreach ($person as $key => $value) {
+        $manager->persist($person);
-            switch ($key) {
+        echo "add person'".$person->__toString()."'\n";
-                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);
-                    }
-                }
-
-            }
-        }
-
-        $manager->persist($p);
-        echo "add person'".$p->__toString()."'\n";
     }
 
     private function createAddress(): Address
     {
-        $loader = new NativeLoader();
+        $objectSet = $this->loader->loadData([
-        $objectSet = $loader->loadData([
             Address::class => [
                 'address' => [
                     'street' => '<fr_FR:streetName()>',
@@ -285,6 +250,17 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         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)];
@@ -306,7 +282,6 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         return Point::fromLonLat($lon, $lat);
     }
 
-
     /**
      * Create a random address
      *
@@ -329,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) {
+        if (0 === count($this->cacheCenters)) {
-            return NULL;
+            $this->cacheCenters = $this->centerRepository->findAll();
         }
-        return $this->container->get('doctrine.orm.entity_manager')
+
-              ->getRepository('ChillMainBundle:Country')
+        return $this->cacheCenters[\array_rand($this->cacheCenters)];
-              ->findOneByCountryCode($countryCode);
     }
 
-    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",
+        if ($nullPercentage < \random_int(0, 100)) {
-        "Compère", "Jean-de-Dieu", "Charles", "Pierre", "Luc", "Mathieu", "Alain", "Etienne", "Eric",
+            return NULL;
-        "Corentin", "Gaston", "Spirou", "Fantasio", "Mahmadou", "Mohamidou", "Vursuv", "Youssef" );
+        }
 
-    private $firstNamesFemale = array("Svedana", "Sevlatina", "Irène", "Marcelle",
+        return $this->cacheCountries [\array_rand($this->cacheCountries)];
-        "Corentine", "Alfonsine", "Caroline", "Solange", "Gostine", "Fatoumata", "Nicole",
+    }
-        "Groseille", "Chana", "Oxana", "Ivana", "Julie", "Tina", "Adèle" );
 
-    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',
+     * @internal This method is public and called by faker as a custom generator
-        'ma', 'gone', 'car',"fu", "ka", "lot", "no", "va", "du", "bu", "su", "jau", "tte", 'sir',
+     * @param int $nullPercentage
-        "lo", 'to', "cho", "car", 'mo','zu', 'qi', 'mu');
+     * @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 $genders = array(Person::MALE_GENDER, Person::FEMALE_GENDER, Person::BOTH_GENDER);
-
-    private $day = array();
 
     private $peoples = array(
         array(
-            'LastName' => "Depardieu",
+            'lastName' => "Depardieu",
-            'FirstName' => "Gérard",
+            'firstName' => "Gérard",
-            'Birthdate' => "1948-12-27",
+            'birthdate' => "1948-12-27",
-            'PlaceOfBirth' => "Châteauroux",
+            'placeOfBirth' => "Châteauroux",
-            'Gender' => Person::MALE_GENDER,
+            'nationality' => 'RU',
-            'CountryOfBirth' => 'FR',
+            'gender' => Person::MALE_GENDER,
-            'Nationality' => 'RU',
+            'center' => 'Center A',
-            'center' => 'centerA',
-            'maritalStatus' => 'ms_divorce',
             'accompanyingPeriods' => [
                 [
                     'from' => '2015-02-01',
@@ -394,67 +393,123 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         ),
         array(
             //to have a person with same firstname as Gérard Depardieu
-            'LastName' => "Depardieu",
+            'lastName' => "Depardieu",
-            'FirstName' => "Jean",
+            'firstName' => "Jean",
-            'Birthdate' => "1960-10-12",
+            'birthdate' => "1960-10-12",
-            'CountryOfBirth' => 'FR',
+            'countryOfBirth' => 'FR',
-            'Nationality' => 'FR',
+            'nationality' => 'FR',
-            'center' => 'centerA',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_divorce'
         ),
         array(
             //to have a person with same birthdate of Gérard Depardieu
-            'LastName' => 'Van Snick',
+            'lastName' => 'Van Snick',
-            'FirstName' => 'Bart',
+            'firstName' => 'Bart',
-            'Birthdate' => '1948-12-27',
+            'birthdate' => '1948-12-27',
-            'center' => 'centerA',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_legalco'
         ),
         array(
             //to have a woman with Depardieu as FirstName
-            'LastName' => 'Depardieu',
+            'lastName' => 'Depardieu',
-            'FirstName' => 'Charline',
+            'firstName' => 'Charline',
-            'Gender' => Person::FEMALE_GENDER,
+            'gender' => Person::FEMALE_GENDER,
-            'center' => 'centerA',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_legalco'
         ),
         array(
             //to have a special character in lastName
-            'LastName' => 'Manço',
+            'lastName' => 'Manço',
-            'FirstName' => 'Étienne',
+            'firstName' => 'Étienne',
-            'center' => 'centerA',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_unknown'
         ),
         array(
             //to have true duplicate person
-            'LastName' => "Depardieu",
+            'lastName' => "Depardieu",
-            'FirstName' => "Jean",
+            'firstName' => "Jean",
-            'Birthdate' => "1960-10-12",
+            'birthdate' => "1960-10-12",
-            'CountryOfBirth' => 'FR',
+            'countryOfBirth' => 'FR',
-            'Nationality' => 'FR',
+            'nationality' => 'FR',
-            'center' => 'centerA',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_divorce'
         ),
         array(
             //to have false duplicate person
-            'LastName' => "Depardieu",
+            'lastName' => "Depardieu",
-            'FirstName' => "Jeanne",
+            'firstName' => "Jeanne",
-            'Birthdate' => "1966-11-13",
+            'birthdate' => "1966-11-13",
-            'CountryOfBirth' => 'FR',
+            'countryOfBirth' => 'FR',
-            'Nationality' => 'FR',
+            'nationality' => 'FR',
-            'center' => 'centerA',
+            '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']))
@@ -464,4 +519,5 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
             $person->addAccompanyingPeriod($accompanyingPeriod);
         }
     }
+    */
 }

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -499,6 +499,17 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return $collection->count() > 0 ? $collection->first() : NULL;
     }
 
+    public function getOPenParticipations(): Collection
+    {
+        return $this
+            ->getParticipations()
+            ->filter(
+                static function(AccompanyingPeriodParticipation $participation): bool {
+                    return null === $participation->getEndDate();
+                }
+            );
+    }
+
     /**
      * Return true if the accompanying period contains a person.
      *
@@ -974,6 +985,22 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return $this->personLocation;
     }
 
+    /**
+     * Get a list of person which have an adresse available for a valid location
+     *
+     * @return Collection|Person[]
+     */
+    public function getAvailablePersonLocation(): Collection
+    {
+        return $this->getOPenParticipations()
+            ->filter(function(AccompanyingPeriodParticipation $p) {
+                return $p->getPerson()->hasCurrentHouseholdAddress();
+            })
+            ->map(function(AccompanyingPeriodParticipation $p) {
+                return $p->getPerson();
+            });
+    }
+
     /**
      * @Groups({"write"})
      */

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

@@ -169,7 +169,7 @@ use Symfony\Component\Validator\Constraints as Assert;
       *     orphanRemoval=true
       * )
       * @Serializer\Groups({"read"})
-      * @internal /!\ the serialization for read / write evaluations is handled in `AccompanyingPeriodWorkDenormalizer`
+      * @internal /!\ the serialization for write evaluations is handled in `AccompanyingPeriodWorkDenormalizer`
       */
     private Collection $accompanyingPeriodWorkEvaluations;
 

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

@@ -74,6 +74,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCre
     /**
      * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private ?DateInterval $warningInterval = null;
@@ -119,12 +120,29 @@ class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCre
      * @var Collection
      * @ORM\OneToMany(
      *     targetEntity=AccompanyingPeriodWorkEvaluationDocument::class,
-     *     mappedBy="accompanyingPeriodWorkEvaluation"
+     *     mappedBy="accompanyingPeriodWorkEvaluation",
+     *     cascade={"remove"}
      *     )
      * @Serializer\Groups({"read"})
      */
     private Collection $documents;
 
+    /**
+     * This is a workaround for client, to allow them to assign arbitrary data
+     * dedicated to their job.
+     *
+     * This data is not persisted into database, but will appears on the data
+     * normalized during the same request (like PUT/PATCH request)
+     *
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     *
+     * @var mixed
+     *
+     */
+    private $key = null;
+
     public function __construct()
     {
         $this->documents = new ArrayCollection();
@@ -186,7 +204,8 @@ class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCre
             ($this->evaluation instanceof Evaluation
                 && null === $evaluation)
         ) {
-            throw new \LogicException("once set, an ${self::class} cannot
+            $cl = AccompanyingPeriodWorkEvaluation::class;
+            throw new \LogicException("once set, an $cl  cannot
                 change or remove the linked Evaluation::class");
         }
 
@@ -365,5 +384,42 @@ class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCre
         return $this->documents;
     }
 
+    public function addDocument(AccompanyingPeriodWorkEvaluationDocument $document): self
+    {
+        if (!$this->documents->contains($document)) {
+            $this->documents[] = $document;
+            $document->setAccompanyingPeriodWorkEvaluation($this);
+        }
 
+        return $this;
+    }
+
+    public function removeDocument(AccompanyingPeriodWorkEvaluationDocument $document): self
+    {
+        $this->documents->removeElement($document);
+        return $this;
+    }
+
+    /**
+     * Arbitrary data, used for client
+     *
+     * @return mixed
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * Arbitrary data, used for client
+     *
+     * @param mixed $key
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setKey($key): self
+    {
+        $this->key = $key;
+
+        return $this;
+    }
 }

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

@@ -2,6 +2,7 @@
 
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
@@ -37,7 +38,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      *     inversedBy="documents"
      * )
      */
-    private ?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation;
+    private ?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation = null;
 
     /**
      * @ORM\ManyToOne(
@@ -45,13 +46,13 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      * )
      * @Serializer\Groups({"read"})
      */
-    private ?User $createdBy;
+    private ?User $createdBy = null;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      * @Serializer\Groups({"read"})
      */
-    private ?\DateTimeImmutable $createdAt;
+    private ?\DateTimeImmutable $createdAt = null;
 
     /**
      * @ORM\ManyToOne(
@@ -59,18 +60,29 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      * )
      * @Serializer\Groups({"read"})
      */
-    private ?User $updatedBy;
+    private ?User $updatedBy = null;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      * @Serializer\Groups({"read"})
      */
-    private ?DateTimeImmutable $updatedAt;
+    private ?\DateTimeImmutable $updatedAt = null;
 
-    // TODO: indiquer le document généré par le module "document"
+    /**
-    private ?StoredObject $storedObject;
+    * @ORM\ManyToOne(
+    *     targetEntity=StoredObject::class
+    * )
+     * @Serializer\Groups({"read"})
+    */
+    private ?StoredObject $storedObject = null;
 
-    // TODO: ajouter gabarit
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity=DocGeneratorTemplate::class
+     * )
+     * @Serializer\Groups({"read"})
+     */
+    private ?DocGeneratorTemplate $template = null;
 
     /**
      * @return AccompanyingPeriodWorkEvaluation|null
@@ -86,6 +98,14 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      */
     public function setAccompanyingPeriodWorkEvaluation(?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation): AccompanyingPeriodWorkEvaluationDocument
     {
+        // if an evaluation is already associated, we cannot change the association (removing the association,
+        // by setting a null value, is allowed.
+        if ($this->accompanyingPeriodWorkEvaluation instanceof AccompanyingPeriodWorkEvaluation
+            && $accompanyingPeriodWorkEvaluation instanceof AccompanyingPeriodWorkEvaluation) {
+            if ($this->accompanyingPeriodWorkEvaluation !== $accompanyingPeriodWorkEvaluation) {
+                throw new \RuntimeException("It is not allowed to change the evaluation for a document");
+            }
+        }
         $this->accompanyingPeriodWorkEvaluation = $accompanyingPeriodWorkEvaluation;
         return $this;
     }
@@ -167,9 +187,27 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
     /**
      * @return DateTimeImmutable|null
      */
-    public function getUpdatedAt(): ?DateTimeInterface
+    public function getUpdatedAt(): ?\DateTimeInterface
     {
         return $this->updatedAt;
     }
 
+    /**
+     * @return DocGeneratorTemplate|null
+     */
+    public function getTemplate(): ?DocGeneratorTemplate
+    {
+        return $this->template;
+    }
+
+    /**
+     * @param DocGeneratorTemplate|null $template
+     * @return AccompanyingPeriodWorkEvaluationDocument
+     */
+    public function setTemplate(?DocGeneratorTemplate $template): AccompanyingPeriodWorkEvaluationDocument
+    {
+        $this->template = $template;
+        return $this;
+    }
+
 }

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -103,7 +103,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * @ORM\Column(type="date", nullable=true)
      */
-    private $birthdate; 
+    private $birthdate;
 
     /**
      * The person's deathdate
@@ -736,8 +736,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     {
         return $this->birthdate;
     }
-    
+
-    public function getAge(): ?int 
+    public function getAge(): ?int
     {
         if ($this->birthdate instanceof \DateTimeInterface) {
             return date_diff($this->birthdate, date_create('now'))->format("%y");
@@ -1439,6 +1439,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         }
     }
 
+    public function hasCurrentHouseholdAddress(?\DateTimeImmutable $at = null): bool
+    {
+        return null !== $this->getCurrentHouseholdAddress($at);
+    }
+
     public function getGenderComment(): CommentEmbeddable
     {
         return $this->genderComment;

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/Resources/public/page/accompanying_course_index/person_locate.js

@@ -0,0 +1,49 @@
+const onSubmit = function(e) {
+    e.preventDefault();
+    let
+        form = e.target,
+        formData = new FormData(form),
+        url = form.action,
+        payload = {
+            type: 'accompanying_period',
+            id: Number.parseInt(formData.get('periodId'), 10),
+            personLocation: {
+                type: 'person',
+                id: Number.parseInt(formData.get('personLocation'), 10)
+            }
+        }
+    ;
+
+    console.log('event', e);
+    console.log('form', form);
+    console.log('formData', formData);
+    console.log('url', url);
+    console.log('payload', payload);
+
+    window.fetch(url, {
+        method: 'PATCH',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(payload),
+    })
+        .then(r => {
+            if (r.ok) {
+                console.log('response ok');
+                window.location.reload();
+            } else {
+                console.err("could not patch accompanying course");
+            }
+        });
+}
+
+window.addEventListener('DOMContentLoaded', function(e) {
+  let forms = document.querySelectorAll('.quickLocationForm');
+
+  console.log(forms);
+
+  forms.forEach(function(form){
+      console.log('form quickLocation found', form);
+      form.addEventListener('submit', onSubmit);
+  })
+});

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

@@ -1,374 +0,0 @@
-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,15 +6,21 @@
    <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>
-   <course-location></course-location>
    <referrer></referrer>
    <resources></resources>
    <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>
@@ -48,7 +54,8 @@ export default {
    },
    computed: mapState([
       'accompanyingCourse',
-      'addressContext'
+      'addressContext',
+      'errorMsg'
    ])
 };
 </script>
@@ -89,6 +96,16 @@ export default {
          }
          table {
          }
+
+         &.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

@@ -9,7 +9,7 @@ const getAccompanyingCourse = (id) => {
    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 };
       });
 };
 
@@ -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,7 +48,7 @@ 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 };
       });
 };
 
@@ -59,7 +60,7 @@ const getSocialIssues = () => {
    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 };
       });
 };
 
@@ -83,7 +84,7 @@ 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 };
       });
 };
 
@@ -109,7 +110,7 @@ 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 };
       });
 };
 
@@ -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 };
       });
 };
 
@@ -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,7 +189,7 @@ 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 };
       });
 }
 

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

@@ -60,7 +60,7 @@ export default {
             personId: this.person.id
          };
          this.$store.dispatch('updateLocation', payload);
-         window.location.assign('#section-50');
+         window.location.assign('#section-20');
          this.modal.showModal = false;
       }
    }