From 50b7df1f4ade75d122fe89477db1d0fb51af84ca Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 11 Feb 2022 15:16:28 +0100
Subject: [PATCH 01/30] adding thirdparty info

---
 .../views/PersonResource/list.html.twig       | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index 62b9701ec..9b0586779 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -14,6 +14,25 @@
     {{ encore_entry_link_tags('mod_pickentity_type') }}
 {% endblock %}
 
+{% macro rowCustomButtons(tp) %}
+    {% if is_granted('CHILL_3PARTY_3PARTY_UPDATE', tp) %}
+        <li>
+            <a href="{{ chill_path_add_return_path('chill_crud_3party_3party_edit',
+                { 'id': (tp.isParent ? tp.id : tp.parent.id) }) }}"
+                title="{{ 'Edit'|trans }}"
+                class="btn btn-sm btn-update"></a>
+        </li>
+    {% endif %}
+    {% if is_granted('CHILL_3PARTY_3PARTY_SHOW', tp) %}
+        <li>
+            <a href="{{ chill_path_add_return_path('chill_crud_3party_3party_view',
+                { 'id': (tp.isParent ? tp.id : tp.parent.id) }) }}"
+                title="{{ 'Show'|trans }}"
+                class="btn btn-sm btn-show"></a>
+        </li>
+    {% endif %}
+{% endmacro %}
+
 {% block personcontent %}
 
 <h1>{{ 'List of resources'|trans }}</h1>
@@ -25,18 +44,27 @@
                 <div class="item-row">
                     <div class="item-col" style="width: 50%">
                     {% if resource.person is not null %}
-                        <div class="denomination h3">
-                            <span>
+                        <div>
+                            {{ resource.person|chill_entity_render_box() }}
+                            {# <span>
                                 {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
                                     action: 'show', displayBadge: true,
                                     targetEntity: { name: 'person', id: resource.person.id },
                                     buttonText: resource.person|chill_entity_render_string,
                                     isDead: resource.person.deathdate is not null
                                 } %}
-                            </span>
+                            </span> #}
                         </div>
                     {% elseif resource.thirdparty is not null %}
-                        <div class="denomination h3">
+                        <div>
+                            {{ resource.thirdparty|chill_entity_render_box({
+                                'render': 'bloc',
+                                'showContacts': false,
+                                'addLink': false,
+                                'isConfidential': (resource.thirdparty.contactDataAnonymous ? true : false)
+                            }) }}
+                        </div>
+                        {# <div class="denomination">
                             <span>
                                 {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
                                     action: 'show', displayBadge: true,
@@ -45,7 +73,7 @@
                                     parent: resource.thirdparty.parent
                                 } %}
                             </span>
-                        </div>
+                        </div> #}
                     {% else %}
                         <div class="denomination h3">
                             <span>{{ resource.freetext }}</span>

From 01a3af694ad7c7465fb08b7c89be75d2d2cbd5bb Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Feb 2022 15:49:49 +0100
Subject: [PATCH 02/30] activity: can click through the cross icon for removing
 person in concerned group

---
 .../vuejs/Activity/components/ConcernedGroups/PersonBadge.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
index 0a611e217..11b8063a3 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
@@ -1,7 +1,7 @@
 <template>
    <li>
-      <span :title="person.text">
-         <span class="chill_denomination" @click.prevent="$emit('remove', person)">
+      <span :title="person.text" @click.prevent="$emit('remove', person)">
+         <span class="chill_denomination">
             <person-text :person="person" :isCut="true"></person-text>
          </span>
       </span>

From 753a007172ed90696f28d796caa82fd8e3201f45 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 11 Feb 2022 16:32:28 +0100
Subject: [PATCH 03/30] translation added for kind of resource

---
 src/Bundle/ChillPersonBundle/translations/messages.fr.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 60cf842af..234afcff2 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -238,6 +238,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

From aa7da2559ccb92bbc07d3247585ebcc31ce62e8b Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Feb 2022 16:48:15 +0100
Subject: [PATCH 04/30] [activity] correct associated persons by considering
 only open participations

---
 CHANGELOG.md                                       | 11 +++++++----
 src/Bundle/ChillActivityBundle/Entity/Activity.php |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e862862eb..fcf514de1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,9 +10,12 @@ and this project adheres to
 
 ## Unreleased
 
