Merge branch 'master' into issue345_internal_thirdparty_contact

CHANGELOG.md

@@ -10,15 +10,22 @@ and this project adheres to
 
 ## Unreleased
 * AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)
+
+<!-- write down unreleased development here -->
+* workflow: fix sending notifications
+* [thirdparty] Extend the thirdparty search to thirdparty children (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/448)
 * [person]: AddPersons: allow creation of person or thirdparty only (no users) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
 * [person]: AddPersons: allow creation of person or thirdparty depending on allowed types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
 * [person]: AddPersons: add suggestion of name when creating new person or thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
 * [main] Address: fix small bug: when modifying an address without street (isNoAddress), also check errors if street is an empty string as back-end change null value to empty string for street (and streetNumber)
 * [main] Address: stronger client-side validation of addresses (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/449)
-
-
-<!-- write down unreleased development here -->
 * [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
+* [person] accompanying course: filter suggested entities by open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/415)
+[activity] can click through the cross icon for removing person in concerned group (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
+[activity] correct associated persons by considering only open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
+* [person_resources]: Renderboxes used to display person/thirdparty info (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/465)
+* [Household]: Add end date in HouseholdMember form for 'enfant hors menage' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/434)
+* [homepage_widget]: If no sender then display as 'notification automatique' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/435)
 
 ## Test releases
 
@@ -46,7 +53,7 @@ and this project adheres to
 * [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459)
 * [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
 * [Thirdparty_contact]: address blurred if confidential in view page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/450)
