Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency

.env

@@ -1,64 +0,0 @@
-##
-##  Manually dump .env files in .env.local.php with
-## `$ composer symfony:dump-env prod`
-##
-
-## Project environment
-APP_ENV=dev
-
-## Enable debug
-APP_DEBUG=true
-
-## Locale
-LOCALE=fr
-
-## Framework secret
-APP_SECRET=ThisTokenIsNotSoSecretChangeIt
-
-## Symfony/swiftmailer
-MAILER_TRANSPORT=smtp
-MAILER_HOST=smtp
-MAILER_PORT=1025
-MAILER_CRYPT=
-MAILER_AUTH=
-MAILER_USER=
-MAILER_PASSWORD=
-MAILER_URL=${MAILER_TRANSPORT}://${MAILER_HOST}:${MAILER_PORT}?encryption=${MAILER_CRYPT}&auth_mode=${MAILER_AUTH}&username=${MAILER_USER}&password=${MAILER_PASSWORD}
-
-## Notifications
-NOTIFICATION_HOST=localhost:8001
-NOTIFICATION_FROM_EMAIL=admin@chill.social
-NOTIFICATION_FROM_NAME=Chill
-
-## Gelf
-GELF_HOST=gelf
-GELF_PORT=12201
-
-## OVH OpenStack Storage User/Role
-OS_USERNAME=
-OS_PASSWORD=
-OS_TENANT_ID=
-OS_REGION_NAME=GRA
-OS_AUTH_URL=https://auth.cloud.ovh.net/v2.0/
-
-## OVH OpenStack Storage Container
-ASYNC_UPLOAD_TEMP_URL_KEY=
-ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
-ASYNC_UPLOAD_TEMP_URL_CONTAINER=
-
-## Redis Cache
-REDIS_HOST=redis
-REDIS_PORT=6379
-REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
-
-## Twilio
-TWILIO_SID=~
-TWILIO_SECRET=~
-
-## DOCKER IMAGES REGISTRY
-#IMAGE_PHP=
-#IMAGE_NGINX=
-
-## DOCKER IMAGES VERSION
-#VERSION=test
-VERSION=prod

CHANGELOG.md

@@ -11,10 +11,26 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)
+* fix normalisation of accompanying course requestor api (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/378)
+* [person] add a returnPath when clicking on some Person or ThirdParty badge (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/427)
+* [person] accompanying course work: fix on-the-fly update of thirdParty 
+* [on-the-fly] close modal only after validation
+* [person] correct thirdparty PATCH url + add email and altnames in AddPerson and serializer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/433)
 * change order for accompanying course work list
+* [parcours]: Mes parcours brouillon added to user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/440)
+* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
 * [person]: style fix in parcours listing per person. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/432)
 * [parcours]: Only the referrer can toggle the intensity of the parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
-
+* [household]: display address of current household (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/415)
+* ajoute un ordre dans les localisation (api)
+* [pick entity]: fix translations in modal (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/419)
+* [homepage_widget]: fix translation on emergency badge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/440)
+* [person]: create person and household added to button dropdown (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/454)
+* display full address in address.text in normalization. Adapt AddressRenderBox
+* [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459)
+* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
+* [Thirdparty_contact]: address blurred if confidential in view page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/450)
 
 ## Test releases
 

phpstan-deprecations.neon

@@ -408,24 +408,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
 
-		-
-			message:
-				"""
-					#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
-					Use getReachableCircles$#
-				"""
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\DocStoreBundle\\\\Controller\\\\DocumentPersonController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
-
 		-
 			message:
 				"""
@@ -927,15 +909,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$trans of method Chill\\\\PersonBundle\\\\Controller\\\\AccompanyingCourseWorkController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
-
 		-
 			message:
 				"""

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue

@@ -19,14 +19,18 @@
          </ul>
       </div>
 
-      <add-persons
+      <ul class="record_actions">
-         buttonTitle="activity.add_persons"
+         <li class="add-persons">
-         modalTitle="activity.add_persons"
+            <add-persons
-         v-bind:key="addPersons.key"
+               buttonTitle="activity.add_persons"
-         v-bind:options="addPersonsOptions"
+               modalTitle="activity.add_persons"
-         @addNewPersons="addNewPersons"
+               v-bind:key="addPersons.key"
-         ref="addPersons">
+               v-bind:options="addPersonsOptions"
-      </add-persons>
+               @addNewPersons="addNewPersons"
+               ref="addPersons">
+            </add-persons>
+         </li>
+      </ul>
 
    </teleport>
 </template>

src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php

@@ -13,7 +13,9 @@ namespace Chill\DocStoreBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Chill\DocStoreBundle\Form\AccompanyingCourseDocumentType;
+use Chill\DocStoreBundle\Repository\AccompanyingCourseDocumentRepository;
 use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