+[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)
+
 <!-- write down unreleased development here -->
 * [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
@@ -37,7 +40,7 @@ and this project adheres to
 * [parcours]: validation + message for closing parcours adjusted.
 * [household]: household composition double edit button replaced by a delete action (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/426)
 [fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
-[homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.  
+[homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
 * [person]: Comment on marital status is possible even if marital status is not defined (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/421)
 * [parcours]: In the list of person results the requestor is not displayed if defined as anonymous (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/424)
 * [bugfix]: modal closes and newly created person/thirdparty is selected when multiple persons/thirdparties are created through the modal (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/429)
@@ -45,7 +48,7 @@ and this project adheres to
 * [workflow][notification] improve how notifications and workflows are 'attached' to entities: contextual list, counter, buttons and vue modal
 * [AddAddress] disable multiselect search, and rely only on most pertinent Cities and Street computed backend
 * [fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
-* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.  
+* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
 
 ### test release 2021-01-31
 
@@ -94,7 +97,7 @@ and this project adheres to
 * [popover] add popover html popup mechanism (used by workflow breadcrumb)
 * [templates] improve updatedBy macro in item metadatas
 * [parcours]: bug fix when comment is pinned all other comments remain in the collection (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/385)
-* [workflow] 
+* [workflow]
   * add My workflow section with my opened subscriptions
   * apply workflow on documents, accompanyingCourseWork and Evaluations
 * [wopi-link] a new vue component allow to open wopi link in a fullscreen chill-themed modal
diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index 2bb40d432..0a344236c 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/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();
                 }

From f9154233e4d3d1bce7f67047c2ea5afde7be8cf4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 11 Feb 2022 17:02:31 +0100
Subject: [PATCH 05/30] using renderbox and adjusting style + show button if
 person or thirdparty

---
 .../Resources/views/Entity/person.html.twig   |  2 +-
 .../views/PersonResource/form.html.twig       |  5 ++
 .../views/PersonResource/list.html.twig       | 87 +++++++------------
 3 files changed, 37 insertions(+), 57 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index 9bee504a9..02fc00e4c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/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>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig
index 6fa294336..9bda2856b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig
+++ b/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">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index 9b0586779..e9e9cd553 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -14,25 +14,6 @@
     {{ encore_entry_link_tags('mod_pickentity_type') }}
 {% endblock %}
 
-{% macro rowCustomButtons(tp) %}
-    {% if is_granted('CHILL_3PARTY_3PARTY_UPDATE', tp) %}
-        <li>
-            <a href="{{ chill_path_add_return_path('chill_crud_3party_3party_edit',
-                { 'id': (tp.isParent ? tp.id : tp.parent.id) }) }}"
-                title="{{ 'Edit'|trans }}"
-                class="btn btn-sm btn-update"></a>
-        </li>
-    {% endif %}
-    {% if is_granted('CHILL_3PARTY_3PARTY_SHOW', tp) %}
-        <li>
-            <a href="{{ chill_path_add_return_path('chill_crud_3party_3party_view',
-                { 'id': (tp.isParent ? tp.id : tp.parent.id) }) }}"
-                title="{{ 'Show'|trans }}"
-                class="btn btn-sm btn-show"></a>
-        </li>
-    {% endif %}
-{% endmacro %}
-
 {% block personcontent %}
 
 <h1>{{ 'List of resources'|trans }}</h1>
@@ -41,50 +22,33 @@
     <div class="flex-table">
         {% for resource in personResources %}
             <div class="item-bloc">
-                <div class="item-row">
-                    <div class="item-col" style="width: 50%">
+                {% if resource.kind is not null %}
+                    <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>
-                            {{ resource.person|chill_entity_render_box() }}
-                            {# <span>
-                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                                    action: 'show', displayBadge: true,
-                                    targetEntity: { name: 'person', id: resource.person.id },
-                                    buttonText: resource.person|chill_entity_render_string,
-                                    isDead: resource.person.deathdate is not null
-                                } %}
-                            </span> #}
-                        </div>
+                        {{ resource.person|chill_entity_render_box({
+                            'render': 'bloc',
+                            'addLink': false,
+                            'addInfo': true,
+                            'addAge': true
+                        }) }}
                     {% elseif resource.thirdparty is not null %}