-* [homepage_widget]: If no sender then display as 'notification automatique' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/435)
+
 
 ### test release 2021-02-01
 

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -357,7 +357,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         if (null !== $this->accompanyingPeriod) {
             $personsAssociated = [];
 
-            foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
+            foreach ($this->accompanyingPeriod->getOpenParticipations() as $participation) {
                 if ($this->persons->contains($participation->getPerson())) {
                     $personsAssociated[] = $participation->getPerson();
                 }

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

@@ -1,7 +1,7 @@
 <template>
    <li>
-      <span :title="person.text">
+      <span :title="person.text" @click.prevent="$emit('remove', person)">
-         <span class="chill_denomination" @click.prevent="$emit('remove', person)">
+         <span class="chill_denomination">
             <person-text :person="person" :isCut="true"></person-text>
          </span>
       </span>

src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php

@@ -14,19 +14,46 @@ namespace Chill\DocStoreBundle\Workflow;
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandlerInterface
 {
     private EntityRepository $repository;
 
+    private TranslatorInterface $translator;
+
     /**
      * TODO: injecter le repository directement.
      */
-    public function __construct(EntityManagerInterface $em)
+    public function __construct(EntityManagerInterface $em, TranslatorInterface $translator)
     {
         $this->repository = $em->getRepository(AccompanyingCourseDocument::class);
+        $this->translator = $translator;
+    }
+
+    public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
+    {
+        $course = $this->getRelatedEntity($entityWorkflow)
+            ->getCourse();
+        $persons = [];
+
+        if (null !== $course) {
+            $persons = $course->getCurrentParticipations()->map(static function (AccompanyingPeriodParticipation $participation) {
+                return $participation->getPerson();
+            })->toArray();
+        }
+
+        return [
+            'persons' => array_values($persons),
+        ];
+    }
+
+    public function getEntityTitle(EntityWorkflow $entityWorkflow, array $options = []): string
+    {
+        return $this->translator->trans('workflow.Document (n°%doc%)', ['%doc%' => $entityWorkflow->getRelatedEntityId()]);
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingCourseDocument

src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php

@@ -11,7 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Controller;
 
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\MainBundle\Serializer\Model\Counter;
 use Doctrine\ORM\EntityManagerInterface;
 use LogicException;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -21,17 +26,71 @@ use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
 
 class WorkflowApiController
 {
     private EntityManagerInterface $entityManager;
 
+    private EntityWorkflowRepository $entityWorkflowRepository;
+
+    private PaginatorFactory $paginatorFactory;
+
     private Security $security;
 
-    public function __construct(Security $security, EntityManagerInterface $entityManager)
+    private SerializerInterface $serializer;
-    {
+
+    public function __construct(
+        EntityManagerInterface $entityManager,
+        EntityWorkflowRepository $entityWorkflowRepository,
+        PaginatorFactory $paginatorFactory,
+        Security $security,
+        SerializerInterface $serializer
+    ) {
         $this->entityManager = $entityManager;
+        $this->entityWorkflowRepository = $entityWorkflowRepository;
+        $this->paginatorFactory = $paginatorFactory;
         $this->security = $security;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Return a list of workflow which are waiting an action for the user.
+     *
+     * @Route("/api/1.0/main/workflow/my", methods={"GET"})
+     */
+    public function myWorkflow(Request $request): JsonResponse
+    {
+        if (!$this->security->isGranted('ROLE_USER') || !$this->security->getUser() instanceof User) {
+            throw new AccessDeniedException();
+        }
+
+        $total = $this->entityWorkflowRepository->countByDest($this->security->getUser());
+
+        if ($request->query->getBoolean('countOnly', false)) {
+            return new JsonResponse(
+                $this->serializer->serialize(new Counter($total), 'json'),
+                JsonResponse::HTTP_OK,
+                [],
+                true
+            );
+        }
+
+        $paginator = $this->paginatorFactory->create($total);
+
+        $workflows = $this->entityWorkflowRepository->findByDest(
+            $this->security->getUser(),
+            ['id' => 'DESC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+
+        return new JsonResponse(
+            $this->serializer->serialize(new Collection($workflows, $paginator), 'json', ['groups' => ['read']]),
+            JsonResponse::HTTP_OK,
+            [],
+            true
+        );
     }
 
     /**

src/Bundle/ChillMainBundle/Controller/WorkflowController.php

@@ -197,6 +197,8 @@ class WorkflowController extends AbstractController
                     );
                 }
 
+                $entityWorkflow->futureDestUsers = $transitionForm['future_dest_users']->getData();
+
                 $workflow->apply($entityWorkflow, $transition);
 
                 foreach ($transitionForm['future_dest_users']->getData() as $user) {

src/Bundle/ChillMainBundle/Entity/Address.php

@@ -139,12 +139,10 @@ class Address
     private $point;
 
     /**
-     * @var PostalCode
-     *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
      * @Groups({"write"})
      */
-    private $postcode;
+    private ?PostalCode $postcode;
 
     /**
      * @var string|null

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

@@ -41,6 +41,17 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 
     use TrackUpdateTrait;
 
+    /**
+     * a list of future dest users for the next steps.
+     *
+     * This is in used in order to let controller inform who will be the future users which will validate
+     * the next step. This is necessary to perform some computation about the next users, before they are
+     * associated to the entity EntityWorkflowStep.
+     *
+     * @var array|User[]
+     */
+    public array $futureDestUsers = [];
+
     /**
      * @ORM\OneToMany(targetEntity=EntityWorkflowComment::class, mappedBy="entityWorkflow", orphanRemoval=true)
      *

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

@@ -23,7 +23,6 @@
             :class="{'active': activeTab === 'MyAccompanyingCourses'}"
             @click="selectTab('MyAccompanyingCourses')">
             {{ $t('my_accompanying_courses.tab') }}
-            <tab-counter :count="state.accompanyingCourses.count"></tab-counter>
          </a>
       </li>
       <li class="nav-item">
@@ -51,6 +50,14 @@
             <tab-counter :count="state.tasks.alert.count"></tab-counter>
          </a>
       </li>
+      <li class="nav-item">
+         <a class="nav-link"
+            :class="{'active': activeTab === 'MyWorkflows'}"
+            @click="selectTab('MyWorkflows')">
+            {{ $t('my_workflows.tab') }}
+            <tab-counter :count="state.workflows.count"></tab-counter>
+         </a>
+      </li>
       <li class="nav-item loading ms-auto py-2" v-if="loading">
          <i class="fa fa-circle-o-notch fa-spin fa-lg text-chill-gray" :title="$t('loading')"></i>
       </li>
@@ -75,6 +82,9 @@
       <my-notifications
          v-else-if="activeTab === 'MyNotifications'">
       </my-notifications>
+      <my-workflows
+         v-else-if="activeTab === 'MyWorkflows'">
+      </my-workflows>
    </div>
 </template>
 
@@ -85,6 +95,7 @@ import MyEvaluations from './MyEvaluations';
 import MyTasks from './MyTasks';
 import MyAccompanyingCourses from './MyAccompanyingCourses';
 import MyNotifications from './MyNotifications';
+import MyWorkflows from './MyWorkflows.vue';
 import TabCounter from './TabCounter';
 import { mapState } from "vuex";
 
@@ -95,6 +106,7 @@ export default {
       MyWorks,
       MyEvaluations,
       MyTasks,
+      MyWorkflows,
       MyAccompanyingCourses,
       MyNotifications,
       TabCounter,
@@ -126,6 +138,7 @@ export default {
          'MyWorks',
          'MyEvaluations',
          'MyTasks',
+         'MyWorkflows',
       ]) {
          this.$store.dispatch('getByTab', { tab: m, param: "countOnly=1" });
       }

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

@@ -66,6 +66,8 @@ export default {
                return appMessages.fr.the_activity;
             case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod':
                return appMessages.fr.the_course;
+            case 'Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow':
+               return appMessages.fr.the_workflow;
             default:
                throw 'notification type unknown';
          }
@@ -76,6 +78,8 @@ export default {
                return `/fr/activity/${n.relatedEntityId}/show`
             case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod':
                return `/fr/parcours/${n.relatedEntityId}`
+            case 'Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow':
+               return `/fr/main/workflow/${n.relatedEntityId}/show`
             default:
                throw 'notification type unknown';
          }

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

@@ -0,0 +1,88 @@
+<template>
+
+<div class="alert alert-light">{{ $t('my_workflows.description') }}</div>
+<span v-if="noResults" class="chill-no-data-statement">{{ $t('no_data') }}</span>
+<tab-table v-else>
+    <template v-slot:thead>
+        <th scope="col">{{ $t('Object_workflow') }}</th>
+        <th scope="col">{{ $t('Step') }}</th>
+        <th scope="col">{{ $t('concerned_users') }}</th>
+        <th scope="col"></th>
+    </template>
+    <template v-slot:tbody>
+        <tr v-for="(w, i) in workflows.results" :key="`workflow-${i}`">
+            <td>{{ w.title }}</td>
+            <td>
+                <div class="workflow">
+                    <div class="breadcrumb">
+                        <i class="fa fa-circle me-1 text-chill-yellow mx-2"></i>
+                        <span class="mx-2">{{ getStep(w) }}</span>
+                    </div>
+                </div>
+            </td>
+            <td v-if="w.datas.persons !== null">
+                <span v-for="p in w.datas.persons" class="me-1" :key="p.id">
+                    <on-the-fly
+                        :type="p.type"
+                        :id="p.id"
+                        :buttonText="p.textAge"
+                        :displayBadge="'true' === 'true'"
+                        action="show">
+                    </on-the-fly>
+                </span>
+            </td>
+            <td>
+            <a class="btn btn-sm btn-show" :href="getUrl(w)">
+                {{ $t('show_entity', { entity: $t('the_workflow') }) }}
+            </a>
+            </td>
+        </tr>
+    </template>
+</tab-table>
+
+</template>
+
+<script>
+import { mapState, mapGetters } from "vuex";
+import TabTable from "./TabTable";
+import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly';
+
+export default {
+    name: "MyWorkflows",
+    components: {
+        TabTable,
+        OnTheFly
+    },
+    computed: {
+        ...mapState([
+            'workflows',
+        ]),
+        ...mapGetters([
+            'isWorkflowsLoaded',
+        ]),
+        noResults() {
+            if (!this.isWorkflowsLoaded) {
+                return false;
+            } else {
+                return this.workflows.count === 0;
+            }
+        },
+    },
+    methods: {
+        getUrl(w) {
+            return `/fr/main/workflow/${w.id}/show`;
+        },
+        getStep(w) {
+            const lastStep = w.steps.length - 1
+            return w.steps[lastStep].currentStep.text;
+        }
+    },
+}
+</script>
+
+<style scoped>
+span.outdated {
+    font-weight: bold;
+    color: var(--bs-warning);
+}
+</style>

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

@@ -22,6 +22,10 @@ const appMessages = {
             tab: "Mes notifications",
             description: "Liste des notifications reçues et non lues.",
         },
+        my_workflows: {
+            tab: "Mes workflows",
+            description: "Liste des workflows en attente d'une action."
+        },
         opening_date: "Date d'ouverture",
         social_issues: "Problématiques sociales",
         concerned_persons: "Usagers concernés",
@@ -33,12 +37,16 @@ const appMessages = {
         From: "Expéditeur",
         Subject: "Objet",
         Entity: "Associé à",
+        Step: "Étape",
+        concerned_users: "Usagers concernés",
+        Object_workflow: "Objet du workflow",
         show_entity: "Voir {entity}",
         the_activity: "l'échange",
         the_course: "le parcours",
         the_action: "l'action",
         the_evaluation: "l'évaluation",
         the_task: "la tâche",
+        the_workflow: "le workflow",
         StartDate: "Date d'ouverture",
         SocialAction: "Action d'accompagnement",
         no_data: "Aucun résultats",

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

@@ -1,12 +1,6 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
-import MyCustoms from "../MyCustoms";
-import MyWorks from "../MyWorks";
-import MyEvaluations from "../MyEvaluations";
-import MyTasks from "../MyTasks";
-import MyAccompanyingCourses from "../MyAccompanyingCourses";
-import MyNotifications from "../MyNotifications";
 
 const debug = process.env.NODE_ENV !== 'production';
 
@@ -27,6 +21,7 @@ const store = createStore({
         },
         accompanyingCourses: {},
         notifications: {},
+        workflows: {},
         errorMsg: [],
         loading: false
     },
@@ -49,6 +44,9 @@ const store = createStore({
         isNotificationsLoaded(state) {
             return !isEmpty(state.notifications);
         },
+        isWorkflowsLoaded(state) {
+            return !isEmpty(state.workflows);
+        },
         counter(state) {
             return {
                 works: state.works.count,
@@ -57,6 +55,7 @@ const store = createStore({
                 tasksAlert: state.tasks.alert.count,
                 accompanyingCourses: state.accompanyingCourses.count,
                 notifications: state.notifications.count,
+                workflows: state.workflows.count
             }
         }
     },
@@ -85,6 +84,9 @@ const store = createStore({
             //console.log('addNotifications', notifications);
             state.notifications = notifications;
         },
+        addWorkflows(state, workflows) {
+            state.workflows = workflows;
+        },
         setLoading(state, bool) {
             state.loading = bool;
         },
@@ -180,14 +182,30 @@ const store = createStore({
                         const url = `/api/1.0/main/notification/my/unread${'?'+ param}`;
                         makeFetch('GET', url)
                             .then((response) => {
+                                console.log('notifications', response)
                                 commit('addNotifications', response);
                                 commit('setLoading', false);
                             })
                             .catch((error) => {
                                 commit('catchError', error);
                                 throw error;
-                            })
+                            });
-                        ;
+                    }
+                    break;
+                case 'MyWorkflows':
+                    if (!getters.isWorflowsLoaded) {
+                        commit('setLoading', true);
+                        const url = '/api/1.0/main/workflow/my';
+                        makeFetch('GET', url)
+                        .then((response) => {
+                            console.log('workflows', response)
+                            commit('addWorkflows', response);
+                            commit('setLoading', false);
+                        })
+                        .catch((error) => {
+                            commit('catchError', error);
+                            throw error;
+                        });
                     }
                     break;
                 default:

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

@@ -78,7 +78,7 @@ export default {
             case 'thirdparty':
                let data = this.$refs.castThirdparty.$data.thirdparty;
                data.name = data.text;
-               if (data.address !== undefined) {
+               if (data.address !== null) {
                    data.address = { id: data.address.address_id }
                } else {
                    data.address = null;

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

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Workflow\EntityWorkflowManager;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
@@ -22,12 +23,18 @@ class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareIn
 {
     use NormalizerAwareTrait;
 
+    private EntityWorkflowManager $entityWorkflowManager;
+
     private MetadataExtractor $metadataExtractor;
 
     private Registry $registry;
 
-    public function __construct(MetadataExtractor $metadataExtractor, Registry $registry)
+    public function __construct(
-    {
+        EntityWorkflowManager $entityWorkflowManager,
+        MetadataExtractor $metadataExtractor,
+        Registry $registry
+    ) {
+        $this->entityWorkflowManager = $entityWorkflowManager;
         $this->metadataExtractor = $metadataExtractor;
         $this->registry = $registry;
     }
@@ -40,6 +47,7 @@ class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareIn
     public function normalize($object, ?string $format = null, array $context = [])
     {
         $workflow = $this->registry->get($object, $object->getWorkflowName());
+        $handler = $this->entityWorkflowManager->getHandler($object);
 
         return [
             'type' => 'entity_workflow',
@@ -49,6 +57,8 @@ class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareIn
             'workflow' => $this->metadataExtractor->buildArrayPresentationForWorkflow($workflow),
             'currentStep' => $this->normalizer->normalize($object->getCurrentStep(), $format, $context),
             'steps' => $this->normalizer->normalize($object->getStepsChained(), $format, $context),
+            'datas' => $this->normalizer->normalize($handler->getEntityData($object), $format, $context),
+            'title' => $handler->getEntityTitle($object),
         ];
     }
 

src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php

@@ -15,6 +15,10 @@ use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 
 interface EntityWorkflowHandlerInterface
 {
+    public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array;
+
+    public function getEntityTitle(EntityWorkflow $entityWorkflow, array $options = []): string;
+
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?object;
 
     /**

src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Workflow\EventSubscriber;
 
 use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Doctrine\ORM\EntityManagerInterface;
@@ -34,8 +35,13 @@ class NotificationOnTransition implements EventSubscriberInterface
 
     private Security $security;
 
-    public function __construct(EntityManagerInterface $entityManager, EngineInterface $engine, MetadataExtractor $metadataExtractor, Security $security, Registry $registry)
+    public function __construct(
-    {
+        EntityManagerInterface $entityManager,
+        EngineInterface $engine,
+        MetadataExtractor $metadataExtractor,
+        Security $security,
+        Registry $registry
+    ) {
         $this->entityManager = $entityManager;
         $this->engine = $engine;
         $this->metadataExtractor = $metadataExtractor;
@@ -62,7 +68,7 @@ class NotificationOnTransition implements EventSubscriberInterface
         $dests = array_merge(
             $entityWorkflow->getSubscriberToStep()->toArray(),
             $entityWorkflow->isFinal() ? $entityWorkflow->getSubscriberToFinal()->toArray() : [],
-            $entityWorkflow->getCurrentStep()->getDestUser()->toArray()
+            $entityWorkflow->getCurrentStepChained()->getPrevious()->getDestUser()->toArray()
         );
 
         $place = $this->metadataExtractor->buildArrayPresentationForPlace($entityWorkflow);
@@ -85,7 +91,7 @@ class NotificationOnTransition implements EventSubscriberInterface
                 'dest' => $subscriber,
                 'place' => $place,
                 'workflow' => $workflow,
-                'is_dest' => $entityWorkflow->getCurrentStep()->getDestUser()->contains($subscriber),
+                'is_dest' => in_array($subscriber->getId(), array_map(static function (User $u) { return $u->getId(); }, $entityWorkflow->futureDestUsers), true),
             ];
 
             $notification = new Notification();

src/Bundle/ChillMainBundle/chill.api.specs.yaml

@@ -125,6 +125,11 @@ components:
                     type: object
                 type:
                     type: string
+        Workflow:
+            type: object
+            properties:
+                id:
+                    type: integer
 
 paths:
     /1.0/search.json:
@@ -165,13 +170,6 @@ paths:
                 200:
                     description: "OK"
     /1.0/main/address.json:
-        get:
-            tags:
-                - address
-            summary: Return a list of all Chill addresses
-            responses:
-                200:
-                    description: "ok"
         post:
             tags:
                 - address
@@ -222,10 +220,44 @@ paths:
                     description: "Unprocessable entity (validation errors)"
                 400:
                     description: "transition cannot be applyed"
+    /1.0/main/address/{id}.json:
+        get:
+            tags:
+                - address
+            summary: Return an address by id
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The address id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/Address'
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
         patch:
             tags:
                 - address
             summary: patch an address
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The address id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
             requestBody:
                 required: true
                 content:
@@ -277,31 +309,6 @@ paths:
                 400:
                     description: "transition cannot be applyed"
 
-    /1.0/main/address/{id}.json:
-        get:
-            tags:
-                - address
-            summary: Return an address by id
-            parameters:
-                -   name: id
-                    in: path
-                    required: true
-                    description: The address id
-                    schema:
-                        type: integer
-                        format: integer
-                        minimum: 1
-            responses:
-                200:
-                    description: "ok"
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/Address'
-                404:
-                    description: "not found"
-                401:
-                    description: "Unauthorized"
 
     /1.0/main/address/{id}/duplicate.json:
         post:
@@ -803,4 +810,20 @@ paths:
                         application/json:
                             schema:
                                 $ref: '#/components/schemas/UserJob'
+    /1.0/main/workflow/my:
+        get:
+            tags:
+                - workflow
+            summary: Return a list of workflows awaiting for user's action
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                type: array
+                                items:
+                                    $ref: '#/components/schemas/Workflow'
+                403:
+                    description: "Unauthorized"
 

src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php

@@ -60,6 +60,7 @@ class UserRefEventSubscriber implements EventSubscriberInterface
     {
         if ($period->hasPreviousUser()
             && $period->getUser() !== $this->security->getUser()
+            && null !== $period->getUser()
             && $period->getStep() !== AccompanyingPeriod::STEP_DRAFT
         ) {
             $this->generateNotificationToUser($period);

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)
     {
@@ -44,13 +44,13 @@ class UserAccompanyingPeriodController extends AbstractController
         );
 
         return $this->render('@ChillPerson/AccompanyingPeriod/user_periods_list.html.twig', [
-            'accompanyingds' => $accompanyingPeriods,
+            'accompanyingPeriods' => $accompanyingPeriods,
             'pagination' => $pagination,
         ]);
     }
 
     /**
-     * @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/Form/HouseholdMemberType.php

@@ -25,6 +25,13 @@ class HouseholdMemberType extends AbstractType
                 'label' => 'household.Start date',
                 'input' => 'datetime_immutable',
             ]);
+
+        if (!$options['data']->getPosition()->getShareHousehold()) {
+            $builder->add('endDate', ChillDateType::class, [
+                'label' => 'household.End date',
+                'input' => 'datetime_immutable',
+            ]);
+        }
         $builder
             ->add('comment', ChillTextareaType::class, [
                 'label' => 'household.Comment',

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/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue

@@ -199,7 +199,7 @@ export default {
       ...mapState({
          suggestedEntities: state => {
            return [
-               ...state.accompanyingCourse.participations.map(p => p.person),
+               ...state.accompanyingCourse.participations.filter((p) => p.endDate === null).map((p) => p.person),
                ...state.accompanyingCourse.resources.map(r => r.resource)
              ]
                .filter((e) => e !== null)

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

@@ -77,7 +77,7 @@ export default {
       counter: state => state.accompanyingCourse.resources.length,
       suggestedEntities: state => [
             state.accompanyingCourse.requestor,
-            ...state.accompanyingCourse.participations.map(p => p.person),
+            ...state.accompanyingCourse.participations.filter((p) => p.endDate === null).map((p) => p.person),
          ]
          .filter((e) => e !== null)
          .filter(

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

@@ -20,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/Entity/person.html.twig

@@ -172,7 +172,7 @@
 
             {%- if options['customButtons']['replace'] is defined -%}
                 {{ options['customButtons']['replace'] }}
-            {%- elseif is_granted('CHILL_PERSON_SEE', person) -%}
+            {%- elseif is_granted('CHILL_PERSON_SEE', person) and options['addLink'] -%}
                 <li>
                     <a class="btn btn-sm btn-show" title="{{ 'Show person'|trans }}"
                     href="{{ path('chill_person_view', { person_id: person.id }) }}"></a>

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

@@ -56,6 +56,11 @@
 
 {% if action is defined %}
     <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ path('chill_person_resource_list', { 'person_id': resource.personOwner.id  } ) }}" class="btn btn-cancel">
+                {{ 'Cancel'|trans }}
+            </a>
+        </li>
         <li class="edit">
             <button class="btn btn-edit"
             type="submit" id="newPersonResource">

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

@@ -22,41 +22,33 @@
     <div class="flex-table">
         {% for resource in personResources %}
             <div class="item-bloc">
-                <div class="item-row">
+                {% if resource.kind is not null %}
-                    <div class="item-col" style="width: 50%">
+                    <div class="item-row">
+                        <section>
+                            <p>{{ resource.kind.title.fr|capitalize }}</p>
+                        </section>
+                    </div>
+                {% endif %}
+                <div class="{% if resource.kind is not null %} separator {% endif %}">
                     {% if resource.person is not null %}
-                        <div class="denomination h3">
+                        {{ resource.person|chill_entity_render_box({
-                            <span>
+                            'render': 'bloc',
-                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                            'addLink': true,
-                                    action: 'show', displayBadge: true,
+                            'addInfo': true,
-                                    targetEntity: { name: 'person', id: resource.person.id },
+                            'addAge': true
-                                    buttonText: resource.person|chill_entity_render_string,
+                        }) }}
-                                    isDead: resource.person.deathdate is not null
-                                } %}
-                            </span>
-                        </div>
                     {% elseif resource.thirdparty is not null %}
-                        <div class="denomination h3">
+                        {{ resource.thirdparty|chill_entity_render_box({
-                            <span>
+                            'render': 'bloc',
-                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                            'showContacts': false,
-                                    action: 'show', displayBadge: true,
+                            'addLink': true,
-                                    targetEntity: { name: 'thirdparty', id: resource.thirdparty.id },
+                            'isConfidential': (resource.thirdparty.contactDataAnonymous ? true : false)
-                                    buttonText: resource.thirdParty|chill_entity_render_string,
+                        }) }}
-                                    parent: resource.thirdparty.parent
-                                } %}
-                            </span>
-                        </div>
                     {% else %}
                         <div class="denomination h3">
                             <span>{{ resource.freetext }}</span>
                         </div>
                     {% endif %}
-                    </div>
-                    <div class="item-col" style="justify-content: flex-end; ">
-                        {% if resource.kind %}
-                        <span>{{ resource.kind.title.fr|capitalize }}</span>
-                        {% endif %}
-                    </div>
                 </div>
                 {% if resource.comment.comment is not empty %}
                     <div class="item-row separator">

src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php

@@ -16,14 +16,32 @@ use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkEvaluationVoter;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowHandlerInterface
 {
     private AccompanyingPeriodWorkEvaluationRepository $repository;
 
-    public function __construct(AccompanyingPeriodWorkEvaluationRepository $repository)
+    private TranslatorInterface $translator;
+
+    public function __construct(AccompanyingPeriodWorkEvaluationRepository $repository, TranslatorInterface $translator)
     {
         $this->repository = $repository;
+        $this->translator = $translator;
+    }
+
+    public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
+    {
+        $evaluation = $this->getRelatedEntity($entityWorkflow);
+
+        return [
+            'persons' => $evaluation->getAccompanyingPeriodWork()->getPersons(),
+        ];
+    }
+
+    public function getEntityTitle(EntityWorkflow $entityWorkflow, array $options = []): string
+    {
+        return $this->translator->trans('workflow.Evaluation (n°%eval%)', ['%eval%' => $entityWorkflow->getRelatedEntityId()]);
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluation

src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php

@@ -15,17 +15,34 @@ use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInterface
 {
     private AccompanyingPeriodWorkRepository $repository;
 
-    public function __construct(AccompanyingPeriodWorkRepository $repository)
+    private TranslatorInterface $translator;
+
+    public function __construct(AccompanyingPeriodWorkRepository $repository, TranslatorInterface $translator)
     {
         $this->repository = $repository;
+        $this->translator = $translator;
     }
 
-    public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?object
+    public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
+    {
+        return [
+            'persons' => $this->getRelatedEntity($entityWorkflow)
+                ->getPersons(),
+        ];
+    }
+
+    public function getEntityTitle(EntityWorkflow $entityWorkflow, array $options = []): string
+    {
+        return $this->translator->trans('workflow.Work (n°%w%)', ['%w%' => $entityWorkflow->getRelatedEntityId()]);
+    }
+
+    public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWork
     {
         return $this->repository->find($entityWorkflow->getRelatedEntityId());
     }

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

@@ -240,6 +240,7 @@ Select a type: "Choisissez un type"
 Select a person: "Choisissez un usager"
 Select a thirdparty: "Choisissez un tiers"
 Contact person: "Personne de contact"
+Kind: "Type"
 
 
 # pickAPersonType

src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php

@@ -180,6 +180,8 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
      * @var string
      * @ORM\Column(name="name", type="string", length=255)
      * @Assert\Length(min="2")
+     * @Assert\NotNull
+     * @Assert\NotBlank
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      */
     private ?string $name = '';

src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue

@@ -118,7 +118,7 @@
       <div class="input-group mb-3">
          <span class="input-group-text" id="phonenumber"><i class="fa fa-fw fa-phone"></i></span>
          <input class="form-control form-control-lg"
-            v-model="thirdparty.phonenumber"
+            v-model="thirdparty.telephone"
             v-bind:placeholder="$t('thirdparty.phonenumber')"
             v-bind:aria-label="$t('thirdparty.phonenumber')"
             aria-describedby="phonenumber" />
@@ -155,7 +155,11 @@ export default {
       return {
          //context: {}, <--
          thirdparty: {
-            type: 'thirdparty'
+            type: 'thirdparty',
+            address: null,
+            kind: 'company',
+            name: '',
+            telephone: '',
          },
          professions: [],
          civilities: [],

src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php

@@ -87,14 +87,24 @@ class ThirdPartyApiSearch implements SearchApiInterface
         foreach ($strs as $str) {
             if (!empty($str)) {
                 $wheres[] = "(LOWER(UNACCENT(?)) <<% tparty.canonicalized OR
-                    tparty.canonicalized LIKE '%' || LOWER(UNACCENT(?)) || '%')";
+                    tparty.canonicalized LIKE '%' || LOWER(UNACCENT(?)) || '%')
-                $whereArgs[] = [$str, $str];
+                    OR
-                $pertinence[] = 'STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), tparty.canonicalized) + ' .
+                    (LOWER(UNACCENT(?)) <<% parent.canonicalized OR
-                   "(tparty.canonicalized LIKE '%s' || LOWER(UNACCENT(?)) || '%')::int + " .
+                    parent.canonicalized LIKE '%' || LOWER(UNACCENT(?)) || '%')
+                    ";
+                $whereArgs[] = [$str, $str, $str, $str];
+                $pertinence[] = 'GREATEST(
+                        STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), tparty.canonicalized),
+                        STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), parent.canonicalized)
+                    ) + ' .
+                    "GREATEST(
+                        (tparty.canonicalized LIKE '%s' || LOWER(UNACCENT(?)) || '%')::int,
+                        (parent.canonicalized LIKE '%s' || LOWER(UNACCENT(?)) || '%')::int
+                    ) + " .
                    // take postcode label into account, but lower than the canonicalized field
                    "COALESCE((LOWER(UNACCENT(cmpc.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0) + " .
                    "COALESCE((LOWER(UNACCENT(cmpc_p.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0)";
-                $pertinenceArgs[] = [$str, $str, $str, $str];
+                $pertinenceArgs[] = [$str, $str, $str, $str, $str, $str];
             }
         }