[person] use the same rendering of person in similar person proposition

homepage (+ ordering)

CHANGELOG.md

@@ -11,7 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
-
+* [person] use the same rendering of person in similar person proposition (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/348)
+* [person] move similar person matcher to PersonACLAwareRepository and replace the SimilarPersonMatcher uses (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/451)
 ## Test releases
 
 ### test release 2022-02-14
@@ -22,7 +23,7 @@ and this project adheres to
 * [person] accompanying course work: fix on-the-fly update of thirdParty
 * 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 
+* [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

src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig

@@ -109,11 +109,9 @@
             {{ 'Cancel'|trans }}
         </a>
     </li>
-    {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
-        <li>
-            <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
-        </li>
-    {% endif %}
+    <li>
+        <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
+    </li>
 </ul>
 
 {{ form_end(edit_form) }}

src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig

@@ -35,7 +35,7 @@
     <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
-            class="btn btn-create">{{ 'Create'|trans }}
+               class="btn btn-create">{{ 'Create'|trans }}
             </a>
         </li>
     </ul>

src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig

@@ -47,13 +47,13 @@
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
 
     {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
-        <ul class="record_actions sticky-form-buttons">
-            <li>
-                <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
-                class="btn btn-create" tabindex="-1" role="button" aria-disabled="true">{{ 'Create'|trans }}
-                </a>
-            </li>
-        </ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li>
+            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
+               class="btn btn-create" tabindex="-1" role="button" aria-disabled="true">{{ 'Create'|trans }}
+            </a>
+        </li>
+    </ul>
     {% endif %}
 
 {% endblock %}

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

@@ -41,28 +41,24 @@
                 </a>
             </li>
         {% endif %}
-        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE', document) and document.course != null %}
-            <li>
-                {{ m.download_button(document.object, document.title) }}
-            </li>
-        {% endif %}
-        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
-            <li>
-            {% if chill_document_is_editable(document.object) %}
-                {% if not freezed %}
-                    {{ document.object|chill_document_edit_button({'title': document.title|e('html') }) }}
-                {% else %}
-                    <a class="btn btn-wopilink disabled" href="#" title="{{ 'workflow.freezed document'|trans }}">
-                        {{ 'Update document'|trans }}
-                    </a>
-                {% endif %}
+        <li>
+            {{ m.download_button(document.object, document.title) }}
+        </li>
+        <li>
+        {% if chill_document_is_editable(document.object) %}
+            {% if not freezed %}
+                {{ document.object|chill_document_edit_button({'title': document.title|e('html') }) }}
+            {% else %}
+                <a class="btn btn-wopilink disabled" href="#" title="{{ 'workflow.freezed document'|trans }}">
+                    {{ 'Update document'|trans }}
+                </a>
             {% endif %}
-            </li>
         {% endif %}
         {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE', document) and document.course != null %}
             <li>
                 <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': document.course.id, 'id': document.id}) }}" class="btn btn-show"></a>
             </li>
         {% endif %}
+        </li>
     </ul>
 {% endif %}

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

@@ -25,11 +25,9 @@
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>
-		{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
-			<li class="edit">
-				<button class="btn btn-edit">{{ 'Edit'|trans }}</button>
-			</li>
-		{% endif %}
+		<li class="edit">
+			<button class="btn btn-edit">{{ 'Edit'|trans }}</button>
+		</li>
 	</ul>
 
 	{{ form_end(form) }}

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

@@ -60,7 +60,7 @@
         {% 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" title="{{ 'Edit attributes' | trans }}"></a>
+                   class="btn btn-edit" title="{{ 'Edit attributes' | trans }}"></a>
             </li>
         {% endif %}
         {% set workflows_frame = chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) %}

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

@@ -42,11 +42,9 @@
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
-        {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
-            <li class="edit">
-                <button class="btn btn-edit">{{ 'Edit'|trans }}</button>
-            </li>
-        {% endif %}
+        <li class="edit">
+            <button class="btn btn-edit">{{ 'Edit'|trans }}</button>
+        </li>
         {# {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
             <li class="delete">
                 {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }}

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

@@ -46,11 +46,9 @@
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>
-		{% if is_granted ('CHILL_PERSON_DOCUMENT_CREATE', person) %}
-			<li class="create">
-				<button class="btn btn-create">{{ 'Create'|trans }}</button>
-			</li>
-		{% endif %}
+		<li class="create">
+			<button class="btn btn-create">{{ 'Create'|trans }}</button>
+		</li>
 	</ul>
 	{{ form_end(form) }}
 {% endblock %}

src/Bundle/ChillPersonBundle/Controller/PersonController.php

@@ -16,8 +16,8 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\CreationPersonType;
 use Chill\PersonBundle\Form\PersonType;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Search\SimilarPersonMatcher;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
@@ -56,11 +56,6 @@ final class PersonController extends AbstractController
      */
     protected $personRepository;
 
-    /**
-     * @var SimilarPersonMatcher
-     */
-    protected $similarPersonMatcher;
-
     /**
      * @var TranslatorInterface
      */
@@ -76,13 +71,14 @@ final class PersonController extends AbstractController
      */
     private $logger;
 
+    private PersonACLAwareRepositoryInterface $personACLAwareRepository;
+
     /**
      * @var ValidatorInterface
      */
     private $validator;
 
     public function __construct(
-        SimilarPersonMatcher $similarPersonMatcher,
         TranslatorInterface $translator,
         EventDispatcherInterface $eventDispatcher,
         PersonRepository $personRepository,
@@ -90,9 +86,9 @@ final class PersonController extends AbstractController
         LoggerInterface $logger,
         ValidatorInterface $validator,
         EntityManagerInterface $em,
-        Security $security
+        Security $security,
+        PersonACLAwareRepositoryInterface $personACLAwareRepository
     ) {
-        $this->similarPersonMatcher = $similarPersonMatcher;
         $this->translator = $translator;
         $this->eventDispatcher = $eventDispatcher;
         $this->configPersonAltNameHelper = $configPersonAltNameHelper;
@@ -101,6 +97,7 @@ final class PersonController extends AbstractController
         $this->validator = $validator;
         $this->em = $em;
         $this->security = $security;
+        $this->personACLAwareRepository = $personACLAwareRepository;
     }
 
     public function editAction($person_id, Request $request)
@@ -236,8 +233,8 @@ final class PersonController extends AbstractController
             $request->getMethod() === Request::METHOD_POST
             && $form->isValid()
         ) {
-            $alternatePersons = $this->similarPersonMatcher
-                ->matchPerson($person);
+            $alternatePersons = $this->personACLAwareRepository
+                ->findMatchingPersons($person);
 
             if (
                 false === $this->isLastPostDataChanges($form, $request, true)

src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php

@@ -20,9 +20,9 @@ use Chill\PersonBundle\Entity\PersonNotDuplicate;
 use Chill\PersonBundle\Form\PersonConfimDuplicateType;
 use Chill\PersonBundle\Form\PersonFindManuallyDuplicateType;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Chill\PersonBundle\Repository\PersonNotDuplicateRepository;
 use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Search\SimilarPersonMatcher;
 use Chill\TaskBundle\Entity\SingleTask;
 use http\Exception\InvalidArgumentException;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -39,6 +39,11 @@ class PersonDuplicateController extends Controller
      */
     private $eventDispatcher;
 
+    /**
+     * @var PersonACLAwareRepositoryInterface
+     */
+    private $personACLAwareRepository;
+
     /**
      * @var \Chill\PersonBundle\Actions\Remove\PersonMove
      */
@@ -49,24 +54,19 @@ class PersonDuplicateController extends Controller
      */
     private $personRepository;
 
-    /**
-     * @var \Chill\PersonBundle\Search\SimilarPersonMatcher
-     */
-    private $similarPersonMatcher;
-
     /**
      * @var \Symfony\Component\Translation\TranslatorInterface
      */
     private $translator;
 
     public function __construct(
-        SimilarPersonMatcher $similarPersonMatcher,
+        PersonACLAwareRepositoryInterface $personACLAwareRepository,
         TranslatorInterface $translator,
         PersonRepository $personRepository,
         PersonMove $personMove,
         EventDispatcherInterface $eventDispatcher
     ) {
-        $this->similarPersonMatcher = $similarPersonMatcher;
+        $this->personACLAwareRepository = $personACLAwareRepository;
         $this->translator = $translator;
         $this->personRepository = $personRepository;
         $this->personMove = $personMove;
@@ -246,8 +246,11 @@ class PersonDuplicateController extends Controller
             'You are not allowed to see this person.'
         );
 
-        $duplicatePersons = $this->similarPersonMatcher->
-            matchPerson($person, $personNotDuplicateRepository, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL);
+        $duplicatePersons = $this->personACLAwareRepository->findMatchingPersons(
+            $person,
+            0.5,
+            PersonACLAwareRepositoryInterface::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL
+        );
 
         $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
 

src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php

@@ -30,7 +30,7 @@ class UserAccompanyingPeriodController extends AbstractController
     }
 
     /**
-     * @Route("/{_locale}/accompanying-periods", name="chill_person_accompanying_period_user")
+     * @Route("/{_locale}/person/accompanying-periods/my", name="chill_person_accompanying_period_user")
      */
     public function listAction(Request $request)
     {
@@ -50,7 +50,7 @@ class UserAccompanyingPeriodController extends AbstractController
     }
 
     /**
-     * @Route("/{_locale}/accompanying-periods/drafts", name="chill_person_accompanying_period_draft_user")
+     * @Route("/{_locale}/person/accompanying-periods/my/drafts", name="chill_person_accompanying_period_draft_user")
      */
     public function listDraftsAction(Request $request)
     {

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php

@@ -71,7 +71,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         $qb = $this->buildQueryByRecentUserHistory($user, $since);
 
         return $qb->select('a')
-            ->distinct(true)
+            ->addOrderBy('userHistory.startDate', 'DESC')
             ->getQuery()
             ->setMaxResults($limit)
             ->setFirstResult($offset)
@@ -95,6 +95,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         $qb
             ->join('a.userHistories', 'userHistory')
             ->where($qb->expr()->eq('a.user', ':user'))
+            ->andWhere($qb->expr()->neq('a.step', "'" . AccompanyingPeriod::STEP_DRAFT . "'"))
             ->andWhere($qb->expr()->gte('userHistory.startDate', ':since'))
             ->andWhere($qb->expr()->isNull('userHistory.endDate'))
             ->setParameter('user', $user)

src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php

@@ -18,6 +18,7 @@ use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
 use DateTimeInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
@@ -40,18 +41,26 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
 
     private EntityManagerInterface $em;
 
+    private PersonNotDuplicateRepository $personNotDuplicateRepository;
+
+    private PersonRender $personRender;
+
     private Security $security;
 
     public function __construct(
         Security $security,
         EntityManagerInterface $em,
         CountryRepository $countryRepository,
-        AuthorizationHelper $authorizationHelper
+        AuthorizationHelper $authorizationHelper,
+        PersonRender $personRender,
+        PersonNotDuplicateRepository $personNotDuplicateRepository
     ) {
         $this->security = $security;
         $this->em = $em;
         $this->countryRepository = $countryRepository;
         $this->authorizationHelper = $authorizationHelper;
+        $this->personRender = $personRender;
+        $this->personNotDuplicateRepository = $personNotDuplicateRepository;
     }
 
     public function buildAuthorizedQuery(
@@ -297,6 +306,70 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         return $this->fetchQueryPerson($query);
     }
 
+    /**
+     * @throws NonUniqueResultException
+     * @throws ParsingException
+     *
+     * @return array|Person[]
+     */
+    public function findMatchingPersons(
+        Person $person,
+        float $precision = 0.15,
+        string $orderBy = self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY
+    ): array {
+        $query = $this->matchPerson($person, $precision, $orderBy);
+        $authorizedQuery = $this->addAuthorizations($query);
+
+        return $this->fetchQueryPerson($authorizedQuery);
+    }
+
+    public function matchPerson(
+        Person $person,
+        float $precision = 0.15,
+        string $orderBy = self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY
+    ): SearchApiQuery {
+        $fullName = $this->personRender->renderString($person, []);
+
+        $query = new SearchApiQuery();
+        $query->setFromClause('chill_person_person AS person');
+        $query->andWhereClause(
+            'SIMILARITY(person.fullnameCanonical, UNACCENT(LOWER(?))) >= ?',
+            [$fullName, $precision]
+        );
+
+        if (null !== $person->getId()) {
+            $query->andWhereClause(
+                'person.id != ?',
+                [$person->getId()]
+            );
+
+            $notDuplicatePersons = $this->personNotDuplicateRepository->findNotDuplicatePerson($person);
+
+            if (count($notDuplicatePersons)) {
+                $query->andWhereClause(
+                    'person.id NOT IN (?)',
+                    [$notDuplicatePersons]
+                );
+            }
+        }
+
+        switch ($orderBy) {
+            case self::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL:
+                $query->setSelectPertinence('person.fullnameCanonical');
+
+                break;
+
+            case self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY:
+            default:
+                $query->setSelectPertinence(
+                    'SIMILARITY(person.fullnameCanonical, UNACCENT(LOWER(?)))',
+                    [$fullName]
+                );
+        }
+
+        return $query;
+    }
+
     private function addAuthorizations(SearchApiQuery $query): SearchApiQuery
     {
         $authorizedCenters = $this->authorizationHelper

src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php

@@ -17,6 +17,10 @@ use DateTimeInterface;
 
 interface PersonACLAwareRepositoryInterface
 {
+    public const SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL = 'alphabetical';
+
+    public const SIMILAR_SEARCH_ORDER_BY_SIMILARITY = 'similarity';
+
     public function buildAuthorizedQuery(
         ?string $default = null,
         ?string $firstname = null,
@@ -61,4 +65,13 @@ interface PersonACLAwareRepositoryInterface
         ?string $phonenumber = null,
         ?string $city = null
     ): array;
+
+    /**
+     * @return array|Person[]
+     */
+    public function findMatchingPersons(
+        Person $person,
+        float $precision = 0.15,
+        string $orderBy = self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY
+    ): array;
 }

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

@@ -46,9 +46,7 @@
                 {% if type == 'new' %}
                     <button class="btn btn-create" type="submit">{{ 'Post a new comment'|trans }}</button>
                 {% elseif type == 'edit' %}
-                    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_COMMENT_EDIT', comment) %}
-                        <button class="btn btn-save" type="submit">{{ 'Save'|trans }}</button>
-                    {% endif %}
+                    <button class="btn btn-save" type="submit">{{ 'Save'|trans }}</button>
                 {% endif %}
                 </li>
             </ul>

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

@@ -4,13 +4,13 @@
             <ul class="record_actions">
                 <li>
                     <a class="btn btn-sm btn-update change-icon"
-                        href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-10' }) }}">
+                       href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-10' }) }}">
                         <i class="fa fa-fw fa-crosshairs"></i>
                         {{ 'fix it'|trans }}
                     </a>
                 </li>
             </ul>
         </div>
-        {{ 'Some people currently do not belong to any household. Add them to a household soon'|trans }}
+        {{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }}
     </div></div>
 </div>

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

@@ -7,7 +7,7 @@
                 <ul class="record_actions">
                     <li>
                         <a class="btn btn-sm btn-update change-icon"
-                            href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-20' }) }}">
+                           href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-20' }) }}">
                             <i class="fa fa-fw fa-crosshairs"></i>
                             {{ 'fix it'|trans }}
                         </a>
@@ -15,10 +15,10 @@
                 </ul>
             </div>
                 <p>
-            {{ 'This course is located at a temporary address. You should link this course to a user'|trans }}</p>
+            {{ 'This course is located at a temporarily address. You should locate this course to an user'|trans }}</p>
             {% if not hasPersonLocation %}
                 <p>
-                {{ 'Associate at least one member with a household, and set an address to this household'|trans }}</p>
+                {{ 'Associate at least one member with an household, and set an address to this household'|trans }}</p>
             {% endif %}
         </div>
     </div>

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

@@ -21,11 +21,9 @@
                     {{ 'Return'|trans }}
                 </a>
             </li>
-            {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE', accompanyingCourse) %}
-                <li>
-                    <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
-                </li>
-            {% endif %}
+            <li>
+                <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
+            </li>
         </ul>
 
     {{ form_end(form) }}

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

@@ -20,7 +20,6 @@
                     {{ 'Return'|trans }}
                 </a>
             </li>
-            {# TODO: add a right here? Use 'CHILL_ACCOMPANYING_PERIOD_CREATE'? #}
             <li>
                 <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
             </li>

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

@@ -101,27 +101,25 @@
             {% if notif_counter.total > 0 %}
                 {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id) }}
             {% endif %}
-
+            
             {% import '@ChillPerson/Macro/updatedBy.html.twig' as macro %}
             {{ macro.updatedBy(w) }}
         </div>
-
+            
         {% if displayAction is defined and displayAction == true %}
             <div class="item-col">
-                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w) %}
                 <ul class="record_actions">
-                        <li>
-                            <a class="btn btn-edit" title="{{ 'Edit'|trans }}"
-                                href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
-                            ></a>
-                        </li>
+                    <li>
+                        <a class="btn btn-edit" title="{{ 'Edit'|trans }}"
+                           href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
+                        ></a>
+                    </li>
                     <li>
                         <a class="btn btn-delete" title="{{ 'Delete'|trans }}"
-                            href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
+                           href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
                         ></a>
                     </li>
                 </ul>
-                {% endif %}
             </div>
         {% endif %}
     </div>

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

@@ -9,12 +9,10 @@
 
         {% if works|length == 0 %}
             <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}
-                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE', accompanyingCourse) %}
-                    <a class="btn btn-sm btn-create"
-                        title="{{ 'accompanying_course_work.create'|trans }}"
-                        href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
-                    ></a>
-                {% endif %}
+                <a class="btn btn-sm btn-create"
+                    title="{{ 'accompanying_course_work.create'|trans }}"
+                    href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
+                ></a>
             </p>
 
         {% else %}
@@ -28,14 +26,12 @@
         {{ chill_pagination(paginator) }}
 
         <ul class="record_actions sticky-form-buttons">
-            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE', accompanyingCourse) %}
-                <li>
-                    <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
-                        class="btn btn-new">
-                        {{ 'accompanying_course_work.create'|trans }}
-                    </a>
-                </li>
-            {% endif %}
+            <li>
+                <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
+                   class="btn btn-new">
+                    {{ 'accompanying_course_work.create'|trans }}
+                </a>
+            </li>
         </ul>
 
     </div>

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

@@ -5,20 +5,16 @@
 
 {% macro recordAction(period, contextEntity) %}
     {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
-    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS', period) %}
-        <li>
-            <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
-            class="btn btn-show" title="{{ 'See accompanying period'|trans }}">{# {{ 'See this period'|trans }} #}</a>
-        </li>
-    {% endif %}
+    <li>
+        <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
+           class="btn btn-show" title="{{ 'See accompanying period'|trans }}">{# {{ 'See this period'|trans }} #}</a>
+    </li>
     {% if period.step == 'DRAFT' and contextEntity.type == 'person' %}
-        {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_DELETE', period) %}
-            {% set person = contextEntity.entity %}
-            <li>
-                <a href="{{ path('chill_person_accompanying_course_delete', { 'accompanying_period_id': period.id, 'person_id' : person.id }) }}"
-                class="btn btn-delete" title="{{ 'Delete accompanying period'|trans }}">{# {{ 'Delete this period'|trans }} #}</a>
-            </li>
-        {% endif %}
+        {% set person = contextEntity.entity %}
+        <li>
+            <a href="{{ path('chill_person_accompanying_course_delete', { 'accompanying_period_id': period.id, 'person_id' : person.id }) }}"
+               class="btn btn-delete" title="{{ 'Delete accompanying period'|trans }}">{# {{ 'Delete this period'|trans }} #}</a>
+        </li>
     {% endif %}
 
     {# DISABLED if new accompanying course, this is not necessary

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

@@ -50,7 +50,7 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id } ) }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
+    <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id } ) }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
     </li>
     <li>
     <button type="submit" class="btn btn-save">

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

@@ -12,22 +12,18 @@
     {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
 
     <ul class="record_actions sticky-form-buttons">
-        {% if is_granted('CHILL_PERSON_SEE', person) %}
-            <li class="cancel">
-                <a href="{{ path ('chill_person_view', {'person_id' : person.id } ) }}"
-                class="btn btn-cancel">{{ 'Person details'|trans }}
-                </a>
-            </li>
-        {% endif %}
-        {# TODO: which right to add here? #}
-            <li>
-                <a class="btn btn-create"
-                href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" role="button">
-                    {{ 'Create an accompanying period'|trans }}
-                </a>
-            </li>
+        <li class="cancel">
+            <a href="{{ path ('chill_person_view', {'person_id' : person.id } ) }}"
+               class="btn btn-cancel">{{ 'Person details'|trans }}
+            </a>
+        </li>
+        <li>
+            <a class="btn btn-create"
+               href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" role="button">
+                {{ 'Create an accompanying period'|trans }}
+            </a>
+        </li>
 
-        {# TODO: should this commented section be deleted? #}
         {#  Disabled dropdown
         <li class="dropdown">
             <a class="btn btn-create change-icon dropdown-toggle"

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

@@ -16,7 +16,6 @@
                 {{ 'Cancel'|trans }}
             </a>
         </li>
-        {# TODO: add a right here? Use 'CHILL_ACCOMPANYING_PERIOD_CREATE'? #}
         <li>
             <a href="{{ path('chill_person_accompanying_period_re_open', {'confirm' : true, 'person_id' : person.id, 'period_id' : period.id } ) }}" class="btn btn-create">
                 {{'Confirm'|trans }}

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

@@ -5,12 +5,10 @@
 {% block title %}{{ 'My accompanying periods in draft'|trans }}{% endblock title %}
 
 {% macro recordAction(period) %}
-    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS', 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>
-    {% endif %}
+    <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 %}
 
 

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

@@ -5,12 +5,10 @@
 {% block title %}{{ 'My accompanying periods'|trans }}{% endblock title %}
 
 {% macro recordAction(period) %}
-    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', 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>
-    {% endif %}
+    <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 %}
 
 
@@ -22,6 +20,8 @@
         <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>
 

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

@@ -29,13 +29,13 @@
                             {% if customButtons['before'] is defined %}
                                 {{ customButtons['before'] }}
                             {% endif %}
-                            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', member.household) %}
-                                <li>
-                                    <a  class="btn btn-sm btn-edit"
-                                        title="{{ 'household.Edit member household'|trans }}"
-                                        href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': member.id }) }}"></a>
-                                </li>
-                            {% endif %}
+
+                            <li>
+                                <a  class="btn btn-sm btn-edit"
+                                    title="{{ 'household.Edit member household'|trans }}"
+                                    href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': member.id }) }}"></a>
+                            </li>
+
                             {% if customButtons['after'] is defined %}
                                 {{ customButtons['after'] }}
                             {% endif %}

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

@@ -41,13 +41,11 @@
     {% endif %}
 
     <ul class="record_actions sticky-form-buttons">
-        {% if is_granted('CHILL_PERSON_HOUSEHOLD_SEE', household) %}
-            <li class="cancel">
-                <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
-                    {{ 'Household summary'|trans }}
-                </a>
-            </li>
-        {% endif %}
+        <li class="cancel">
+            <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
+                {{ 'Household summary'|trans }}
+            </a>
+        </li>
         {#
         <li>
             <a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create">

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

@@ -63,13 +63,11 @@
                     'has_no_address': true
                 }) }}
                 <ul class="record_actions">
-                {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                     <li>
                         <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}"
                            class="btn btn-edit"></a>
 
                     </li>
-                {% endif %}
                 </ul>
             </div>
 

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

@@ -26,13 +26,11 @@
       {{ 'Cancel'|trans }}
     </a>
   </li>
-  {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
-    <li>
-      <button type="submit" class="btn btn-save">
-        {{ 'Save'|trans }}
-      </button>
-    </li>
-  {% endif %}
+  <li>
+    <button type="submit" class="btn btn-save">
+      {{ 'Save'|trans }}
+    </button>
+  </li>
 </ul>
 
 {{ form_end(form) }}

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

@@ -64,14 +64,12 @@
                                 {{ 'household_composition.Since'|trans({'startDate': currentComposition.startDate}) }}
                             </p>
                             <ul class="record_actions">
-                            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                                 <li>
                                     <a class="btn btn-sm btn-update change-icon"
                                        href="{{ path('chill_person_household_composition_index', {'id': household.id}) }}">
                                         {{ 'household_composition.Update composition'|trans }}
                                     </a>
                                 </li>
-                            {% endif %}
                             </ul>
                         </div>
                     {% else %}
@@ -80,14 +78,12 @@
                                 {{ 'household_composition.Currently no composition'|trans }}
                             </p>
                                 <ul class="record_actions" style="margin-bottom: 0">
-                                {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                                     <li>
                                         <a class="btn btn-sm btn-update change-icon"
                                            href="{{ path('chill_person_household_composition_index', {'id': household.id}) }}">
                                             {{ 'household_composition.Add a composition'|trans }}
                                         </a>
                                     </li>
-                                {% endif %}
                                 </ul>
                         </div>
                     {% endif %}
@@ -109,19 +105,15 @@
                     {% endif %}
 
                     {% if not household.commentMembers.isEmpty() %}
-                        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
-                            <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
-                            class="btn btn-edit btn-block">
-                                {{ 'household.Edit comment and expecting birth'|trans }}
-                            </a>
-                        {% endif %}
+                        <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
+                           class="btn btn-edit btn-block">
+                            {{ 'household.Edit comment and expecting birth'|trans }}
+                        </a>
                     {% else %}
-                        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
-                            <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
-                            class="btn btn-create btn-block">
-                                {{ 'household.New comment and expecting birth'|trans }}
-                            </a>
-                        {% endif %}
+                        <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
+                           class="btn btn-create btn-block">
+                            {{ 'household.New comment and expecting birth'|trans }}
+                        </a>
                     {% endif %}
 
                 {% else %}
@@ -137,13 +129,11 @@
                         {{ form_widget(form.commentMembers) }}
                     </div>
                     <ul class="record_actions">
-                        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
-                            <li>
-                                <button type="submit" class="btn btn-save" id="form_household_comment_confirm">
-                                    {{ 'Save'|trans }}
-                                </button>
-                            </li>
-                        {% endif %}
+                        <li>
+                            <button type="submit" class="btn btn-save" id="form_household_comment_confirm">
+                                {{ 'Save'|trans }}
+                            </button>
+                        </li>
                     </ul>
                     {{ form_end(form) }}
                 {% endif %}
@@ -255,14 +245,12 @@
 
 
     <ul class="record_actions">
-    {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
-        <li>
-            <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
-            class="btn btn-create">
-            {{ 'household.Add a member'|trans }}
-            </a>
-        </li>
-      {% endif %}
+      <li>
+        <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
+          class="btn btn-create">
+          {{ 'household.Add a member'|trans }}
+        </a>
+      </li>
     </ul>
 
 </div>

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

@@ -63,11 +63,9 @@
                         <li class="cancel" style="margin-right: auto;">
                             <a class="btn btn-cancel" href="{{ path('chill_person_household_composition_index', {'id': c.household.id}) }}">{{ 'Cancel'|trans }}</a>
                         </li>
-                        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', c.household) %}
-                            <li>
-                                <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-                            </li>
-                        {% endif %}
+                        <li>
+                            <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
+                        </li>
                     </ul>
                     {{ form_end(form) }}
                 {% endif %}
@@ -81,24 +79,20 @@
         {{ form_widget(form) }}
 
         <ul class="record_actions">
-            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
-                <li>
-                    <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-                </li>
-            {% endif %}
+           <li>
+               <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
+           </li>
         </ul>
         {{ form_end(form) }}
     </div>
 
     {% if editId == -1 %}
         <ul class="record_actions sticky-form-buttons">
-            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                 <li>
                     <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
                         {{ 'Create'|trans }}
                     </button>
                 </li>
-            {% endif %}
         </ul>
     {% endif %}
 </div>

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

@@ -17,6 +17,15 @@
 
 {% block title %}{{ 'Add a person'|trans }}{% endblock title %}
 
+{% macro button_person_after(person) %}
+    {% set household = person.getCurrentHousehold %}
+    {% if household is not null %}
+        <li>
+            <a href="{{ path('chill_person_household_summary', { 'household_id': household.id }) }}" class="btn btn-sm btn-chill-beige"><i class="fa fa-home"></i></a>
+        </li>
+    {% endif %}
+{% endmacro %}
+
 {% block content %}
 <div class="col-md-10 col-xxl person-new">
 
@@ -31,34 +40,24 @@
             </span>
         </div>
 
-        <table class="table table-bordered border-dark">
-            <thead>
-            <tr>
-                <th class="chill-red">{{ 'Name'|trans }}</th>
-                <th class="chill-green">{{ 'Date of birth'|trans }}</th>
-                <th class="chill-orange">{{ 'Nationality'|trans }}</th>
-            </tr>
-            </thead>
-            <tbody>
+        <div class="flex-table">
             {% for person in alternatePersons %}
-                <tr>
-                    <td>
-                        <a href="{{ path('chill_person_view', {'person_id': person.id } ) }}">
-                            {{ person|chill_entity_render_string }}{% apply spaceless %}
-                                {% if person.isOpen == false %}
-                                    <i class="icon-lock"></i>
-                                {% endif %}
-                            {% endapply %}
-                        </a>
-                    </td>
-                    <td>{% if person.birthdate is not null %}{{ person.birthdate|format_date('long') }}{% else %}&nbsp;{% endif %}</td>
-                    <td>
-                        {% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{%  else  %}{{ 'Without nationality'|trans }}{% endif %}
-                    </td>
-                </tr>
+            <div class="item-bloc">
+
+                {{ person|chill_entity_render_box({
+                    'render': 'bloc',
+                    'addLink': true,
+                    'addInfo': true,
+                    'addAge': true,
+                    'addAltNames': true,
+                    'addCenter': true,
+                    'address_multiline': false,
+                    'customButtons': { 'after': _self.button_person_after(person) }
+                }) }}
+            </div>
             {% endfor %}
-            </tbody>
-        </table>
+        </div>
+
     {% endif %}
 
     {{ form_start(form, {'attr' : {'id' : 'create-form'}}) }}
@@ -107,24 +106,21 @@
 
     <ul class="record_actions sticky-form-buttons">
         <li class="dropdown">
-            {% if is_granted('CHILL_PERSON_CREATE') %}
-                <a class="btn btn-create dropdown-toggle"
-                href="#" role="button" id="newPersonMore" data-bs-toggle="dropdown" aria-expanded="false">
-                    {{ 'Add the person'|trans }}
-                </a>
-            {% endif %}
-                <ul class="dropdown-menu" aria-labelledby="newPersonMore">
-                    <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>
-                </ul>
-            {# {% endif %} #}
+            <a class="btn btn-create dropdown-toggle"
+            href="#" role="button" id="newPersonMore" data-bs-toggle="dropdown" aria-expanded="false">
+                {{ 'Add the person'|trans }}
+            </a>
+            <ul class="dropdown-menu" aria-labelledby="newPersonMore">
+                <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>
+            </ul>
         </li>
     </ul>
 

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

@@ -136,13 +136,11 @@
                 {{ 'Return'|trans }}
             </a>
         </li>
-        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-            <li>
-                <button class="btn btn-save" type="submit">
-                    {{ 'Save'|trans }}
-                </button>
-            </li>
-        {% endif %}
+        <li>
+            <button class="btn btn-save" type="submit">
+                {{ 'Save'|trans }}
+            </button>
+        </li>
     </ul>
     {{ form_end(form) }}
 

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

@@ -113,18 +113,14 @@
 
                         <div class="item-row separator">
                             <ul class="record_actions">
-                                {% if is_granted('CHILL_PERSON_HOUSEHOLD_SEE', p.household) %}
                                 <li>
                                     <a href="{{ chill_path_add_return_path('chill_person_household_summary',{ 'household_id': p.household.id }) }}"
                                     class="btn btn-show" title="{{ 'Show'|trans }}"></a>
                                 </li>
-                                {% endif %}
-                                {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', p.household) %}
                                 <li>
                                     <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
-                                    class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
+                                       class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
                                 </li>
-                                {% endif %}
                                 {% if p.isCurrent() %}
                                     <li>
                                         <a class="btn btn-misc" href="{{ chill_path_add_return_path( 'chill_person_household_members_editor', { 'persons': [ person.id ], 'allow_leave_without_household': true }) }}">
@@ -168,12 +164,10 @@
 
                     <div class="item-row separator">
                         <ul class="record_actions">
-                            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', p.household) %}
-                                <li>
-                                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
-                                    class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
-                                </li>
-                            {% endif %}
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
+                                   class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
+                            </li>
                         </ul>
                     </div>
 

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

@@ -69,9 +69,7 @@
                         </td>
                         <td>
                             <ul class="record_actions">
-                                {% if is_granted('CHILL_PERSON_SEE', person) %}
-                                    <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
-                                {% endif %}
+                                <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
                                 {% if is_granted('CHILL_PERSON_UPDATE', person) %}
                                 <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
                                 {% endif %}

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

@@ -74,11 +74,9 @@
                         </td>
                         <td>
                             <ul class="record_actions">
-                                {% if is_granted('CHILL_PERSON_SEE', person) %}
-                                    <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
-                                {% endif %}
+                                <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
                                 {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-                                    <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
+                                <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
                                 {% endif %}
                             </ul>
                         </td>

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

@@ -214,14 +214,12 @@
                                     {% endif %}
 
                                     <ul class="record_actions record_actions_column">
-                                        {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', acp) %}
-                                            <li>
-                                                <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': acp.id }) }}"
-                                                class="btn btn-sm btn-outline-primary" title="{{ 'See accompanying period'|trans }}">
-                                                    <i class="fa fa-random fa-fw"></i>
-                                                </a>
-                                            </li>
-                                        {% endif %}
+                                        <li>
+                                            <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': acp.id }) }}"
+                                               class="btn btn-sm btn-outline-primary" title="{{ 'See accompanying period'|trans }}">
+                                                <i class="fa fa-random fa-fw"></i>
+                                            </a>
+                                        </li>
                                     </ul>
 
                                 </div>

src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig

@@ -8,26 +8,24 @@
 
 {% block personcontent %}
 <div class="person-duplicate">
+            
+            <h1>{{ 'Désigner un dossier doublon'|trans }}</h1>
+            
+            {{ form_start(form) }}
+            {{ form_rest(form) }}
 
-    <h1>{{ 'Désigner un dossier doublon'|trans }}</h1>
+            <ul class="record_actions sticky-form-buttons">
+                <li class="cancel">
+                    <a href="{{ path('chill_person_duplicate_view',  {'person_id' : person.id}) }}" class="btn btn-cancel">
+                        {{ 'Return'|trans }}
+                    </a>
+                </li>
+                <li>
+                    <button class="btn btn-save" type="submit">{{ 'Next'|trans }}</button>
+                </li>
+            </ul>
 
-    {{ form_start(form) }}
-    {{ form_rest(form) }}
-
-    <ul class="record_actions sticky-form-buttons">
-        <li class="cancel">
-            <a href="{{ path('chill_person_duplicate_view',  {'person_id' : person.id}) }}" class="btn btn-cancel">
-                {{ 'Return'|trans }}
-            </a>
-        </li>
-        {% if is_granted('CHILL_PERSON_CREATE') %}
-            <li>
-                <button class="btn btn-save" type="submit">{{ 'Next'|trans }}</button>
-            </li>
-        {% endif %}
-    </ul>
-
-    {{ form_end(form) }}
+            {{ form_end(form) }}
 
 </div>
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig

@@ -56,11 +56,9 @@
                         </td>
                         <td>
                             <ul class="record_actions">
-                                {% if is_granted('CHILL_PERSON_SEE', duplicatePerson) %}
-                                    <li>
-                                        <a class="btn btn-show" target="_blank" href="{{ path('chill_person_view', { person_id : duplicatePerson.id }) }}"></a>
-                                    </li>
-                                {% endif %}
+                                <li>
+                                    <a class="btn btn-show" target="_blank" href="{{ path('chill_person_view', { person_id : duplicatePerson.id }) }}"></a>
+                                </li>
                                 <li>
                                     <a class="btn btn-action" href="{{ path('chill_person_duplicate_confirm', { person1_id : person.id, person2_id : duplicatePerson.id }) }}">
                                     <i class="fa fa-cog fa-fw"></i>{{ 'Merge'|trans }}</a>
@@ -126,17 +124,15 @@
                             </td>
                             <td>
                                 <ul class="record_actions">
-                                {% if is_granted('CHILL_PERSON_SEE', notDuplicatePerson) %}
                                     <li>
                                         <a class="btn btn-show" target="_blank" href="{{ path('chill_person_view', { person_id : notDuplicatePerson.id }) }}"></a>
                                     </li>
-                                {% endif %}
                                     <li>
                                         <a class="btn btn-misc" title="{{ 'Switch to duplicate'|trans }}"
-                                            href="{{ path('chill_person_remove_duplicate_not_duplicate', {person1_id : person.id, person2_id : notDuplicatePerson.id}) }}">
-                                            <i class="fa fa-toggle-off fa-fw"></i>
-                                            {{ 'not-duplicate'|trans }}
-                                        </a>
+                                           href="{{ path('chill_person_remove_duplicate_not_duplicate', {person1_id : person.id, person2_id : notDuplicatePerson.id}) }}">
+                                           <i class="fa fa-toggle-off fa-fw"></i>
+                                           {{ 'not-duplicate'|trans }}
+                                       </a>
                                     </li>
                                 </ul>
                             </td>

src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig

@@ -65,14 +65,12 @@
     </ul>
 {% else %}
     <ul class="record_actions">
-        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-            <li>
-                <button class="btn btn-create"
-                type="submit" id="newPersonResource">
-                    {{ 'Save'|trans }}
-                </button>
-            </li>
-        {% endif %}
+        <li>
+            <button class="btn btn-create"
+            type="submit" id="newPersonResource">
+                {{ 'Save'|trans }}
+            </button>
+        </li>
     </ul>
 {% endif %}
 

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

@@ -38,11 +38,9 @@
                     {{ 'Cancel'|trans|chill_return_path_label }}
                 </a>
             </li>
-            {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-                <li>
-                    <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
-                </li>
-            {% endif %}
+            <li>
+                <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
+            </li>
         </ul>
 
         {{ form_end(form) }}

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

@@ -104,12 +104,12 @@
             </a>
         </li>
         {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-            <li>
-                <a class="btn btn-create"
-                    href="{{ path('chill_person_residential_address_new', { 'id' : person.id } ) }}">
-                    {{ 'Add a residential address'|trans }}
-                </a>
-            </li>
+        <li>
+            <a class="btn btn-create"
+                href="{{ path('chill_person_residential_address_new', { 'id' : person.id } ) }}">
+                {{ 'Add a residential address'|trans }}
+            </a>
+        </li>
         {% endif %}
     </ul>
 </div>

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

@@ -8,16 +8,16 @@
 
     <div class="container" style="margin-top: 2rem;">
         <div class="row">
-            <div class="col-md-4 mb-4">
-                <a
-                    href="{{ chill_path_forward_return_path('chill_person_residential_address_new', {'id': person.id, 'kind': 'person'}) }}"
-                    class="btn btn-outline-chill-green-dark">
-                    {{ 'The address of another person'|trans }}
-                </a>
-            </div>
-            <div class="col-md-8">
-                <p>{{ 'residential_address_person_explanation'|trans  }}</p>
-            </div>
+           <div class="col-md-4 mb-4">
+               <a
+                   href="{{ chill_path_forward_return_path('chill_person_residential_address_new', {'id': person.id, 'kind': 'person'}) }}"
+                   class="btn btn-outline-chill-green-dark">
+                   {{ 'The address of another person'|trans }}
+               </a>
+           </div>
+           <div class="col-md-8">
+               <p>{{ 'residential_address_person_explanation'|trans  }}</p>
+           </div>
         </div>
         <div class="row">
             <div class="col-md-4 mb-4">

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Evaluation/index.html.twig

@@ -14,13 +14,11 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
-                    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
                     <ul class="record_actions">
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_crud_social_evaluation_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
                         </li>
                     </ul>
-                    {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig

@@ -14,13 +14,11 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
-                    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
                     <ul class="record_actions">
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_crud_social_goal_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
                         </li>
                     </ul>
-                    {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Result/index.html.twig

@@ -14,13 +14,11 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
-                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
-                <ul class="record_actions">
-                    <li>
-                        <a href="{{ chill_path_add_return_path('chill_crud_social_result_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
-                    </li>
-                </ul>
-                {% endif %}
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_crud_social_result_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
+                        </li>
+                    </ul>
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig

@@ -14,13 +14,11 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
-                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
                     <ul class="record_actions">
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_crud_social_action_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
                         </li>
                     </ul>
-                {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig

@@ -14,13 +14,11 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
-                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
                     <ul class="record_actions">
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_crud_social_issue_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
                         </li>
                     </ul>
-                {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/Timeline/closing_period.html.twig

@@ -14,11 +14,11 @@
     <dl class="chill_view_data">
       <dd>{{ 'Participants'|trans }}&nbsp;:</dd>
       <dt>
-        <ul>
-          {% for p in period.participations %}
-            <li>{{ p.person|chill_entity_render_box({ 'addLink': true }) }}: {{ 'since %date%'|trans({'%date%': p.startDate|format_date("long") } ) }}, {{ 'until %date%'|trans({'%date%': (p.endDate is not null ? p.endDate : period.closingDate)|format_date("long") }) }}</li>
-          {% endfor %}
-        </ul>
+      <ul>
+        {% for p in period.participations %}
+        <li>{{ p.person|chill_entity_render_box({ 'addLink': true }) }}: {{ 'since %date%'|trans({'%date%': p.startDate|format_date("long") } ) }}, {{ 'until %date%'|trans({'%date%': (p.endDate is not null ? p.endDate : period.closingDate)|format_date("long") }) }}</li>
+        {% endfor %}
+      </ul>
       </dt>
   </div>
 </div>

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

@@ -28,10 +28,12 @@ This view should receive those arguments:
 
 {% block personcontent %}
 <div class="timeline">
-    {{ timeline|raw }}
-
-    {% if nb_items > paginator.getItemsPerPage %}
-        {{ chill_pagination(paginator) }}
-    {% endif %}
-</div>
+            
+            {{ timeline|raw }}
+            
+            {% if nb_items > paginator.getItemsPerPage %}
+            {{ chill_pagination(paginator) }}
+            {% endif %}
+    
+</div>    
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Timeline/opening_period.html.twig

@@ -14,11 +14,11 @@
     <dl class="chill_view_data">
       <dd>{{ 'Participants'|trans }}&nbsp;:</dd>
       <dt>
-        <ul>
-          {% for p in period.participations %}
-            <li>{{ 'Since %date%'|trans( {'%date%': p.startDate|format_date("long") } ) }}&nbsp;: {{ p.person|chill_entity_render_box({ 'addLink': true }) }}</li>
-          {% endfor %}
-        </ul>
+      <ul>
+        {% for p in period.participations %}
+        <li>{{ 'Since %date%'|trans( {'%date%': p.startDate|format_date("long") } ) }}&nbsp;: {{ p.person|chill_entity_render_box({ 'addLink': true }) }}</li>
+        {% endfor %}
+      </ul>
       </dt>
   </div>
 </div>

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig

@@ -6,14 +6,12 @@
 </div>
 
 {% if display_action is defined and display_action == true %}
-    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', work) %}
-        <ul class="record_actions">
-            <li>
-                <a class="btn btn-update"
-                    href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': work.id }) }}">
-                    {{ 'Edit'|trans }}
-                </a>
-            </li>
-        </ul>
-    {% endif %}
+    <ul class="record_actions">
+        <li>
+            <a class="btn btn-update"
+               href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': work.id }) }}">
+                {{ 'Edit'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endif %}

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig

@@ -88,13 +88,12 @@
 </div>
 
 {% if display_action is defined and display_action == true %}
-    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE', evaluation.accompanyingPeriodWork) %}
-        <ul class="record_actions">
-            <li>
-                <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
-                    {{ 'Show'|trans }}
-                </a>
-            </li>
-        </ul>
-    {% endif %}
+    {# TODO add acl #}
+    <ul class="record_actions">
+        <li>
+            <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
+                {{ 'Show'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endif %}

src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php

@@ -21,6 +21,9 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt
 
 use function count;
 
+/**
+ * @deprecated
+ */
 class SimilarPersonMatcher
 {
     public const SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL = 'alphabetical';

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

@@ -24,7 +24,7 @@ services:
 
     Chill\PersonBundle\Controller\PersonDuplicateController:
         arguments:
-            $similarPersonMatcher: '@Chill\PersonBundle\Search\SimilarPersonMatcher'
+            $personACLAwareRepository: '@Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface'
             $translator: '@Symfony\Component\Translation\TranslatorInterface'
             $personRepository: '@Chill\PersonBundle\Repository\PersonRepository'
             $personMove: '@Chill\PersonBundle\Actions\Remove\PersonMove'

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

@@ -213,7 +213,7 @@ No requestor: Pas de demandeur
 No resources: "Pas d'interlocuteurs privilégiés"
 Persons associated: Usagers concernés
 Referrer: Référent
-Some people currently do not belong to any household. Add them to a household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur ménage dès que possible.
+Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur ménage dès que possible.
 Add to household now: Ajouter à un ménage
 Any resource for this accompanying course: Aucun interlocuteur privilégié pour ce parcours
 course.draft: Brouillon
@@ -451,12 +451,12 @@ Edit Accompanying Course: Modifier le parcours
 Close Accompanying Course: Clôturer le parcours
 Create Accompanying Course: Créer un nouveau parcours
 Drop Accompanying Course: Supprimer le parcours
-This course is located at a temporary address. You should link this course to a user: Le parcours est localisé à une adresse temporaire. Il devrait être localisé auprès d'une personne concernée.
+This course is located at a temporarily address. You should locate this course to an user: Le parcours est localisé à une adresse temporaire. Il devrait être localisé auprès d'une personne concernée.
 Accompanying course location: Localisation du parcours
 This course is located by: Localisé auprès de
 This course has a temporarily location: Localisation temporaire
 Choose a person to locate by: Localiser auprès d'un usager concerné
-Associate at least one member with a household, and set an address to this household: Associez au moins un membre du parcours à un ménage, et indiquez une adresse à ce ménage.
+Associate at least one member with an household, and set an address to this household: Associez au moins un membre du parcours à un ménage, et indiquez une adresse à ce ménage.
 Locate by: Localiser auprès de
 fix it: Compléter
 accompanying_course:

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_edit.html.twig

@@ -19,11 +19,9 @@
 			<a class="btn btn-cancel" href={% if task.person is not null %}"{{ chill_return_path_or('chill_task_singletask_list', { 'person_id': task.person.id } ) }}"{% else %}"{{ chill_return_path_or('chill_task_singletask_courselist', {'course_id': task.course.id}) }}" {% endif %}>
 				{{ 'Cancel'|trans }}</a>
 		</li>
-		{% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
-			<li>
-				{{ form_widget(form.submit, { 'label': 'Save task', 'attr': {'class' : 'btn btn-update'}})}}
-			</li>
-		{% endif %}
+		<li>
+			{{ form_widget(form.submit, { 'label': 'Save task', 'attr': {'class' : 'btn btn-update'}})}}
+		</li>
 	</ul>
 	{{ form_end(form) }}
 </div>