-                        <div>
-                            {{ resource.thirdparty|chill_entity_render_box({
-                                'render': 'bloc',
-                                'showContacts': false,
-                                'addLink': false,
-                                'isConfidential': (resource.thirdparty.contactDataAnonymous ? true : false)
-                            }) }}
-                        </div>
-                        {# <div class="denomination">
-                            <span>
-                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                                    action: 'show', displayBadge: true,
-                                    targetEntity: { name: 'thirdparty', id: resource.thirdparty.id },
-                                    buttonText: resource.thirdParty|chill_entity_render_string,
-                                    parent: resource.thirdparty.parent
-                                } %}
-                            </span>
-                        </div> #}
+                        {{ resource.thirdparty|chill_entity_render_box({
+                            'render': 'bloc',
+                            'showContacts': false,
+                            'addLink': false,
+                            'isConfidential': (resource.thirdparty.contactDataAnonymous ? true : false)
+                        }) }}
                     {% 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">
@@ -97,6 +61,17 @@
                     <div class="item-row separator">
                         <div class="item-col">
                             <ul class="record_actions">
+                            {% if resource.person is not null and is_granted('CHILL_PERSON_SEE', resource.person) %}
+                                <li>
+                                    <a class="btn btn-sm btn-show" title="{{ 'Show person'|trans }}"
+                                    href="{{ path('chill_person_view', { person_id: resource.person.id }) }}"></a>
+                                </li>
+                            {% elseif resource.thirdparty is not null and is_granted('CHILL_3PARTY_3PARTY_SHOW', resource.thirdparty) %}
+                                <li>
+                                    <a class="btn btn-sm btn-show" target="_blank" title="{{ 'Show thirdparty'|trans }}"
+                                        href="{{ path('chill_crud_3party_3party_view', { id: resource.thirdparty.isChild ? resource.thirdparty.parent.id : resource.thirdparty.id }) }}"></a>
+                                </li>
+                            {% endif %}
                                 <li>
                                     <a href="{{ chill_path_add_return_path('chill_person_resource_edit', {'resource_id': resource.id,
                                                     'person_id': person.id,}) }}"

From b9af54892bf6c92763e95022276b11b3420ca132 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 11 Feb 2022 17:04:15 +0100
Subject: [PATCH 06/30] changelog updated

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e729f18de..a569adbbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to
 * [person]: create person and household added to button dropdown (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/454)
 * display full address in address.text in normalization. Adapt AddressRenderBox
 * [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459)
+* [person_resources]: Renderboxes used to display person/thirdparty info (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/465)
 
 ## Test releases
 

From 973644c62debb59b63bf2b87a4cb15e538351b8d Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 11 Feb 2022 17:07:47 +0100
Subject: [PATCH 07/30] csfixes

---
 src/Bundle/ChillPersonBundle/Controller/PersonController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index ac371a2af..ef06e4d3e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -225,7 +225,7 @@ final class PersonController extends AbstractController
             ])->add('createPeriod', SubmitType::class, [
                 'label' => 'Add the person and create an accompanying period',
             ])->add('createHousehold', SubmitType::class, [
-                'label' => 'Add the person and create a household'
+                'label' => 'Add the person and create a household',
             ]);
 
         $form->handleRequest($request);

From b1993dbf2294ebe658f596f7b2a3888fc77eb3b5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Feb 2022 17:37:45 +0100
Subject: [PATCH 08/30] accompanying course: filter suggested entities by open
 participations

---
 .../public/vuejs/AccompanyingCourse/components/Requestor.vue    | 2 +-
 .../public/vuejs/AccompanyingCourse/components/Resources.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 92931cfcb..a7c1ee017 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -195,7 +195,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)
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index 3697d8b64..0f8154dc0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -73,7 +73,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(

From fc9deb8ba8d8dcff6d7bc5b993dfec85dc1a018f Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Feb 2022 17:37:45 +0100
Subject: [PATCH 09/30] accompanying course: filter suggested entities by open
 participations

---
 .../public/vuejs/AccompanyingCourse/components/Requestor.vue    | 2 +-
 .../public/vuejs/AccompanyingCourse/components/Resources.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 45521b11e..0f1416b22 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/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)
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index c7a26bfba..e9b9695ab 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/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(

From 40a1726ca740cb43c5da7fd8fedfa5f1dca77df5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Feb 2022 17:41:39 +0100
Subject: [PATCH 10/30] upd CHANGELOG

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e113f12c..d99ec283f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,11 +10,13 @@ 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)
+* [person] accompanying course: filter suggested entities by open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/415)
+
 
 <!-- write down unreleased development here -->
 * 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

