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

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 {
-                    $requestor = $this->getSerializer()
-                        ->deserialize($request->getContent(), $class, $_format, []);
-                } catch (RuntimeException $e) {
-                    $exceptions[] = $e;
-                }
+            try {
+                $requestor = $this->getSerializer()->deserialize(
+                    $request->getContent(),
+                    '@multi',
+                    $_format,
+                    [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) {
-                $this->addComment($this->pinnedComment);
-            }
-            $this->addComment($comment);
+        if (null !== $this->pinnedComment) {
+            $this->addComment($this->pinnedComment);
         }
 
         $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
-         buttonTitle="persons_associated.add_persons"
-         modalTitle="add_persons.title"
-         v-bind:key="addPersons.key"
-         v-bind:options="addPersons.options"
-         @addNewPersons="addNewPersons"
-         ref="addPersons"> <!-- to cast child method -->
-      </add-persons>
+      <ul class="record_actions">
+         <li class="add-persons">
+            <add-persons
+               buttonTitle="persons_associated.add_persons"
+               modalTitle="add_persons.title"
+               v-bind:key="addPersons.key"
+               v-bind:options="addPersons.options"
+               @addNewPersons="addNewPersons"
+               ref="addPersons"> <!-- to cast child method -->
+            </add-persons>
+         </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">

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

@@ -144,14 +144,18 @@
    </div>
 
    <div>
-      <add-persons v-if="accompanyingCourse.requestor === null"
-         buttonTitle="requestor.add_requestor"
-         modalTitle="requestor.add_requestor"
-         v-bind:key="addPersons.key"
-         v-bind:options="addPersons.options"
-         @addNewPersons="addNewPersons"
-         ref="addPersons"> <!-- to cast child method -->
-      </add-persons>
+      <ul class="record_actions">
+         <li class="add-persons">
+            <add-persons v-if="accompanyingCourse.requestor === null"
+               buttonTitle="requestor.add_requestor"
+               modalTitle="requestor.add_requestor"
+               v-bind:key="addPersons.key"
+               v-bind:options="addPersons.options"
+               @addNewPersons="addNewPersons"
+               ref="addPersons"> <!-- to cast child method -->
+            </add-persons>
+         </li>
+      </ul>
    </div>
 
 </div>

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

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

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"
@@ -222,7 +222,7 @@
          </div>
 
          <ul class="record_actions">
-            <li>
+            <li class="add-persons">
                <add-persons
                   ref="thirdPartyPicker"
                   v-bind:key="thirdPartyPicker.key"

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">
-      <li class="add-persons">
-        <a class="btn" :class="getClassButton" :title="$t(buttonTitle)"
-           @click="openModal"><span v-if="displayTextButton">{{ $t(buttonTitle) }}</span></a>
-      </li>
-    </ul>
+   <a class="btn" :class="getClassButton" :title="$t(buttonTitle)" @click="openModal">
+      <span v-if="displayTextButton">{{ $t(buttonTitle) }}</span>
+   </a>
 
   <teleport to="body">
       <modal v-if="modal.showModal"

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">
-        <div class="wrap-list">
-            {% if period.requestorPerson is not null or period.requestorThirdParty is not null %}
-                <div class="wl-row">
-                    <div class="wl-col title"><h3>{{ 'Requestor'|trans({'gender': null }) }}</h3></div>
-                    <div class="wl-col list">
-                        {% if period.requestorPerson is not null %}
-                            <span class="wl-item">
-                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                                    action: 'show', displayBadge: true,
-                                    targetEntity: { name: 'person', id: period.requestorPerson.id },
-                                    buttonText: period.requestorPerson|chill_entity_render_string,
-                                    isDead: period.requestorPerson.deathdate is not null
-                                } %}
-                            </span>
-                        {% endif %}
-                        {% if period.requestorThirdParty is not null %}
-                            <span class="wl-item">
-                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                                    action: 'show', displayBadge: true,
-                                    targetEntity: { name: 'thirdparty', id: period.requestorThirdParty.id },
-                                    buttonText: period.requestorThirdParty|chill_entity_render_string
-                                } %}
-                            </span>
-                        {% endif %}
+    {% if period.requestor is not null or period.participations.count > 0 or period.socialIssues.count > 0%}
+        <div class="item-row separator">
+            <div class="wrap-list">
+                {% if period.requestorPerson is not null or period.requestorThirdParty is not null %}
+                    <div class="wl-row">
+                        <div class="wl-col title"><h3>{{ 'Requestor'|trans({'gender': null }) }}</h3></div>
+                        <div class="wl-col list">
+                            {% if period.requestorPerson is not null %}
+                                <span class="wl-item">
+                                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                        action: 'show', displayBadge: true,
+                                        targetEntity: { name: 'person', id: period.requestorPerson.id },
+                                        buttonText: period.requestorPerson|chill_entity_render_string,
+                                        isDead: period.requestorPerson.deathdate is not null
+                                    } %}
+                                </span>
+                            {% endif %}
+                            {% if period.requestorThirdParty is not null %}
+                                <span class="wl-item">
+                                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                        action: 'show', displayBadge: true,
+                                        targetEntity: { name: 'thirdparty', id: period.requestorThirdParty.id },
+                                        buttonText: period.requestorThirdParty|chill_entity_render_string
+                                    } %}
+                                </span>
+                            {% endif %}
+                        </div>
                     </div>