+use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use DateTime;
@@ -29,20 +31,15 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class DocumentAccompanyingCourseController extends AbstractController
 {
-    /**
+    protected AuthorizationHelper $authorizationHelper;
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
 
-    /**
+    protected EventDispatcherInterface $eventDispatcher;
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
 
-    /**
+    protected TranslatorInterface $translator;
-     * @var TranslatorInterface
+
-     */
+    private AccompanyingCourseDocumentRepository $courseRepository;
-    protected $translator;
+
+    private PaginatorFactory $paginatorFactory;
 
     /**
      * DocumentAccompanyingCourseController constructor.
@@ -50,11 +47,15 @@ class DocumentAccompanyingCourseController extends AbstractController
     public function __construct(
         TranslatorInterface $translator,
         EventDispatcherInterface $eventDispatcher,
-        AuthorizationHelper $authorizationHelper
+        AuthorizationHelper $authorizationHelper,
+        PaginatorFactory $paginatorFactory,
+        AccompanyingCourseDocumentRepository $courseRepository
     ) {
         $this->translator = $translator;
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
+        $this->paginatorFactory = $paginatorFactory;
+        $this->courseRepository = $courseRepository;
     }
 
     /**
@@ -130,11 +131,15 @@ class DocumentAccompanyingCourseController extends AbstractController
 
         $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::SEE, $course);
 
-        $documents = $em
+        $total = $this->courseRepository->countByCourse($course);
-            ->getRepository('ChillDocStoreBundle:AccompanyingCourseDocument')
+        $pagination = $this->paginatorFactory->create($total);
+
+        $documents = $this->courseRepository
             ->findBy(
                 ['course' => $course],
-                ['date' => 'DESC']
+                ['date' => 'DESC'],
+                $pagination->getItemsPerPage(),
+                $pagination->getCurrentPageFirstItemNumber()
             );
 
         return $this->render(
@@ -142,6 +147,7 @@ class DocumentAccompanyingCourseController extends AbstractController
             [
                 'documents' => $documents,
                 'accompanyingCourse' => $course,
+                'pagination' => $pagination,
             ]
         );
     }

src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php

@@ -13,7 +13,8 @@ namespace Chill\DocStoreBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Form\PersonDocumentType;
-use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Chill\DocStoreBundle\Repository\PersonDocumentACLAwareRepositoryInterface;
+use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
@@ -24,7 +25,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class DocumentPersonController.
@@ -35,20 +36,15 @@ use Symfony\Component\Translation\TranslatorInterface;
  */
 class DocumentPersonController extends AbstractController
 {
-    /**
+    protected AuthorizationHelper $authorizationHelper;
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
 
-    /**
+    protected EventDispatcherInterface $eventDispatcher;
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
 
-    /**
+    protected TranslatorInterface $translator;
-     * @var TranslatorInterface
+
-     */
+    private PaginatorFactory $paginatorFactory;
-    protected $translator;
+
+    private PersonDocumentACLAwareRepositoryInterface $personDocumentACLAwareRepository;
 
     /**
      * DocumentPersonController constructor.
@@ -56,11 +52,15 @@ class DocumentPersonController extends AbstractController
     public function __construct(
         TranslatorInterface $translator,
         EventDispatcherInterface $eventDispatcher,
-        AuthorizationHelper $authorizationHelper
+        AuthorizationHelper $authorizationHelper,
+        PaginatorFactory $paginatorFactory,
+        PersonDocumentACLAwareRepositoryInterface $personDocumentACLAwareRepository
     ) {
         $this->translator = $translator;
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
+        $this->paginatorFactory = $paginatorFactory;
+        $this->personDocumentACLAwareRepository = $personDocumentACLAwareRepository;
     }
 
     /**
@@ -156,19 +156,15 @@ class DocumentPersonController extends AbstractController
 
         $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
 
-        $reachableScopes = $this->authorizationHelper
+        $total = $this->personDocumentACLAwareRepository->countByPerson($person);
-            ->getReachableScopes(
+        $pagination = $this->paginatorFactory->create($total);
-                $this->getUser(),
-                PersonDocumentVoter::SEE,
-                $person->getCenter()
-            );
 
-        $documents = $em
+        $documents = $this->personDocumentACLAwareRepository->findByPerson(
-            ->getRepository('ChillDocStoreBundle:PersonDocument')
+            $person,
-            ->findBy(
+            [],
-                ['person' => $person, 'scope' => $reachableScopes],
+            $pagination->getItemsPerPage(),
-                ['date' => 'DESC']
+            $pagination->getCurrentPageFirstItemNumber()
-            );
+        );
 
         $event = new PrivacyEvent($person, [
             'element_class' => PersonDocument::class,
@@ -181,6 +177,7 @@ class DocumentPersonController extends AbstractController
             [
                 'documents' => $documents,
                 'person' => $person,
+                'pagination' => $pagination,
             ]
         );
     }

src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php

@@ -38,6 +38,7 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
         $loader->load('services/menu.yaml');
         $loader->load('services/fixtures.yaml');
         $loader->load('services/form.yaml');
+        $loader->load('services/templating.yaml');
     }
 
     public function prepend(ContainerBuilder $container)

src/Bundle/ChillDocStoreBundle/Entity/Document.php

@@ -11,7 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\DocStoreBundle\Entity;
 
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
@@ -20,8 +26,12 @@ use Symfony\Component\Validator\Constraints as Assert;
 /**
  * @ORM\MappedSuperclass
  */
-class Document implements HasScopeInterface
+class Document implements HasScopeInterface, TrackCreationInterface, TrackUpdateInterface
 {
+    use TrackCreationTrait;
+
+    use TrackUpdateTrait;
+
     /**
      * @ORM\ManyToOne(targetEntity="Chill\DocStoreBundle\Entity\DocumentCategory")
      * @ORM\JoinColumns({
@@ -67,6 +77,11 @@ class Document implements HasScopeInterface
      */
     private $scope;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate")
+     */
+    private $template;
+
     /**
      * @ORM\Column(type="text")
      * @Assert\Length(
@@ -82,9 +97,6 @@ class Document implements HasScopeInterface
      */
     private $user;
 
-    /**
-     * @return DocumentCategory
-     */
     public function getCategory(): ?DocumentCategory
     {
         return $this->category;
@@ -115,11 +127,16 @@ class Document implements HasScopeInterface
      *
      * @return \Chill\MainBundle\Entity\Scope
      */
-    public function getScope()
+    public function getScope(): ?Scope
     {
         return $this->scope;
     }
 
+    public function getTemplate(): ?DocGeneratorTemplate
+    {
+        return $this->template;
+    }
+
     public function getTitle(): ?string
     {
         return $this->title;
@@ -165,6 +182,13 @@ class Document implements HasScopeInterface
         return $this;
     }
 
+    public function setTemplate(?DocGeneratorTemplate $template): self
+    {
+        $this->template = $template;
+
+        return $this;
+    }
+
     public function setTitle(string $title): self
     {
         $this->title = $title;

src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php

@@ -18,10 +18,12 @@ use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -51,14 +53,25 @@ class PersonDocumentType extends AbstractType
      */
     protected $user;
 
+    private ParameterBagInterface $parameterBag;
+
+    private ScopeResolverDispatcher $scopeResolverDispatcher;
+
     public function __construct(
-        TranslatableStringHelper $translatableStringHelper
+        TranslatableStringHelper $translatableStringHelper,
+        ScopeResolverDispatcher $scopeResolverDispatcher,
+        ParameterBagInterface $parameterBag
     ) {
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->scopeResolverDispatcher = $scopeResolverDispatcher;
+        $this->parameterBag = $parameterBag;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        $document = $options['data'];
+        $isScopeConcerned = $this->scopeResolverDispatcher->isConcerned($document);
+
         $builder
             ->add('title', TextType::class)
             ->add('description', ChillTextareaType::class, [
@@ -67,10 +80,6 @@ class PersonDocumentType extends AbstractType
             ->add('object', StoredObjectType::class, [
                 'error_bubbling' => true,
             ])
-            ->add('scope', ScopePickerType::class, [
-                'center' => $options['center'],
-                'role' => $options['role'],
-            ])
             ->add('date', ChillDateType::class)
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
@@ -84,6 +93,13 @@ class PersonDocumentType extends AbstractType
                     return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
                 },
             ]);
+
+        if ($isScopeConcerned && $this->parameterBag->get('chill_main')['acl']['form_show_scopes']) {
+            $builder->add('scope', ScopePickerType::class, [
+                'center' => $options['center'],
+                'role' => $options['role'],
+            ]);
+        }
     }
 
     public function configureOptions(OptionsResolver $resolver)

src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php

@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Repository;
+
+use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectRepository;
+
+class AccompanyingCourseDocumentRepository implements ObjectRepository
+{
+    private EntityManagerInterface $em;
+
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $em)
+    {
+        $this->em = $em;
+        $this->repository = $em->getRepository(AccompanyingCourseDocument::class);
+    }
+
+    public function buildQueryByCourse(AccompanyingPeriod $course): QueryBuilder
+    {
+        $qb = $this->repository->createQueryBuilder('d');
+
+        $qb
+            ->where($qb->expr()->eq('d.course', ':course'))
+            ->setParameter('course', $course);
+
+        return $qb;
+    }
+
+    public function countByCourse(AccompanyingPeriod $course): int
+    {
+        $qb = $this->buildQueryByCourse($course)->select('COUNT(d)');
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
+    public function find($id): ?AccompanyingCourseDocument
+    {
+        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)
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?AccompanyingCourseDocument
+    {
+        return $this->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return AccompanyingCourseDocument::class;
+    }
+}

src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php

@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Repository;
+
+use Chill\DocStoreBundle\Entity\PersonDocument;
+use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Security\Core\Security;
+
+class PersonDocumentACLAwareRepository implements PersonDocumentACLAwareRepositoryInterface
+{
+    private AuthorizationHelperInterface $authorizationHelper;
+
+    private CenterResolverDispatcher $centerResolverDispatcher;
+
+    private EntityManagerInterface $em;
+
+    private Security $security;
+
+    public function __construct(EntityManagerInterface $em, AuthorizationHelperInterface $authorizationHelper, CenterResolverDispatcher $centerResolverDispatcher, Security $security)
+    {
+        $this->em = $em;
+        $this->authorizationHelper = $authorizationHelper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+        $this->security = $security;
+    }
+
+    public function buildQueryByPerson(Person $person): QueryBuilder
+    {
+        $qb = $this->em->getRepository(PersonDocument::class)->createQueryBuilder('d');
+
+        $qb
+            ->where($qb->expr()->eq('d.person', ':person'))
+            ->setParameter('person', $person);
+
+        return $qb;
+    }
+
+    public function countByPerson(Person $person): int
+    {
+        $qb = $this->buildQueryByPerson($person)->select('COUNT(d)');
+
+        $this->addACL($qb, $person);
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
+    public function findByPerson(Person $person, array $orderBy = [], int $limit = 20, int $offset = 0): array
+    {
+        $qb = $this->buildQueryByPerson($person)->select('d');
+
+        $this->addACL($qb, $person);
+
+        foreach ($orderBy as [$field, $order]) {
+            $qb->addOrderBy($field, $order);
+        }
+
+        $qb->setFirstResult($offset)->setMaxResults($limit);
+
+        return $qb->getQuery()->getResult();
+    }
+
+    private function addACL(QueryBuilder $qb, Person $person): void
+    {
+        $center = $this->centerResolverDispatcher->resolveCenter($person);
+
+        $reachableScopes = $this->authorizationHelper
+            ->getReachableScopes(
+                $this->security->getUser(),
+                PersonDocumentVoter::SEE,
+                $center
+            );
+
+        $qb->andWhere($qb->expr()->in('d.scope', ':scopes'))
+            ->setParameter('scopes', $reachableScopes);
+    }
+}

src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Repository;
+
+use Chill\PersonBundle\Entity\Person;
+
+interface PersonDocumentACLAwareRepositoryInterface
+{
+    public function countByPerson(Person $person): int;
+
+    public function findByPerson(Person $person, array $orderBy = [], int $limit = 20, int $offset = 0): array;
+}

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig

@@ -1,4 +1,5 @@
 {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
 
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc document-item bg-chill-llight-gray">
@@ -9,8 +10,10 @@
             <div class="col-8">
                 <h3>{{ document.title }}</h3>
 
+                {{ mm.mimeIcon(document.object.type) }}
+
                 {% if document.description is not empty %}
-                    <blockquote class="chill-user-quote mt-2">
+                    <blockquote class="chill-user-quote mt-4">
                         {{ document.description }}
                     </blockquote>
                 {% endif %}
@@ -42,26 +45,14 @@
             {{ m.download_button(document.object, document.title) }}
         </li>
         <li>
-        {% if not freezed %}
+        {% if chill_document_is_editable(document.object) %}
-            {% set button = {
+            {% if not freezed %}
-                'changeIcon': 'fa-unlock',
+                {{ document.object|chill_document_edit_button({'title': document.title|e('html') }) }}
-            } %}{#
+            {% else %}
-                'changeClass'   string
+                <a class="btn btn-wopilink disabled" href="#" title="{{ 'workflow.freezed document'|trans }}">
-                'noText'        boolean
+                    {{ 'Update document'|trans }}
-            #}
+                </a>
-            {# vue component
+            {% endif %}
-            <span
-                data-module="wopi-link"
-                data-wopi-url="{{ path('chill_wopi_file_edit', {'fileId': document.object.uuid}) }}"
-                data-doc-title="{{ document.title|e('html_attr') }}"
-                data-doc-type="{{ document.object.type|e('html_attr') }}"
-                data-button="{{ button|json_encode }}"
-            ></span> #}
-            <a class="btn btn-update" href="{{ chill_path_add_return_path('chill_wopi_file_edit', {'fileId': document.object.uuid}) }}">{{ 'Edit'|trans }}</a>
-        {% else %}
-            <a class="btn btn-update change-icon disabled" href="#" title="{{ 'workflow.freezed document'|trans }}">
-                <i class="fa fa-lock me-2"></i>{{ 'Update document'|trans }}
-            </a>
         {% endif %}
         {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE', document) and document.course != null %}
             <li>

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig

@@ -19,7 +19,7 @@
 	{{ form_row(form.description) }}
 	{{ form_row(form.object, { 'label': 'Document', 'existing': document.object }) }}
 
-	<ul class="record_actions">
+	<ul class="record_actions sticky-form-buttons">
 		<li class="cancel">
 			<a href="{{ path('accompanying_course_document_index', {'course': accompanyingCourse.id}) }}" class="btn btn-cancel">
 				{{ 'Back to the list' | trans }}

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig

@@ -2,8 +2,6 @@
 
 {% set activeRouteKey = '' %}
 
-{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
-
 {% block title %}
 	{{ 'Documents' }}
 {% endblock %}
@@ -11,64 +9,35 @@
 {% block js %}
 	{{ parent() }}
 	{{ encore_entry_script_tags('mod_async_upload') }}
-  {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
 {% endblock %}
 
 {% block css %}
 	{{ parent() }}
 	{{ encore_entry_link_tags('mod_async_upload') }}
-  {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
 {% endblock %}
 
 {% block content %}
+<div class="col-md-10 col-xxl">
 	<h1>{{ 'Documents' }}</h1>
 
-	<table class="table table-bordered border-dark table-striped">
+	{% if documents|length == 0 %}
-
+            <p class="chill-no-data-statement">{{ 'No documents'|trans }}</p>
-		<thead>
+    {% else %}
-			<tr>
+		<div class="flex-table chill-task-list">
-				<th>{{ 'Title' | trans }}</th>
-				<th>{{ 'Category'|trans }}</th>
-				<th>{{ 'Actions' | trans }}</th>
-			</tr>
-		</thead>
-		<tbody>
 			{% for document in documents %}
-				<tr>
+				{% include 'ChillDocStoreBundle:List:list_item.html.twig' %}
-					<td>{{ document.title }}</td>
-					<td>{% if document.category %}{{ document.category.name|localize_translatable_string }}{% endif %}</td>
-					<td>
-						<ul class="record_actions">
-							{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
-								<li>
-									{{ m.download_button(document.object, document.title) }}
-								</li>
-								<li>
-									<a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
-								</li>
-							{% endif %}
-							{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
-								<li>
-									<a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
-								</li>
-							{% endif %}
-						</ul>
-					</td>
-				</tr>
-			{% else %}
-				<tr>
-					<td colspan="9" style="text-align:center;">
-						<span class="chill-no-data-statement">{{ 'Any document found'|trans }}</span>
-					</td>
-				</tr>
 			{% endfor %}
-		</tbody>
+		</div>
-	</table>
+    {% endif %}
 
-    <div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\PersonBundle\Entity\AccompanyingPeriod" data-entity-id="{{ accompanyingCourse.id }}"></div>
+	{{ chill_pagination(pagination) }}
+
+	<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\PersonBundle\Entity\AccompanyingPeriod" data-entity-id="{{ accompanyingCourse.id }}"></div>
 
 	{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE', accompanyingCourse) %}
-		<ul class="record_actions">
+		<ul class="record_actions sticky-form-buttons">
 			<li class="create">
 				<a href="{{ path('accompanying_course_document_new', {'course': accompanyingCourse.id}) }}" class="btn btn-create">
 					{{ 'Create'|trans }}
@@ -76,4 +45,6 @@
 			</li>
 		</ul>
 	{% endif %}
+
+</div>
 {% endblock %}

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig

@@ -3,6 +3,7 @@
 {% set activeRouteKey = '' %}
 
 {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
 
 {% block title %}
 	{# {{ 'Detail of document of %name%'|trans({ '%name%': accompanyingCourse|chill_entity_render_string } ) }} #}
@@ -19,7 +20,9 @@
 <div class="document-show">
     <h1>{{ block('title') }}</h1>
 
-    <dl class="chill_view_data">
+    {{ mm.mimeIcon(document.object.type) }}
+
+    <dl class="chill_view_data mt-4">
         <dt>{{ 'Title'|trans }}</dt>
         <dd>{{ document.title }}</dd>
 
@@ -49,11 +52,15 @@
         <li>
             {{ m.download_button(document.object, document.title) }}
         </li>
+        {% if chill_document_is_editable(document.object) %}
+            <li>
+                {{ document.object|chill_document_edit_button }}
+            </li>
+        {% endif %}
         {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
             <li>
-                <a href="{{ path('accompanying_course_document_edit', {'id': document.id, 'course': accompanyingCourse.id}) }}" class="btn btn-edit">
+                <a href="{{ path('accompanying_course_document_edit', {'id': document.id, 'course': accompanyingCourse.id}) }}"
-                    {{ 'Edit' | trans }}
+                   class="btn btn-edit" title="{{ 'Edit attributes' | trans }}"></a>
-                </a>
             </li>
         {% endif %}
         {% set workflows_frame = chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) %}

src/Bundle/ChillDocStoreBundle/Resources/views/Button/wopi_edit_document.html.twig

@@ -0,0 +1,9 @@
+
+{# Twig way
+    TODO: une route, un template avec un header CHILL et un iframe
+#}
+<a href="{{ chill_path_add_return_path('chill_wopi_file_edit', {'fileId': document.uuid}) }}"
+    class="btn btn-wopilink">
+    {{ 'online_edit_document'|trans }}
+</a>
+

src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig

@@ -0,0 +1,83 @@
+{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
+<div class="item-bloc">
+    <div class="item-row">
+        <div class="item-col">
+            <div class="denomination h2">
+                {{ document.title }}
+            </div>
+            <div>
+                {{ mm.mimeIcon(document.object.type) }}
+            </div>
+            <div>
+                <p>{{ document.category.name|localize_translatable_string }}</p>
+            </div>
+            {% if document.template is not null %}
+                <div>
+                    <p>{{ document.template.name.fr }}</p>
+                </div>
+            {% endif %}
+        </div>
+
+        <div class="item-col">
+            <div class="container">
+                {% if document.date is not null %}
+                    <div class="dates row" style="float: right;">
+                        <span>{{ document.createdAt|format_date('short') }}</span>
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+    {% if document.description is not empty %}
+        <div class="item-row separator">
+            <blockquote class="chill-user-quote">
+                {{ document.description|chill_markdown_to_html }}
+            </blockquote>
+        </div>
+    {% endif %}
+    <div class="item-row separator">
+        <div class="item-col item-meta">
+            <div class="updatedBy">
+                {{ 'Created by'|trans }}:
+                <span class="user">{{ document.createdBy|chill_entity_render_string }}</span>
+                <span class="date">le {{ document.createdAt|format_date('long') }}</span>
+            </div>
+        </div>
+    </div>
+    <div>
+    {% if document.course is defined %}
+        <ul class="record_actions">
+            {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
+                <li>
+                    {{ m.download_button(document.object, document.title) }}
+                </li>
+                <li>
+                    <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
+                </li>
+            {% endif %}
+            {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
+                <li>
+                    <a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
+                </li>
+            {% endif %}
+        </ul>
+    {% else %}
+        <ul class="record_actions">
+            {% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
+                <li>
+                    {{ m.download_button(document.object, document.title) }}
+                </li>
+                <li>
+                    <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
+                </li>
+            {% endif %}
+            {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
+                <li>
+                    <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
+                </li>
+            {% endif %}
+        </ul>
+    {% endif %}
+    </div>
+</div>

src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro_mimeicon.html.twig

@@ -0,0 +1,55 @@
+{% macro mimeIcon(type) %}
+    
+    {# mapping
+        forkawesome and mime type  https://gist.github.com/colemanw/9c9a12aae16a4bfe2678de86b661d922
+    #}
+    {% set mapmime = {
+        'image': 'fa-file-image-o',
+        'audio': 'fa-file-audio-o',
+        'video': 'fa-file-video-o',
+        'application/pdf': 'fa-file-pdf-o',
+        'application/msword': 'fa-file-word-o',
+        'application/vnd.ms-word': 'fa-file-word-o',
+        'application/vnd.oasis.opendocument.text': 'fa-file-word-o',
+        'application/vnd.openxmlformats-officedocument.wordprocessingml': 'fa-file-word-o',
+        'application/vnd.ms-excel': 'fa-file-excel-o',
+        'application/vnd.openxmlformats-officedocument.spreadsheetml': 'fa-file-excel-o',
+        'application/vnd.oasis.opendocument.spreadsheet': 'fa-file-excel-o',
+        'application/vnd.ms-powerpoint': 'fa-file-powerpoint-o',
+        'application/vnd.openxmlformats-officedocument.presentationml': 'fa-file-powerpoint-o',
+        'application/vnd.oasis.opendocument.presentation': 'fa-file-powerpoint-o',
+        'text/plain': 'fa-file-text-o',
+        'text/html': 'fa-file-code-o',
+        'application/json': 'fa-file-code-o',
+        'application/gzip': 'fa-file-archive-o',
+        'application/zip': 'fa-file-archive-o',
+    } %}
+    
+    {% set icon = 'fa-file-o' %}
+    {% for key,val in mapmime %}
+        {% if type starts with key %}
+            {% set icon = val %}
+        {% endif %}
+    {% endfor %}
+    
+    {# TODO improve mapping
+        mime type and friendly name  https://gist.github.com/rosskmurphy/3724501
+    #}
+    {% set maptype = {
+        'fa-file-word-o': 'office document/texte',
+        'fa-file-excel-o': 'office document/tableur',
+        'fa-file-powerpoint-o': 'office document/presentation',
+    } %}
+    
+    {% set label = type %}
+    {% for key, val in maptype %}
+        {% if icon == key %}
+            {% set label = val %}
+        {% endif %}
+    {% endfor %}
+    
+    <div class="metadata">
+        <i class="fa {{ icon }} fa-lg me-1"></i>
+        {{ label|capitalize }}
+    </div>
+{% endmacro %}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig

@@ -30,7 +30,9 @@
     {{ form_row(form.title) }}
     {{ form_row(form.date) }}
     {{ form_row(form.category) }}
-    {{ form_row(form.scope) }}
+    {% if form.scope is defined %}
+        {{ form_row(form.scope) }}
+    {% endif %}
     {{ form_row(form.description) }}
     {{ form_row(form.object, { 'label': 'Document', 'existing': document.object }) }}
 

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig

@@ -30,54 +30,24 @@
 {% endblock %}
 
 {% block personcontent %}
+
+<div class="col-md-10 col-xxl">
 	<h1>{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}</h1>
 
-	<table class="table table-bordered border-dark table-striped">
+	{% if documents|length == 0 %}
-
+            <p class="chill-no-data-statement">{{ 'No documents'|trans }}</p>
-		<thead>
+    {% else %}
-			<tr>
+		<div class="flex-table chill-task-list">
-				<th>{{ 'Title' | trans }}</th>
-				<th>{{ 'Category'|trans }}</th>
-				<th>{{ 'Circle' | trans }}</th>
-				<th>{{ 'Actions' | trans }}</th>
-			</tr>
-		</thead>
-		<tbody>
 			{% for document in documents %}
-				<tr>
+				{% include 'ChillDocStoreBundle:List:list_item.html.twig' %}
-					<td>{{ document.title }}</td>
-					<td>{{ document.category.name|localize_translatable_string }}</td>
-					<td>{{ document.scope.name|localize_translatable_string }}</td>
-					<td>
-						<ul class="record_actions">
-							{% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
-								<li>
-									{{ m.download_button(document.object, document.title) }}
-								</li>
-								<li>
-									<a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
-								</li>
-							{% endif %}
-							{% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
-								<li>
-									<a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
-								</li>
-							{% endif %}
-						</ul>
-					</td>
-				</tr>
-			{% else %}
-				<tr>
-					<td colspan="9" style="text-align:center;">
-						<span class="chill-no-data-statement">{{ 'Any document found'|trans }}</span>
-					</td>
-				</tr>
 			{% endfor %}
-		</tbody>
+		</div>
-	</table>
+    {% endif %}
+
+	{{ chill_pagination(pagination) }}
 
 	{% if is_granted('CHILL_PERSON_DOCUMENT_CREATE', person) %}
-		<ul class="record_actions">
+		<ul class="record_actions sticky-form-buttons">
 			<li class="create">
 				<a href="{{ path('person_document_new', {'person': person.id}) }}" class="btn btn-create">
 					{{ 'Create new document' | trans }}
@@ -85,4 +55,6 @@
 			</li>
 		</ul>
 	{% endif %}
+
+</div>
 {% endblock %}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig

@@ -19,6 +19,7 @@
 {% set activeRouteKey = '' %}
 
 {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
 
 {% block title %}{{ 'Detail of document of %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
@@ -29,12 +30,16 @@
 {% block personcontent %}
     <h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>
 
+    {{ mm.mimeIcon(document.object.type) }}
+
     <dl class="chill_view_data">
         <dt>{{ 'Title'|trans }}</dt>
         <dd>{{ document.title }}</dd>
 
+        {% if document.scope is not null %}
         <dt>{{ 'Scope' | trans }}</dt>
         <dd>{{ document.scope.name | localize_translatable_string }}</dd>
+        {% endif %}
 
         <dt>{{ 'Category'|trans }}</dt>
         <dd>{{ document.category.name|localize_translatable_string }}</dd>
@@ -52,7 +57,7 @@
 
     </dl>
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
                 {{ 'Back to the list' | trans }}
@@ -63,6 +68,12 @@
             {{ m.download_button(document.object, document.title) }}
         </li>
 
+        {% if chill_document_is_editable(document.object) %}
+            <li>
+                {{ document.object|chill_document_edit_button }}
+            </li>
+        {% endif %}
+
         {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
             <li>
                 <a href="{{ path('person_document_edit', {'id': document.id, 'person': person.id}) }}" class="btn btn-edit">

src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtension.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Templating;
+
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
+
+class WopiEditTwigExtension extends AbstractExtension
+{
+    public function getFilters(): array
+    {
+        return [
+            new TwigFilter('chill_document_edit_button', [WopiEditTwigExtensionRuntime::class, 'renderEditButton'], [
+                'needs_environment' => true,
+                'is_safe' => ['html'],
+            ]),
+        ];
+    }
+
+    public function getFunctions(): array
+    {
+        return [
+            new TwigFunction('chill_document_is_editable', [WopiEditTwigExtensionRuntime::class, 'isEditable']),
+        ];
+    }
+}

src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php

@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Templating;
+
+use ChampsLibres\WopiLib\Contract\Service\Discovery\DiscoveryInterface;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Twig\Environment;
+use Twig\Extension\RuntimeExtensionInterface;
+use function array_key_exists;
+
+class WopiEditTwigExtensionRuntime implements RuntimeExtensionInterface
+{
+    public const TEMPLATE = '@ChillDocStore/Button/wopi_edit_document.html.twig';
+
+    private DiscoveryInterface $discovery;
+
+    public function __construct(DiscoveryInterface $discovery)
+    {
+        $this->discovery = $discovery;
+    }
+
+    public function isEditable(StoredObject $document): bool
+    {
+        $mime_type = $this->discovery->discoverMimeType($document->getType());
+
+        if ([] === $mime_type) {
+            return false;
+        }
+
+        foreach ($mime_type as $item) {
+            if (array_key_exists('default', $item) && 'true' === $item['default']) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function renderEditButton(Environment $environment, StoredObject $document, ?array $options = null): string
+    {
+        return $environment->render(self::TEMPLATE, [
+            'document' => $document,
+            'options' => $options,
+        ]);
+    }
+}

src/Bundle/ChillDocStoreBundle/config/services.yaml

@@ -6,7 +6,6 @@ services:
     autowire: true
     autoconfigure: true
     resource: "../Repository/"
-    tags: ["doctrine.repository_service"]
 
   Chill\DocStoreBundle\Form\DocumentCategoryType:
     class: Chill\DocStoreBundle\Form\DocumentCategoryType
@@ -16,8 +15,10 @@ services:
 
   Chill\DocStoreBundle\Form\PersonDocumentType:
     class: Chill\DocStoreBundle\Form\PersonDocumentType
-    arguments:
+    autowire: true
-      - "@chill.main.helper.translatable_string"
+    autoconfigure: true
+    # arguments:
+    #   - "@chill.main.helper.translatable_string"
     tags:
       - { name: form.type, alias: chill_docstorebundle_form_document }
 

src/Bundle/ChillDocStoreBundle/config/services/templating.yaml

@@ -0,0 +1,6 @@
+services:
+
+  Chill\DocStoreBundle\Templating\:
+    resource: ../../Templating
+    autoconfigure: true
+    autowire: true

src/Bundle/ChillDocStoreBundle/migrations/Version20220131093117.php

@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\DocStore;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Implementations of create and update traits for Document entity + template property added.
+ */
+final class Version20220131093117 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP CONSTRAINT FK_41DA53C5DA0FB8');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP CONSTRAINT FK_41DA53C3174800F');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP CONSTRAINT FK_41DA53C65FF1AEC');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP template_id');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP createdAt');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP updatedAt');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP createdBy_id');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP updatedBy_id');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F65DA0FB8');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F63174800F');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F665FF1AEC');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP template_id');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP createdAt');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP updatedAt');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP createdBy_id');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP updatedBy_id');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Implementations of create and update traits for Document entity + template property added';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD template_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD createdBy_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD updatedBy_id INT DEFAULT NULL');
+        $this->addSql('COMMENT ON COLUMN chill_doc.accompanyingcourse_document.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_doc.accompanyingcourse_document.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD CONSTRAINT FK_A45098F65DA0FB8 FOREIGN KEY (template_id) REFERENCES chill_docgen_template (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD CONSTRAINT FK_A45098F63174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD CONSTRAINT FK_A45098F665FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_A45098F65DA0FB8 ON chill_doc.accompanyingcourse_document (template_id)');
+        $this->addSql('CREATE INDEX IDX_A45098F63174800F ON chill_doc.accompanyingcourse_document (createdBy_id)');
+        $this->addSql('CREATE INDEX IDX_A45098F665FF1AEC ON chill_doc.accompanyingcourse_document (updatedBy_id)');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD template_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD createdBy_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD updatedBy_id INT DEFAULT NULL');
+        $this->addSql('COMMENT ON COLUMN chill_doc.person_document.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_doc.person_document.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD CONSTRAINT FK_41DA53C5DA0FB8 FOREIGN KEY (template_id) REFERENCES chill_docgen_template (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD CONSTRAINT FK_41DA53C3174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD CONSTRAINT FK_41DA53C65FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_41DA53C5DA0FB8 ON chill_doc.person_document (template_id)');
+        $this->addSql('CREATE INDEX IDX_41DA53C3174800F ON chill_doc.person_document (createdBy_id)');
+        $this->addSql('CREATE INDEX IDX_41DA53C65FF1AEC ON chill_doc.person_document (updatedBy_id)');
+    }
+}

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

@@ -10,6 +10,7 @@ New document for %name%: Nouveau document pour %name%
 Editing document for %name%: Modification d'un document pour %name%
 Edit Document: Modification d'un document
 Update document: Modifier le document
+Edit attributes: Modifier les propriétés du document
 Existing document: Document existant
 No document to download: Aucun document à télécharger
 'Choose a document category': Choisissez une catégorie de document
@@ -52,3 +53,6 @@ Document class: Classe de document
 no records found:
 Create new category: Créer une nouvelle catégorie
 Back to the category list: Retour à la liste
+
+# WOPI EDIT
+online_edit_document: Éditer en ligne

src/Bundle/ChillMainBundle/Controller/LocationApiController.php

@@ -12,6 +12,8 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -19,7 +21,7 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class LocationApiController extends ApiController
 {
-    public function customizeQuery(string $action, Request $request, $query): void
+    protected function customizeQuery(string $action, Request $request, $query): void
     {
         $query
             ->leftJoin('e.locationType', 'lt')
@@ -31,4 +33,14 @@ class LocationApiController extends ApiController
                 )
             );
     }
+
+    /**
+     * @param QueryBuilder $query
+     * @param mixed $_format
+     */
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
+    {
+        return $query
+            ->addOrderBy('e.name', 'ASC');
+    }
 }

src/Bundle/ChillMainBundle/Controller/WorkflowController.php

@@ -167,6 +167,7 @@ class WorkflowController extends AbstractController
 
         $handler = $this->entityWorkflowManager->getHandler($entityWorkflow);
         $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
+        $errors = [];
 
         if (count($workflow->getEnabledTransitions($entityWorkflow)) > 0) {
             // possible transition
@@ -245,7 +246,7 @@ class WorkflowController extends AbstractController
                 'handler_template_data' => $handler->getTemplateData($entityWorkflow),
                 'transition_form' => isset($transitionForm) ? $transitionForm->createView() : null,
                 'entity_workflow' => $entityWorkflow,
-                'transition_form_errors' => $errors ?? [],
+                'transition_form_errors' => $errors,
                 //'comment_form' => $commentForm->createView(),
             ]
         );

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php

@@ -135,6 +135,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
         if (!$this->steps->contains($step)) {
             $this->steps[] = $step;
             $step->setEntityWorkflow($this);
+            $this->stepsChainedCache = null;
         }
 
         return $this;
@@ -332,32 +333,26 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 
     public function isFinal(): bool
     {
-        $steps = $this->getStepsChained();
+        foreach ($this->getStepsChained() as $step) {
-
+            if ($step->isFinal()) {
-        if (1 === count($steps)) {
+                return true;
-            // the initial step cannot be finalized
+            }
-            return false;
         }
 
-        /** @var EntityWorkflowStep $last */
+        return false;
-        $last = end($steps);
-
-        return $last->isFinal();
     }
 
     public function isFreeze(): bool
     {
         $steps = $this->getStepsChained();
 
-        if (1 === count($steps)) {
+        foreach ($this->getStepsChained() as $step) {
-            // the initial step cannot be finalized
+            if ($step->isFreezeAfter()) {
-            return false;
+                return true;
+            }
         }
 
-        /** @var EntityWorkflowStep $last */
+        return false;
-        $last = end($steps);
-
-        return $last->getPrevious()->isFreezeAfter();
     }
 
     public function isUserSubscribedToFinal(User $user): bool
@@ -434,7 +429,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
         $newStep->setCurrentStep($step);
 
         // copy the freeze
-        if ($this->getCurrentStep()->isFreezeAfter()) {
+        if ($this->isFreeze()) {
             $newStep->setFreezeAfter(true);
         }
 

src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepRepository.php

@@ -56,7 +56,7 @@ class EntityWorkflowStepRepository implements ObjectRepository
 
     public function getClassName()
     {
-        return EntityWorkflow::class;
+        return EntityWorkflowStep::class;
     }
 
     private function buildQueryByUser(User $user): QueryBuilder

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

@@ -15,6 +15,7 @@ $chill-theme-buttons: (
    "action":        $chill-orange,
    "edit":          $chill-orange,
    "update":        $chill-orange,
+   "wopilink":      $chill-orange,
    "show":          $chill-blue,
    "view":          $chill-blue,
    "misc":          $gray-300,
@@ -54,6 +55,7 @@ $chill-theme-buttons: (
    &.btn-action,
    &.btn-edit,
    &.btn-tpchild,
+   &.btn-wopilink,
    &.btn-update {
        &, &:hover {
           color: $light;
@@ -66,6 +68,7 @@ $chill-theme-buttons: (
    &.btn-create::before,
    &.btn-edit::before,
    &.btn-update::before,
+   &.btn-wopilink::before,
    &.btn-show::before,
    &.btn-view::before,
    &.btn-save::before,
@@ -98,6 +101,7 @@ $chill-theme-buttons: (
    &.btn-create::before    { content: "\f067"; } // fa-plus
    &.btn-edit::before,
    &.btn-update::before    { content: "\f040"; } // fa-pencil
+   &.btn-wopilink::before  { content: "\f1dd"; } // fa-paragraph
    &.btn-show::before,
    &.btn-view::before      { content: "\f06e"; } // fa-eye
    &.btn-save::before      { content: "\f0c7"; } // fa-floppy-o

src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js

@@ -17,7 +17,12 @@ function loadDynamicPicker(element) {
             isMultiple = parseInt(el.dataset.multiple) === 1,
             uniqId = el.dataset.uniqid,
             input = element.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'),
-            picked = (isMultiple) ? (JSON.parse(input.value)) : ((input.value === '[]') ? (null) : ([JSON.parse(input.value)]));
+            picked = isMultiple ?
+                JSON.parse(input.value) : (
+                    (input.value === '[]' || input.value === '') ?
+                        null : [ JSON.parse(input.value) ]
+                )
+        ;
 
         if (!isMultiple) {
             if (input.value === '[]'){

src/Bundle/ChillMainBundle/Resources/public/module/wopi-link/index.js

@@ -4,20 +4,34 @@ import {_createI18n} from "ChillMainAssets/vuejs/_js/i18n";
 
 const i18n = _createI18n({});
 
+
+//TODO move to chillDocStore or ChillWopi
+
+/*
+
+tags to load module:
+
+<span data-module="wopi-link"
+    data-wopi-url="{{ path('chill_wopi_file_edit', {'fileId': document.uuid}) }}"
+    data-doc-type="{{ document.type|e('html_attr') }}"
+    data-options="{{ options|json_encode }}"
+        ></span>
+
+*/
+
 window.addEventListener('DOMContentLoaded', function (e) {
     document.querySelectorAll('span[data-module="wopi-link"]')
         .forEach(function (el) {
             createApp({
-                template: '<open-wopi-link :wopiUrl="wopiUrl" :title="title" :type="type" :button="button"></open-wopi-link>',
+                template: '<open-wopi-link :wopiUrl="wopiUrl" :type="type" :options="options"></open-wopi-link>',
                 components: {
                     OpenWopiLink
                 },
                 data() {
                     return {
                         wopiUrl: el.dataset.wopiUrl,
-                        title: el.dataset.docTitle,
                         type: el.dataset.docType,
-                        button: el.dataset.button ? JSON.parse(el.dataset.button) : {}
+                        options: el.dataset.options !== 'null' ? JSON.parse(el.dataset.options) : {}
                     }
                 }
             })

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue

@@ -32,7 +32,7 @@
                </span>
             </td>
             <td>
-               <span v-if="c.emergency" class="badge rounded-pill bg-danger">{{ $t('emergency') }}</span>
+               <span v-if="c.emergency" class="badge rounded-pill bg-danger me-1">{{ $t('emergency') }}</span>
                <span v-if="c.confidential" class="badge rounded-pill bg-danger">{{ $t('confidential') }}</span>
             </td>
             <td>
@@ -80,5 +80,7 @@ export default {
 </script>
 
 <style scoped>
-
+span.badge.rounded-pill.bg-danger {
+   text-transform: uppercase;
+}
 </style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js

@@ -50,7 +50,9 @@ const appMessages = {
             assignated_evaluations: "{n} évaluation assignée | {n} évaluations assignées",
             alert_tasks: "{n} tâche en rappel | {n} tâches en rappel",
             warning_tasks: "{n} tâche à échéance | {n} tâches à échéance",
-        }
+        },
+        emergency: "Urgent",
+        confidential: "Confidentiel",
     }
 };
 

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue

@@ -90,7 +90,7 @@ export default {
       OnTheFlyThirdparty,
       OnTheFlyCreate
    },
-   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent', 'canCloseModal'],
+   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent'],
    emits: ['saveFormOnTheFly'],
    data() {
       return {
@@ -160,17 +160,10 @@ export default {
       },
       badgeType() {
          return 'entity-' + this.type + ' badge-' + this.type;
-      }
+      },
-   },
+      getReturnPath() {
-   watch: {
+         return `?returnPath=${window.location.pathname}${window.location.search}${window.location.hash}`;
-      canCloseModal: {
+      },
-         handler: function(val, oldVal) {
-            if (val) {
-               this.closeModal();
-            }
-         },
-         deep: true
-      }
    },
    methods: {
       closeModal() {
@@ -217,9 +210,9 @@ export default {
       buildLocation(id, type) {
          if (type === 'person') {
             // TODO i18n
-            return `/fr/person/${id}/general`;
+            return encodeURI(`/fr/person/${id}/general${this.getReturnPath}`);
          } else if (type === 'thirdparty') {
-            return `/fr/3party/3party/${id}/view`;
+            return encodeURI(`/fr/3party/3party/${id}/view${this.getReturnPath}`);
          }
       }
    }

src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue

@@ -5,8 +5,8 @@
         </li>
     </ul>
     <ul class="record_actions">
-        <li>
+        <li class="add-persons">
-            <AddPersons
+            <add-persons
                 :options="addPersonsOptions"
                 :key="uniqid"
                 :buttonTitle="translatedListOfTypes"
@@ -14,7 +14,7 @@
                 ref="addPersons"
                 @addNewPersons="addNewEntity"
             >
-            </AddPersons>
+            </add-persons>
         </li>
     </ul>
 </template>

src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js

@@ -1,4 +1,7 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n';
+import { thirdpartyMessages } from 'ChillThirdPartyAssets/vuejs/_js/i18n';
+import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n';
+import { ontheflyMessages } from 'ChillMainAssets/vuejs/OnTheFly/i18n';
 
 const appMessages = {
     fr: {
@@ -12,6 +15,6 @@ const appMessages = {
     }
 }
 
-Object.assign(appMessages.fr, personMessages.fr);
+Object.assign(appMessages.fr, personMessages.fr, thirdpartyMessages.fr, addressMessages.fr, ontheflyMessages.fr );
 
 export { appMessages };

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue

@@ -42,57 +42,11 @@
                   class="street">
                   {{ address.text }}
                </p>
-               <p v-if="address.postcode"
-                  class="postcode">
-                  {{ address.postcode.code }} {{ address.postcode.name }}
-               </p>
-               <p v-if="address.country"
-                  class="country">
-                  {{ address.country.name.fr }}
-               </p>
             </div>
          </div>
 
       </component>
 
-      <!-- <div v-if="isMultiline === true" class="address-more">
-         <div v-if="address.floor">
-            <span class="floor">
-               <b>{{ $t('floor') }}</b>: {{ address.floor }}
-            </span>
-         </div>
-         <div v-if="address.corridor">
-            <span class="corridor">
-               <b>{{ $t('corridor') }}</b>: {{ address.corridor }}
-            </span>
-         </div>
-         <div v-if="address.steps">
-            <span class="steps">
-               <b>{{ $t('steps') }}</b>: {{ address.steps }}
-            </span>
-         </div>
-         <div v-if="address.flat">
-            <span class="flat">
-               <b>{{ $t('flat') }}</b>: {{ address.flat }}
-            </span>
-         </div>
-         <div v-if="address.buildingName">
-               <span class="buildingName">
-                  <b>{{ $t('buildingName') }}</b>: {{ address.buildingName }}
-               </span>
-         </div>
-         <div v-if="address.extra">
-               <span class="extra">
-                  <b>{{ $t('extra') }}</b>: {{ address.extra }}
-               </span>
-         </div>
-         <div v-if="address.distribution">
-               <span class="distribution">
-                  <b>{{ $t('distribution') }}</b>: {{ address.distribution }}
-               </span>
-         </div>
-      </div> -->
-
       <div v-if="useDatePane === true" class="address-more">
          <div v-if="address.validFrom">
             <span class="validFrom">

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue

@@ -1,12 +1,14 @@
 <template>
    <a v-if="isOpenDocument"
-      class="btn change-icon" :class="[isChangeClass ? button.changeClass : 'btn-edit']"
+      class="btn" :class="[
+         isChangeIcon ? 'change-icon' : '',
+         isChangeClass ? options.changeClass : 'btn-wopilink' ]"
       @click="openModal">
       
-      <i class="fa me-2" :class="[isChangeIcon ? button.changeIcon : 'fa-pencil']"></i>
+      <i v-if="isChangeIcon" class="fa me-2" :class="options.changeIcon"></i>
       
       <span v-if="!noText">
-         {{ $t('Update_document') }}
+         {{ $t('online_edit_document') }}
       </span>
    </a>
    
@@ -20,12 +22,14 @@
             <template v-slot:header>
                <img class="logo" :src="logo" height="45"/>
                   <span class="ms-auto me-3">
-                     {{ this.title }}
+                     <span v-if="options.title">{{ options.title }}</span>
                   </span>
+                  <!--
                   <a class="btn btn-outline-light">
                      <i class="fa fa-save fa-fw"></i>
                      {{ $t('save_and_quit') }}
                   </a>
+                  -->
             </template>
             
             <template v-slot:body>
@@ -71,15 +75,11 @@ export default {
          type: String,
          required: true
       },
-      title: {
-         type: String,
-         required: true
-      },
       type: {
          type: String,
          required: true
       },
-      button: {
+      options: {
          type: Object,
          required: false
       }
@@ -175,20 +175,20 @@ export default {
          return false;
       },
       noText() {
-         if (typeof this.button.noText !== 'undefined') {
+         if (typeof this.options.noText !== 'undefined') {
-            return this.button.noText === true;
+            return this.options.noText === true;
          }
          return false;
       },
       isChangeIcon() {
-         if (typeof this.button.changeIcon !== 'undefined') {
+         if (typeof this.options.changeIcon !== 'undefined') {
-            return (!(this.button.changeIcon === null || this.button.changeIcon === ''))
+            return (!(this.options.changeIcon === null || this.options.changeIcon === ''))
          }
          return false;
       },
       isChangeClass() {
-         if (typeof this.button.changeClass !== 'undefined') {
+         if (typeof this.options.changeClass !== 'undefined') {
-            return (!(this.button.changeClass === null || this.button.changeClass === ''))
+            return (!(this.options.changeClass === null || this.options.changeClass === ''))
          }
          return false;
       }
@@ -205,7 +205,7 @@ export default {
    i18n: {
       messages: {
          fr: {
-            Update_document: "Modifier le document",
+            online_edit_document: "Éditer en ligne",
             save_and_quit: "Enregistrer et quitter",
             loading: "Chargement de l'éditeur en ligne",
             invalid_title: "Format incompatible",

src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig

@@ -6,7 +6,6 @@
 
 {% block js %}
     {{ parent() }}
-    
     {{ encore_entry_script_tags('mod_async_upload') }}
     {{ encore_entry_script_tags('mod_pickentity_type') }}
     {{ encore_entry_script_tags('mod_entity_workflow_subscribe') }}

src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php

@@ -64,7 +64,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
         if ($address instanceof Address) {
             $data = [
                 'address_id' => $address->getId(),
-                'text' => $address->isNoAddress() ? null : $this->addressRender->renderStreetLine($address, []),
+                'text' => $this->addressRender->renderString($address, []),
                 'street' => $address->getStreet(),
                 'streetNumber' => $address->getStreetNumber(),
                 'postcode' => [

src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Serializer\Normalizer;
 
 use LogicException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Exception\RuntimeException;
 use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
@@ -44,7 +45,7 @@ class DiscriminatedObjectDenormalizer implements ContextAwareDenormalizerInterfa
             if ($this->denormalizer->supportsDenormalization($data, $localType, $format)) {
                 try {
                     return $this->denormalizer->denormalize($data, $localType, $format, $context);
-                } catch (RuntimeException $e) {
+                } catch (RuntimeException|NotNormalizableValueException $e) {
                     $lastException = $e;
                 }
             }

src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php

@@ -124,7 +124,7 @@ class AddressRender implements ChillEntityRenderInterface
      */
     public function renderString($addr, array $options): string
     {
-        return implode(' - ', $this->renderLines($addr));
+        return implode(' — ', $this->renderLines($addr));
     }
 
     public function supports($entity, array $options): bool

src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php

@@ -24,30 +24,30 @@ final class EntityWorkflowTest extends TestCase
     {
         $entityWorkflow = new EntityWorkflow();
 
-        $entityWorkflow->getCurrentStep()->setFinalizeAfter(true);
         $entityWorkflow->setStep('final');
+        $entityWorkflow->getCurrentStep()->setIsFinal(true);
 
-        $this->assertTrue($entityWorkflow->isFinalize());
+        $this->assertTrue($entityWorkflow->isFinal());
     }
 
     public function testIsFinalizeWith4Steps()
     {
         $entityWorkflow = new EntityWorkflow();
 
-        $this->assertFalse($entityWorkflow->isFinalize());
+        $this->assertFalse($entityWorkflow->isFinal());
 
         $entityWorkflow->setStep('two');
 
-        $this->assertFalse($entityWorkflow->isFinalize());
+        $this->assertFalse($entityWorkflow->isFinal());
 
         $entityWorkflow->setStep('previous_final');
 
-        $this->assertFalse($entityWorkflow->isFinalize());
+        $this->assertFalse($entityWorkflow->isFinal());
 
-        $entityWorkflow->getCurrentStep()->setFinalizeAfter(true);
+        $entityWorkflow->getCurrentStep()->setIsFinal(true);
         $entityWorkflow->setStep('final');
 
-        $this->assertTrue($entityWorkflow->isFinalize());
+        $this->assertTrue($entityWorkflow->isFinal());
     }
 
     public function testIsFreeze()
@@ -64,11 +64,8 @@ final class EntityWorkflowTest extends TestCase
 
         $this->assertFalse($entityWorkflow->isFreeze());
 
-        $entityWorkflow->getCurrentStep()->setFreezeAfter(true);
-
-        $this->assertFalse($entityWorkflow->isFreeze());
-
         $entityWorkflow->setStep('freezed');
+        $entityWorkflow->getCurrentStep()->setFreezeAfter(true);
 
         $this->assertTrue($entityWorkflow->isFreeze());
 

src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php

@@ -48,7 +48,7 @@ final class AddressRenderTest extends KernelTestCase
 
         $addr->setBuildingName('Résidence "Les Bleuets"');
 
-        yield [$addr, 'Résidence "Les Bleuets" - Rue ABC, 5 - 012345 Locality - Belgium'];
+        yield [$addr, 'Résidence "Les Bleuets" — Rue ABC, 5 — 012345 Locality — Belgium'];
     }
 
     public function addressDataProviderBEWithSteps(): Iterator
@@ -68,7 +68,7 @@ final class AddressRenderTest extends KernelTestCase
 
         $addr->setSteps('4');
 
-        yield [$addr, 'esc 4 - Rue ABC, 5 - 012345 Locality - Belgium'];
+        yield [$addr, 'esc 4 — Rue ABC, 5 — 012345 Locality — Belgium'];
     }
 
     public function addressDataProviderFRWithBuilding(): Iterator
@@ -88,7 +88,7 @@ final class AddressRenderTest extends KernelTestCase
 
         $addr->setBuildingName('Résidence "Les Bleuets"');
 
-        yield [$addr, 'Résidence "Les Bleuets" - 5, Rue ABC - 012345 Locality - France'];
+        yield [$addr, 'Résidence "Les Bleuets" — 5, Rue ABC — 012345 Locality — France'];
     }
 
     public function addressDataProviderFRWithSteps(): Iterator
@@ -108,7 +108,7 @@ final class AddressRenderTest extends KernelTestCase
 
         $addr->setSteps('4');
 
-        yield [$addr, 'esc 4 - 5, Rue ABC - 012345 Locality - France'];
+        yield [$addr, 'esc 4 — 5, Rue ABC — 012345 Locality — France'];
     }
 
     public function complexAddressDataProviderBE(): Iterator
@@ -132,7 +132,7 @@ final class AddressRenderTest extends KernelTestCase
         $addr->setCorridor('3');
         $addr->setSteps('4');
 
-        yield [$addr, 'Résidence "Les Bleuets" - appart 1 - ét 2 - coul 3 - esc 4 - Rue ABC, 5 - 012345 Locality - Belgium'];
+        yield [$addr, 'Résidence "Les Bleuets" - appart 1 - ét 2 - coul 3 - esc 4 — Rue ABC, 5 — 012345 Locality — Belgium'];
     }
 
     public function complexAddressDataProviderFR(): Iterator
@@ -158,7 +158,7 @@ final class AddressRenderTest extends KernelTestCase
         $addr->setExtra('A droite de la porte');
         $addr->setDistribution('CEDEX');
 
-        yield [$addr, 'appart 1 - ét 2 - coul 3 - esc 4 - Résidence "Les Bleuets" - 5, Rue ABC - A droite de la porte - 012345 Locality CEDEX - France'];
+        yield [$addr, 'appart 1 - ét 2 - coul 3 - esc 4 — Résidence "Les Bleuets" — 5, Rue ABC — A droite de la porte — 012345 Locality CEDEX — France'];
     }
 
     public function noFullAddressDataProviderBE(): Iterator
@@ -175,7 +175,7 @@ final class AddressRenderTest extends KernelTestCase
         $addr->setPostcode($postCode)
             ->setIsNoAddress(true);
 
-        yield [$addr, '012345 Locality - Belgium'];
+        yield [$addr, '012345 Locality — Belgium'];
     }
 
     public function simpleAddressDataProviderBE(): Iterator
@@ -193,7 +193,7 @@ final class AddressRenderTest extends KernelTestCase
             ->setStreetNumber('5')
             ->setPostcode($postCode);
 
-        yield [$addr, 'Rue ABC, 5 - 012345 Locality - Belgium'];
+        yield [$addr, 'Rue ABC, 5 — 012345 Locality — Belgium'];
     }
 
     public function simpleAddressDataProviderFR(): Iterator
@@ -211,7 +211,7 @@ final class AddressRenderTest extends KernelTestCase
             ->setStreetNumber('5')
             ->setPostcode($postCode);
 
-        yield [$addr, '5, Rue ABC - 012345 Locality - France'];
+        yield [$addr, '5, Rue ABC — 012345 Locality — France'];
     }
 
     /**

src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php

@@ -32,20 +32,20 @@ final class WorkflowByUserCounter implements NotificationCounterInterface, Event
         $this->cacheItemPool = $cacheItemPool;
     }
 
-    public function addNotification(UserInterface $user): int
+    public function addNotification(UserInterface $u): int
     {
-        if (!$user instanceof User) {
+        if (!$u instanceof User) {
             return 0;
         }
 
-        $key = self::generateCacheKeyWorkflowByUser($user);
+        $key = self::generateCacheKeyWorkflowByUser($u);
         $item = $this->cacheItemPool->getItem($key);
 
         if ($item->isHit()) {
             return $item->get();
         }
 
-        $nb = $this->getCountUnreadByUser($user);
+        $nb = $this->getCountUnreadByUser($u);
 
         $item->set($nb)
             ->expiresAfter(60 * 15);

src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php

@@ -72,17 +72,18 @@ class MetadataExtractor
 
         foreach ($transitions as $transition) {
             if ($transition->getName() === $transitionName) {
-                break;
+                $metadata = $workflow->getMetadataStore()->getTransitionMetadata($transition);
+
+                return [
+                    'name' => $transition->getName(),
+                    'text' => array_key_exists('label', $metadata) ?
+                        $this->translatableStringHelper->localize($metadata['label']) : $transition->getName(),
+                    'isForward' => $metadata['isForward'] ?? null,
+                ];
             }
         }
-        $metadata = $workflow->getMetadataStore()->getTransitionMetadata($transition);
 
-        return [
+        return [];
-            'name' => $transition->getName(),
-            'text' => array_key_exists('label', $metadata) ?
-                $this->translatableStringHelper->localize($metadata['label']) : $transition->getName(),
-            'isForward' => $metadata['isForward'] ?? null,
-        ];
     }
 
     public function buildArrayPresentationForWorkflow(WorkflowInterface $workflow): array

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php

@@ -16,6 +16,7 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\MainBundle\Serializer\Model\Counter;
+use Chill\MainBundle\Serializer\Normalizer\DiscriminatedObjectDenormalizer;
 use Chill\PersonBundle\AccompanyingPeriod\Suggestion\ReferralsSuggestionInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
@@ -234,17 +235,19 @@ final class AccompanyingCourseApiController extends ApiController
             $requestor = null;
             $exceptions = [];
 
-            foreach ([Person::class, ThirdParty::class] as $class) {
+            try {
-                try {
+                $requestor = $this->getSerializer()->deserialize(
-                    $requestor = $this->getSerializer()
+                    $request->getContent(),
-                        ->deserialize($request->getContent(), $class, $_format, []);
+                    '@multi',
-                } catch (RuntimeException $e) {
+                    $_format,
-                    $exceptions[] = $e;
+                    [DiscriminatedObjectDenormalizer::ALLOWED_TYPES => [Person::class, ThirdParty::class]]
-                }
+                );
+            } catch (RuntimeException $e) {
+                $exceptions[] = $e;
             }
 
             if (null === $requestor) {
-                throw new BadRequestException('Could not find any person or requestor', 0, $exceptions[0]);
+                throw new BadRequestException('Could not find any person or thirdparty', 0, null);
             }
 
             $accompanyingPeriod->setRequestor($requestor);

src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php

@@ -50,7 +50,6 @@ class HouseholdApiController extends ApiController
      */
     public function getHouseholdByAddressReference(AddressReference $addressReference): Response
     {
-        // TODO ACL
         $this->denyAccessUnlessGranted('ROLE_USER');
 
         $total = $this->householdACLAwareRepository->countByAddressReference($addressReference);

src/Bundle/ChillPersonBundle/Controller/PersonController.php

@@ -224,6 +224,8 @@ final class PersonController extends AbstractController
                 'label' => 'Add the person',
             ])->add('createPeriod', SubmitType::class, [
                 'label' => 'Add the person and create an accompanying period',
+            ])->add('createHousehold', SubmitType::class, [
+                'label' => 'Add the person and create a household',
             ]);
 
         $form->handleRequest($request);
@@ -252,6 +254,12 @@ final class PersonController extends AbstractController
                     ]);
                 }
 
+                if ($form->get('createHousehold')->isClicked()) {
+                    return $this->redirectToRoute('chill_person_household_members_editor', [
+                        'persons' => [$person->getId()],
+                    ]);
+                }
+
                 return $this->redirectToRoute(
                     'chill_person_general_edit',
                     ['person_id' => $person->getId()]

src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php

@@ -34,16 +34,36 @@ class UserAccompanyingPeriodController extends AbstractController
      */
     public function listAction(Request $request)
     {
-        $total = $this->accompanyingPeriodRepository->countBy(['user' => $this->getUser()]);
+        $total = $this->accompanyingPeriodRepository->countBy(['user' => $this->getUser(), 'step' => ['CONFIRMED', 'CLOSED']]);
         $pagination = $this->paginatorFactory->create($total);
         $accompanyingPeriods = $this->accompanyingPeriodRepository->findBy(
-            ['user' => $this->getUser()],
+            ['user' => $this->getUser(), 'step' => ['CONFIRMED', 'CLOSED']],
             ['openingDate' => 'DESC'],
             $pagination->getItemsPerPage(),
             $pagination->getCurrentPageFirstItemNumber()
         );
 
         return $this->render('@ChillPerson/AccompanyingPeriod/user_periods_list.html.twig', [
+            'accompanyingds' => $accompanyingPeriods,
+            'pagination' => $pagination,
+        ]);
+    }
+
+    /**
+     * @Route("/{_locale}/accompanying-periods/drafts", name="chill_person_accompanying_period_draft_user")
+     */
+    public function listDraftsAction(Request $request)
+    {
+        $total = $this->accompanyingPeriodRepository->countBy(['user' => $this->getUser(), 'step' => 'DRAFT']);
+        $pagination = $this->paginatorFactory->create($total);
+        $accompanyingPeriods = $this->accompanyingPeriodRepository->findBy(
+            ['createdBy' => $this->getUser(), 'step' => 'DRAFT'],
+            ['id' => 'DESC'],
+            $pagination->getItemsPerPage(),
+            $pagination->getCurrentPageFirstItemNumber()
+        );
+
+        return $this->render('@ChillPerson/AccompanyingPeriod/user_draft_periods_list.html.twig', [
             'accompanyingPeriods' => $accompanyingPeriods,
             'pagination' => $pagination,
         ]);

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -1153,11 +1153,8 @@ class AccompanyingPeriod implements
             $this->removeComment($this->pinnedComment);
         }
 
-        if ($comment instanceof Comment) {
+        if (null !== $this->pinnedComment) {
-            if (null !== $this->pinnedComment) {
+            $this->addComment($this->pinnedComment);
-                $this->addComment($this->pinnedComment);
-            }
-            $this->addComment($comment);
         }
 
         $this->pinnedComment = $comment;

src/Bundle/ChillPersonBundle/Menu/UserMenuBuilder.php

@@ -44,6 +44,13 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                     'order' => 20,
                     'icon' => 'tasks',
                 ]);
+            $menu->addChild('My accompanying periods in draft', [
+                'route' => 'chill_person_accompanying_period_draft_user',
+            ])
+                ->setExtras([
+                    'order' => 30,
+                    'icon' => 'tasks',
+                ]);
         }
     }
 

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

@@ -14,7 +14,7 @@ namespace Chill\PersonBundle\Repository\Household;
 use Chill\MainBundle\Entity\AddressReference;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\Household\Household;
-use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
@@ -39,7 +39,7 @@ final class HouseholdACLAwareRepository implements HouseholdACLAwareRepositoryIn
     {
         $centers = $this->authorizationHelper->getReachableCenters(
             $this->security->getUser(),
-            HouseholdVoter::SEE
+            PersonVoter::SEE // the authorization to see a household is the same as seeing a person
         );
 
         if ([] === $centers) {

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

@@ -56,14 +56,18 @@
    </div>
 
    <div>
-      <add-persons
+      <ul class="record_actions">
-         buttonTitle="persons_associated.add_persons"
+         <li class="add-persons">
-         modalTitle="add_persons.title"
+            <add-persons
-         v-bind:key="addPersons.key"
+               buttonTitle="persons_associated.add_persons"
-         v-bind:options="addPersons.options"
+               modalTitle="add_persons.title"
-         @addNewPersons="addNewPersons"
+               v-bind:key="addPersons.key"
-         ref="addPersons"> <!-- to cast child method -->
+               v-bind:options="addPersons.options"
-      </add-persons>
+               @addNewPersons="addNewPersons"
+               ref="addPersons"> <!-- to cast child method -->
+            </add-persons>
+         </li>
+      </ul>
    </div>
 
    <div v-if="!isParticipationValid" class="alert alert-warning to-confirm">

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

@@ -10,6 +10,7 @@
                addAge : true,
                hLevel : 3,
                isConfidential :  false,
+               isMultiline: true,
             }"
       :person="participation.person"
       :returnPath="getAccompanyingCourseReturnPath">
@@ -28,7 +29,7 @@
                </a>
             </li>
             <li><on-the-fly :type="participation.person.type" :id="participation.person.id" action="show"></on-the-fly></li>
-            <li><on-the-fly :type="participation.person.type" :id="participation.person.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly" :canCloseModal="canCloseOnTheFlyModal"></on-the-fly></li>
+            <li><on-the-fly :type="participation.person.type" :id="participation.person.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly" ref="onTheFly"></on-the-fly></li>
             <li>
                <button v-if="!participation.endDate"
                   class="btn btn-sm btn-remove"
@@ -90,7 +91,6 @@ export default {
                hLevel: 1
             }
          },
-         canCloseOnTheFlyModal: false
       }
    },
    computed: {
@@ -120,12 +120,14 @@ export default {
             if (payload.data.birthdate !== null) { body.birthdate = payload.data.birthdate; }
             body.phonenumber = payload.data.phonenumber;
             body.mobilenumber = payload.data.mobilenumber;
+            body.email = payload.data.email;
+            body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {
-                  this.$store.dispatch('addPerson', { target: payload.target, body: response })
+                  this.$store.dispatch('addPerson', { target: payload.target, body: response });
-                  this.canCloseOnTheFlyModal = true;
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {
@@ -143,10 +145,10 @@ export default {
             body.telephone = payload.data.phonenumber;
             body.address = { id: payload.data.address.address_id };
 
-            makeFetch('PATCH', `/api/1.0/third-party/third-party/${payload.data.id}.json`, body)
+            makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
                .then(response => {
                   this.$store.dispatch('addThirdparty', { target: payload.target, body: response })
-                  this.canCloseOnTheFlyModal = true;
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {

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

@@ -26,7 +26,7 @@
             <template v-slot:record-actions>
                <ul class="record_actions">
                   <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="show"></on-the-fly></li>
-                  <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
+                  <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly" ref="onTheFly"></on-the-fly></li>
                </ul>
             </template>
             </third-party-render-box>
@@ -52,7 +52,7 @@
                <template v-slot:record-actions>
                   <ul class="record_actions">
                      <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="show"></on-the-fly></li>
-                     <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
+                     <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly" ref="onTheFly"></on-the-fly></li>
                   </ul>
                </template>
             </person-render-box>
@@ -92,7 +92,7 @@
          <template v-slot:record-actions>
             <ul class="record_actions">
                <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="show"></on-the-fly></li>
-               <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
+               <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly" ref="onTheFly"></on-the-fly></li>
             </ul>
          </template>
       </third-party-render-box>
@@ -114,7 +114,7 @@
          <template v-slot:record-actions>
             <ul class="record_actions">
                <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="show"></on-the-fly></li>
-               <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly" :canCloseModal="canCloseOnTheFlyModal"></on-the-fly></li>
+               <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly" ref="onTheFly"></on-the-fly></li>
             </ul>
          </template>
       </person-render-box>
@@ -144,14 +144,18 @@
    </div>
 
    <div>
-      <add-persons v-if="accompanyingCourse.requestor === null"
+      <ul class="record_actions">
-         buttonTitle="requestor.add_requestor"
+         <li class="add-persons">
-         modalTitle="requestor.add_requestor"
+            <add-persons v-if="accompanyingCourse.requestor === null"
-         v-bind:key="addPersons.key"
+               buttonTitle="requestor.add_requestor"
-         v-bind:options="addPersons.options"
+               modalTitle="requestor.add_requestor"
-         @addNewPersons="addNewPersons"
+               v-bind:key="addPersons.key"
-         ref="addPersons"> <!-- to cast child method -->
+               v-bind:options="addPersons.options"
-      </add-persons>
+               @addNewPersons="addNewPersons"
+               ref="addPersons"> <!-- to cast child method -->
+            </add-persons>
+         </li>
+      </ul>
    </div>
 
 </div>
@@ -189,7 +193,6 @@ export default {
                uniq: true,
             }
          },
-         canCloseOnTheFlyModal: false
       }
    },
    computed: {
@@ -261,12 +264,14 @@ export default {
             if (payload.data.birthdate !== null) { body.birthdate = payload.data.birthdate; }
             body.phonenumber = payload.data.phonenumber;
             body.mobilenumber = payload.data.mobilenumber;
+            body.email = payload.data.email;
+            body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {
                   this.$store.dispatch('addPerson', { target: payload.target, body: response })
-                  this.canCloseOnTheFlyModal = true;
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {
@@ -284,10 +289,10 @@ export default {
             body.telephone = payload.data.phonenumber;
             body.address = { id: payload.data.address.address_id };
 
-            makeFetch('PATCH', `/api/1.0/third-party/third-party/${payload.data.id}.json`, body)
+            makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
                .then(response => {
                   this.$store.dispatch('addThirdparty', { target: payload.target, body: response })
-                  this.canCloseOnTheFlyModal = true;
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {

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

@@ -29,14 +29,18 @@
    </div>
 
    <div>
-      <add-persons
+      <ul class="record_actions">
-      buttonTitle="resources.add_resources"
+         <li class="add-persons">
-      modalTitle="resources.add_resources"
+            <add-persons
-      v-bind:key="addPersons.key"
+            buttonTitle="resources.add_resources"
-      v-bind:options="addPersons.options"
+            modalTitle="resources.add_resources"
-      @addNewPersons="addNewPersons"
+            v-bind:key="addPersons.key"
-      ref="addPersons"> <!-- to cast child method -->
+            v-bind:options="addPersons.options"
-      </add-persons>
+            @addNewPersons="addNewPersons"
+            ref="addPersons"> <!-- to cast child method -->
+            </add-persons>
+         </li>
+      </ul>
    </div>
 
 </div>

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

@@ -35,7 +35,7 @@
                   :id="resource.resource.id"
                   action="edit"
                   @saveFormOnTheFly="saveFormOnTheFly"
-                  :canCloseModal="canCloseOnTheFlyModal">
+                  ref="onTheFly">
                </on-the-fly>
             </li>
             <li>
@@ -82,7 +82,7 @@
                   :id="resource.resource.id"
                   action="edit"
                   @saveFormOnTheFly="saveFormOnTheFly"
-                  :canCloseModal="canCloseOnTheFlyModal">
+                  ref="onTheFly">
                </on-the-fly>
             </li>
             <li>
@@ -116,11 +116,6 @@ export default {
    },
    props: ['resource'],
    emits: ['remove'],
-   data() {
-      return {
-         canCloseOnTheFlyModal: false
-      }
-   },
    computed: {
       parent() {
          return {
@@ -152,12 +147,14 @@ export default {
             if (payload.data.birthdate !== null) { body.birthdate = payload.data.birthdate; }
             body.phonenumber = payload.data.phonenumber;
             body.mobilenumber = payload.data.mobilenumber;
+            body.email = payload.data.email;
+            body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {
                   this.$store.dispatch('addPerson', { target: payload.target, body: response })
-                  this.canCloseOnTheFlyModal = true;
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {
@@ -175,10 +172,10 @@ export default {
             body.telephone = payload.data.phonenumber;
             body.address = { id: payload.data.address.address_id };
 
-            makeFetch('PATCH', `/api/1.0/third-party/third-party/${payload.data.id}.json`, body)
+            makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
                .then(response => {
                   this.$store.dispatch('addThirdparty', { target: payload.target, body: response })
-                  this.canCloseOnTheFlyModal = true;
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {

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

@@ -160,7 +160,7 @@
             </p>
 
             <ul class="record_actions">
-               <li>
+               <li class="add-persons">
                   <add-persons
                      ref="handlingThirdPartyPicker"
                      v-bind:key="handlingThirdPartyPicker.key"
@@ -211,7 +211,7 @@
                      <template v-slot:record-actions>
                         <ul class="record_actions">
                            <li><on-the-fly :type="thirdparty.type" :id="thirdparty.id" action="show"></on-the-fly></li>
-                           <li><on-the-fly :type="thirdparty.type" :id="thirdparty.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
+                           <li><on-the-fly :type="thirdparty.type" :id="thirdparty.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly" ref="onTheFly"></on-the-fly></li>
                            <li>
                               <button :title="$t('remove_thirdparty')" class="btn btn-sm btn-remove" @click="removeThirdParty(thirdparty)" />
                            </li>
@@ -222,7 +222,7 @@
          </div>
 
          <ul class="record_actions">
-            <li>
+            <li class="add-persons">
                <add-persons
                   ref="thirdPartyPicker"
                   v-bind:key="thirdPartyPicker.key"
@@ -286,6 +286,8 @@ import ListWorkflowModal from 'ChillMainAssets/vuejs/_components/EntityWorkflow/
 import PickWorkflow from 'ChillMainAssets/vuejs/_components/EntityWorkflow/PickWorkflow.vue';
 import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
 import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
+
 
 const i18n = {
    messages: {
@@ -476,15 +478,27 @@ export default {
       },
       saveFormOnTheFly(payload) {
          console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
-         payload.target = 'resource';
+
-         this.$store.dispatch('patchOnTheFly', payload)
+         let body = { type: payload.type };
-            .catch(({name, violations}) => {
+         body.name = payload.data.text;
-               if (name === 'ValidationException' || name === 'AccessException') {
+         body.email = payload.data.email;
-                  violations.forEach((violation) => this.$toast.open({message: violation}));
+         body.telephone = payload.data.phonenumber;
+         body.address = { id: payload.data.address.address_id };
+
+         makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
+            .then(response => {
+               this.$store.dispatch('updateThirdParty', response)
+               this.$refs.onTheFly.closeModal();
+            })
+            .catch((error) => {
+               if (error.name === 'ValidationException') {
+                  for (let v of error.violations) {
+                        this.$toast.open({message: v });
+                  }
                } else {
-                  this.$toast.open({message: 'An error occurred'})
+                     this.$toast.open({message: 'An error occurred'});
                }
-            });
+            })
       }
    }
 };

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

@@ -1,7 +1,9 @@
 import { createApp } from 'vue';
 import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n';
 import { store } from './store';
-import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n';
+import VueToast from 'vue-toast-notification';
+import 'vue-toast-notification/dist/theme-sugar.css';
 import App from './App.vue';
 
 const i18n = _createI18n(personMessages);
@@ -10,6 +12,12 @@ const app = createApp({
    template: `<app></app>`,
 })
 .use(store)
+.use(VueToast, {
+   position: "bottom-right",
+   type: "error",
+   duration: 5000,
+   dismissible: true
+})
 .use(i18n)
 .component('app', App)
 .mount('#accompanying_course_work_edit');

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

@@ -266,6 +266,14 @@ const store = createStore({
         state.thirdParties.push(unexistings[i]);
       }
     },
+    updateThirdParty(state, thirdParty) {
+      for (let t of state.thirdParties) {
+        if (t.id === thirdParty.id){
+          state.thirdParties = state.thirdParties.filter(t => t.id !== thirdParty.id);
+          state.thirdParties.push(thirdParty);
+        }
+      }
+    },
     removeThirdParty(state, thirdParty) {
       state.thirdParties = state.thirdParties
         .filter(t => t.id !== thirdParty.id);
@@ -278,6 +286,10 @@ const store = createStore({
     },
   },
   actions: {
+    updateThirdParty({ commit }, payload) {
+      console.log(payload);
+      commit('updateThirdParty', payload);
+    },
     getReachablesGoalsForAction({ getters, commit, dispatch }) {
       let
         socialActionId = getters.socialAction.id,

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

@@ -29,7 +29,7 @@
   </div>
 
   <ul class="record_actions">
-    <li>
+    <li class="add-persons">
       <add-persons
           buttonTitle="household_members_editor.concerned.add_persons"
           modalTitle="household_members_editor.concerned.search"

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

@@ -61,7 +61,7 @@
     <li v-if="hasHousehold">
       <button @click="resetMode" class="btn btn-sm btn-misc">{{ $t('household_members_editor.household.reset_mode')}}</button>
     </li>
-    <li v-if="!hasHousehold">
+    <li v-if="!hasHousehold" class="add-persons">
       <add-persons
           modalTitle="Chercher un ménage existant"
           buttonTitle="Chercher un ménage existant"

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

@@ -1,10 +1,7 @@
 <template>
-    <ul class="record_actions">
+   <a class="btn" :class="getClassButton" :title="$t(buttonTitle)" @click="openModal">
-      <li class="add-persons">
+      <span v-if="displayTextButton">{{ $t(buttonTitle) }}</span>
-        <a class="btn" :class="getClassButton" :title="$t(buttonTitle)"
+   </a>
-           @click="openModal"><span v-if="displayTextButton">{{ $t(buttonTitle) }}</span></a>
-      </li>
-    </ul>
 
   <teleport to="body">
       <modal v-if="modal.showModal"
@@ -69,7 +66,7 @@
                      :buttonText="$t('onthefly.create.button', {q: query})"
                      action="create"
                      @saveFormOnTheFly="saveFormOnTheFly"
-                     :canCloseModal="canCloseOnTheFlyModal">
+                     ref="onTheFly">
                   </on-the-fly>
                </div>
 
@@ -121,7 +118,6 @@ export default {
             selected: [],
             priorSuggestion: {}
          },
-         canCloseOnTheFlyModal: false
       }
    },
    computed: {
@@ -271,7 +267,7 @@ export default {
             makeFetch('POST', '/api/1.0/person/person.json', data)
                .then(response => {
                   this.newPriorSuggestion(response);
-                  this.canCloseOnTheFlyModal = true;
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {
@@ -287,7 +283,7 @@ export default {
             makeFetch('POST', '/api/1.0/thirdparty/thirdparty.json', data)
                .then(response => {
                   this.newPriorSuggestion(response);
-                  this.canCloseOnTheFlyModal = true;
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {
@@ -299,7 +295,6 @@ export default {
                   }
                })
          }
-         this.canCloseOnTheFlyModal = false;
       }
    },
 }

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

@@ -43,10 +43,11 @@
       <label for="firstname">{{ $t('person.firstname') }}</label>
    </div>
 
-   <div v-for="(a) in config.altNames" :key="a.key" class="form-floating mb-3">
+   <div v-for="(a, i) in config.altNames" :key="a.key" class="form-floating mb-3">
       <input
           class="form-control form-control-lg"
           :id="a.key"
+          :value="personAltNamesLabels[i]"
           @input="onAltNameInput"
       />
       <label :for="a.key">{{ a.labels.fr }}</label>
@@ -199,6 +200,9 @@ export default {
       },
       feminized() {
          return (this.person.gender === 'woman')? 'e' : '';
+      },
+      personAltNamesLabels() {
+         return this.person.altNames.map(a => a ? a.label : '');
       }
    },
    mounted() {

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

@@ -26,9 +26,9 @@
             </div>
             <div class="wh-row">
                 <div class="wh-col">
-                    {% if period.closingDate == null %}
+                    {% if period.closingDate == null and period.step != 'DRAFT' %}
                         {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': period.openingDate|format_date('long') } ) }}
-                    {% else %}
+                    {% elseif period.closingDate != null %}
                         {{ 'accompanying_period.dates_from_%opening_date%_to_%closing_date%'|trans({
                             '%opening_date%': period.openingDate|format_date('long'),
                             '%closing_date%': period.closingDate|format_date('long')}
@@ -55,65 +55,67 @@
             </div>
         </div>
     </div>
-    <div class="item-row separator">
+    {% if period.requestor is not null or period.participations.count > 0 or period.socialIssues.count > 0%}
-        <div class="wrap-list">
+        <div class="item-row separator">
-            {% if period.requestorPerson is not null or period.requestorThirdParty is not null %}
+            <div class="wrap-list">
-                <div class="wl-row">
+                {% if period.requestorPerson is not null or period.requestorThirdParty is not null %}
-                    <div class="wl-col title"><h3>{{ 'Requestor'|trans({'gender': null }) }}</h3></div>
+                    <div class="wl-row">
-                    <div class="wl-col list">
+                        <div class="wl-col title"><h3>{{ 'Requestor'|trans({'gender': null }) }}</h3></div>
-                        {% if period.requestorPerson is not null %}
+                        <div class="wl-col list">
-                            <span class="wl-item">
+                            {% if period.requestorPerson is not null %}
-                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                <span class="wl-item">
-                                    action: 'show', displayBadge: true,
+                                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                                    targetEntity: { name: 'person', id: period.requestorPerson.id },
+                                        action: 'show', displayBadge: true,
-                                    buttonText: period.requestorPerson|chill_entity_render_string,
+                                        targetEntity: { name: 'person', id: period.requestorPerson.id },
-                                    isDead: period.requestorPerson.deathdate is not null
+                                        buttonText: period.requestorPerson|chill_entity_render_string,
-                                } %}
+                                        isDead: period.requestorPerson.deathdate is not null
-                            </span>
+                                    } %}
-                        {% endif %}
+                                </span>
-                        {% if period.requestorThirdParty is not null %}
+                            {% endif %}
-                            <span class="wl-item">
+                            {% if period.requestorThirdParty is not null %}
-                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                <span class="wl-item">
-                                    action: 'show', displayBadge: true,
+                                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                                    targetEntity: { name: 'thirdparty', id: period.requestorThirdParty.id },
+                                        action: 'show', displayBadge: true,
-                                    buttonText: period.requestorThirdParty|chill_entity_render_string
+                                        targetEntity: { name: 'thirdparty', id: period.requestorThirdParty.id },
-                                } %}
+                                        buttonText: period.requestorThirdParty|chill_entity_render_string
-                            </span>
+                                    } %}
-                        {% endif %}
+                                </span>
+                            {% endif %}
+                        </div>
                     </div>
-                </div>
+                {% endif %}
-            {% endif %}
+                {% if period.participations.count > 0 %}
-            {% if period.participations.count > 0 %}
+                    <div class="wl-row">
-                <div class="wl-row">
+                        <div class="wl-col title"><h3>{{ 'Participants'|trans }}</h3></div>
-                    <div class="wl-col title"><h3>{{ 'Participants'|trans }}</h3></div>
+                        <div class="wl-col list">
-                    <div class="wl-col list">
+                            {% for p in period.getCurrentParticipations %}
-                        {% for p in period.getCurrentParticipations %}
+                                <span class="wl-item">
-                            <span class="wl-item">
+                                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                        action: 'show', displayBadge: true,
-                                    action: 'show', displayBadge: true,
+                                        targetEntity: { name: 'person', id: p.person.id },
-                                    targetEntity: { name: 'person', id: p.person.id },
+                                        buttonText: p.person|chill_entity_render_string,
-                                    buttonText: p.person|chill_entity_render_string,
+                                        isDead: p.person.deathdate is not null
-                                    isDead: p.person.deathdate is not null
+                                    } %}
-                                } %}
+                                </span>
-                            </span>
+                            {% endfor %}
-                        {% endfor %}
+                        </div>
                     </div>
-                </div>
+                {% endif %}
-            {% endif %}
+                {% if period.socialIssues.count > 0 %}
-            {% if period.socialIssues.count > 0 %}
+                    <div class="wl-row">
-                <div class="wl-row">
+                        <div class="wl-col title"><h3>{{ 'Social issues'|trans }}</h3></div>
-                    <div class="wl-col title"><h3>{{ 'Social issues'|trans }}</h3></div>
+                        <div class="wl-col list">
-                    <div class="wl-col list">
+                            {% for si in period.socialIssues %}
-                        {% for si in period.socialIssues %}
+                                <p class="wl-item">
-                            <p class="wl-item">
+                                    {{ si|chill_entity_render_box }}
-                                {{ si|chill_entity_render_box }}
+                                </p>
-                            </p>
+                            {% endfor %}
-                        {% endfor %}
+                        </div>
                     </div>
-                </div>
+                {% endif %}
-            {% endif %}
+            </div>
         </div>
-    </div>
+    {% endif %}
     <div class="item-row separator">
         <div class="item-col item-meta">
             {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', period.id) %}

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

@@ -0,0 +1,32 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_person_accompanying_period_user_list' %}
+
+{% block title %}{{ 'My accompanying periods in draft'|trans }}{% endblock title %}
+
+{% macro recordAction(period) %}
+    <li>
+        <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
+        class="btn btn-show" title="{{ 'See accompanying period'|trans }}"></a>
+    </li>
+{% endmacro %}
+
+
+{% block content %}
+
+    <div class="col-md-10">
+        <h1>{{ 'My accompanying periods in draft'|trans }}</h1>
+
+        <div class="flex-table accompanyingcourse-list">
+            {% for period in accompanyingPeriods %}
+                {% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {'period': period, 'recordAction': _self.recordAction(period)} %}
+            {% else %}
+                <p class="chill-no-data-statement">{{ 'Any accompanying period'|trans }}</p>
+            {% endfor %}
+        </div>
+
+        {{ chill_pagination(pagination) }}
+
+    </div>
+
+{% endblock %}

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

@@ -115,6 +115,9 @@
                 <li>
                     {{ form_widget(form.editPerson, { 'attr': { 'class': 'dropdown-item' }}) }}
                 </li>
+                <li>
+                    {{ form_widget(form.createHousehold, { 'attr': { 'class': 'dropdown-item' }}) }}
+                </li>
                 <li>
                     {{ form_widget(form.createPeriod, { 'attr': { 'class': 'dropdown-item' }}) }}
                 </li>

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

@@ -32,14 +32,28 @@
     </div>
     <div class="item-row separator">
         <div class="wrap-list">
+            {% if p.household is same as p.person.getCurrentHousehold %}
+                <div class="wl-row">
+                    <div class="wl-col title">
+                        <h3>{{ 'Address'|trans }}</h3>
+                    </div>
+                    <div class="wl-col list">
+                        <p class="item">{{ p.household.getCurrentAddress|chill_entity_render_box }}</p>
+                    </div>
+                </div>
+            {% endif %}
             <div class="wl-row">
                 <div class="wl-col title">
-                    <h3>En tant que</h3>
+                    <h3>{{ 'household.As member'|trans }}</h3>
                 </div>
                 <div class="wl-col list">
-                    <p class="item">{{ p.position.label|localize_translatable_string }}
+                    <p class="item">
+                        {{ p.position.label|localize_translatable_string }}
                         {% if p.holder %}
-                            <span class="holder">{{ 'household.holder'|trans }}</span>
+                            <span class="fa-stack fa-holder" title="{{ 'houshold.holder'|trans|e('html_attr') }}">
+                                <i class="fa fa-circle fa-stack-1x text-success"></i>
+                                <i class="fa fa-stack-1x">T</i>
+                            </span>
                         {% endif %}
                     </p>
                 </div>

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

@@ -29,10 +29,10 @@
 
                         <div class="item-col" style="width: 33%;">
                             <ul class="list-unstyled h3">
-                                {% if a.endDate is not null %}
                                 <li><span class="item-key">{{'Since'|trans}} : </span>{{ a.startDate|format_date('long') }}</li>
+                                {% if a.endDate is not null %}
+                                    <li><span class="item-key">{{'Until'|trans}} : </span><b>{{ a.endDate|format_date('long') }}</b></li>
                                 {% endif %}
-                                <li><span class="item-key">{{'Until'|trans}} : </span><b>{{ a.endDate|format_date('long') }}</b></li>
                             </ul>
                         </div>
                         <div class="item-col flex-column justify-content-start">

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

@@ -58,6 +58,11 @@ class AccompanyingPeriodWorkVoter extends Voter
                 case self::SEE:
                     return $this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $subject->getAccompanyingPeriod());
 
+                case self::CREATE:
+                case self::UPDATE:
+                    return $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod());
+
+
                 default:
                     throw new UnexpectedValueException("attribute {$attribute} is not supported");
             }
@@ -66,6 +71,9 @@ class AccompanyingPeriodWorkVoter extends Voter
                 case self::SEE:
                     return $this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $subject);
 
+                case self::CREATE:
+                    return $this->security->isGranted(AccompanyingPeriodVoter::CREATE, $subject);
+
                 default:
                     throw new UnexpectedValueException(sprintf(
                         "attribute {$attribute} is not supported on instance %s",
@@ -79,6 +87,6 @@ class AccompanyingPeriodWorkVoter extends Voter
 
     private function getRoles(): array
     {
-        return [self::SEE];
+        return [self::SEE, self::CREATE, self::UPDATE];
     }
 }

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

@@ -91,6 +91,7 @@ class PersonJsonNormalizer implements
             'deathdate',
             'center',
             'altNames',
+            'email',
         ];
 
         $fields = array_filter(
@@ -161,6 +162,11 @@ class PersonJsonNormalizer implements
                         }
                     }
 
+                    break;
+
+                case 'email':
+                    $person->setEmail($data[$item]);
+
                     break;
             }
         }
@@ -189,6 +195,7 @@ class PersonJsonNormalizer implements
             'centers' => $this->normalizer->normalize($this->centerResolverManager->resolveCenters($person), $format, $context),
             'phonenumber' => $person->getPhonenumber(),
             'mobilenumber' => $person->getMobilenumber(),
+            'email' => $person->getEmail(),
             'altNames' => $this->normalizeAltNames($person->getAltNames()),
             'gender' => $person->getGender(),
             'current_household_address' => $this->normalizer->normalize($person->getCurrentHouseholdAddress(), $format, $context),

src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php

@@ -241,7 +241,8 @@ class AccompanyingPeriodContext implements
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $doc = new AccompanyingCourseDocument();
-        $doc->setTitle($this->translatableStringHelper->localize($template->getName()))
+        $doc->setTemplate($template)
+            ->setTitle($this->translatableStringHelper->localize($template->getName()))
             ->setDate(new DateTime())
             ->setDescription($this->translatableStringHelper->localize($template->getName()))
             ->setCourse($entity)

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

@@ -21,6 +21,7 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
+use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
 use function array_map;
@@ -58,10 +59,16 @@ final class HouseholdApiControllerTest extends WebTestCase
         $centerA = $em->getRepository(Center::class)->findOneBy(['name' => 'Center A']);
         $nbReference = $em->createQueryBuilder()->select('count(ar)')->from(AddressReference::class, 'ar')
             ->getQuery()->getSingleScalarResult();
+
+        if (0 === $nbReference) {
+            throw new RuntimeException('any reference found. Add a reference in database to perform this test');
+        }
+
         $reference = $em->createQueryBuilder()->select('ar')->from(AddressReference::class, 'ar')
             ->setFirstResult(random_int(0, $nbReference))
             ->setMaxResults(1)
             ->getQuery()->getSingleResult();
+
         $p = new Person();
         $p->setFirstname('test')->setLastName('test lastname')
             ->setGender(Person::BOTH_GENDER)
@@ -79,6 +86,7 @@ final class HouseholdApiControllerTest extends WebTestCase
             [HouseholdMember::class, $m->getId()],
             [User::class, $p->getId()],
             [Household::class, $h->getId()],
+            [Person::class, $p->getId()],
         ];
 
         yield [$reference->getId(), $h->getId()];

src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php

@@ -129,20 +129,27 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $this->assertNull($period->getPinnedComment());
 
         $period->setPinnedComment($comment);
+
         $this->assertSame($period->getPinnedComment(), $comment);
-        $this->assertSame($period, $comment->getAccompanyingPeriod());
+        $this->assertNull($comment->getAccompanyingPeriod());
-        $this->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
+        $this->assertEquals(0, count($period->getComments()));
 
         $period->setPinnedComment($replacingComment);
+
         $this->assertSame($period->getPinnedComment(), $replacingComment);
-        $this->assertSame($period, $replacingComment->getAccompanyingPeriod());
+        $this->assertNull($replacingComment->getAccompanyingPeriod());
-        $this->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
+        $this->assertSame($period, $comment->getAccompanyingPeriod());
-        $this->assertNull($comment->getAccompanyingPeriod());
+        $this->assertEquals(1, count($period->getComments()));
+        $this->assertContains($comment, $period->getComments());
 
         $period->setPinnedComment(null);
+
         $this->assertNull($period->getPinnedComment());
-        $this->assertNull($replacingComment->getAccompanyingPeriod());
+        $this->assertSame($period, $comment->getAccompanyingPeriod());
-        $this->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
+        $this->assertSame($period, $replacingComment->getAccompanyingPeriod());
+        $this->assertEquals(2, count($period->getComments()));
+        $this->assertContains($comment, $period->getComments());
+        $this->assertContains($replacingComment, $period->getComments());
     }
 
     public function testRequestor()

src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml

@@ -98,6 +98,7 @@ household:
     from: Depuis
     to: Jusqu'au
     person history: Ménages
+    As member: En tant que
 
 household_composition:
     Since: >-

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

@@ -124,7 +124,7 @@ address_country_code: Code pays
 'Alreay existing person': 'Dossiers déjà encodés'
 'Add the person': 'Ajouter la personne'
 'Add the person and create an accompanying period': "Créer la personne & créer une période d'accompagnement"
-'Add the person and create an household': "Créer la personne & créer un ménage"
+'Add the person and create a household': "Créer la personne & créer un ménage"
 Show person: Voir le dossier de la personne
 'Confirm the creation': 'Confirmer la création'
 'You will create this person': 'Vous allez créer le dossier suivant'
@@ -179,6 +179,7 @@ An accompanying period is open: Une période d'accompagnement est ouverte
 Accompanying period list: Périodes d'accompagnement
 Accompanying period list for person: Périodes d'accompagnement de la personne
 Accompanying period: Parcours d'accompagnement
+Any accompanying period: Aucun parcours d'accompagnement
 period: Parcours
 New accompanying course: Nouveau parcours d'accompagnement
 Choose a motive: Motif de fermeture
@@ -566,3 +567,4 @@ Linked evaluations: Évaluations associées
 
 # Accompanying period per user
 My accompanying periods: Mes parcours
+My accompanying periods in draft: Mes parcours brouillons

src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig

@@ -115,7 +115,7 @@
                                 <div class="flex-table">
                                     {% for tp in thirdParty.activeChildren %}
                                     <div class="item-bloc">
-                                        {{ tp|chill_entity_render_box({'render': 'bloc', 'addLink': false}) }}
+                                        {{ tp|chill_entity_render_box({'render': 'bloc', 'addLink': false, 'isConfidential': tp.contactDataAnonymous ? true : false }) }}
                                     </div>
                                     {% endfor %}
                                 </div>