From d254a9e14ae107dfb57e0e695b66c8e141fd7bc3 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 14 Feb 2022 12:02:15 +0100
Subject: [PATCH 11/30] add endDate field in HouseholdMember form for enfant
 hors menage

---
 CHANGELOG.md                                              | 1 +
 src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3037eda41..14040d451 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,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)
+* [Household]: Add end date in HouseholdMember form for 'enfant hors menage' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/434)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
index e0d2d9d47..99c698c91 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
+++ b/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',

From bd05315de39e8c195a570641377c39d80e0cc69a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 14 Feb 2022 12:02:32 +0100
Subject: [PATCH 12/30] csfixes

---
 .../Security/Authorization/AccompanyingPeriodWorkVoter.php       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
index 750cdd2dd..7193c524e 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
@@ -62,7 +62,6 @@ class AccompanyingPeriodWorkVoter extends Voter
                 case self::UPDATE:
                     return $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod());
 
-
                 default:
                     throw new UnexpectedValueException("attribute {$attribute} is not supported");
             }

From 89d3ab38f043d119b62166451d4ce74c4fbde48d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Feb 2022 20:02:07 +0100
Subject: [PATCH 13/30] add endpoint to list workflows

---
 .../Controller/WorkflowApiController.php      | 63 ++++++++++++++++++-
 .../ChillMainBundle/chill.api.specs.yaml      | 21 +++++++
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
index dda787708..afb85658b 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+++ b/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
+        );
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index 034dfe74b..8129748a3 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/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:
@@ -793,4 +798,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"
 

From b6c118a0c8fa8c891fe5e0e757c94b05807f593f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Feb 2022 20:02:24 +0100
Subject: [PATCH 14/30] add informations to workflow normalization

---
 ...ompanyingCourseDocumentWorkflowHandler.php | 29 ++++++++++++++++++-
 .../Normalizer/EntityWorkflowNormalizer.php   | 14 +++++++--
 .../EntityWorkflowHandlerInterface.php        |  4 +++
 ...ingPeriodWorkEvaluationWorkflowHandler.php | 20 ++++++++++++-
 .../AccompanyingPeriodWorkWorkflowHandler.php | 21 ++++++++++++--
 5 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
index a615ddda2..7e572c89d 100644
--- a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
+++ b/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' => $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
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
index bc053b3cf..b74520436 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
+++ b/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),
         ];
     }
 
diff --git a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
index 2e97f77af..551a17747 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowHandlerInterface.php
+++ b/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;
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
index 46aed46b4..1be9f87bf 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
+++ b/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
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
index cdb70f49c..3b6a1e9aa 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
+++ b/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());
     }

From 861f461bc5b09ef9f013ce45cf817ea8d1c049ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Feb 2022 20:19:56 +0100
Subject: [PATCH 15/30] workflow context for accompanying course document:
 ensure persons are represented as an array in json

---
 .../Workflow/AccompanyingCourseDocumentWorkflowHandler.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
index 7e572c89d..c1e3a7765 100644
--- a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
@@ -47,7 +47,7 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
         }
 
         return [
-            'persons' => $persons,
+            'persons' => array_values($persons),
         ];
     }
 

From bc99c85802bd4c5294894deb012376e91811b81a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 15 Feb 2022 13:16:04 +0100
Subject: [PATCH 16/30] thirdparty search: add where clause for searching into
 children

---
 .../ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