-                </div>
-            {% endif %}
-            {% if period.participations.count > 0 %}
-                <div class="wl-row">
-                    <div class="wl-col title"><h3>{{ 'Participants'|trans }}</h3></div>
-                    <div class="wl-col list">
-                        {% for p in period.getCurrentParticipations %}
-                            <span class="wl-item">
-                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                                    action: 'show', displayBadge: true,
-                                    targetEntity: { name: 'person', id: p.person.id },
-                                    buttonText: p.person|chill_entity_render_string,
-                                    isDead: p.person.deathdate is not null
-                                } %}
-                            </span>
-                        {% endfor %}
+                {% endif %}
+                {% if period.participations.count > 0 %}
+                    <div class="wl-row">
+                        <div class="wl-col title"><h3>{{ 'Participants'|trans }}</h3></div>
+                        <div class="wl-col list">
+                            {% for p in period.getCurrentParticipations %}
+                                <span class="wl-item">
+                                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                        action: 'show', displayBadge: true,
+                                        targetEntity: { name: 'person', id: p.person.id },
+                                        buttonText: p.person|chill_entity_render_string,
+                                        isDead: p.person.deathdate is not null
+                                    } %}
+                                </span>
+                            {% endfor %}
+                        </div>
                     </div>
-                </div>
-            {% endif %}
-            {% if period.socialIssues.count > 0 %}
-                <div class="wl-row">
-                    <div class="wl-col title"><h3>{{ 'Social issues'|trans }}</h3></div>
-                    <div class="wl-col list">
-                        {% for si in period.socialIssues %}
-                            <p class="wl-item">
-                                {{ si|chill_entity_render_box }}
-                            </p>
-                        {% endfor %}
+                {% endif %}
+                {% if period.socialIssues.count > 0 %}
+                    <div class="wl-row">
+                        <div class="wl-col title"><h3>{{ 'Social issues'|trans }}</h3></div>
+                        <div class="wl-col list">
+                            {% for si in period.socialIssues %}
+                                <p class="wl-item">
+                                    {{ si|chill_entity_render_box }}
+                                </p>
+                            {% 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,7 +91,7 @@ class PersonJsonNormalizer implements
             'deathdate',
             'center',
             'altNames',
-            'email'
+            'email',
         ];
 
         $fields = array_filter(

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

@@ -242,7 +242,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->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
+        $this->assertNull($comment->getAccompanyingPeriod());
+        $this->assertEquals(0, count($period->getComments()));
 
         $period->setPinnedComment($replacingComment);
+
         $this->assertSame($period->getPinnedComment(), $replacingComment);
-        $this->assertSame($period, $replacingComment->getAccompanyingPeriod());
-        $this->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
-        $this->assertNull($comment->getAccompanyingPeriod());
+        $this->assertNull($replacingComment->getAccompanyingPeriod());
+        $this->assertSame($period, $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->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
+        $this->assertSame($period, $comment->getAccompanyingPeriod());
+        $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