index 994b9d65c..4144db6a0 100644
--- a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
+++ b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
@@ -87,8 +87,12 @@ class ThirdPartyApiSearch implements SearchApiInterface
         foreach ($strs as $str) {
             if (!empty($str)) {
                 $wheres[] = "(LOWER(UNACCENT(?)) <<% tparty.canonicalized OR
-                    tparty.canonicalized LIKE '%' || LOWER(UNACCENT(?)) || '%')";
-                $whereArgs[] = [$str, $str];
+                    tparty.canonicalized LIKE '%' || LOWER(UNACCENT(?)) || '%')
+                    OR
+                    (LOWER(UNACCENT(?)) <<% parent.canonicalized OR
+                    parent.canonicalized LIKE '%' || LOWER(UNACCENT(?)) || '%')
+                    ";
+                $whereArgs[] = [$str, $str, $str, $str];
                 $pertinence[] = 'STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), tparty.canonicalized) + ' .
                    "(tparty.canonicalized LIKE '%s' || LOWER(UNACCENT(?)) || '%')::int + " .
                    // take postcode label into account, but lower than the canonicalized field

From f5bc8dca5e82b6dbaba088587e7499a416fc8577 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 15 Feb 2022 13:39:46 +0100
Subject: [PATCH 17/30] thirdparty search: adapt pertinence select clause for
 searching into children

---
 .../Search/ThirdPartyApiSearch.php                   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
index 4144db6a0..a50d35cf2 100644
--- a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
+++ b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
@@ -93,12 +93,18 @@ class ThirdPartyApiSearch implements SearchApiInterface
                     parent.canonicalized LIKE '%' || LOWER(UNACCENT(?)) || '%')
                     ";
                 $whereArgs[] = [$str, $str, $str, $str];
-                $pertinence[] = 'STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), tparty.canonicalized) + ' .
-                   "(tparty.canonicalized LIKE '%s' || LOWER(UNACCENT(?)) || '%')::int + " .
+                $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];
             }
         }
 

From 489473806f5d1a8658a22cb22b252aa19c248975 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 15 Feb 2022 13:41:59 +0100
Subject: [PATCH 18/30] upd CHANGELOG

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c392663a..ec16d8ede 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
-
+* [thirdparty] Extend the thirdparty search to thirdparty children (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/448)
 ## Test releases
 
 ### test release 2022-02-14
@@ -22,7 +22,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

From 96b1854fef386fe6d0f2c80d205a234ff0b28fff Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 15 Feb 2022 13:57:02 +0100
Subject: [PATCH 19/30] php code style fix

---
 .../ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
index a50d35cf2..e4b7f43af 100644
--- a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
+++ b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
@@ -93,10 +93,10 @@ class ThirdPartyApiSearch implements SearchApiInterface
                     parent.canonicalized LIKE '%' || LOWER(UNACCENT(?)) || '%')
                     ";
                 $whereArgs[] = [$str, $str, $str, $str];
-                $pertinence[] = "GREATEST(
+                $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

From 056d5a3f98727e6479827e4d3ad72dab0d43e377 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 16 Feb 2022 10:24:05 +0100
Subject: [PATCH 20/30] Remove counter from 'mes parcours'

---
 .../public/vuejs/HomepageWidget/App.vue       | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
index da3b9ba71..343b638da 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
@@ -1,7 +1,7 @@
 <template>
-   
+
    <h2>{{ $t('main_title') }}</h2>
-   
+
    <ul class="nav nav-tabs">
       <li class="nav-item">
          <a class="nav-link"
@@ -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,11 +50,19 @@
             <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>
    </ul>
-   
+
    <div class="my-4">
       <my-customs
          v-if="activeTab === 'MyCustoms'">
@@ -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" });
       }

From 3d38da7b3701a7ff7e3a7b778f8b8c7de52974c4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 16 Feb 2022 10:25:18 +0100
Subject: [PATCH 21/30] Add workflow notifications to the dashboard

---
 .../Resources/public/vuejs/HomepageWidget/MyNotifications.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
index 897ea3a9a..06683f8fc 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
+++ b/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';
          }

From 2ab7556ac3ea5c0785cd5456f718e4d6459d3a0f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 16 Feb 2022 10:26:00 +0100
Subject: [PATCH 22/30] Add workflows tab to dashboard

---
 .../vuejs/HomepageWidget/MyWorkflows.vue      | 88 +++++++++++++++++++
 .../public/vuejs/HomepageWidget/js/i18n.js    |  8 ++
 .../public/vuejs/HomepageWidget/js/store.js   | 34 +++++--
 3 files changed, 122 insertions(+), 8 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue
new file mode 100644
index 000000000..779cd35c0
--- /dev/null
+++ b/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('Document') }}</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>
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
index 0845d0f02..b3576116e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
+++ b/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",
+        Document: "Document",
         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",
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js
index 9507d5085..c33ec2123 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js
+++ b/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:

From d4534b56a04fdbc755dba49ec6914a9c49081a94 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 16 Feb 2022 15:28:08 +0100
Subject: [PATCH 23/30] bugfix listing mes parcours for user

---
 .../Controller/UserAccompanyingPeriodController.php             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
index 51c8a32c0..4bbf72b7d 100644
--- a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
@@ -44,7 +44,7 @@ class UserAccompanyingPeriodController extends AbstractController
         );
 
         return $this->render('@ChillPerson/AccompanyingPeriod/user_periods_list.html.twig', [
-            'accompanyingds' => $accompanyingPeriods,
+            'accompanyingPeriods' => $accompanyingPeriods,
             'pagination' => $pagination,
         ]);
     }

From aebb21935b5f58dd030596362463bd741fd3550c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 16 Feb 2022 19:57:35 +0100
Subject: [PATCH 24/30] fix page "my accompanying period" and do not show
 drafts periods in homepage (+ ordering)

---
 .../Controller/UserAccompanyingPeriodController.php         | 6 +++---
 .../Repository/AccompanyingPeriodRepository.php             | 3 ++-
 .../views/AccompanyingPeriod/user_periods_list.html.twig    | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
index 51c8a32c0..321f212d5 100644
--- a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
+++ b/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)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
index 10b424cef..122b658bd 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
+++ b/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)
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig
index d30997bac..7395fceda 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig
+++ b/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>
 

From 45beb27f83bc903253c9922c970b1c8b5ad621d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 16 Feb 2022 21:54:06 +0100
Subject: [PATCH 25/30] fix sending notifications

---
 .../Controller/WorkflowController.php              |  2 ++
 .../Entity/Workflow/EntityWorkflow.php             | 11 +++++++++++
 .../EventSubscriber/NotificationOnTransition.php   | 14 ++++++++++----
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
index 876e095a8..ac8a5a7e0 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/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) {
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
index b9773040a..84a75fc6d 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
+++ b/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)
      *
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
index c46899e52..6d5a54d45 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
+++ b/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();

From 95b2fcead7c7f6782717143a8cda20d2b4153008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 16 Feb 2022 21:58:49 +0100
Subject: [PATCH 26/30] update changelog [ci-skip]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c392663a..c9f4d2c9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* workflow: fix sending notifications
 
 ## Test releases
 

From c2c5bec0e57c01b188611140c1a5dae96df573ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 17 Feb 2022 21:08:55 +0100
Subject: [PATCH 27/30] in period notification, handle case when period
 referrer is null

---
 .../AccompanyingPeriod/Events/UserRefEventSubscriber.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
index 590874ab4..ce52fe5e0 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
+++ b/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);

From d6990349d8bd268b9c7657c26b007b3241542984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 17 Feb 2022 21:28:27 +0100
Subject: [PATCH 28/30] PersonResource: add link to person or 3party in the
 associated person or 3party part

There was a mismatch between "opening a resource to see the resource
details" and "see the associated person/3party details". On the previous location,
the user would expect to open the resource details, and not the person
details.
---
 .../Resources/views/PersonResource/list.html.twig | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index e9e9cd553..1d480614f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -33,7 +33,7 @@
                     {% if resource.person is not null %}
                         {{ resource.person|chill_entity_render_box({
                             'render': 'bloc',
-                            'addLink': false,
+                            'addLink': true,
                             'addInfo': true,
                             'addAge': true
                         }) }}
@@ -41,7 +41,7 @@
                         {{ resource.thirdparty|chill_entity_render_box({
                             'render': 'bloc',
                             'showContacts': false,
-                            'addLink': false,
+                            'addLink': true,
                             'isConfidential': (resource.thirdparty.contactDataAnonymous ? true : false)
                         }) }}
                     {% else %}
@@ -61,17 +61,6 @@
                     <div class="item-row separator">
                         <div class="item-col">
                             <ul class="record_actions">
-                            {% if resource.person is not null and is_granted('CHILL_PERSON_SEE', resource.person) %}
-                                <li>
-                                    <a class="btn btn-sm btn-show" title="{{ 'Show person'|trans }}"
-                                    href="{{ path('chill_person_view', { person_id: resource.person.id }) }}"></a>
-                                </li>
-                            {% elseif resource.thirdparty is not null and is_granted('CHILL_3PARTY_3PARTY_SHOW', resource.thirdparty) %}
-                                <li>
-                                    <a class="btn btn-sm btn-show" target="_blank" title="{{ 'Show thirdparty'|trans }}"
-                                        href="{{ path('chill_crud_3party_3party_view', { id: resource.thirdparty.isChild ? resource.thirdparty.parent.id : resource.thirdparty.id }) }}"></a>
-                                </li>
-                            {% endif %}
                                 <li>
                                     <a href="{{ chill_path_add_return_path('chill_person_resource_edit', {'resource_id': resource.id,
                                                     'person_id': person.id,}) }}"

From caaebd593bf7d663b3f58a0e85b6d75b7ab2c7c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 17 Feb 2022 22:42:52 +0100
Subject: [PATCH 29/30] misc fixes for Thirdparty / addPerson

* set default values for ThirdParty in ThirdParty.vue
* set correct value for binding with phone (telephone instead of
phonenumber)
* add validation on ThirdParty/denomination: at least two characters, no
Null value
---
 src/Bundle/ChillMainBundle/Entity/Address.php |  4 +-
 .../vuejs/OnTheFly/components/Create.vue      |  2 +-
 .../ChillMainBundle/chill.api.specs.yaml      | 66 ++++++++++---------
 .../Entity/ThirdParty.php                     |  2 +
 .../vuejs/_components/OnTheFly/ThirdParty.vue |  7 +-
 5 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index 0e6cd549b..4ccafa8c2 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/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
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
index d242037b8..061d728a0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
+++ b/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;
diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index 034dfe74b..b2d6cb7de 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
@@ -165,13 +165,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 +215,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 +304,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:
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 95c930956..390427d74 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -179,6 +179,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 = '';
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 5dacee2c0..02515981b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -92,7 +92,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" />
@@ -120,6 +120,11 @@ export default {
          //context: {}, <--
          thirdparty: {
             type: 'thirdparty',
+            address: null,
+            kind: 'company',
+            name: '',
+            telephone: '',
+
          },
          addAddress: {
             options: {

From fe35a29fb83b9bb9c89363ab8dd3f04b608b1cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 17 Feb 2022 23:12:14 +0100
Subject: [PATCH 30/30] homepage vue / my workflow: replace "document" by
 object type

---
 .../Workflow/AccompanyingCourseDocumentWorkflowHandler.php    | 2 +-
 .../Resources/public/vuejs/HomepageWidget/MyWorkflows.vue     | 4 ++--
 .../Resources/public/vuejs/HomepageWidget/js/i18n.js          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
index c1e3a7765..33fba8d3f 100644
--- a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
@@ -53,7 +53,7 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
 
     public function getEntityTitle(EntityWorkflow $entityWorkflow, array $options = []): string
     {
-        return $this->translator->trans('workflow.Document (n°%doc%)', ['%%doc%' => $entityWorkflow->getRelatedEntityId()]);
+        return $this->translator->trans('workflow.Document (n°%doc%)', ['%doc%' => $entityWorkflow->getRelatedEntityId()]);
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingCourseDocument
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue
index 779cd35c0..1272a3c19 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue
@@ -4,7 +4,7 @@
 <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('Document') }}</th>
+        <th scope="col">{{ $t('Object_workflow') }}</th>
         <th scope="col">{{ $t('Step') }}</th>
         <th scope="col">{{ $t('concerned_users') }}</th>
         <th scope="col"></th>
@@ -85,4 +85,4 @@ span.outdated {
     font-weight: bold;
     color: var(--bs-warning);
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
index b3576116e..b5ae78e34 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
@@ -39,7 +39,7 @@ const appMessages = {
         Entity: "Associé à",
         Step: "Étape",
         concerned_users: "Usagers concernés",
-        Document: "Document",
+        Object_workflow: "Objet du workflow",
         show_entity: "Voir {entity}",
         the_activity: "l'échange",
         the_course: "le parcours",
@@ -69,4 +69,4 @@ Object.assign(appMessages.fr);
 
 export {
     appMessages
-};
\ No newline at end of file
+};