Merge branch 'fix-prototypage-details' into deploy/quick-fixes

* add context for accompanying period, if indicated in a query
parameter;
* expand automatically household suggestion, if indicated in a query
parameter

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -106,15 +106,16 @@ class Activity implements HasCenterInterface, HasScopeInterface
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
+     * @Groups({"read"})
      */
-    private $socialIssues;
+    private Collection $socialIssues;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
+     * @Groups({"read"})
      */
-    private $socialActions;
+    private Collection $socialActions;
-
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
@@ -281,7 +282,7 @@ class Activity implements HasCenterInterface, HasScopeInterface
         return $this->socialIssues;
     }
 
-    public function addSocialIssue(SocialIssue $socialIssue): self
+    public function addSocialIssue(?SocialIssue $socialIssue): self
     {
         if (!$this->socialIssues->contains($socialIssue)) {
             $this->socialIssues[] = $socialIssue;
@@ -297,15 +298,12 @@ class Activity implements HasCenterInterface, HasScopeInterface
         return $this;
     }
 
-    /**
-     * @return Collection|SocialAction[]
-     */
     public function getSocialActions(): Collection
     {
         return $this->socialActions;
     }
 
-    public function addSocialAction(SocialAction $socialAction): self
+    public function addSocialAction(?SocialAction $socialAction): self
     {
         if (!$this->socialActions->contains($socialAction)) {
             $this->socialActions[] = $socialAction;

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -35,6 +35,7 @@ use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\CallbackTransformer;
 use Chill\PersonBundle\Form\DataTransformer\PersonToIdTransformer;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 
 class ActivityType extends AbstractType
 {
@@ -46,6 +47,10 @@ class ActivityType extends AbstractType
 
     protected TranslatableStringHelper $translatableStringHelper;
 
+    protected SocialIssueRender $socialIssueRender;
+
+    protected SocialActionRender $socialActionRender;
+
     protected array $timeChoices;
 
     public function __construct (
@@ -54,7 +59,8 @@ class ActivityType extends AbstractType
         ObjectManager $om,
         TranslatableStringHelper $translatableStringHelper,
         array $timeChoices,
-        SocialIssueRender $socialIssueRender
+        SocialIssueRender $socialIssueRender,
+        SocialActionRender $socialActionRender
     ) {
         if (!$tokenStorage->getToken()->getUser() instanceof User) {
             throw new \RuntimeException("you should have a valid user");
@@ -66,6 +72,7 @@ class ActivityType extends AbstractType
         $this->translatableStringHelper = $translatableStringHelper;
         $this->timeChoices = $timeChoices;
         $this->socialIssueRender = $socialIssueRender;
+        $this->socialActionRender = $socialActionRender;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
@@ -105,31 +112,51 @@ class ActivityType extends AbstractType
         }
 
         if ($activityType->isVisible('socialIssues') && $accompanyingPeriod) {
-            $builder->add('socialIssues', EntityType::class, [
+            $builder->add('socialIssues', HiddenType::class);
-                'label' => $activityType->getLabel('socialIssues'),
+            $builder->get('socialIssues')
-                'required' => $activityType->isRequired('socialIssues'),
+               ->addModelTransformer(new CallbackTransformer(
-                'class' => SocialIssue::class,
+                   function (iterable $socialIssuesAsIterable): string {
-                'choice_label' => function (SocialIssue $socialIssue) {
+                       $socialIssueIds = [];
-                    return $this->socialIssueRender->renderString($socialIssue, []);
+                       foreach ($socialIssuesAsIterable as $value) {
+                          $socialIssueIds[] = $value->getId();
+                       }
+                       return implode(',', $socialIssueIds);
                    },
-                'multiple' => true,
+                   function (?string $socialIssuesAsString): array {
-                'choices' => $accompanyingPeriod->getRecursiveSocialIssues(),
+                       if (null === $socialIssuesAsString) {
-                'expanded' => true,
+                          return [];
-            ]);
+                       }
+                       return array_map(
+                          fn(string $id): ?SocialIssue => $this->om->getRepository(SocialIssue::class)->findOneBy(['id' => (int) $id]),
+                          explode(',', $socialIssuesAsString)
+                       );
+                   }
+               ))
+            ;
         }
 
         if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
-            $builder->add('socialActions', EntityType::class, [
+            $builder->add('socialActions', HiddenType::class);
-                'label' => $activityType->getLabel('socialActions'),
+            $builder->get('socialActions')
-                'required' => $activityType->isRequired('socialActions'),
+               ->addModelTransformer(new CallbackTransformer(
-                'class' => SocialAction::class,
+                   function (iterable $socialActionsAsIterable): string {
-                'choice_label' => function (SocialAction $socialAction) {
+                       $socialActionIds = [];
-                    return $this->translatableStringHelper->localize($socialAction->getTitle());
+                       foreach ($socialActionsAsIterable as $value) {
+                          $socialActionIds[] = $value->getId();
+                       }
+                       return implode(',', $socialActionIds);
                    },
-                'multiple' => true,
+                   function (?string $socialActionsAsString): array {
-                'choices' => $accompanyingPeriod->getRecursiveSocialActions(),
+                       if (null === $socialActionsAsString) {
-                'expanded' => true,
+                          return [];
-            ]);
+                       }
+                       return array_map(
+                          fn(string $id): ?SocialAction => $this->om->getRepository(SocialAction::class)->findOneBy(['id' => (int) $id]),
+                          explode(',', $socialActionsAsString)
+                       );
+                   }
+               ))
+            ;
         }
 
         if ($activityType->isVisible('date')) {
@@ -203,9 +230,7 @@ class ActivityType extends AbstractType
         }
 
         if ($activityType->isVisible('persons')) {
-            $builder->add('persons', HiddenType::class, [
+            $builder->add('persons', HiddenType::class);
-               //'data_class' => Person::class,
-            ]);
             $builder->get('persons')
                ->addModelTransformer(new CallbackTransformer(
                    function (iterable $personsAsIterable): string {
@@ -226,9 +251,7 @@ class ActivityType extends AbstractType
         }
 
         if ($activityType->isVisible('thirdParties')) {
-            $builder->add('thirdParties', HiddenType::class, [
+            $builder->add('thirdParties', HiddenType::class);
-               //'data_class' => ThirdParty::class,
-            ]);
             $builder->get('thirdParties')
                ->addModelTransformer(new CallbackTransformer(
                    function (iterable $thirdpartyAsIterable): string {
@@ -260,9 +283,7 @@ class ActivityType extends AbstractType
         }
 
         if ($activityType->isVisible('users')) {
-            $builder->add('users', HiddenType::class, [
+            $builder->add('users', HiddenType::class);
-               //'data_class' => User::class,
-            ]);
             $builder->get('users')
                ->addModelTransformer(new CallbackTransformer(
                    function (iterable $usersAsIterable): string {

src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -4,6 +4,7 @@ namespace Chill\ActivityBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -34,21 +35,13 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
     {
         $period = $parameters['accompanyingCourse'];
 
+        if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()) {
             $menu->addChild($this->translator->trans('Activity list'), [
                 'route' => 'chill_activity_activity_list',
                 'routeParameters' => [
                     'accompanying_period_id' => $period->getId(),
                 ]])
                 ->setExtras(['order' => 40]);
-
+        }
-        $menu->addChild($this->translator->trans('Add a new activity'), [
-            'route' => 'chill_activity_activity_select_type',
-            'routeParameters' => [
-                'accompanying_period_id' => $period->getId(),
-            ]])
-            ->setExtras(['order' => 41]);
-
-
-
     }
 }

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -56,6 +56,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         /* @var $person \Chill\PersonBundle\Entity\Person */
         $person = $parameters['person'];
 
+        if (false) {
             if ($this->authorizationChecker->isGranted(ActivityVoter::SEE, $person)) {
                 $menu->addChild(
                     $this->translator->trans('Activity list'), [
@@ -75,6 +76,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
                     ;
             }
         }
+    }
 
     public static function getMenuIds(): array
     {

src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss

@@ -112,3 +112,19 @@ div.flex-table.list-records {
       margin-top: 1em;
    }
 }
+
+div.activity-row {
+   display: flex;
+   flex-direction: row;
+   flex-wrap: wrap;
+   justify-content: center;
+   gap: 12px;
+   div.bloc {
+      width: 200px;
+      align-self: flex-end;
+      height: 140px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+   }
+}

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue

@@ -1,170 +1,17 @@
 <template>
-   <teleport to="#add-persons">
+   <concerned-groups></concerned-groups>
-
+   <social-issues-acc></social-issues-acc>
-      <div class="flex-bloc concerned-groups" :class="getContext">
-         <persons-bloc 
-            v-for="bloc in contextPersonsBlocs"
-            v-bind:key="bloc.key"
-            v-bind:bloc="bloc"
-            v-bind:setPersonsInBloc="setPersonsInBloc">
-         </persons-bloc>
-      </div>
-
-      <add-persons 
-         buttonTitle="activity.add_persons"
-         modalTitle="activity.add_persons"
-         v-bind:key="addPersons.key"
-         v-bind:options="addPersons.options"
-         @addNewPersons="addNewPersons"
-         ref="addPersons">
-      </add-persons>
- 
-  </teleport>
 </template>
 
 <script>
-import { mapState } from 'vuex';
+import ConcernedGroups from './components/ConcernedGroups.vue';
-import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
+import SocialIssuesAcc from './components/SocialIssuesAcc.vue';
-import PersonsBloc from './components/PersonsBloc.vue';
 
 export default {
    name: "App",
    components: {
-      AddPersons,
+      ConcernedGroups,
-      PersonsBloc
+      SocialIssuesAcc
-   },
-   data() {
-      return {
-         personsBlocs: [
-            {  key: 'persons', 
-               title: 'activity.bloc_persons', 
-               persons: [], 
-               included: false 
-            },
-            {  key: 'personsAssociated', 
-               title: 'activity.bloc_persons_associated', 
-               persons: [], 
-               included: false 
-            },
-            {  key: 'personsNotAssociated', 
-               title: 'activity.bloc_persons_not_associated', 
-               persons: [], 
-               included: false 
-            },
-            {  key: 'thirdparty', 
-               title: 'activity.bloc_thirdparty', 
-               persons: [], 
-               included: true
-            },
-            {  key: 'users', 
-               title: 'activity.bloc_users', 
-               persons: [], 
-               included: true
-            },
-         ],
-         addPersons: {
-            key: 'activity',
-            options: {
-               type: ['person', 'thirdparty'], // TODO add 'user'
-               priority: null,
-               uniq: false,
-            }
-         }
-      }
-   },
-   computed: {
-      ...mapState({
-         persons: state => state.activity.persons,
-         thirdParties: state => state.activity.thirdParties,
-         users: state => state.activity.users,
-         accompanyingCourse: state => state.activity.accompanyingPeriod
-      }),
-      getContext() {
-         return (this.accompanyingCourse) ? "accompanyingCourse" : "person";
-      },
-      contextPersonsBlocs() {
-         return this.personsBlocs.filter(bloc => bloc.included !== false);
-      }
-   },
-   mounted() {
-      this.setPersonsInBloc();
-   },
-   methods: {
-      setPersonsInBloc() {
-         let groups; 
-         if (this.accompanyingCourse) {
-            groups = this.splitPersonsInGroups();
-         }     
-         this.personsBlocs.forEach(bloc => {
-            if (this.accompanyingCourse) {
-               switch (bloc.key) {
-                  case 'personsAssociated':
-                     bloc.persons = groups.personsAssociated;
-                     bloc.included = true;
-                     break;
-                  case 'personsNotAssociated':
-                     bloc.persons = groups.personsNotAssociated;
-                     bloc.included = true;
-                     break;
-               }
-            } else {
-               switch (bloc.key) {
-                  case 'persons': 
-                     bloc.persons = this.persons;
-                     bloc.included = true;
-                     break;
-               }
-            }
-            switch (bloc.key) {
-               case 'thirdparty':
-                  bloc.persons = this.thirdParties;
-                  break;
-               case 'users':
-                  bloc.persons = this.users;
-                  break;
-            }
-         }, groups);
-      },
-      splitPersonsInGroups() {
-         let personsAssociated = [];
-         let personsNotAssociated = this.persons;
-         let participations = this.getCourseParticipations();         
-         this.persons.forEach(person => {
-            participations.forEach(participation => {
-               if (person.id === participation.id) {
-                  console.log(person.id);
-                  personsAssociated.push(person);
-                  personsNotAssociated = personsNotAssociated.filter(p => p !== person);
-               }
-            });
-         });
-         return { 
-            'personsAssociated': personsAssociated, 
-            'personsNotAssociated': personsNotAssociated 
-         };
-      },
-      getCourseParticipations() {
-         let participations = [];
-         this.accompanyingCourse.participations.forEach(participation => {
-            if (!participation.endDate) {
-               participations.push(participation.person);
-            }
-         });
-         return participations;
-      },
-      addNewPersons({ selected, modal }) {
-         console.log('@@@ CLICK button addNewPersons', selected);
-         selected.forEach(function(item) {
-               this.$store.dispatch('addPersonsInvolved', item);
-            }, this
-         );
-         this.$refs.addPersons.resetSearch(); // to cast child method
-         modal.showModal = false;
-         this.setPersonsInBloc();
-      }
    }
 }
 </script>
-
-<style lang="scss">
-</style>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/api.js

@@ -0,0 +1,18 @@
+import { getSocialIssues } from 'ChillPersonAssets/vuejs/AccompanyingCourse/api.js';
+
+/*
+*  Load socialActions by socialIssue (id)
+*/
+const getSocialActionByIssue = (id) => { 
+   const url = `/api/1.0/person/social/social-action/by-social-issue/${id}.json`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response'); 
+      });
+};
+
+export {
+   getSocialIssues,
+   getSocialActionByIssue
+};

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

@@ -0,0 +1,170 @@
+<template>
+   <teleport to="#add-persons">
+
+      <div class="flex-bloc concerned-groups" :class="getContext">
+         <persons-bloc 
+            v-for="bloc in contextPersonsBlocs"
+            v-bind:key="bloc.key"
+            v-bind:bloc="bloc"
+            v-bind:setPersonsInBloc="setPersonsInBloc">
+         </persons-bloc>
+      </div>
+
+      <add-persons 
+         buttonTitle="activity.add_persons"
+         modalTitle="activity.add_persons"
+         v-bind:key="addPersons.key"
+         v-bind:options="addPersons.options"
+         @addNewPersons="addNewPersons"
+         ref="addPersons">
+      </add-persons>
+ 
+  </teleport>  
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
+import PersonsBloc from './ConcernedGroups/PersonsBloc.vue';
+
+export default {
+   name: "ConcernedGroups",
+   components: {
+      AddPersons,
+      PersonsBloc
+   },
+   data() {
+      return {
+         personsBlocs: [
+            {  key: 'persons', 
+               title: 'activity.bloc_persons', 
+               persons: [], 
+               included: false 
+            },
+            {  key: 'personsAssociated', 
+               title: 'activity.bloc_persons_associated', 
+               persons: [], 
+               included: false 
+            },
+            {  key: 'personsNotAssociated', 
+               title: 'activity.bloc_persons_not_associated', 
+               persons: [], 
+               included: false 
+            },
+            {  key: 'thirdparty', 
+               title: 'activity.bloc_thirdparty', 
+               persons: [], 
+               included: true
+            },
+            {  key: 'users', 
+               title: 'activity.bloc_users', 
+               persons: [], 
+               included: true
+            },
+         ],
+         addPersons: {
+            key: 'activity',
+            options: {
+               type: ['person', 'thirdparty'], // TODO add 'user'
+               priority: null,
+               uniq: false,
+            }
+         }
+      }
+   },
+   computed: {
+      ...mapState({
+         persons: state => state.activity.persons,
+         thirdParties: state => state.activity.thirdParties,
+         users: state => state.activity.users,
+         accompanyingCourse: state => state.activity.accompanyingPeriod
+      }),
+      getContext() {
+         return (this.accompanyingCourse) ? "accompanyingCourse" : "person";
+      },
+      contextPersonsBlocs() {
+         return this.personsBlocs.filter(bloc => bloc.included !== false);
+      }
+   },
+   mounted() {
+      this.setPersonsInBloc();
+   },
+   methods: {
+      setPersonsInBloc() {
+         let groups; 
+         if (this.accompanyingCourse) {
+            groups = this.splitPersonsInGroups();
+         }     
+         this.personsBlocs.forEach(bloc => {
+            if (this.accompanyingCourse) {
+               switch (bloc.key) {
+                  case 'personsAssociated':
+                     bloc.persons = groups.personsAssociated;
+                     bloc.included = true;
+                     break;
+                  case 'personsNotAssociated':
+                     bloc.persons = groups.personsNotAssociated;
+                     bloc.included = true;
+                     break;
+               }
+            } else {
+               switch (bloc.key) {
+                  case 'persons': 
+                     bloc.persons = this.persons;
+                     bloc.included = true;
+                     break;
+               }
+            }
+            switch (bloc.key) {
+               case 'thirdparty':
+                  bloc.persons = this.thirdParties;
+                  break;
+               case 'users':
+                  bloc.persons = this.users;
+                  break;
+            }
+         }, groups);
+      },
+      splitPersonsInGroups() {
+         let personsAssociated = [];
+         let personsNotAssociated = this.persons;
+         let participations = this.getCourseParticipations();         
+         this.persons.forEach(person => {
+            participations.forEach(participation => {
+               if (person.id === participation.id) {
+                  //console.log(person.id);
+                  personsAssociated.push(person);
+                  personsNotAssociated = personsNotAssociated.filter(p => p !== person);
+               }
+            });
+         });
+         return { 
+            'personsAssociated': personsAssociated, 
+            'personsNotAssociated': personsNotAssociated 
+         };
+      },
+      getCourseParticipations() {
+         let participations = [];
+         this.accompanyingCourse.participations.forEach(participation => {
+            if (!participation.endDate) {
+               participations.push(participation.person);
+            }
+         });
+         return participations;
+      },
+      addNewPersons({ selected, modal }) {
+         console.log('@@@ CLICK button addNewPersons', selected);
+         selected.forEach(function(item) {
+               this.$store.dispatch('addPersonsInvolved', item);
+            }, this
+         );
+         this.$refs.addPersons.resetSearch(); // to cast child method
+         modal.showModal = false;
+         this.setPersonsInBloc();
+      }
+   }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

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

@@ -0,0 +1,214 @@
+<template>
+   <teleport to="#social-issues-acc">
+      
+      <div class="container">
+         <div class="grid-4 clear">
+            <label>{{ $t('activity.social_issues') }}</label>
+         </div>
+         <div class="grid-8">
+            
+            <check-social-issue
+               v-for="issue in socialIssuesList"
+               v-bind:key="issue.id"
+               v-bind:issue="issue"
+               v-bind:selection="socialIssuesSelected"
+               @updateSelected="updateIssuesSelected">
+            </check-social-issue>
+            
+            <div class="my-3">
+            <VueMultiselect
+               name="otherIssues"
+               label="text"
+               track-by="id"
+               open-direction="bottom"
+               v-bind:close-on-select="true"
+               v-bind:preserve-search="false"
+               v-bind:reset-after="true"
+               v-bind:hide-selected="true"
+               v-bind:taggable="false"
+               v-bind:multiple="false"
+               v-bind:searchable="true"
+               v-bind:allow-empty="true" 
+               v-bind:show-labels="false"
+               v-bind:loading="issueIsLoading"
+               v-bind:placeholder="$t('activity.choose_other_social_issue')"
+               v-bind:options="socialIssuesOther"
+               v-model="value"
+               @select="addIssueInList">
+            </VueMultiselect>
+            </div>
+            
+         </div>
+      </div>
+
+      <div class="container">
+         <div class="grid-4 clear">
+            <label>{{ $t('activity.social_actions') }}</label>
+         </div>
+         <div class="grid-8">
+            
+            <div v-if="actionIsLoading === true">
+               <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>
+            </div>
+            
+            <check-social-action
+               v-if="socialIssuesSelected.length || socialActionsSelected.length"
+               v-for="action in socialActionsList"
+               v-bind:key="action.id"
+               v-bind:action="action"
+               v-bind:selection="socialActionsSelected"
+               @updateSelected="updateActionsSelected">
+            </check-social-action>
+            
+            <span v-else class="inline-choice chill-no-data-statement mt-3">
+               {{ $t('activity.select_first_a_social_issue') }}
+            </span>
+            
+         </div>
+      </div>
+      
+   </teleport>
+</template>
+
+<script>
+import { readonly } from 'vue';
+import VueMultiselect from 'vue-multiselect';
+import CheckSocialIssue from './SocialIssuesAcc/CheckSocialIssue.vue';
+import CheckSocialAction from './SocialIssuesAcc/CheckSocialAction.vue';
+import { getSocialIssues, getSocialActionByIssue } from '../api.js';
+
+export default {
+   name: "SocialIssuesAcc",
+   components: {
+      CheckSocialIssue,
+      CheckSocialAction,
+      VueMultiselect
+   },
+   data() {
+      return {
+         issueIsLoading: false,
+         actionIsLoading: false
+      }
+   },
+   computed: {
+      socialIssuesList() {
+         return this.$store.state.activity.accompanyingPeriod.socialIssues;
+      },
+      socialIssuesSelected() {
+         return this.$store.state.activity.socialIssues;
+      },
+      socialIssuesOther() {
+         return this.$store.state.socialIssuesOther;
+      },
+      socialActionsList() {
+         return this.$store.state.socialActionsList;
+      },
+      socialActionsSelected() {
+         return this.$store.state.activity.socialActions;
+      }
+   },
+   mounted() {
+      /* Load others issues in multiselect
+      */
+      this.issueIsLoading = true;
+      getSocialIssues().then(response => new Promise((resolve, reject) => {
+         this.$store.commit('updateIssuesOther', response.results);
+         
+         /* Add in list the issues already associated (if not yet listed)
+         */
+         this.socialIssuesSelected.forEach(issue => {
+            if (this.socialIssuesList.filter(i => i.id === issue.id).length !== 1) {
+               this.$store.commit('addIssueInList', issue);
+            }
+         }, this);
+         
+         /* Remove from multiselect the issues that are not yet in checkbox list
+         */
+         this.socialIssuesList.forEach(issue => {
+            this.$store.commit('removeIssueInOther', issue);
+         }, this);
+         
+         /* Filter issues
+         */
+         this.$store.commit('filterList', 'issues');
+         
+         /* Add in list the actions already associated (if not yet listed)
+         */
+         this.socialActionsSelected.forEach(action => {
+            this.$store.commit('addActionInList', action);
+         }, this);
+         
+         /* Filter issues
+         */
+         this.$store.commit('filterList', 'actions');
+         
+         this.issueIsLoading = false;
+         resolve();
+      }));   
+   },
+   methods: {
+   
+      /* When choosing an issue in multiselect, add it in checkboxes (as selected), 
+         remove it from multiselect, and add socialActions concerned
+      */
+      addIssueInList(value) {
+         //console.log('addIssueInList', value);
+         this.$store.commit('addIssueInList', value);
+         this.$store.commit('removeIssueInOther', value);
+         this.$store.dispatch('addIssueSelected', value);
+         this.updateActionsList();
+      },
+      /* Update value for selected issues checkboxes
+      */
+      updateIssuesSelected(issues) {
+         //console.log('updateIssuesSelected', issues);
+         this.$store.dispatch('updateIssuesSelected', issues);
+         this.updateActionsList();
+      },
+      /* Update value for selected actions checkboxes
+      */
+      updateActionsSelected(actions) {
+         //console.log('updateActionsSelected', actions);
+         this.$store.dispatch('updateActionsSelected', actions);
+      },
+      /* Add socialActions concerned: after reset, loop on each issue selected 
+         to get social actions concerned
+      */
+      updateActionsList() {
+         //console.log('updateActionsList');
+         this.resetActionsList();
+         this.socialIssuesSelected.forEach(item => {
+            
+            this.actionIsLoading = true;
+            getSocialActionByIssue(item.id)
+               .then(actions => new Promise((resolve, reject) => {
+                  
+                  actions.results.forEach(action => {
+                     this.$store.commit('addActionInList', action);
+                  }, this);
+                  
+                  this.$store.commit('filterList', 'actions');
+                  
+                  this.actionIsLoading = false;
+                  resolve();
+            }));
+         }, this);
+      },
+      /* Reset socialActions List: flush list and restore selected actions 
+      */
+      resetActionsList() {
+         this.$store.commit('resetActionsList');
+         this.socialActionsSelected.forEach(item => {
+            this.$store.commit('addActionInList', item);
+         }, this);
+      }
+   }
+}
+</script>
+
+<style src="vue-multiselect/dist/vue-multiselect.css"></style>
+<style lang="scss">
+   span.multiselect__single {
+      display: none !important;
+   }
+</style>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue

@@ -0,0 +1,34 @@
+<template>
+   <span class="inline-choice">
+      
+      <input 
+         type="checkbox" 
+         v-model="selected"
+         name="action"
+         v-bind:id="action.id" 
+         v-bind:value="action"
+         />
+      <label class="inline" v-bind:for="action.id">
+         {{ action.text }}
+      </label>
+      
+   </span><br>
+</template>
+
+<script>
+export default {
+   name: "CheckSocialAction",
+   props: [ 'action', 'selection' ],
+   emits: [ 'updateSelected' ],
+   computed: {
+      selected: {
+         set(value) {
+            this.$emit('updateSelected', value);
+         },
+         get() {
+            return this.selection;
+         }
+      }
+   }
+}
+</script>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue

@@ -0,0 +1,34 @@
+<template>
+   <span class="inline-choice">
+      
+      <input 
+         type="checkbox" 
+         v-model="selected"
+         name="issue"
+         v-bind:id="issue.id" 
+         v-bind:value="issue"
+         />
+      <label class="inline" v-bind:for="issue.id">
+         {{ issue.text }}
+      </label>
+      
+   </span><br>
+</template>
+
+<script>
+export default {
+   name: "CheckSocialIssue",
+   props: [ 'issue', 'selection' ],
+   emits: [ 'updateSelected' ],
+   computed: {
+      selected: {
+         set(value) {
+            this.$emit('updateSelected', value);
+         },
+         get() {
+            return this.selection;
+         }
+      }
+   }
+}
+</script>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js

@@ -3,6 +3,13 @@ import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
 const appMessages = {
    fr: {
       activity: {
+         //
+         social_issues: "Problématiques sociales",
+         choose_other_social_issue: "Ajouter une autre problématique sociale...",
+         social_actions: "Actions d'accompagnement",
+         select_first_a_social_issue: "Sélectionnez d'abord une problématique sociale",
+         
+         //
          add_persons: "Ajouter des personnes concernées",
          bloc_persons: "Usagers",
          bloc_persons_associated: "Usagers du parcours",

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js

@@ -21,11 +21,62 @@ const removeIdFromValue = (string, id) => {
 const store = createStore({
    strict: debug,
    state: {
-     activity: window.activity
+     activity: window.activity,
-   },
+     socialIssuesOther: [],
-   getters: {
+     socialActionsList: [],
    },
    mutations: {
+      
+      // SocialIssueAcc
+      addIssueInList(state, issue) {
+         //console.log('add issue list', issue.id);
+         state.activity.accompanyingPeriod.socialIssues.push(issue);         
+      },
+      addIssueSelected(state, issue) {
+         //console.log('add issue selected', issue.id);
+         state.activity.socialIssues.push(issue);
+      },
+      updateIssuesSelected(state, issues) {
+         //console.log('update issues selected', issues);
+         state.activity.socialIssues = issues;
+      },
+      updateIssuesOther(state, payload) {
+         //console.log('update issues other');
+         state.socialIssuesOther = payload;
+      },
+      removeIssueInOther(state, issue) {
+         //console.log('remove issue other', issue.id);
+         state.socialIssuesOther = state.socialIssuesOther.filter(i => i.id !== issue.id);
+      },
+      resetActionsList(state) {
+         //console.log('reset list actions');
+         state.socialActionsList = [];
+      },
+      addActionInList(state, action) {
+         //console.log('add action list', action.id);
+         state.socialActionsList.push(action);         
+      },
+      updateActionsSelected(state, actions) {
+         //console.log('update actions selected', actions);
+         state.activity.socialActions = actions;
+      },
+      filterList(state, list) {
+         const filterList = (list) => {
+            // remove duplicates entries
+            list = list.filter((value, index) => list.findIndex(array => array.id === value.id) === index);
+            // alpha sort
+            list.sort((a,b) => (a.text > b.text) ? 1 : ((b.text > a.text) ? -1 : 0));
+            return list;
+         };
+         if (list === 'issues') {
+            state.activity.accompanyingPeriod.socialIssues = filterList(state.activity.accompanyingPeriod.socialIssues);
+         }
+         if (list === 'actions') {
+            state.socialActionsList = filterList(state.socialActionsList);
+         }
+      },
+      
+      // ConcernedGroups
       addPersonsInvolved(state, payload) {
          //console.log('### mutation addPersonsInvolved', payload.result.type);
          switch (payload.result.type) {
@@ -56,8 +107,29 @@ const store = createStore({
       }
    },
    actions: {
+      addIssueSelected({ commit }, issue) {
+         let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
+         aSocialIssues.value = addIdToValue(aSocialIssues.value, issue.id);
+         commit('addIssueSelected', issue);
+      },
+      updateIssuesSelected({ commit }, payload) {
+         let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
+         aSocialIssues.value = '';
+         payload.forEach(item => {
+            aSocialIssues.value = addIdToValue(aSocialIssues.value, item.id);
+         });
+         commit('updateIssuesSelected', payload);
+      },
+      updateActionsSelected({ commit }, payload) {
+         let aSocialActions = document.getElementById("chill_activitybundle_activity_socialActions");
+         aSocialActions.value = '';
+         payload.forEach(item => {
+            aSocialActions.value = addIdToValue(aSocialActions.value, item.id);
+         });
+         commit('updateActionsSelected', payload);
+      },
       addPersonsInvolved({ commit }, payload) {
-         console.log('### action addPersonsInvolved', payload.result.type);
+         //console.log('### action addPersonsInvolved', payload.result.type);
          switch (payload.result.type) {
             case 'person':
                let aPersons = document.getElementById("chill_activitybundle_activity_persons");
@@ -75,7 +147,7 @@ const store = createStore({
          commit('addPersonsInvolved', payload);
       },
       removePersonInvolved({ commit }, payload) {
-         console.log('### action removePersonInvolved', payload);
+         //console.log('### action removePersonInvolved', payload);
          switch (payload.type) {
             case 'person':
                let aPersons = document.getElementById("chill_activitybundle_activity_persons");

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

@@ -1,4 +1,8 @@
-<h1>{{ "Update activity"|trans }}</h1>
+<h1>{{ "Update activity"|trans ~ ' :' }}
+    <span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;">
+        {{ entity.type.name|localize_translatable_string }}
+    </span>
+</h1>
 
 {{ form_start(edit_form) }}
 {{ form_errors(edit_form) }}
@@ -19,13 +23,15 @@
     {{ form_row(edit_form.scope) }}
 {% endif %}
 
+{%- if edit_form.socialIssues is defined -%}
+    {{ form_row(edit_form.socialIssues) }}
+{% endif %}
+
 {%- if edit_form.socialActions is defined -%}
     {{ form_row(edit_form.socialActions) }}
 {% endif %}
 
-{%- if edit_form.socialIssues is defined -%}
+<div id="social-issues-acc"></div>
-    {{ form_row(edit_form.socialIssues) }}
-{% endif %}
 
 {%- if edit_form.reasons is defined -%}
     {{ form_row(edit_form.reasons) }}

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

@@ -12,8 +12,10 @@
 {% block js %}
     {{ encore_entry_link_tags('async_upload') }}
     <script type="text/javascript">
+        window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', 
             '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        });
         window.activity = {{ activity_json|json_encode|raw }}; 
     </script>
     {{ encore_entry_script_tags('vue_activity') }}

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

@@ -21,15 +21,17 @@
 {% block title  'Update activity'|trans %}
 
 {% block personcontent %}
-    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
     <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
 {% endblock %}
 
 {% block js %}
     {{ encore_entry_link_tags('async_upload') }}
     <script type="text/javascript">
+        window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', 
             '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        });
         window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}

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

@@ -1,4 +1,8 @@
-<h1>{{ "Activity creation"|trans }}</h1>
+<h1>{{ "Activity creation"|trans ~ ' :' }}
+    <span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;">
+        {{ entity.type.name|localize_translatable_string }}
+    </span>
+</h1>
 
 {{ form_start(form) }}
 {{ form_errors(form) }}
@@ -20,14 +24,15 @@
     {{ form_row(form.scope) }}
 {% endif %}
 
-{%- if form.socialActions is defined -%}
-    {{ form_row(form.socialActions) }}
-{% endif %}
-
 {%- if form.socialIssues is defined -%}
     {{ form_row(form.socialIssues) }}
 {% endif %}
 
+{%- if form.socialActions is defined -%}
+    {{ form_row(form.socialActions) }}
+{% endif %}
+
+<div id="social-issues-acc"></div>
 
 {%- if form.reasons is defined -%}
     {{ form_row(form.reasons) }}

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

@@ -12,8 +12,10 @@
 {% block js %}
     {{ encore_entry_script_tags('async_upload') }}
     <script type="text/javascript">
+        window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', 
             '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        });
         window.activity = {{ activity_json|json_encode|raw }}; 
     </script>
     {{ encore_entry_script_tags('vue_activity') }}

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

@@ -5,15 +5,17 @@
 {% block title 'Activity creation' |trans %}
 
 {% block personcontent %}
-    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
     <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
 {% endblock %}
 
 {% block js %}
     {{ encore_entry_link_tags('async_upload') }}
     <script type="text/javascript">
+        window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', 
             '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        });
         window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}

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

@@ -4,7 +4,7 @@
 
 {% for row in data %}
     <h3>{{ row.activityTypeCategory.name|localize_translatable_string }}</h3>
-    <div style="display:flex;justify-content:center;gap:12px;flex-wrap:wrap;">
+    <div class="activity-row">
         {% for activityType in row.activityTypes %}
 
             {% set person_id = null %}
@@ -19,7 +19,7 @@
 
             <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'activityType_id': activityType.id, 'accompanying_period_id': accompanying_course_id }) }}">
 
-                <div style="width:200px;height:200px;border:1px dotted red;display:flex;justify-content:center;align-items:center;align-content:center;">
+                <div class="bloc btn btn-primary btn-lg btn-block">
                     {{ activityType.name|localize_translatable_string }}
                 </div>
             </a>

src/Bundle/ChillActivityBundle/config/services/form.yaml

@@ -32,6 +32,7 @@ services:
             - "@chill.main.helper.translatable_string"
             - "%chill_activity.form.time_duration%"
             - '@Chill\PersonBundle\Templating\Entity\SocialIssueRender'
+            - '@Chill\PersonBundle\Templating\Entity\SocialActionRender'
         tags:
             - { name: form.type, alias: chill_activitybundle_activity }
 

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

@@ -38,7 +38,7 @@ Required: Obligatoire
 Persons: Personnes
 Users: Utilisateurs
 Emergency: Urgent
-Sent received: Envoyer / Recevoir
+Sent received: Entrant / Sortant
 Sent: Envoyer
 Received: Recevoir
 by: 'Par '

src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php

@@ -8,6 +8,11 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\CRUD\Resolver\Resolver;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class AbstractCRUDController extends AbstractController
 {
@@ -248,4 +253,24 @@ class AbstractCRUDController extends AbstractController
     {
         return $this->get('validator');
     }
+
+    /**
+     * @return array
+     */
+    public static function getSubscribedServices(): array
+    {
+        return \array_merge(
+            parent::getSubscribedServices(),
+            [
+                'chill_main.paginator_factory' => PaginatorFactory::class,
+
+                'translator' => TranslatorInterface::class,
+                AuthorizationHelper::class => AuthorizationHelper::class,
+                EventDispatcherInterface::class => EventDispatcherInterface::class,
+                Resolver::class => Resolver::class,
+                SerializerInterface::class => SerializerInterface::class,
+                'validator' => ValidatorInterface::class,
+            ]
+        );
+    }
 }

src/Bundle/ChillMainBundle/Controller/SearchController.php

@@ -36,6 +36,7 @@ use Chill\MainBundle\Search\SearchProvider;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Search\SearchApi;
+use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 
 /**
  * Class SearchController
@@ -151,11 +152,14 @@ class SearchController extends AbstractController
     {
         //TODO this is an incomplete implementation
         $query = $request->query->get('q', '');
+        $types = $request->query->get('type', []);
 
-        $results = $this->searchApi->getResults($query, 0, 150);
+        if (count($types) === 0) {
-        $paginator = $this->paginatorFactory->create(count($results));
+            throw new BadRequestException("The request must contains at "
+                ." one type");
+        }
 
-        $collection = new Collection($results, $paginator);
+        $collection = $this->searchApi->getResults($query, $types, []);
 
         return $this->json($collection);
     }

src/Bundle/ChillMainBundle/Entity/Address.php

@@ -132,6 +132,7 @@ class Address
     /**
      * True if the address is a "no address", aka homeless person, ...
      * @groups({"write"})
+     * @ORM\Column(type="boolean")
      *
      * @var bool
      */
@@ -298,7 +299,7 @@ class Address
      * @param bool $isNoAddress
      * @return $this
      */
-    public function setIsNoAddress(bool $isNoAddress)
+    public function setIsNoAddress(bool $isNoAddress): self
     {
         $this->isNoAddress = $isNoAddress;
         return $this;

src/Bundle/ChillMainBundle/Form/Type/CommentType.php

@@ -51,7 +51,7 @@ class CommentType extends AbstractType
 
         $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
             $data = $event->getForm()->getData();
-            $comment = $event->getData();
+            $comment = $event->getData() ?? ['comment' => ''];
 
             if ($data->getComment() !== $comment['comment']) {
                 $data->setDate(new \DateTime());

src/Bundle/ChillMainBundle/Repository/ScopeRepository.php

@@ -44,6 +44,11 @@ final class ScopeRepository implements ObjectRepository
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
     
+    public function createQueryBuilder($alias, $indexBy = null)  
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
     public function getClassName() {
         return Scope::class;
     }

src/Bundle/ChillMainBundle/Resources/public/js/date.js

@@ -48,8 +48,8 @@ const ISOToDatetime = (str) => {
   let 
     [cal, times] = str.split('T'),
     [year, month, date] = cal.split('-'),
-    [time, timezone] = cal.split(times.charAt(9)),
+    [time, timezone] = times.split(times.charAt(8)),
-    [hours, minutes, seconds] = cal.split(':')
+    [hours, minutes, seconds] = time.split(':')
   ;
 
   return new Date(year, month-1, date, hours, minutes, seconds);

src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss

@@ -45,33 +45,6 @@ table {
    }
 }
 
-/*
- *  ACCOMPANYING_COURSE
- *  Header custom for Accompanying Course
- */
-
-div#header-accompanying_course-name {
-  background: none repeat scroll 0 0 #718596;
-  color: #FFF;
-  h1 {
-    margin: 0.4em 0;
-  }
-  span {
-    a {
-      color: white;
-    }
-    a:hover {
-      text-decoration: underline;
-    }
-  }
-}
-div#header-accompanying_course-details {
-  background: none repeat scroll 0 0 #718596ab;
-  color: #FFF;
-  padding-top: 1em;
-  padding-bottom: 1em;
-}
-
 /*
 *  FLEX RESPONSIVE TABLE/BLOCK PRESENTATION
 */
@@ -109,23 +82,13 @@ div.flex-bloc {
    align-content: stretch;
 
    div.item-bloc {
-      flex-grow: 0; flex-shrink: 1; flex-basis: 50%;
+      flex-grow: 0; flex-shrink: 1; flex-basis: 33%;
       margin: 0;
       padding: 1em;
-      border-top: 0;
-      &:nth-child(1), &:nth-child(2) {
-         border-top: 1px solid #000;
-      }
-      border-left: 0;
-      &:nth-child(odd) {
-         border-left: 1px solid #000;
-      }
-
-      //background-color: #e6e6e6;
       display: flex;
       flex-direction: column;
 
-      & > div.item-row {
+      div.item-row {
          flex-grow: 1; flex-shrink: 1; flex-basis: auto;
          display: flex;
          flex-direction: column;
@@ -158,12 +121,6 @@ div.flex-bloc {
    @media only screen and (max-width: 900px) {
       flex-direction: column;
       margin: auto 0;
-      div.item-bloc {
-         border-left: 1px solid #000;
-         &:nth-child(2) {
-            border-top: 0;
-         }
-      }
    }
 }
 
@@ -232,8 +189,6 @@ div.flex-table {
    }
 }
 
-
-
 /*
 * Address form
 */
@@ -277,5 +232,3 @@ div.address_form {
       }
    }
 }
-
-

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

@@ -26,6 +26,12 @@
       <div v-if="errors.length > 0">
          {{ errors }}
       </div>
+      <div v-if="loading">
+            {{ $t('loading') }}
+      </div>
+      <div v-if="success">
+            {{ $t('person_address_creation_success') }}
+      </div>
    </div>
 
    <div>
@@ -68,6 +74,12 @@ export default {
       },
       errors() {
          return this.$store.state.errorMsg;
+      },
+      loading() {
+         return this.$store.state.loading;
+      },
+      success() {
+         return this.$store.state.success;
       }
    },
    methods: {

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

@@ -26,7 +26,9 @@ const addressMessages = {
       date: 'Date de la nouvelle adresse',
       add_an_address_to_person: 'Ajouter l\'adresse à la personne',
       validFrom: 'Date de la nouvelle adresse',
-      back_to_the_list: 'Retour à la liste'
+      back_to_the_list: 'Retour à la liste',
+      person_address_creation_success: 'La nouvelle adresse de la personne est enregistrée',
+      loading: 'chargement en cours...'
    }
 };
 

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js

@@ -11,7 +11,9 @@ const store = createStore({
       address: {},
       editAddress: {}, //TODO or should be address?
       person: {},
-      errorMsg: []
+      errorMsg: [],
+      loading: false,
+      success: false
    },
    getters: {
    },
@@ -39,11 +41,17 @@ const store = createStore({
          console.log('@M getEditAddress address', address);
          state.editAddress = address;
       },
+      setLoading(state, b) {
+         state.loading = b;
+      },
+      setSuccess(state, b) {
+         state.success = b;
+      }
    },
    actions: {
       addAddress({ commit }, payload) {
          console.log('@A addAddress payload', payload);
-
+         commit('setLoading', true);
          if('newPostalCode' in payload){
             let postalCodeBody = payload.newPostalCode;
             postalCodeBody = Object.assign(postalCodeBody, {'origin': 3});
@@ -55,9 +63,11 @@ const store = createStore({
                      .then(address => new Promise((resolve, reject) => {
                         commit('addAddress', address);
                         resolve();
+                        commit('setLoading', false);
                      }))
                      .catch((error) => {
                         commit('catchError', error);
+                        commit('setLoading', false);
                      });
                })
 
@@ -66,15 +76,17 @@ const store = createStore({
                .then(address => new Promise((resolve, reject) => {
                   commit('addAddress', address);
                   resolve();
+                  commit('setLoading', false);
                }))
                .catch((error) => {
                   commit('catchError', error);
+                  commit('setLoading', false);
                });
          }
       },
       addDateToAddressAndAddressToPerson({ commit }, payload) {
          console.log('@A addDateToAddressAndAddressToPerson payload', payload);
-
+         commit('setLoading', true);
          patchAddress(payload.addressId, payload.body)
             .then(address => new Promise((resolve, reject) => {
                commit('addDateToAddress', address.validFrom);
@@ -84,13 +96,17 @@ const store = createStore({
                   .then(person => new Promise((resolve, reject) => {
                      commit('addAddressToPerson', person);
                      resolve();
+                     commit('setLoading', false);
+                     commit('setSuccess', true);
                }))
                .catch((error) => {
                   commit('catchError', error);
+                  commit('setLoading', false);
                })
             ))
             .catch((error) => {
                commit('catchError', error);
+               commit('setLoading', false);
             });
       },
       updateAddress({ commit }, payload) {

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

@@ -19,6 +19,10 @@
          <template v-slot:body>
             <div class="address_form">
 
+               <div v-if="loading">
+                  {{ $t('loading') }}
+               </div>
+
                <div class="address_form__header">
                   <h4>{{ $t('select_an_address_title') }}</h4>
                </div>
@@ -110,6 +114,7 @@ export default {
             showModal: false,
             modalDialogClass: "modal-dialog-scrollable modal-xl"
          },
+         loading: false,
          address: {
             writeNewAddress: false,
             writeNewPostalCode: false,
@@ -143,7 +148,7 @@ export default {
             extra: null,
             distribution: null,
          },
-         errorMsg: {}
+         errorMsg: {},
       }
    },
    computed: {
@@ -170,33 +175,42 @@ export default {
       },
       getCountries() {
          console.log('getCountries');
+         this.loading = true;
          fetchCountries().then(countries => new Promise((resolve, reject) => {
              this.address.loaded.countries = countries.results;
              resolve()
+             this.loading = false;
           }))
           .catch((error) => {
              this.errorMsg.push(error.message);
+             this.loading = false;
           });
       },
       getCities(country) {
          console.log('getCities for', country.name);
+         this.loading = true;
          fetchCities(country).then(cities => new Promise((resolve, reject) => {
             this.address.loaded.cities = cities.results.filter(c => c.origin !== 3); // filter out user-defined cities
             resolve();
+            this.loading = false;
          }))
          .catch((error) => {
             this.errorMsg.push(error.message);
+            this.loading = false;
          });
       },
       getReferenceAddresses(city) {
+         this.loading = true;
          console.log('getReferenceAddresses for', city.name);
          fetchReferenceAddresses(city).then(addresses => new Promise((resolve, reject) => {
                console.log('addresses', addresses);
                this.address.loaded.addresses = addresses.results;
                resolve();
+               this.loading = false;
             }))
             .catch((error) => {
                this.errorMsg.push(error.message);
+               this.loading = false;
             });
       },
       updateMapCenter(point) {

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue

@@ -23,7 +23,7 @@ export default {
    },
    methods:{
       init() {
-         map = L.map('address_map').setView([48.8589, 2.3469], 12);
+         map = L.map('address_map').setView([46.67059, -1.42683], 12);
 
          L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
             attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMore.vue

@@ -5,6 +5,7 @@
       <input
          type="text"
          name="floor"
+         maxlength=16
          :placeholder="$t('floor')"
          v-model="floor"/>
       </div>
@@ -13,6 +14,7 @@
       <input
          type="text"
          name="corridor"
+         maxlength=16
          :placeholder="$t('corridor')"
          v-model="corridor"/>
    </div>
@@ -21,6 +23,7 @@
       <input
          type="text"
          name="steps"
+         maxlength=16
          :placeholder="$t('steps')"
          v-model="steps"/>
    </div>
@@ -29,6 +32,7 @@
       <input
          type="text"
          name="flat"
+         maxlength=16
          :placeholder="$t('flat')"
          v-model="flat"/>
    </div>
@@ -37,6 +41,7 @@
       <input
          type="text"
          name="buildingName"
+         maxlength=255
          :placeholder="$t('buildingName')"
          v-model="buildingName"/>
    </div>
@@ -45,6 +50,7 @@
       <input
          type="text"
          name="extra"
+         maxlength=255
          :placeholder="$t('extra')"
          v-model="extra"/>
    </div>
@@ -53,6 +59,7 @@
       <input
          type="text"
          name="distribution"
+         maxlength=255
          :placeholder="$t('distribution')"
          v-model="distribution"/>
    </div>

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

@@ -58,9 +58,9 @@ const messages = {
          },
          create: {
             button: "Créer \"{q}\"",
-            title: "Créer à la volée…",
+            title: "Création d'un nouvel usager ou d'un tiers professionnel",
             person: "un nouvel usager",
-            thirdparty: "un nouveau tiers"
+            thirdparty: "un nouveau tiers professionnel"
          },         
       },
    }

src/Bundle/ChillMainBundle/Search/SearchApi.php

@@ -2,88 +2,169 @@
 
 namespace Chill\MainBundle\Search;
 
-use Chill\PersonBundle\Entity\Person;
+use Chill\MainBundle\Serializer\Model\Collection;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\PersonBundle\Search\SearchPersonApiProvider;
+use Chill\ThirdPartyBundle\Search\ThirdPartyApiSearch;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Chill\MainBundle\Search\SearchProvider;
 use Symfony\Component\VarDumper\Resources\functions\dump;
 
 /**
- *  ***Warning*** This is an incomplete implementation ***Warning***
  */
 class SearchApi
 {
     private EntityManagerInterface $em;
-    private SearchProvider $search;
+    private PaginatorFactory $paginator;
 
-    public function __construct(EntityManagerInterface $em, SearchProvider $search)
+    private array $providers = [];
+
+    public function __construct(
+        EntityManagerInterface $em,
+        SearchPersonApiProvider $searchPerson,
+        ThirdPartyApiSearch $thirdPartyApiSearch,
+        PaginatorFactory $paginator
+    )
     {
         $this->em = $em;
-        $this->search = $search;
+        $this->providers[] = $searchPerson;
+        $this->providers[] = $thirdPartyApiSearch;
+        $this->paginator = $paginator;
     }
 
     /**
      * @return Model/Result[]
      */
-    public function getResults(string $query, int $offset, int $maxResult): array
+    public function getResults(string $pattern, array $types, array $parameters): Collection
     {
-        // **warning again**: this is an incomplete implementation 
+        $queries = $this->findQueries($pattern, $types, $parameters);
-        $results = [];
 
-        foreach ($this->getPersons($query) as $p) {
+        $total = $this->countItems($queries, $types, $parameters);
-            $results[] = new Model\Result((float)\rand(0, 100) / 100, $p);
+        $paginator = $this->paginator->create($total);
-        }
+
-        foreach ($this->getThirdParties($query) as $t) {
+        $rawResults = $this->fetchRawResult($queries, $types, $parameters, $paginator);
-            $results[] = new Model\Result((float)\rand(0, 100) / 100, $t);
+
+        $this->prepareProviders($rawResults);
+        $results = $this->buildResults($rawResults);
+
+        $collection = new Collection($results, $paginator);
+
+        return $collection;
     }
 
-        \usort($results, function(Model\Result $a, Model\Result $b) {
+    private function findQueries($pattern, array $types, array $parameters): array
-            return ($a->getRelevance() <=> $b->getRelevance()) * -1;
-        });
-
-        return $results;
-    }
-
-    public function countResults(string $query): int
     {
-        return 0;
+        return \array_map(
+            fn($p) => $p->provideQuery($pattern, $parameters),
+            $this->findProviders($pattern, $types, $parameters),
+        );
     }
 
-    private function getThirdParties(string $query)
+    private function findProviders(string $pattern, array $types, array $parameters): array
     {
-        $thirdPartiesIds = $this->em->createQuery('SELECT t.id FROM '.ThirdParty::class.' t')
+        return \array_filter(
-            ->getScalarResult();
+            $this->providers,
-        $nbResults = rand(0, 15);
+            fn($p) => $p->supportsTypes($pattern, $types, $parameters)
-
+        );
-        if ($nbResults === 1) {
-            $nbResults++;
-        } elseif ($nbResults === 0) {
-            return [];
-        }
-        $ids = \array_map(function ($e) use ($thirdPartiesIds) { return $thirdPartiesIds[$e]['id'];}, 
-            \array_rand($thirdPartiesIds, $nbResults));
-
-        $a = $this->em->getRepository(ThirdParty::class)
-            ->findById($ids);
-        return $a;
     }
 
-    private function getPersons(string $query)
+    private function countItems($providers, $types, $parameters): int
     {
-        $params = [
+        list($countQuery, $parameters) = $this->buildCountQuery($providers, $types, $parameters);
-            SearchInterface::SEARCH_PREVIEW_OPTION => false
+        $rsmCount = new ResultSetMappingBuilder($this->em);
+        $rsmCount->addScalarResult('count', 'count');
+        $countNq = $this->em->createNativeQuery($countQuery, $rsmCount);
+        $countNq->setParameters($parameters);
+        
+        return $countNq->getSingleScalarResult();
+    }
+
+    private function buildCountQuery(array $queries, $types, $parameters)
+    {
+        $query = "SELECT COUNT(sq.key) AS count FROM ({union_unordered}) AS sq";
+        $unions = [];
+        $parameters = [];
+
+        foreach ($queries as $q) {
+            $unions[] = $q->buildQuery();
+            $parameters = \array_merge($parameters, $q->buildParameters());
+        }
+
+        $unionUnordered = \implode(" UNION ", $unions);
+
+        return [
+            \strtr($query, [ '{union_unordered}' => $unionUnordered ]),
+            $parameters
         ];
-        $search = $this->search->getResultByName($query, 'person_regular', 0, 50, $params, 'json');
-        $ids = \array_map(function($r) { return $r['id']; }, $search['results']);
-
-
-        if (count($ids) === 0) {
-            return [];
     }
 
-        return $this->em->getRepository(Person::class)
+    private function buildUnionQuery(array $queries, $types, $parameters)
-            ->findById($ids)
+    {
+        $query = "{unions} ORDER BY pertinence DESC";
+        $unions = [];
+        $parameters = [];
+
+        foreach ($queries as $q) {
+            $unions[] = $q->buildQuery();
+            $parameters = \array_merge($parameters, $q->buildParameters());
+        }
+
+        $union = \implode(" UNION ", $unions);
+
+        return [
+            \strtr($query, [ '{unions}' => $union]),
+            $parameters
+        ];
+    }
+
+    private function fetchRawResult($queries, $types, $parameters, $paginator): array
+    {
+        list($union, $parameters) = $this->buildUnionQuery($queries, $types, $parameters, $paginator);
+        $rsm = new ResultSetMappingBuilder($this->em);
+        $rsm->addScalarResult('key', 'key', Types::STRING)
+            ->addScalarResult('metadata', 'metadata', Types::JSON)
+            ->addScalarResult('pertinence', 'pertinence', Types::FLOAT)
             ;
+
+        $nq = $this->em->createNativeQuery($union, $rsm);
+        $nq->setParameters($parameters);
+        
+        return $nq->getResult();
     }
 
+    private function prepareProviders($rawResults)
+    {
+        $metadatas = [];
+        foreach ($rawResults as $r) {
+            foreach ($this->providers as $k => $p) {
+                if ($p->supportsResult($r['key'], $r['metadata'])) {
+                    $metadatas[$k][] = $r['metadata'];
+                    break;
+                } 
+            }
+        }
+
+        foreach ($metadatas as $k => $m) {
+            $this->providers[$k]->prepare($m);
+        }
+    }
+
+    private function buildResults($rawResults)
+    {
+        foreach ($rawResults as $r) {
+            foreach ($this->providers as $k => $p) {
+                if ($p->supportsResult($r['key'], $r['metadata'])) {
+                    $items[] = (new SearchApiResult($r['pertinence']))
+                        ->setResult(
+                            $p->getResult($r['key'], $r['metadata'], $r['pertinence'])
+                        );
+                    break;
+                } 
+            }
+        }
+
+        return $items ?? [];
+    }
 }

src/Bundle/ChillMainBundle/Search/SearchApiInterface.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Chill\MainBundle\Search;
+
+use Chill\MainBundle\Search\SearchApiQuery;
+
+interface SearchApiInterface
+{
+    public function provideQuery(string $pattern, array $parameters): SearchApiQuery;
+
+    public function supportsTypes(string $pattern, array $types, array $parameters): bool;
+
+    public function prepare(array $metadatas): void;
+
+    public function supportsResult(string $key, array $metadatas): bool;
+
+    public function getResult(string $key, array $metadata, float $pertinence);
+}

src/Bundle/ChillMainBundle/Search/SearchApiQuery.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace Chill\MainBundle\Search;
+
+class SearchApiQuery
+{
+    private ?string $selectKey;
+    private array $selectKeyParams = [];
+    private ?string $jsonbMetadata;
+    private array $jsonbMetadataParams = [];
+    private ?string $pertinence;
+    private array $pertinenceParams = [];
+    private ?string $fromClause;
+    private array $fromClauseParams = [];
+    private ?string $whereClause;
+    private array $whereClauseParams = [];
+
+    public function setSelectKey(string $selectKey, array $params = []): self
+    {
+        $this->selectKey = $selectKey;
+        $this->selectKeyParams = $params;
+
+        return $this;
+    }
+
+    public function setSelectJsonbMetadata(string $jsonbMetadata, array $params = []): self
+    {
+        $this->jsonbMetadata = $jsonbMetadata;
+        $this->jsonbMetadataParams = $params;
+
+        return $this;
+    }
+
+    public function setSelectPertinence(string $pertinence, array $params = []): self
+    {
+        $this->pertinence = $pertinence;
+        $this->pertinenceParams = $params;
+
+        return $this;
+    }
+
+    public function setFromClause(string $fromClause, array $params = []): self
+    {
+        $this->fromClause = $fromClause;
+        $this->fromClauseParams = $params;
+
+        return $this;
+    }
+
+    public function setWhereClause(string $whereClause, array $params = []): self
+    {
+        $this->whereClause = $whereClause;
+        $this->whereClauseParams = $params;
+
+        return $this;
+    }
+
+    public function buildQuery(): string
+    {
+        return \strtr("SELECT
+            '{key}' AS key,
+            {metadata} AS metadata,
+            {pertinence} AS pertinence
+        FROM {from}
+        WHERE {where}
+        ", [
+            '{key}' => $this->selectKey,
+            '{metadata}' => $this->jsonbMetadata,
+            '{pertinence}' => $this->pertinence,
+            '{from}' => $this->fromClause,
+            '{where}' => $this->whereClause
+        ]);
+    }
+
+    public function buildParameters(): array
+    {
+        return \array_merge(
+            $this->selectKeyParams,
+            $this->jsonbMetadataParams,
+            $this->pertinenceParams,
+            $this->fromClauseParams,
+            $this->whereClauseParams
+        );
+    }
+}

src/Bundle/ChillMainBundle/Search/SearchApiResult.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Chill\MainBundle\Search;
+
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+class SearchApiResult
+{
+    private float $pertinence;
+
+    private $result;
+
+    public function __construct(float $relevance)
+    {
+        $this->relevance = $relevance;
+    }
+
+    public function setResult($result): self
+    {
+        $this->result = $result;
+
+        return $this;
+    } 
+
+    /**
+     * @Serializer\Groups({"read"})
+     */
+    public function getResult()
+    {
+        return $this->result;
+    }
+
+    /**
+     * @Serializer\Groups({"read"})
+     */
+    public function getRelevance(): float
+    {
+        return $this->relevance;
+    }
+}

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

@@ -14,7 +14,7 @@ class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface
     public function normalize($address, string $format = null, array $context = [])
     {
         $data['address_id'] = $address->getId();
-        $data['text'] = $address->getStreet().', '.$address->getStreetNumber();
+        $data['text'] = $address->isNoAddress() ? '' : $address->getStreet().', '.$address->getStreetNumber();
         $data['street'] = $address->getStreet();
         $data['streetNumber'] = $address->getStreetNumber();
         $data['postcode']['name'] = $address->getPostCode()->getName();

src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Bundle\ChillMainBundle\Tests\Controller;
+
+use Chill\MainBundle\Test\PrepareClientTrait;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpFoundation\Request;
+
+class SearchApiControllerTest extends WebTestCase
+{
+    use PrepareClientTrait;
+
+    /**
+     * @dataProvider generateSearchData
+     */
+    public function testSearch(string $pattern, array $types)
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request(
+            Request::METHOD_GET,
+            '/api/1.0/search.json',
+            [ 'q' => $pattern, 'type' => $types ]
+        );
+
+        $this->assertResponseIsSuccessful();
+    }
+
+    public function generateSearchData()
+    {
+        yield ['per', ['person', 'thirdparty'] ];
+        yield ['per', ['thirdparty'] ];
+        yield ['per', ['person'] ];
+        yield ['fjklmeqjfkdqjklrmefdqjklm', ['person', 'thirdparty'] ];
+    }
+}

src/Bundle/ChillMainBundle/chill.webpack.config.js

@@ -56,7 +56,6 @@ module.exports = function(encore, entries)
     // Chill2 new assets
     encore.addEntry('forkawesome', __dirname + '/Resources/public/modules/forkawesome/index.js');
     encore.addEntry('bootstrap', __dirname + '/Resources/public/modules/bootstrap/index.js');
-    //encore.addEntry('vuejs', __dirname + '/Resources/public/modules/vue/index.js');
 
     // CKEditor5
     buildCKEditor(encore);

src/Bundle/ChillMainBundle/config/services/search.yaml

@@ -5,6 +5,5 @@ services:
     Chill\MainBundle\Search\SearchProvider: '@chill_main.search_provider'
 
     Chill\MainBundle\Search\SearchApi:
-        arguments:
+        autowire: true
-          $em: '@Doctrine\ORM\EntityManagerInterface'
+        autoconfigure: true
-          $search: '@Chill\MainBundle\Search\SearchProvider'

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php

@@ -2,10 +2,12 @@
 
 namespace Chill\PersonBundle\Controller;
 
+use Chill\ActivityBundle\Entity\Activity;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Privacy\AccompanyingPeriodPrivacyEvent;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -34,14 +36,18 @@ class AccompanyingCourseController extends Controller
 
     protected ValidatorInterface $validator;
 
+    private AccompanyingPeriodWorkRepository $workRepository;
+
     public function __construct(
         SerializerInterface $serializer,
         EventDispatcherInterface $dispatcher,
-        ValidatorInterface $validator
+        ValidatorInterface $validator,
+        AccompanyingPeriodWorkRepository $workRepository
     ) {
         $this->serializer = $serializer;
         $this->dispatcher = $dispatcher;
         $this->validator = $validator;
+        $this->workRepository = $workRepository;
     }
 
     /**
@@ -96,9 +102,22 @@ class AccompanyingCourseController extends Controller
             }
         }
 
+        $activities = $this->getDoctrine()->getManager()->getRepository(Activity::class)->findBy(
+            ['accompanyingPeriod' => $accompanyingCourse],
+            ['date' => 'DESC'],
+        );
+
+        $works = $this->workRepository->findByAccompanyingPeriod(
+            $accompanyingCourse,
+            ['startDate' => 'DESC', 'endDate' => 'DESC'],
+            3
+        );
+
         return $this->render('@ChillPerson/AccompanyingCourse/index.html.twig', [
             'accompanyingCourse' => $accompanyingCourse,
-            'withoutHousehold' => $withoutHousehold
+            'withoutHousehold' => $withoutHousehold,
+            'works' => $works,
+            'activities' => $activities
         ]);
     }
 

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Symfony\Component\HttpFoundation\Request;
+
+class AccompanyingCourseWorkApiController extends ApiController
+{
+    protected function getContextForSerialization(string $action, Request $request, string $_format, $entity): array
+    {
+        switch($action) {
+            case '_entity':
+                switch ($request->getMethod()) {
+                    case Request::METHOD_PUT:
+                        return [ 'groups' => [ 'accompanying_period_work:edit' ] ];
+                }
+        }
+
+        return parent::getContextForSerialization($action, $request, $_format, $entity);
+    }
+
+}

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php

@@ -2,32 +2,44 @@
 
 namespace Chill\PersonBundle\Controller;
 
+use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
 
 class AccompanyingCourseWorkController extends AbstractController
 {
     private TranslatorInterface $trans;
     private SerializerInterface $serializer;
+    private AccompanyingPeriodWorkRepository $workRepository;
+    private PaginatorFactory $paginator;
 
-    public function __construct(TranslatorInterface $trans, SerializerInterface $serializer)
+    public function __construct(
-    {
+        TranslatorInterface $trans,
+        SerializerInterface $serializer,
+        AccompanyingPeriodWorkRepository $workRepository,
+        PaginatorFactory $paginator
+    ) {
         $this->trans = $trans;
         $this->serializer = $serializer;
+        $this->workRepository = $workRepository;
+        $this->paginator = $paginator;
     }
     
     /**
      * @Route(
      *  "{_locale}/person/accompanying-period/{id}/work/new",
-     *  methods={"GET", "POST"}
+     *  name="chill_person_accompanying_period_work_new",
+     *  methods={"GET"}
      *  )
      */
-    public function createWork(AccompanyingPeriod $period)
+    public function createWork(AccompanyingPeriod $period): Response
     {
         // TODO ACL
 
@@ -49,4 +61,49 @@ class AccompanyingCourseWorkController extends AbstractController
             'json' => $json
         ]);
     }
+
+    /**
+     * @Route(
+     *  "{_locale}/person/accompanying-period/work/{id}/edit",
+     *  name="chill_person_accompanying_period_work_edit",
+     *  methods={"GET"}
+     *  )
+     */
+    public function editWork(AccompanyingPeriodWork $work): Response
+    {
+        // TODO ACL
+        $json = $this->serializer->normalize($work, 'json', [ "groups" => [ "read" ] ]);
+        return $this->render('@ChillPerson/AccompanyingCourseWork/edit.html.twig', [
+            'accompanyingCourse' => $work->getAccompanyingPeriod(),
+            'work' => $work,
+            'json' => $json
+        ]);
+    }
+
+    /**
+     * @Route(
+     *  "{_locale}/person/accompanying-period/{id}/work",
+     *  name="chill_person_accompanying_period_work_list",
+     *  methods={"GET"}
+     *  )
+     */
+    public function listWorkByAccompanyingPeriod(AccompanyingPeriod $period): Response
+    {
+        // TODO ACL
+        $totalItems = $this->workRepository->countByAccompanyingPeriod($period);
+        $paginator = $this->paginator->create($totalItems);
+
+        $works = $this->workRepository->findByAccompanyingPeriod(
+            $period,
+            ['startDate' => 'DESC', 'endDate' => 'DESC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+
+        return $this->render('@ChillPerson/AccompanyingCourseWork/list_by_accompanying_period.html.twig', [
+            'accompanyingCourse' => $period,
+            'works' => $works,
+            'paginator' => $paginator
+        ]);
+    }
 }

src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php

@@ -75,8 +75,10 @@ class AccompanyingPeriodController extends AbstractController
         ]);
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
+        $accompanyingPeriods = $person->getAccompanyingPeriodsOrdered();
+
         return $this->render('ChillPersonBundle:AccompanyingPeriod:list.html.twig', [
-            'accompanying_periods' => $person->getAccompanyingPeriodsOrdered(),
+            'accompanying_periods' => $accompanyingPeriods,
             'person' => $person
         ]);
     }

src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php

@@ -4,15 +4,50 @@ namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\Household\HouseholdRepository;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 
 class HouseholdApiController extends ApiController
 {
+    private HouseholdRepository $householdRepository;
+
+    public function __construct(HouseholdRepository $householdRepository)
+    {
+        $this->householdRepository = $householdRepository;
+    }
+    
 
     public function householdAddressApi($id, Request $request, string $_format): Response
     {
         return $this->addRemoveSomething('address', $id, $request, $_format, 'address', Address::class, [ 'groups' => [ 'read' ] ]);
     }
 
+    /**
+     * Find Household of people participating to the same AccompanyingPeriod
+     *
+     * @ParamConverter("person", options={"id" = "person_id"})
+     */
+    public function suggestHouseholdByAccompanyingPeriodParticipationApi(Person $person, string $_format)
+    {
+        // TODO add acl
+
+        $count = $this->householdRepository->countByAccompanyingPeriodParticipation($person); 
+        $paginator = $this->getPaginatorFactory()->create($count);
+
+        if ($count === 0) {
+            $households = [];
+        } else {
+            $households = $this->householdRepository->findByAccompanyingPeriodParticipation($person,
+                $paginator->getItemsPerPage(), $paginator->getCurrentPageFirstItemNumber());
+        }
+
+        $collection = new Collection($households, $paginator);
+
+        return $this->json($collection, Response::HTTP_OK, [],
+            [ "groups" => ["read"]]);
+    }
 }

src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php

@@ -3,6 +3,7 @@
 namespace Chill\PersonBundle\Controller;
 
 use Chill\PersonBundle\Entity\Household\Position;
+use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Household\Household;
@@ -25,11 +26,17 @@ class HouseholdMemberController extends ApiController
 
     private TranslatorInterface $translator;
 
+    private AccompanyingPeriodRepository $periodRepository;
 
-    public function __construct(UrlGeneratorInterface $generator, TranslatorInterface $translator)
+    public function __construct(
+        UrlGeneratorInterface $generator,
+        TranslatorInterface $translator,
+        AccompanyingPeriodRepository $periodRepository
+    )
     {
         $this->generator = $generator;
         $this->translator = $translator;
+        $this->periodRepository = $periodRepository;
     }
     
     /**
@@ -144,8 +151,23 @@ class HouseholdMemberController extends ApiController
             'allowLeaveWithoutHousehold' => $allowLeaveWithoutHousehold ?? $request->query->has('allow_leave_without_household'),
         ];
 
+        // context
+        if ($request->query->has('accompanying_period_id')) {
+            $period = $this->periodRepository->find(
+                $request->query->getInt('accompanying_period_id')
+            );
+
+            if ($period === null) {
+                throw $this->createNotFoundException('period not found');
+            }
+
+            // TODO add acl on accompanying Course
+        }
+
         return $this->render('@ChillPerson/Household/members_editor.html.twig', [
-            'data' => $data 
+            'data' => $data,
+            'expandSuggestions' => (int) $request->query->getBoolean('expand_suggestions', false),
+            'accompanyingCourse' => $period ?? null,
         ]);
     }
 

src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php

@@ -297,18 +297,16 @@ class PersonAddressController extends AbstractController
      */
     protected function findAddressById(Person $person, $address_id)
     {
-        // filtering address
+        $address = $this->getDoctrine()->getManager()
-        $criteria = Criteria::create()
+            ->getRepository(Address::class)
-              ->where(Criteria::expr()->eq('id', $address_id))
+            ->find($address_id)
-              ->setMaxResults(1);
+            ;
-        $addresses = $person->getAddresses()->matching($criteria);
 
-        if (count($addresses) === 0) {
+        if (!$person->getAddresses()->contains($address)) {
-            throw $this->createNotFoundException("Address with id $address_id "
+            throw $this->createAccessDeniedException("Not allowed to see this address");
-                  . "matching person $person_id not found ");
         }
 
-        return $addresses->first();
+        return $address;
     }
 
     /**

src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class SocialIssueApiController extends ApiController
+{
+    protected function customizeQuery(string $action, Request $request, $query): void
+    {
+        $query->where(
+            $query->expr()->orX(
+                $query->expr()->gt('e.desactivationDate', ':now'),
+                $query->expr()->isNull('e.desactivationDate')
+            )
+        );
+        $query->setParameter('now', new \DateTimeImmutable());
+    }
+}

src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class SocialWorkGoalApiController extends ApiController
+{
+    private GoalRepository $goalRepository;
+
+    private PaginatorFactory $paginator;
+
+
+    public function __construct(GoalRepository $goalRepository, PaginatorFactory $paginator)
+    {
+        $this->goalRepository = $goalRepository;
+        $this->paginator = $paginator;
+    }
+
+    public function listBySocialAction(Request $request, SocialAction $action): Response
+    {
+        $totalItems = $this->goalRepository->countBySocialActionWithDescendants($action);
+        $paginator = $this->getPaginatorFactory()->create($totalItems);
+        
+        $entities = $this->goalRepository->findBySocialActionWithDescendants($action, ["id" => "ASC"],
+            $paginator->getItemsPerPage(), $paginator->getCurrentPageFirstItemNumber());
+        
+        $model = new Collection($entities, $paginator);
+
+        return $this->json($model, Response::HTTP_OK, [], [ "groups" => [ "read" ]]);    
+    }
+    
+}

src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class SocialWorkResultApiController extends ApiController
+{
+    private ResultRepository $resultRepository;
+
+    public function __construct(ResultRepository $resultRepository)
+    {
+        $this->resultRepository = $resultRepository;
+    }
+
+    public function listBySocialAction(Request $request, SocialAction $action): Response
+    {
+        $totalItems = $this->resultRepository->countBySocialActionWithDescendants($action);
+        $paginator = $this->getPaginatorFactory()->create($totalItems);
+        
+        $entities = $this->resultRepository->findBySocialActionWithDescendants($action, ["id" => "ASC"],
+            $paginator->getItemsPerPage(), $paginator->getCurrentPageFirstItemNumber());
+        
+        $model = new Collection($entities, $paginator);
+
+        return $this->json($model, Response::HTTP_OK, [], [ "groups" => [ "read" ]]);    
+    }
+    
+    public function listByGoal(Request $request, Goal $goal): Response
+    {    
+        $totalItems = $this->resultRepository->countByGoal($goal);
+        $paginator = $this->getPaginatorFactory()->create($totalItems);
+        
+        $entities = $this->resultRepository->findByGoal($goal, ["id" => "ASC"],
+            $paginator->getItemsPerPage(), $paginator->getCurrentPageFirstItemNumber());
+        
+        $model = new Collection($entities, $paginator);
+
+        return $this->json($model, Response::HTTP_OK, [], [ "groups" => [ "read" ]]);    
+    }
+}

src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php

@@ -488,6 +488,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                 [
                     'class' => \Chill\PersonBundle\Entity\SocialWork\SocialIssue::class,
                     'name' => 'social_work_social_issue',
+                    'controller' => \Chill\PersonBundle\Controller\SocialIssueApiController::class,
                     'base_path' => '/api/1.0/person/social-work/social-issue',
                     'base_role' => 'ROLE_USER',
                     'actions' => [
@@ -553,7 +554,6 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
-                                Request::METHOD_POST=> true,
                             ]
                         ],
                         'address' => [
@@ -565,25 +565,13 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             ],
                             'controller_action' => 'householdAddressApi'
                         ],
-                    ]
+                        'suggestHouseholdByAccompanyingPeriodParticipation' => [
-                ],
+                            'path' => '/suggest/by-person/{person_id}/through-accompanying-period-participation.{_format}',
-                [
-                    'class' => \Chill\PersonBundle\Entity\Household\Household::class,
-                    'name' => 'household',
-                    'base_path' => '/api/1.0/person/household',
-                    // TODO: acl
-                    'base_role' => 'ROLE_USER',
-                    'actions' => [
-                        '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
-                            ],
-                            'roles' => [
-                                Request::METHOD_GET => 'ROLE_USER',
-                                Request::METHOD_HEAD => 'ROLE_USER',
                             ]
-                        ],
+                        ]
                     ]
                 ],
                 [
@@ -629,6 +617,127 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ]
                     ]
                 ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork::class,
+                    'name' => 'accompanying_period_work',
+                    'base_path' => '/api/1.0/person/accompanying-course/work',
+                    'controller' => \Chill\PersonBundle\Controller\AccompanyingCourseWorkApiController::class,
+                    // TODO: acl
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                                Request::METHOD_PATCH => true,
+                                Request::METHOD_PUT => true,
+                            ],
+                            'roles' => [
+                                Request::METHOD_GET => 'ROLE_USER',
+                                Request::METHOD_HEAD => 'ROLE_USER',
+                                Request::METHOD_PATCH => 'ROLE_USER',
+                                Request::METHOD_PUT => 'ROLE_USER',
+                            ]
+                        ],
+                    ]
+                ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\SocialWork\Result::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWorkResultApiController::class,
+                    'name' => 'social_work_result',
+                    'base_path' => '/api/1.0/person/social-work/result',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                            'roles' => [
+                                Request::METHOD_GET => 'ROLE_USER',
+                                Request::METHOD_HEAD => 'ROLE_USER',
+                            ]
+                        ],
+                        '_index' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                            'roles' => [
+                                Request::METHOD_GET => 'ROLE_USER',
+                                Request::METHOD_HEAD => 'ROLE_USER',
+                            ]
+                        ],
+                        'by-social-action' => [
+                            'single-collection' => 'collection',
+                            'path' => '/by-social-action/{id}.{_format}',
+                            'controller_action' => 'listBySocialAction',
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                            'roles' => [
+                                Request::METHOD_GET => 'ROLE_USER',
+                                Request::METHOD_HEAD => 'ROLE_USER',
+                            ]
+                        ],
+                        'by-goal' => [
+                            'single-collection' => 'collection',
+                            'path' => '/by-goal/{id}.{_format}',
+                            'controller_action' => 'listByGoal',
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                            'roles' => [
+                                Request::METHOD_GET => 'ROLE_USER',
+                                Request::METHOD_HEAD => 'ROLE_USER',
+                            ]
+                        ],
+                    ]
+                ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\SocialWork\Goal::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWorkGoalApiController::class,
+                    'name' => 'social_work_goal',
+                    'base_path' => '/api/1.0/person/social-work/goal',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                            'roles' => [
+                                Request::METHOD_GET => 'ROLE_USER',
+                                Request::METHOD_HEAD => 'ROLE_USER',
+                            ]
+                        ],
+                        '_index' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                            'roles' => [
+                                Request::METHOD_GET => 'ROLE_USER',
+                                Request::METHOD_HEAD => 'ROLE_USER',
+                            ]
+                        ],
+                        'by-social-action' => [
+                            'single-collection' => 'collection',
+                            'path' => '/by-social-action/{id}.{_format}',
+                            'controller_action' => 'listBySocialAction',
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                            'roles' => [
+                                Request::METHOD_GET => 'ROLE_USER',
+                                Request::METHOD_HEAD => 'ROLE_USER',
+                            ]
+                        ],
+                    ]
+                ],
             ]
         ]);
     }

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -848,7 +848,6 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
                 }
             }
         }
-
         return $recursiveSocialIssues;
     }
 

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php

@@ -4,6 +4,7 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\SocialWork\Result;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
@@ -38,7 +39,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 
     /**
      * @ORM\Column(type="text")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "accompanying_period_work:edit"})
      */
     private string $note = "";
 
@@ -50,7 +51,8 @@ use Symfony\Component\Validator\Constraints as Assert;
 
     /**
      * @ORM\ManyToOne(targetEntity=SocialAction::class)
-     * @Serializer\Groups({"accompanying_period_work:create", "read"})
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work:create"})
      */
     private ?SocialAction $socialAction = null;
 
@@ -83,13 +85,16 @@ use Symfony\Component\Validator\Constraints as Assert;
     /**
      * @ORM\Column(type="date_immutable")
      * @Serializer\Groups({"accompanying_period_work:create"})
+     * @Serializer\Groups({"accompanying_period_work:edit"})
      * @Serializer\Groups({"read"})
      */
     private \DateTimeImmutable $startDate;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default":null})
-     * @Serializer\Groups({"accompanying_period_work:create", "read"})
+     * @Serializer\Groups({"accompanying_period_work:create"})
+     * @Serializer\Groups({"accompanying_period_work:edit"})
+     * @Serializer\Groups({"read"})
      * @Assert\GreaterThan(propertyPath="startDate",
      *    message="accompanying_course_work.The endDate should be greater than the start date"
      *  )
@@ -99,6 +104,7 @@ use Symfony\Component\Validator\Constraints as Assert;
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class)
      * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work:edit"})
      *
      * In schema : traitant
      */
@@ -115,13 +121,22 @@ use Symfony\Component\Validator\Constraints as Assert;
     private string $createdAutomaticallyReason = "";
 
     /**
-     * @ORM\OneToMany(targetEntity=AccompanyingPeriodWorkGoal::class, mappedBy="accompanyingPeriodWork")
+     * @ORM\OneToMany(
+     *      targetEntity=AccompanyingPeriodWorkGoal::class,
+     *      mappedBy="accompanyingPeriodWork",
+     *      cascade={"persist"},
+     *      orphanRemoval=true
+     *  )
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work:edit"})
      */
     private Collection $goals;
 
     /**
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="accompanyingPeriodWorks")
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_result")
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work:edit"})
      */
     private Collection $results;
 
@@ -130,14 +145,27 @@ use Symfony\Component\Validator\Constraints as Assert;
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_third_party")
      *
      * In schema : intervenants
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work:edit"})
     */
     private Collection $thirdParties;
 
+    /**
+     *
+     * @ORM\ManyToMany(targetEntity=Person::class)
+     * @ORM\JoinTable(name="chill_person_accompanying_period_work_person")
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"accompanying_period_work:edit"})
+     * @Serializer\Groups({"accompanying_period_work:create"})
+     */
+    private Collection $persons;
+
     public function __construct()
     {
         $this->goals = new ArrayCollection();
         $this->results = new ArrayCollection();
         $this->thirdParties = new ArrayCollection();
+        $this->persons = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -255,7 +283,7 @@ use Symfony\Component\Validator\Constraints as Assert;
         return $this->endDate;
     }
 
-    public function setEndDate(\DateTimeInterface $endDate): self
+    public function setEndDate(?\DateTimeInterface $endDate = null): self
     {
         $this->endDate = $endDate;
 
@@ -310,7 +338,7 @@ use Symfony\Component\Validator\Constraints as Assert;
     {
         if (!$this->goals->contains($goal)) {
             $this->goals[] = $goal;
-            $goal->setAccompanyingPeriodWork2($this);
+            $goal->setAccompanyingPeriodWork($this);
         }
 
         return $this;
@@ -320,8 +348,8 @@ use Symfony\Component\Validator\Constraints as Assert;
     {
        if ($this->goals->removeElement($goal)) {
             // set the owning side to null (unless already changed)
-            if ($goal->getAccompanyingPeriodWork2() === $this) {
+            if ($goal->getAccompanyingPeriodWork() === $this) {
-                $goal->setAccompanyingPeriodWork2(null);
+                $goal->setAccompanyingPeriodWork(null);
             }
         }
 
@@ -375,4 +403,25 @@ use Symfony\Component\Validator\Constraints as Assert;
 
         return $this;
     }
+
+    public function getPersons(): Collection
+    {
+        return $this->persons;
+    }
+
+    public function addPerson(Person $person): self
+    {
+        if (!$this->persons->contains($person)) {
+            $this->persons[] = $person;
+        }
+
+        return $this;
+    }
+
+    public function removePerson(Person $person): self
+    {
+        $this->persons->removeElement($person);
+
+        return $this;
+    }
 }

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php

@@ -7,10 +7,17 @@ use Chill\PersonBundle\Entity\SocialWork\Result;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period_work_goal")
+ * @Serializer\DiscriminatorMap(
+ *      typeProperty="type",
+ *      mapping={
+ *          "accompanying_period_work_goal":AccompanyingPeriodWorkGoal::class
+ *      }
+ *  )
  */
 class AccompanyingPeriodWorkGoal
 {
@@ -18,11 +25,14 @@ class AccompanyingPeriodWorkGoal
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
      */
     private $id;
 
     /**
      * @ORM\Column(type="text")
+     * @Serializer\Groups({"accompanying_period_work:edit"})
+     * @Serializer\Groups({"read"})
      */
     private $note;
 
@@ -33,12 +43,16 @@ class AccompanyingPeriodWorkGoal
 
     /**
      * @ORM\ManyToOne(targetEntity=Goal::class)
+     * @Serializer\Groups({"accompanying_period_work:edit"})
+     * @Serializer\Groups({"read"})
      */
     private $goal;
 
     /**
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="accompanyingPeriodWorkGoals")
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_goal_result")
+     * @Serializer\Groups({"accompanying_period_work:edit"})
+     * @Serializer\Groups({"read"})
      */
     private $results;
 
@@ -71,6 +85,13 @@ class AccompanyingPeriodWorkGoal
 
     public function setAccompanyingPeriodWork(?AccompanyingPeriodWork $accompanyingPeriodWork): self
     {
+        if ($this->accompanyingPeriodWork instanceof AccompanyingPeriodWork
+            && $accompanyingPeriodWork !== $this->accompanyingPeriodWork
+            && $accompanyingPeriodWork !== null
+        ) {
+            throw new \LogicException("Change accompanying period work is not allowed");
+        }
+
         $this->accompanyingPeriodWork = $accompanyingPeriodWork;
 
         return $this;

src/Bundle/ChillPersonBundle/Entity/Household/Household.php

@@ -51,7 +51,7 @@ class Household
      *      targetEntity=HouseholdMember::class,
      *      mappedBy="household"
      *  )
-     * @Serializer\Groups({"write", "read"})
+     * @Serializer\Groups({"read"})
      */
     private Collection $members;
 

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -1426,4 +1426,122 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
             return null;
         }
     }
+
+    public function getGenderComment(): CommentEmbeddable
+    {
+        return $this->genderComment;
+    }
+
+    public function setGenderComment(CommentEmbeddable $genderComment): self
+    {
+        $this->genderComment = $genderComment;
+
+        return $this;
+    }
+
+    public function getMaritalStatusComment(): CommentEmbeddable
+    {
+        return $this->maritalStatusComment;
+    }
+
+    public function setMaritalStatusComment(CommentEmbeddable $maritalStatusComment): self
+    {
+        $this->maritalStatusComment = $maritalStatusComment;
+
+        return $this;
+    }
+
+    public function getDeathdate(): ?\DateTimeInterface
+    {
+        return $this->deathdate;
+    }
+
+    public function setDeathdate(?\DateTimeInterface $deathdate): self
+    {
+        $this->deathdate = $deathdate;
+
+        return $this;
+    }
+
+    public function getMaritalStatusDate(): ?\DateTimeInterface
+    {
+        return $this->maritalStatusDate;
+    }
+
+    public function setMaritalStatusDate(?\DateTimeInterface $maritalStatusDate): self
+    {
+        $this->maritalStatusDate = $maritalStatusDate;
+
+        return $this;
+    }
+
+    public function getAcceptSMS(): ?bool
+    {
+        return $this->acceptSMS;
+    }
+
+    public function setAcceptSMS(bool $acceptSMS): self
+    {
+        $this->acceptSMS = $acceptSMS;
+
+        return $this;
+    }
+
+    public function getAcceptEmail(): ?bool
+    {
+        return $this->acceptEmail;
+    }
+
+    public function setAcceptEmail(bool $acceptEmail): self
+    {
+        $this->acceptEmail = $acceptEmail;
+
+        return $this;
+    }
+
+    public function getNumberOfChildren(): ?int
+    {
+        return $this->numberOfChildren;
+    }
+
+    public function setNumberOfChildren(int $numberOfChildren): self
+    {
+        $this->numberOfChildren = $numberOfChildren;
+
+        return $this;
+    }
+
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    public function setCreatedBy(User $createdBy): self
+    {
+        $this->createdBy = $createdBy;
+
+        return $this;
+    }
+
+    public function setCreatedAt(\DateTimeInterface $datetime): self
+    {
+        $this->createdAt = $datetime;
+
+        return $this;
+    }
+
+    public function setUpdatedBy(User $user): self
+    {
+        $this->updatedBy = $user;
+
+        return $this;
+    }
+
+    public function setUpdatedAt(\DateTimeInterface $datetime): self
+    {
+        $this->updatedAt = $datetime;
+
+        return $this;
+    }
+
 }

src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php

@@ -5,10 +5,17 @@ namespace Chill\PersonBundle\Entity\SocialWork;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_person_social_work_goal")
+ * @Serializer\DiscriminatorMap(
+ *      typeProperty="type",
+ *      mapping={
+ *          "social_work_goal":Goal::class
+ *      }
+ *  )
  */
 class Goal
 {
@@ -16,11 +23,13 @@ class Goal
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
      */
     private $id;
 
     /**
      * @ORM\Column(type="json")
+     * @Serializer\Groups({"read"})
      */
     private $title = [];
 
@@ -46,6 +55,11 @@ class Goal
         $this->results = new ArrayCollection();
     }
 
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
     public function getTitle(): array
     {
         return $this->title;

src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php

@@ -7,10 +7,17 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_person_social_work_result")
+ * @Serializer\DiscriminatorMap(
+ *      typeProperty="type",
+ *      mapping={
+ *          "social_work_result":Result::class
+ *      }
+ *  )
  */
 class Result
 {
@@ -18,11 +25,13 @@ class Result
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
      */
     private $id;
 
     /**
      * @ORM\Column(type="json")
+     * @Serializer\Groups({"read"})
      */
     private $title = [];
 

src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -60,6 +60,13 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
                 'accompanying_period_id' => $period->getId()
         ]])
         ->setExtras(['order' => 30]);
+
+        $menu->addChild($this->translator->trans('Accompanying Course Actions'), [
+            'route' => 'chill_person_accompanying_period_work_list',
+            'routeParameters' => [
+                'id' => $period->getId()
+        ]])
+        ->setExtras(['order' => 40]);
     }
     
     

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php

@@ -3,16 +3,12 @@
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
 
-/**
+final class AccompanyingPeriodWorkRepository implements ObjectRepository
- * @method AccompanyingPeriodWork|null find($id, $lockMode = null, $lockVersion = null)
- * @method AccompanyingPeriodWork|null findOneBy(array $criteria, array $orderBy = null)
- * @method AccompanyingPeriodWork[]    findAll()
- * @method AccompanyingPeriodWork[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
- */
-final class AccompanyingPeriodWorkRepository
 {
     private EntityRepository $repository;
 
@@ -20,4 +16,88 @@ final class AccompanyingPeriodWorkRepository
     {
         $this->repository = $entityManager->getRepository(AccompanyingPeriodWork::class);
     }
+
+    public function find($id): ?AccompanyingPeriodWork
+    {
+        return $this->repository->find($id);
+    }
+
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?AccompanyingPeriodWork
+    {
+        return $this->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return AccompanyingPeriodWork::class;
+    }
+
+    /**
+     *
+     * @return AccompanyingPeriodWork[]
+     */
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findByAccompanyingPeriod($period, $orderBy, $limit, $offset);
+    }
+
+    public function countByAccompanyingPeriod(AccompanyingPeriod $period): int
+    {
+        return $this->repository->countByAccompanyingPeriod($period);
+    }
+
+    public function toDelete()
+    {
+        $qb = $this->buildQueryBySocialActionWithDescendants($action);
+        $qb->select('g');
+
+        foreach ($orderBy as $sort => $order) {
+            $qb->addOrderBy('g.'.$sort, $order);
+        }
+
+        return $qb
+            ->setMaxResults($limit)
+            ->setFirstResult($offset)
+            ->getQuery()
+            ->getResult()
+            ;
+    }
+
+    public function countBySocialActionWithDescendants(SocialAction $action): int
+    {
+        $qb = $this->buildQueryBySocialActionWithDescendants($action);
+        $qb->select('COUNT(g)');
+
+        return $qb
+            ->getQuery()
+            ->getSingleScalarResult()
+            ;
+    }
+
+    protected function buildQueryBySocialActionWithDescendants(SocialAction $action): QueryBuilder
+    {
+        $actions = $action->getDescendantsWithThis();
+
+        $qb = $this->repository->createQueryBuilder('g');
+
+        $orx = $qb->expr()->orX();
+        $i = 0;
+        foreach ($actions as $action) {
+            $orx->add(":action_{$i} MEMBER OF g.socialActions");
+            $qb->setParameter("action_{$i}", $action);
+        }
+        $qb->where($orx);
+
+        return $qb;
+    }
 }

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php

@@ -25,8 +25,9 @@ namespace Chill\PersonBundle\Repository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
 
-final class AccompanyingPeriodRepository
+final class AccompanyingPeriodRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
@@ -34,4 +35,32 @@ final class AccompanyingPeriodRepository
     {
         $this->repository = $entityManager->getRepository(AccompanyingPeriod::class);
     }
+    public function find($id): ?AccompanyingPeriod
+    {
+        return $this->repository->find($id);
+    }
+
+    /**
+     * @return AccompanyingPeriod[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): ?AccompanyingPeriod
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?AccompanyingPeriod
+    {
+        return $this->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return AccompanyingPeriod::class;
+    }
+
 }

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

@@ -3,15 +3,102 @@
 namespace Chill\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query\ResultSetMappingBuilder;
+use Doctrine\Persistence\ObjectRepository;
 
-final class HouseholdRepository
+final class HouseholdRepository implements ObjectRepository
 {
     private EntityRepository $repository;
+    private EntityManagerInterface $em;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
         $this->repository = $entityManager->getRepository(Household::class);
+        $this->em = $entityManager;
+    }
+
+    public function find($id)
+    {
+        return $this->repository->find($id);
+    }
+
+    public function findAll()
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria)
+    {
+        return $this->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return Household::class;
+    }
+
+    public function countByAccompanyingPeriodParticipation(Person $person)
+    {
+        return $this->buildQueryByAccompanyingPeriodParticipation($person, true);
+    }
+
+    public function findByAccompanyingPeriodParticipation(Person $person, int $limit, int $offset)
+    {
+        return $this->buildQueryByAccompanyingPeriodParticipation($person, false, $limit, $offset);
+    }
+
+    private function buildQueryByAccompanyingPeriodParticipation(Person $person, bool $isCount = false, int $limit = 50, int $offset = 0)
+    {
+        $rsm = new ResultSetMappingBuilder($this->em);
+        $rsm->addRootEntityFromClassMetadata(Household::class, 'h');
+
+        if ($isCount) {
+            $rsm->addScalarResult('count', 'count');
+            $sql = \strtr(self::SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION, [
+                '{select}' => 'COUNT(households.*) AS count',
+                '{limits}' => ''
+            ]);
+        } else {
+            $sql = \strtr(self::SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION, [
+                '{select}' => $rsm->generateSelectClause(['h' => 'households']),
+                '{limits}' => "OFFSET {$offset} LIMIT {$limit}"
+            ]);
+        }
+        $native = $this->em->createNativeQuery($sql, $rsm);
+        $native->setParameters([0 => $person->getId(), 1 => $person->getId()]);
+
+        if ($isCount) {
+            return $native->getSingleScalarResult();
+        } else {
+            return $native->getResult();
         }
     }
+
+    private CONST SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION = <<<SQL
+WITH participations AS (
+	SELECT DISTINCT part.accompanyingperiod_id
+	FROM chill_person_accompanying_period_participation AS part
+	WHERE person_id = ?),
+other_participants AS (
+	SELECT person_id, startDate, endDate 
+	FROM chill_person_accompanying_period_participation
+	JOIN participations USING (accompanyingperiod_id)
+	WHERE person_id != ? 
+),
+households AS (SELECT DISTINCT household.*
+	FROM chill_person_household_members AS hmembers
+	JOIN other_participants AS op USING (person_id)
+	JOIN chill_person_household AS household ON hmembers.household_id = household.id
+  WHERE daterange(op.startDate, op.endDate) && daterange(hmembers.startDate, hmembers.endDate)
+)
+SELECT {select} FROM households {limits}
+SQL;
+}

src/Bundle/ChillPersonBundle/Repository/PersonRepository.php

@@ -37,6 +37,11 @@ final class PersonRepository
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
+    public function findByIds($ids): array
+    {
+        return $this->repository->findBy(['id' => $ids]);
+    }
+
     /**
      * @param $centers
      * @param $firstResult

src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php

@@ -3,10 +3,13 @@
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectRepository;
 
-final class GoalRepository
+final class GoalRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
@@ -14,4 +17,78 @@ final class GoalRepository
     {
         $this->repository = $entityManager->getRepository(Goal::class);
     }
+
+    public function find($id)
+    {
+        return $this->repository->find($id);
+    }
+
+    public function findAll()
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria)
+    {
+        return $this->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return Goal::class;
+    }
+
+    /**
+     *
+     * @return Goal[]
+     */
+    public function findBySocialActionWithDescendants(SocialAction $action, $orderBy = null, $limit = null, $offset = null): array
+    {
+        $qb = $this->buildQueryBySocialActionWithDescendants($action);
+        $qb->select('g');
+
+        foreach ($orderBy as $sort => $order) {
+            $qb->addOrderBy('g.'.$sort, $order);
+        }
+
+        return $qb
+            ->setMaxResults($limit)
+            ->setFirstResult($offset)
+            ->getQuery()
+            ->getResult()
+            ;
+    }
+
+    public function countBySocialActionWithDescendants(SocialAction $action): int
+    {
+        $qb = $this->buildQueryBySocialActionWithDescendants($action);
+        $qb->select('COUNT(g)');
+
+        return $qb
+            ->getQuery()
+            ->getSingleScalarResult()
+            ;
+    }
+
+    protected function buildQueryBySocialActionWithDescendants(SocialAction $action): QueryBuilder
+    {
+        $actions = $action->getDescendantsWithThis();
+
+        $qb = $this->repository->createQueryBuilder('g');
+
+        $orx = $qb->expr()->orX();
+        $i = 0;
+        foreach ($actions as $action) {
+            $orx->add(":action_{$i} MEMBER OF g.socialActions");
+            $qb->setParameter("action_{$i}", $action);
+        }
+        $qb->where($orx);
+
+        return $qb;
+    }
 }

src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php

@@ -3,10 +3,14 @@
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\Result;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectRepository;
 
-final class ResultRepository
+final class ResultRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
@@ -14,4 +18,120 @@ final class ResultRepository
     {
         $this->repository = $entityManager->getRepository(Result::class);
     }
+
+    public function find($id)
+    {
+        return $this->repository->find($id);
     }
+
+    public function findAll()
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria)
+    {
+        return $this->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return Result::class;
+    }
+
+    /**
+     *
+     * @return Result[]
+     */
+    public function findBySocialActionWithDescendants(SocialAction $action, $orderBy = null, $limit = null, $offset = null): array
+    {
+        $qb = $this->buildQueryBySocialActionWithDescendants($action);
+        $qb->select('r');
+
+        foreach ($orderBy as $sort => $order) {
+            $qb->addOrderBy('r.'.$sort, $order);
+        }
+
+        return $qb
+            ->setMaxResults($limit)
+            ->setFirstResult($offset)
+            ->getQuery()
+            ->getResult()
+            ;
+    }
+
+    public function countBySocialActionWithDescendants(SocialAction $action): int
+    {
+        $qb = $this->buildQueryBySocialActionWithDescendants($action);
+        $qb->select('COUNT(r)');
+
+        return $qb
+            ->getQuery()
+            ->getSingleScalarResult()
+            ;
+    }
+
+    protected function buildQueryBySocialActionWithDescendants(SocialAction $action): QueryBuilder
+    {
+        $actions = $action->getDescendantsWithThis();
+
+        $qb = $this->repository->createQueryBuilder('r');
+
+        $orx = $qb->expr()->orX();
+        $i = 0;
+        foreach ($actions as $action) {
+            $orx->add(":action_{$i} MEMBER OF r.socialActions");
+            $qb->setParameter("action_{$i}", $action);
+        }
+        $qb->where($orx);
+
+        return $qb;
+    }
+    protected function buildQueryByGoal(Goal $goal): QueryBuilder
+    {
+        $qb = $this->repository->createQueryBuilder('r');
+
+        $qb->where(":goal MEMBER OF r.goals")
+            ->setParameter('goal', $goal)
+            ;
+
+        return $qb;
+    }
+
+    /**
+     * @return Result[]
+     */
+    public function findByGoal(Goal $goal, $orderBy = null, $limit = null, $offset = null): array
+    {
+        $qb = $this->buildQueryByGoal($goal);
+
+        foreach ($orderBy as $sort => $order) {
+            $qb->addOrderBy('r.'.$sort, $order);
+        }
+
+        return $qb
+            ->select('r')
+            ->setMaxResults($limit)
+            ->setFirstResult($offset)
+            ->getQuery()
+            ->getResult()
+            ;
+    }
+
+    public function countByGoal(Goal $goal): int
+    {
+        $qb = $this->buildQueryByGoal($goal);
+        $qb->select('COUNT(r)');
+
+        return $qb
+            ->getQuery()
+            ->getSingleScalarResult()
+            ;
+    }
+}
+

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

@@ -1,3 +1,3 @@
-require('./sass/person.scss');
+require('./sass/chillperson.scss');
 require('./sass/person_with_period.scss');
 require('./sass/household_banner.scss');

src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.js

@@ -0,0 +1 @@
+require('./index.scss');

src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss

@@ -0,0 +1,96 @@
+
+#accompanying_course_work_list {
+
+  .item {
+    margin-bottom: 1.5rem;
+    padding: 1rem;
+    border: 1px solid gray;
+
+    .title_label {
+      display: block;
+      margin: 0;
+
+      font-variant-caps: small-caps;
+
+      + * {
+        margin-top: 0;
+      }
+    }
+
+    .objective_results {
+      display: grid;
+      grid-template-areas:
+        "obj res"
+        ;
+      grid-template-columns: 50%;
+      column-gap: 1rem;
+      
+      padding: 0.3rem;
+
+      .obj {
+        grid-area: obj;
+      }
+
+      .res {
+        grid-area: res;
+
+        ul.result_list {
+          list-style-type: none;
+          padding: 0;
+        }
+      }
+    }
+
+    .objective_results:nth-child(2n+2) {
+      background-color: var(--chill-llight-gray);
+    }
+  }
+
+  .updatedBy {
+    margin-top: 1rem;
+    text-align: right;
+    font-size: 0.8rem;
+    font-style: italic;
+  }
+}
+
+ul.timeline {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0;
+  list-style-type: none;
+
+  > li {
+    min-width: 210px;
+
+    div.date {
+      margin-bottom: 20px;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+    div.label {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      padding: 0 40px;
+      border-top: 2px solid var(--chill-green);
+
+      &:before {
+        content: '';
+        display: inline-block;
+        position: relative;
+        width: 25px;
+        height: 25px;
+        
+        background-color: white;
+        border-radius: 25px;
+        border: 1px solid #ddd;
+        
+        top: -15px;
+      }
+    }
+  }
+}

src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss

@@ -0,0 +1,214 @@
+@import '~ChillMainSass/custom/config/colors';
+
+/*
+*  PERSON CONTEXT
+*/
+
+div#header-person-name {
+   background: none repeat scroll 0 0 $chill-green-dark;
+   color: #FFF;
+   padding-top: 1em;
+   padding-bottom: 1em;
+}
+
+div#header-person-details {
+   background: none repeat scroll 0 0 $chill-green;
+   color: #FFF;
+   padding-top: 1em;
+   padding-bottom: 1em;
+}
+
+div#person_details_container {
+   padding-top: 20px;
+   padding-bottom: 20px;
+}
+
+div.person-view {
+   figure.person-details {
+      h2 {
+         font-family: 'Open Sans';
+         font-weight: 600;
+         margin-bottom: 0.3em;
+         font-variant: small-caps;
+      }
+      dl {
+         margin-top: 0.3em;
+      }
+      dt {
+         font-family: 'Open Sans';
+         font-weight: 600;
+      }
+      dd {
+         margin-left: 0;
+      }
+      /*
+         a.sc-button { background-color: $black; padding-top: 0.2em; padding-bottom: 0.2em; }
+      */
+   }
+   /* custom fields on the home page */
+   div.custom-fields {
+      figure.person-details {
+         display: flex;
+         flex-flow: row wrap;
+         div.cf_title_box:nth-child(4n+1) h2 {
+            @extend .chill-red;
+         }
+         div.cf_title_box:nth-child(4n+2) h2 {
+            @extend .chill-green;
+         }
+         div.cf_title_box:nth-child(4n+3) h2 {
+            @extend .chill-orange;
+         }
+         div.cf_title_box:nth-child(4n+4) h2 {
+            @extend .chill-blue;
+         }
+         div.cf_title_box:nth-child(2n+1) {
+            width: 50%;
+            margin-right: 40px;
+         }
+         div.cf_title_box:nth-child(2n+2) {
+            width: calc(50% - 40px);
+         }
+      }
+   }
+}
+
+/*
+ *  ACCOMPANYING_COURSE CONTEXT
+ *  Header custom for Accompanying Course
+ */
+
+div#header-accompanying_course-name {
+  background: none repeat scroll 0 0 #718596;
+  color: #FFF;
+  h1 {
+    margin: 0.4em 0;
+  }
+  span {
+    a {
+      color: white;
+    }
+    a:hover {
+      text-decoration: underline;
+    }
+  }
+}
+div#header-accompanying_course-details {
+  background: none repeat scroll 0 0 #718596ab;
+  color: #FFF;
+  padding-top: 1em;
+  padding-bottom: 1em;
+}
+
+/*
+ *  HOUSEHOLD CONTEXT
+ *  Header custom for Household
+ */
+ 
+div#header-household-name {
+   background: none repeat scroll 0 0 #929d69; //#b97a7a;
+   color: #FFF;
+   h1 {
+     margin: 0.4em 0;
+   }
+   span {
+     a {
+       color: white;
+     }
+     a:hover {
+       text-decoration: underline;
+     }
+   }
+}
+div#header-household-details {
+   background: none repeat scroll 0 0 #b0b984; //#d29791;
+   color: #FFF;
+   padding-top: 1em;
+   padding-bottom: 1em;
+   span.current-members-explain {
+      font-weight: bold;
+   }
+}
+
+/*
+*  ADDRESS HISTORY
+*  context person / household
+*/
+div.address-timeline.grid {
+   display: grid;
+   grid-template-rows: auto auto auto;
+   grid-template-columns: auto 120px auto;
+   
+   @media only screen and (max-width: 750px) {
+      grid-template-columns: auto 1em auto;
+   }
+   
+   div.top {
+      grid-column: 2;
+      text-align: center;
+      color: lightgrey;
+      margin-bottom: -20px;
+   }
+   div.col-a {
+      grid-column: 1;
+      text-align: right;
+   }
+   div.col-b, 
+   div.date {
+      grid-column: 2;
+      position: relative;
+      &:after {
+         position: absolute;
+         content: '';
+         top: 0; bottom: 0;
+         left: 50%;
+         margin: auto -5px;
+         width: 10px;
+         height: 100%;
+         background-color: lightgrey;
+         z-index: -5;
+      }
+   }
+   div.col-c {
+      grid-column: 3;
+   }
+
+   div.col-b,
+   div.action,
+   div.content {
+      min-height: 30px;
+      padding: 1em;
+   }
+   div.content {
+      margin: 0.3em;
+      border: 1px dashed #00000045;
+      &.row1 { // current address
+         border: 1px solid #000;
+      }   
+      div.address {
+         font-variant: small-caps;
+      }
+   }   
+   div.date {
+      text-align: center;
+      background-color: lightgrey;
+      padding: 0.5em;
+      border-radius: 0.3em;
+   }
+   
+   div.span2 { grid-row: span 3; }
+   div.span3 { grid-row: span 5; }
+   div.span4 { grid-row: span 7; }
+   div.span5 { grid-row: span 9; }
+   
+   ul.record_actions {
+      margin: 0;
+   }
+   .fake {
+      &:after {
+         content: 'fake, just to test.. ';
+         color: lightgrey;
+         font-style: italic;
+      }
+   }
+}

src/Bundle/ChillPersonBundle/Resources/public/sass/person.scss

@@ -1,168 +0,0 @@
-
-@import '~ChillMainSass/custom/config/colors';
-
-div#header-person-name {
-    background: none repeat scroll 0 0 $chill-green-dark;
-    color: #FFF;
-    padding-top: 1em;
-    padding-bottom: 1em;
-}
-
-div#header-person-details {
-    background: none repeat scroll 0 0 $chill-green;
-    color: #FFF;
-    padding-top: 1em;
-    padding-bottom: 1em;
-}
-
-div#person_details_container {
-	padding-top: 20px;
-	padding-bottom: 20px;
-}
-
-div.person-view {
-    figure.person-details {
-            h2 {
-                font-family: 'Open Sans';
-                font-weight: 600;
-                margin-bottom: 0.3em;
-                font-variant: small-caps;
-            }
-
-            dl {
-                    margin-top: 0.3em;
-            }
-
-            dt {
-            font-family: 'Open Sans';
-            font-weight: 600;
-            }
-
-            dd {
-                    margin-left: 0;
-            }
-
-//            a.sc-button {
-/*                    background-color: $black;
-                    padding-top: 0.2em;
-                    padding-bottom: 0.2em;
-            }*/
-    }
-
-    /* custom fields on the home page */
-    div.custom-fields {
-        figure.person-details {
-            display: flex;
-            flex-flow: row wrap;
-
-            div.cf_title_box:nth-child(4n+1) h2 {
-                @extend .chill-red;
-            }
-
-            div.cf_title_box:nth-child(4n+2) h2 {
-                @extend .chill-green;
-            }
-
-            div.cf_title_box:nth-child(4n+3) h2 {
-                @extend .chill-orange;
-            }
-
-            div.cf_title_box:nth-child(4n+4) h2 {
-                @extend .chill-blue;
-            }
-
-            div.cf_title_box:nth-child(2n+1){
-                width: 50%;
-                margin-right: 40px;
-            }
-
-            iv.cf_title_box:nth-child(2n+2) {
-                width: calc(50% - 40px);
-            }
-
-        }
-
-
-    }
-
-}
-
-
-/*
- *  HOUSEHOLD
- */
-
-
-div.household__address, div.person__address {
-    div.row {
-        height: 100px;
-        width: 100%;
-        position: relative;
-        & > div {
-            position: absolute;
-            display: table;
-            height: 100%;
-            border: 1px dotted #c3c3c3;
-        }
-        div.household__address--date, div.person__address--date {
-            width: 30%;
-            background-color: #c3c3c3;
-            height: 100%;
-            div.cell {
-                box-sizing: border-box;
-                position: relative;
-                height: 100%;
-                width: 100%;
-                margin-left: 50%;
-                div.pill {
-                    position: absolute;
-                    box-sizing: border-box;
-                    width: 120px;
-                    height: 40px;
-                    bottom: -20px;
-                    background-color: white;
-                    padding: 10px;
-                    border-radius: 30px;
-                    left: -60px;
-                    text-align: center;
-                    z-index: 10;
-                }
-            }
-        }
-        div.household__address--content, div.person__address--content {
-            width: 70%;
-            left: 30%;
-            text-align: left;
-            background-color: #ececec;
-            border: 1px solid #888;
-            div.cell {
-                display: table-cell;
-                padding: 5px 30px;
-                vertical-align: middle;
-                & > div {
-                    display: flex;
-                    justify-content: space-between;
-                }
-                i.dot::before, i.dot::after {
-                    position: absolute;
-                    width: 20px;
-                    height: 20px;
-                    content: '';
-                    border: 0;
-                    background-color: white;
-                    border-radius: 50%;
-                    border: 5px solid #c3c3c3;
-                    z-index: 10;
-                    left: -15px;
-                    bottom: -15px;
-                }
-            }
-        }
-    }
-}
-div.household__address-move {
-    div.household__address-move__create {
-        display: flex;
-        flex-direction: column;
-    }
-}

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

@@ -57,12 +57,6 @@ export default {
             position: relative;
             &:before {
                position: absolute;
-               /*
-               content: "\f192";  //circle-dot
-               content: "\f1dd";  //paragraph
-               content: "\f292";  //hashtag
-               content: "\f069";  //asterisk
-               */
                content: "\f142";  //ellipsis-v
                font-family: "ForkAwesome";
                color: #718596ab;
@@ -71,7 +65,7 @@ export default {
             }
             a[name^="section"] {
                position: absolute;
-               top: -3.5em;  // ref. stickNav
+               top: -3.5em;  // reference for stickNav
             }
          }
          padding: 0.8em 0em;
@@ -80,18 +74,6 @@ export default {
          border-radius: 5px;
          border-left: 1px dotted #718596ab;
          border-right: 1px dotted #718596ab;
-         /* debug components
-         position: relative; 
-         &:before { 
-            content: "vuejs component";
-            position: absolute;
-            left: 1.5em;
-            top: -0.9em;
-            background-color: white;
-            color: grey;
-            padding: 0 0.3em;
-         }
-         */
          dd { 
             margin-left: 1em; 
          }

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

@@ -24,7 +24,6 @@ if (root === 'app') {
       .use(i18n)
       .component('app', App)
       .mount('#accompanying-course');
-      
    });
 }
 
@@ -43,8 +42,7 @@ if (root === 'banner') {
       .use(store)
       .use(i18n)
       .component('banner', Banner)
-      .mount('#accompanying-course');
+      .mount('#banner-accompanying-course');
-      
    });
    
 }

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

@@ -14,7 +14,6 @@
 
       <div v-if="hasSocialIssuePicked">
         <h2>{{ $t('pick_an_action') }}</h2> 
-
         <vue-multiselect
           v-model="socialActionPicked"
           label="text"
@@ -29,8 +28,19 @@
       <div v-if="isLoadingSocialActions">
         <p>spinner</p>
       </div>
+
+      <div v-if="hasSocialActionPicked" id="persons">
+        <h2>{{ $t('persons_involved') }}</h2>
+
+        <ul>
+          <li v-for="p in personsReachables" :key="p.id">
+            <input type="checkbox" :value="p.id" v-model="personsPicked">
+            <person :person="p"></person>
+          </li>
+        </ul>
       </div>
 
+    </div>
     <div v-if="hasSocialActionPicked" id="start_date">
       <p><label>{{ $t('startDate') }}</label> <input type="date" v-model="startDate" /></p>
     </div>
@@ -86,6 +96,14 @@
 
   #picking {
     grid-area: picking;
+
+    #persons {
+      ul {
+        padding: 0;
+
+        list-style-type: none;
+      }
+    }
   }
 
   #start_date {
@@ -106,6 +124,7 @@
 import { mapState, mapActions, mapGetters } from 'vuex';
 import VueMultiselect from 'vue-multiselect';
 import { dateToISO, ISOToDate } from 'ChillMainAssets/js/date.js';
+import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
 
 const i18n = {
   messages: {
@@ -116,6 +135,7 @@ const i18n = {
       pick_social_issue: "Choisir une problématique sociale",
       pick_an_action: "Choisir une action d'accompagnement",
       pick_social_issue_linked_with_action: "Indiquez la problématique sociale liée à l'action d'accompagnement",
+      persons_involved: "Usagers concernés",
 
     }
   }
@@ -125,6 +145,7 @@ export default {
   name: 'App',
   components: {
     VueMultiselect,
+    Person,
   },
   methods: {
     submit() {
@@ -137,6 +158,7 @@ export default {
       'socialIssues',
       'socialActionsReachables',
       'errors',
+      'personsReachables',
     ]),
     ...mapGetters([
       'hasSocialIssuePicked',
@@ -145,6 +167,18 @@ export default {
       'isPostingWork',
       'hasErrors',
     ]),
+    personsPicked: {
+      get() {
+        let s = this.$store.state.personsPicked.map(p => p.id);
+        console.log('persons picked', s);
+
+        return s;
+      },
+      set(v) {
+        console.log('persons picked', v); 
+        this.$store.commit('setPersonsPickedIds', v);
+      }
+    },
     socialIssuePicked: {
       get() {
         let s = this.$store.state.socialIssuePicked;

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

@@ -14,6 +14,10 @@ const store = createStore({
     socialIssuePicked: null,
     socialActionsReachables: [],
     socialActionPicked: null,
+    personsPicked: window.accompanyingCourse.participations.filter(p => p.endDate == null)
+      .map(p => p.person),
+    personsReachables: window.accompanyingCourse.participations.filter(p => p.endDate == null)
+      .map(p => p.person),
     startDate: new Date(),
     endDate: null,
     isLoadingSocialActions: false,
@@ -38,15 +42,23 @@ const store = createStore({
     buildPayloadCreate(state) {
       let payload = {
         type: 'accompanying_period_work',
-        social_action: {
+        socialAction: {
           type: 'social_work_social_action',
           id: state.socialActionPicked.id
         },
         startDate: {
           datetime: datetimeToISO(state.startDate)
-        }
+        },
+        persons: []
       };
 
+      for (let i in state.personsPicked) {
+        payload.persons.push({
+          id: state.personsPicked[i].id,
+          type: 'person'
+        });
+      }
+
       if (null !== state.endDate) {
         payload.endDate = {
           datetime: datetimeToISO(state.endDate)
@@ -71,12 +83,16 @@ const store = createStore({
       state.socialActionPicked = socialAction;
     },
     setSocialIssue(state, socialIssueId) {
+      console.log('set social issue', socialIssueId);
       if (socialIssueId === null) {
         state.socialIssuePicked = null;
-        return;
+      } else {
-      }
+        let mapped = state.socialIssues
-      state.socialIssuePicked = state.socialIssues
           .find(e => e.id === socialIssueId);
+        console.log('mapped', mapped);
+        state.socialIssuePicked = mapped;
+        console.log('social issue setted', state.socialIssuePicked);
+      }
     },
     setIsLoadingSocialActions(state, s) {
       state.isLoadingSocialActions = s;
@@ -90,6 +106,11 @@ const store = createStore({
     setEndDate(state, date) {
       state.endDate = date;
     },
+    setPersonsPickedIds(state, ids) {
+      console.log('persons ids', ids);
+      state.personsPicked = state.personsReachables
+        .filter(p => ids.includes(p.id))
+    },
     addErrors(state, { errors, cancel_posting }) {
       console.log('add errors', errors);
       state.errors = errors;
@@ -103,8 +124,10 @@ const store = createStore({
       console.log('pick social issue');
 
       commit('setIsLoadingSocialActions', true);
-      commit('setSocialIssue', null);
+      commit('setSocialAction', null);
       commit('setSocialActionsReachables', []);
+      commit('setSocialIssue', null);
+
 
       findSocialActionsBySocialIssue(socialIssueId).then(
         (response) => {
@@ -144,9 +167,6 @@ const store = createStore({
             commit('addErrors', { errors, cancel_posting: true });
           }
         });
-
-
-
     },
   },
  

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

@@ -0,0 +1,486 @@
+<template>
+  <div id="workEditor">
+    <div id="title">
+      <label class="action_title_label">{{ $t('action_title') }}</label>
+      <p class="action_title">{{ work.socialAction.text }}</p>
+    </div>
+    <div id="startDate">
+      <label>{{ $t('startDate') }}</label>
+      <input type="date" v-model="startDate" />
+    </div>
+    <div id="endDate">
+      <label>{{ $t('endDate') }}</label>
+      <input type="date" v-model="endDate" />
+    </div>
+    <div id="comment">
+      <label>Commentaire</label>
+      <ckeditor 
+        :editor="editor"
+        v-model="note"
+        tag-name="textarea"
+      ></ckeditor>
+    </div>
+    <div id="objectives" class="objectives_list">
+      <div class="title" aria="hidden">
+        <div><h3>Motifs - objectifs - dispositifs</h3></div>
+        <div><h3>Orientations - résultats</h3></div>
+      </div>
+
+      <!-- results which are not attached to an objective -->
+      <div v-if="hasResultsForAction">
+        <div class="results_without_objective">
+          {{ $t('results_without_objective') }}
+        </div>
+        <div>
+          <add-result :availableResults="resultsForAction" destination="action"></add-result>  
+        </div>
+      </div> 
+
+      <!-- results which **are** attached to an objective -->
+      <div v-for="g in goalsPicked">
+        <div>
+          <div @click="removeGoal(g)" class="objective-title">
+            <i class="fa fa-times"></i>
+            {{ g.goal.title.fr }}
+          </div> 
+        </div>
+        <div>
+          <add-result destination="goal" :goal="g.goal"></add-result>  
+        </div>
+      </div>
+
+      <!-- box to add goal -->
+      <div class="add_goal">
+        <div>
+          <div v-if="showAddObjective">
+
+            <p>Motifs, objectifs et dispositifs disponibles pour ajout&nbsp;:</p>
+
+            <ul class="list-objectives">
+              <li v-for="g in availableForCheckGoal" @click="addGoal(g)" class="badge badge-primary">
+                <i class="fa fa-plus"></i>
+                {{ g.title.fr }} 
+              </li>
+            </ul>
+          </div>
+          <ul class="record_actions">
+            <li>
+              <button @click="toggleAddObjective" class="sc-button bt-create">
+                Ajouter un objectif
+              </button>
+            </li>
+          </ul>
+        </div>
+        <div><!-- empty for results --></div>
+      </div>
+    </div>
+
+
+    <div id="persons">
+      <h2>{{ $t('persons_involved') }}</h2>
+
+      <ul>
+        <li v-for="p in personsReachables" :key="p.id">
+          <input type="checkbox" :value="p.id" v-model="personsPicked">
+          <person :person="p"></person>
+        </li>
+      </ul>
+    </div>
+
+
+    <div id="handlingThirdParty">
+      <h2>Tiers traitant</h2>
+
+      <div v-if="!hasHandlingThirdParty">
+        <p class="chill-no-data-statement">
+          Aucun tiers traitant
+        </p>
+
+        <ul class="record_actions">
+          <li>
+            <add-persons
+               buttonTitle="Indiquer un tiers traitant"
+               modalTitle="Choisir un tiers"
+               v-bind:key="handlingThirdPartyPicker.key"
+               v-bind:options="handlingThirdPartyPicker.options"
+               @addNewPersons="setHandlingThirdParty"
+               ref="handlingThirdPartyPicker"> <!-- to cast child method -->
+            </add-persons>
+          </li>
+        </ul>
+      </div>
+      <div v-else>
+        <p>{{ handlingThirdParty.text }}</p>
+        <show-address :address="handlingThirdParty.address"></show-address>
+
+        <ul class="record_actions">
+          <li>
+            <button class="sc-button bt-delete" @click="removeHandlingThirdParty">
+              Supprimer le tiers traitant
+            </button>
+          </li>
+        </ul>
+      </div>
+
+    </div>
+
+
+    <div id="thirdParties">
+      <h2>Tiers intervenants</h2>
+
+      <div v-if="!hasThirdParties">
+        <p class="chill-no-data-statement">Aucun tiers intervenant</p>
+
+      </div>
+      <div v-else>
+        <ul>
+          <li v-for="t in thirdParties">
+            <p>{{ t.text }}</p>
+            <show-address :address="t.address"></show-address>
+
+            <ul class="record_actions">
+              <button class="sc-button bt-delete" @click="removeThirdParty(t)"></button>
+            </ul>
+          </li>
+        </ul>
+      </div>
+
+      <ul class="record_actions">
+        <li>
+          <add-persons
+             buttonTitle="Ajouter des tiers"
+             modalTitle="Choisir des tiers"
+             v-bind:key="thirdPartyPicker.key"
+             v-bind:options="thirdPartyPicker.options"
+             @addNewPersons="addThirdParties"
+             ref="thirdPartyPicker"> <!-- to cast child method -->
+          </add-persons>
+        </li>
+      </ul>
+    </div>
+
+    <div id="errors" v-if="errors.length > 0">
+      <p>Veuillez corriger les erreurs suivantes:</p>
+      <ul>
+        <li v-for="e in errors">{{ e }}</li>
+      </ul> 
+    </div>
+  </div>
+
+  <ul class="record_actions sticky-form-buttons">
+    <li v-if="!isPosting">
+      <button
+        class="sc-button bt-save"
+        @click="submit"
+      >
+        {{ $t('action.save') }}
+      </button>
+    </li>
+    <li v-if="isPosting">
+      <button
+        class="sc-button bt-save"
+        disabled
+      >
+        {{ $t('action.save') }}
+      </button>
+    </li>
+  </ul>
+
+</template>
+
+<style lang="scss">
+
+#workEditor {
+  display: grid;
+  grid-template-areas: 
+    "title title"
+    "startDate endDate"
+    "comment comment"
+    "objectives objectives"
+    "persons persons"
+    "handling handling"
+    "tparties tparties"
+    "errors errors"
+    ;
+
+  grid-template-columns: 50%;
+  column-gap: 1rem;
+  
+  #title {
+    grid-area: title;
+
+    .action_title_label {
+      margin-bottom: 0;
+    }
+    .action_title {
+      margin-top: 0;
+      font-weight: bold;
+      font-size: 1.5rem;
+    }
+  }
+  #startDate {
+    grid-area: startDate;
+  }
+  #endDate {
+    grid-area: endDate;
+  }
+  #comment {
+    grid-area: comment;
+  }
+  #objectives {
+    grid-area: objectives;
+
+    > div.title {
+      background-color: var(--chill-light-gray);
+      color: white;
+
+      h3 {
+        text-align: center;
+      }
+    }
+
+    > div {
+      display: grid;
+      grid-template-areas: "obj res";
+      grid-template-columns: 50%;
+      column-gap: 1rem;
+
+      > div {
+        &:nth-child(1) {
+          grid-area: obj;
+        }
+
+        &:nth-child(2) {
+          grid-area: res;
+        }
+      }
+
+      > div.results_without_objective {
+        background: repeating-linear-gradient(
+        45deg,
+        var(--chill-light-gray),
+        var(--chill-light-gray) 10px,
+        var(--chill-llight-gray) 10px,
+        var(--chill-llight-gray) 20px
+      );
+
+        text-align: center;
+        font-weight: 700;
+        padding-top: 1.5rem;
+      }
+    }
+
+    ul.list-objectives {
+      list-style-type: none;
+      padding: 0;
+
+      li {
+        margin: 0.5rem;
+      }
+    }
+
+    div.objective-title {
+      margin-top: 1rem;
+      font-size: 1.5rem;
+      font-weight: bold;
+      text-align: center;
+
+
+      i.fa {
+        padding: 0.25rem;
+      }
+
+      i.fa-times {
+        background-color: red;
+        color: white;
+      }
+    }
+
+    li.badge, div.badge {
+      padding-bottom: 0;
+      padding-top: 0;
+      padding-left: 0;
+
+      i.fa {
+        padding: 0.25rem;
+      }
+
+      i.fa-plus {
+        background-color: green;
+      }
+
+    }
+  }
+  #persons {
+    grid-area: persons;
+  }
+  #handlingThirdParty {
+    grid-area: handling;
+  }
+  #thirdParties {
+    grid-area: tparties;
+  }
+  #errors {
+    grid-area: errors;
+  }
+}
+
+</style>
+
+<script>
+
+import { mapState, mapGetters, } from 'vuex';
+import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/js/date.js';
+import CKEditor from '@ckeditor/ckeditor5-vue';
+import ClassicEditor from 'ChillMainAssets/modules/ckeditor5/index.js';
+import AddResult from './_components/AddResult.vue';
+import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
+import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/ShowAddress.vue';
+
+const i18n = {
+  messages: {
+    fr: {
+      action_title: "Action d'accompagnement",
+      startDate: "Date de début",
+      endDate: "Date de fin",
+      results_without_objective: "Résultats - orientations sans objectifs",
+      add_objectif: "Ajouter un motif - objectif - dispositif",
+      persons_involved: "Usagers concernés",
+    }
+}
+};
+
+export default {
+  name: 'App',
+  components: {
+    ckeditor: CKEditor.component,
+    AddResult,
+    AddPersons,
+    Person,
+    ShowAddress,
+  },
+  i18n,
+  data() {
+    return {
+      editor: ClassicEditor,
+      showAddObjective: false,
+      handlingThirdPartyPicker: {
+        key: 'handling-third-party',
+        options: {
+          type: [ 'thirdparty' ],
+          priority: null,
+          uniq: true
+        },
+      },
+      thirdPartyPicker: {
+        key: 'third-party',
+        options: {
+          type: [ 'thirdparty' ],
+          priority: null,
+          uniq: false,
+        },
+      }
+    };
+  },
+  computed: {
+    ...mapState([
+      'work',
+      'resultsForAction',
+      'goalsPicked',
+      'personsReachables',
+      'handlingThirdParty',
+      'thirdParties',
+      'isPosting',
+      'errors',
+    ]),
+    ...mapGetters([
+      'hasResultsForAction',
+      'hasHandlingThirdParty',
+      'hasThirdParties',
+    ]),
+    startDate: {
+      get() {
+        console.log('get start date', this.$store.state.startDate);
+        return dateToISO(this.$store.state.startDate);
+      },
+      set(v) {
+        this.$store.commit('setStartDate', ISOToDate(v));
+      }
+    },
+    endDate: {
+      get() {
+        console.log('get end date', this.$store.state.endDate);
+        return dateToISO(this.$store.state.endDate);
+      },
+      set(v) {
+        this.$store.commit('setEndDate', ISOToDate(v));
+      }
+    },
+    note: {
+      get() {
+        return this.$store.state.note;
+      },
+      set(v) {
+        this.$store.commit('setNote', v);
+      }
+    },
+    availableForCheckGoal() {
+      let pickedIds = this.$store.state.goalsPicked.map(g => g.goal.id);
+      console.log('pickeds goals id', pickedIds);
+      console.log(this.$store.state.goalsForAction);
+
+      return this.$store.state.goalsForAction.filter(g => !pickedIds.includes(g.id));
+    },
+    personsPicked: {
+      get() {
+        let s = this.$store.state.personsPicked.map(p => p.id);
+        console.log('persons picked', s);
+
+        return s;
+      },
+      set(v) {
+        console.log('persons picked', v); 
+        this.$store.commit('setPersonsPickedIds', v);
+      }
+    },
+  },
+  methods: {
+    toggleAddObjective() {
+      this.showAddObjective = !this.showAddObjective;
+    },
+    addGoal(g) {
+      console.log('add Goal', g);
+      this.$store.commit('addGoal', g);
+    },
+    removeGoal(g) {
+      console.log('remove goal', g);
+      this.$store.commit('removeGoal', g);
+    },
+    setHandlingThirdParty({ selected, modal }) {
+      console.log('setHandlingThirdParty', selected);
+      this.$store.commit('setHandlingThirdParty', selected.shift().result);
+      this.$refs.handlingThirdPartyPicker.resetSearch();
+      modal.showModal = false;
+    },
+    removeHandlingThirdParty() {
+      console.log('removeHandlingThirdParty');
+      this.$store.commit('setHandlingThirdParty', null);
+    },
+    addThirdParties({ selected, modal}) {
+      console.log('addThirdParties', selected);
+      this.$store.commit('addThirdParties', selected.map(r => r.result));
+      this.$refs.thirdPartyPicker.resetSearch();
+      modal.showModal = false;
+    },
+    removeThirdParty(t) {
+      console.log('remove third party', t);
+      this.$store.commit('removeThirdParty', t);
+    },
+    submit() {
+      this.$store.dispatch('submit');
+    },
+  }
+};
+
+</script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/_components/AddResult.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="addResult" v-if="hasResult">
+    <p class="chill-no-data-statement" v-if="pickedResults.length ===0">
+      Aucun résultat associé
+    </p>
+    <ul class="list-results">
+      <li v-for="r in pickedResults" @click="removeResult(r)" class="badge badge-primary">
+        <i class="fa fa-times"></i>
+        {{ r.title.fr }}
+      </li>
+      <template v-if="isExpanded">
+        <li v-for="r in availableForCheckResults" @click="addResult(r)" class="badge badge-primary">
+          <i class="fa fa-plus"></i>
+          {{ r.title.fr }}
+        </li>
+      </template>
+    </ul>
+    <ul class="record_actions">
+      <li v-if="isExpanded">
+        <button @click="toggleSelect" class="sc-button bt-hide" >
+          <i class="fa fa-eye-slash"></i>
+          Masquer résultats et orientations disponibles
+        </button>
+      </li>
+      <li v-else>
+        <button @click="toggleSelect" class="sc-button bt-show">
+          Afficher résultats et orientations disponibles
+        </button>
+      </li>
+    </ul>
+  </div>
+  <div class="noResult" v-if="!hasResult">
+    <div class="chill-no-data-statement">
+      {{ $t('goal_has_no_result') }}
+    </div>
+  </div>
+</template>
+
+<style lang="scss">
+
+button.hide {
+  background-color: rgb(51, 77, 92);
+}
+
+ul.list-results {
+  list-style-type: none;
+  padding: 0;
+
+  li {
+    margin: 0.5rem;
+  }
+
+  li.badge {
+    padding-bottom: 0;
+    padding-top: 0;
+    padding-left: 0;
+
+    i.fa {
+      /*border-radius: 0.25rem; */
+      padding: 0.25rem;
+    }
+
+    i.fa-plus {
+      background-color: green;
+    }
+
+    i.fa-times {
+      background-color: red;
+      color: white;
+    }
+  }
+}
+
+</style>
+
+<script>
+
+const i18n = {
+  messages: {
+    fr: {
+      add_a_result: "Résultat - orientation disponibles",
+      goal_has_no_result: "Aucun résultat - orientation disponible",
+    }
+  }
+};
+
+export default {
+  name: "AddResult",
+  props: [ 'destination', 'goal' ],
+  i18n,
+  data() {
+    return {
+      isExpanded: false,
+    };
+  },
+  computed: {
+    hasResult() {
+      if (this.destination === 'action') {
+        return this.$store.state.resultsForAction.length > 0;
+      } else if (this.destination === 'goal') {
+        return this.$store.getters.resultsForGoal(this.goal).length > 0;
+      }
+
+      throw Error(`this.destination is not implemented: ${this.destination}`);
+    },
+    pickedResults() {
+      console.log('get checked');
+      console.log('this.destination', this.destination);
+      console.log('this.goal', this.goal);
+      if (this.destination === 'action') {
+        return this.$store.state.resultsPicked;
+      } else if (this.destination === 'goal') {
+        return this.$store.getters.resultsPickedForGoal(this.goal);
+      }
+
+      throw Error(`this.destination is not implemented: ${this.destination}`);
+    },
+    availableForCheckResults() {
+      console.log('availableForCheckResults');
+      console.log('this.destination', this.destination);
+      console.log('this.goal', this.goal);
+      if (this.destination === 'action') {
+        let pickedIds = this.$store.state.resultsPicked.map(r => r.id);
+        console.log('picked ids', pickedIds);
+
+        return this.$store.state.resultsForAction.filter(r => !pickedIds.includes(r.id));
+      } else if (this.destination === 'goal') {
+        console.log('results picked for goal', this.$store.getters.resultsPickedForGoal(this.goal));
+        let pickedIds = this.$store.getters.resultsPickedForGoal(this.goal).map(r => r.id);
+
+        return this.$store.getters.resultsForGoal(this.goal).filter(r => !pickedIds.includes(r.id));
+      }
+
+      throw Error(`this.destination is not implemented: ${this.destination}`);
+    }
+  },
+  methods: {
+    toggleSelect() {
+      this.isExpanded = !this.isExpanded; 
+    },
+    addResult(r) {
+      console.log('addResult', r);
+      if (this.destination === 'action') {
+        this.$store.commit('addResultPicked', r);
+        return;
+      } else if (this.destination === 'goal') {
+        this.$store.commit('addResultForGoalPicked', { goal: this.goal, result: r });
+        return;
+      }
+      throw Error(`this.destination is not implemented: ${this.destination}`);
+    },
+    removeResult(r) {
+      console.log('removeresult', r);
+      if (this.destination === 'action') {
+        this.$store.commit('removeResultPicked', r);
+        return;
+      } else if (this.destination === 'goal') {
+        this.$store.commit('removeResultForGoalPicked', { goal: this.goal, result: r });
+        return;
+      }
+      throw Error(`this.destination is not implemented: ${this.destination}`);
+    }
+  }
+}
+
+</script>

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

@@ -0,0 +1,15 @@
+import { createApp } from 'vue';
+import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n';
+import { store } from './store';
+import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+import App from './App.vue';
+
+const i18n = _createI18n(personMessages);
+
+const app = createApp({
+   template: `<app></app>`,
+})
+.use(store)
+.use(i18n)
+.component('app', App)
+.mount('#accompanying_course_work_edit');

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

@@ -0,0 +1,304 @@
+import { createStore } from 'vuex';
+import { datetimeToISO, ISOToDatetime } from 'ChillMainAssets/js/date.js';
+import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
+import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
+
+const debug = process.env.NODE_ENV !== 'production';
+
+console.log(window.accompanyingCourseWork);
+
+const store = createStore({
+  strict: debug,
+  state: {
+    work: window.accompanyingCourseWork,
+    startDate: ISOToDatetime(window.accompanyingCourseWork.startDate.datetime),
+    endDate: (window.accompanyingCourseWork.endDate !== null ?
+      ISOToDatetime(window.accompanyingCourseWork.endDate.datetime) : null),
+    note: window.accompanyingCourseWork.note,
+    goalsPicked: window.accompanyingCourseWork.goals,
+    resultsPicked: window.accompanyingCourseWork.results,
+    resultsForAction: [],
+    goalsForAction: [],
+    resultsForGoal: [],
+    personsPicked: window.accompanyingCourseWork.persons,
+    personsReachables: window.accompanyingCourseWork.accompanyingPeriod.participations.filter(p => p.endDate == null)
+      .map(p => p.person),
+    handlingThirdParty: window.accompanyingCourseWork.handlingThierParty,
+    thirdParties: window.accompanyingCourseWork.thirdParties,
+    isPosting: false,
+    errors: [],
+  },
+  getters: {
+    socialAction(state) {
+      return state.work.socialAction;
+    },
+    hasResultsForAction(state) {
+      return state.resultsForAction.length > 0;
+    },
+    resultsForGoal: (state) => (goal) => {
+      let founds = state.resultsForGoal.filter(r => r.goalId === goal.id);
+
+      return founds === undefined ? [] : founds;
+    },
+    resultsPickedForGoal: (state) => (goal) => {
+      let found = state.goalsPicked.find(g => g.goal.id === goal.id);
+      
+      return found === undefined ? [] : found.results;
+    },
+    hasHandlingThirdParty(state) {
+      return state.handlingThirdParty !== null;
+    },
+    hasThirdParties(state) {
+      return state.thirdParties.length > 0;
+    },
+    buildPayload(state) {
+      return {
+        type: 'accompanying_period_work',
+        id: state.work.id,
+        startDate: {
+          datetime: datetimeToISO(state.startDate)
+        },
+        endDate: state.endDate === null ? null : {
+          datetime: datetimeToISO(state.endDate)
+        },
+        note: state.note,
+        persons: state.personsPicked.map(p => ({id: p.id, type: p.type})),
+        handlingThierParty: state.handlingThirdParty === null ? null : {
+          id: state.handlingThirdParty.id,
+          type: state.handlingThirdParty.type
+        },
+        results: state.resultsPicked.map(r => ({id: r.id, type: r.type})),
+        thirdParties: state.thirdParties.map(t => ({id: t.id, type: t.type})),
+        goals: state.goalsPicked.map(g => {
+          let o = {
+            type: g.type,
+            note: g.note,
+            goal: {
+              type: g.goal.type,
+              id: g.goal.id,
+            },
+            results: g.results.map(r => ({id: r.id, type: r.type})),
+          };
+
+          if (g.id !== undefined) {
+            o.id = g.id;
+          }
+
+          return o;
+        })
+      };
+    }
+  },
+  mutations: {
+    setStartDate(state, date) {
+      state.startDate = date;
+    },
+    setEndDate(state, date) {
+      state.endDate = date;
+    },
+    setResultsForAction(state, results) {
+      console.log('set results for action', results);
+      state.resultsForAction = results;
+    },
+    setResultsForGoal(state, { goal, results }) {
+      console.log('set results for goal', results);
+      state.goalsForAction.push(goal);
+      for (let i in results) {
+        let r = results[i];
+        r.goalId = goal.id;
+        console.log('adding result', r);
+        state.resultsForGoal.push(r);
+      }
+    },
+    addResultPicked(state, result) {
+      state.resultsPicked.push(result);
+    },
+    removeResultPicked(state, result) {
+      state.resultsPicked = state.resultsPicked.filter(r => r.id !== result.id);
+    },
+    addGoal(state, goal) {
+      let g = {
+        type: "accompanying_period_work_goal",
+        goal: goal,
+        note: '',
+        results: []
+      }
+      state.goalsPicked.push(g);
+    },
+    removeGoal(state, goal) {
+      state.goalsPicked = state.goalsPicked.filter(g => g.id !== goal.id);
+    },
+    addResultForGoalPicked(state, { goal, result}) {
+      let found = state.goalsPicked.find(g => g.goal.id === goal.id);
+      console.log('adResultForGoalPicked');
+      console.log('found', found);
+      console.log('goal', goal);
+      console.log('result', result);
+
+      if (found === undefined) {
+        return;
+      }
+
+      found.results.push(result);
+    },
+    removeResultForGoalPicked(state, { goal, result}) {
+      let found = state.goalsPicked.find(g => g.goal.id === goal.id);
+
+      if (found === undefined) {
+        return;
+      }
+
+      found.results = found.results.filter(r => r.id !== result.id);
+    },
+    setPersonsPickedIds(state, ids) {
+      console.log('persons ids', ids);
+      state.personsPicked = state.personsReachables
+        .filter(p => ids.includes(p.id))
+    },
+    setNote(state, note) {
+      state.note = note;
+    },
+    setHandlingThirdParty(state, thirdParty) {
+      state.handlingThirdParty = thirdParty;
+    },
+    addThirdParties(state, thirdParties) {
+      console.log('addThirdParties', thirdParties);
+      // filter to remove existing thirdparties
+      let ids = state.thirdParties.map(t => t.id);
+      let unexistings = thirdParties.filter(t => !ids.includes(t.id));
+      console.log('unexisting third parties', unexistings);
+      for (let i in unexistings) {
+        state.thirdParties.push(unexistings[i]);
+      }
+    },
+    removeThirdParty(state, thirdParty) {
+      state.thirdParties = state.thirdParties
+        .filter(t => t.id !== thirdParty.id);
+    },
+    setErrors(state, errors) {
+      console.log('handling errors', errors);
+      state.errors = errors;
+    },
+    setIsPosting(state, st) {
+      state.isPosting = st;
+    },
+  },
+  actions: {
+    getReachablesGoalsForAction({ getters, commit, dispatch }) {
+      console.log('getReachablesGoalsForAction');
+      let
+        socialActionId = getters.socialAction.id,
+        url = `/api/1.0/person/social-work/goal/by-social-action/${socialActionId}.json`
+      ;
+
+      console.log(url);
+
+      window
+        .fetch(
+          url
+        ).then( response => {
+          if (response.ok) {
+            return response.json();
+          }
+          throw { m: 'Error while retriving goal for social action', s: response.status, b: response.body };
+        }).then( data => {
+           for (let i in data.results) {
+             dispatch('getReachablesResultsForGoal', data.results[i]);
+           }
+        }).catch( errors => {
+            commit('addErrors', errors);
+        });
+    },
+    getReachablesResultsForGoal({ commit }, goal) {
+      console.log('getReachablesResultsForGoal');
+      let
+        url = `/api/1.0/person/social-work/result/by-goal/${goal.id}.json`
+      ;
+
+      console.log(url);
+
+      window.fetch(url)
+        .then(response => {
+          if (response.ok) {
+            return response.json();
+          }
+
+          throw { m: 'Error while retriving results for goal', s: response.status, b: response.body };
+        })
+        .then(data => {
+          console.log('data');
+          commit('setResultsForGoal', { goal, results: data.results });
+        });
+    },
+    getReachablesResultsForAction({ getters, commit }) {
+      console.log('getReachablesResultsForAction');
+      let
+        socialActionId = getters.socialAction.id,
+        url = `/api/1.0/person/social-work/result/by-social-action/${socialActionId}.json`
+      ;
+
+      console.log(url);
+
+      window.fetch(url)
+        .then(response => {
+          if (response.ok) {
+            return response.json();
+          }
+
+          throw { m: 'Error while retriving results for social action', s: response.status, b: response.body };
+        })
+        .then(data => {
+          console.log('data retrived', data);
+          commit('setResultsForAction', data.results);
+        });
+    },
+    submit({ getters, state, commit }) {
+      let
+        payload = getters.buildPayload,
+        url = `/api/1.0/person/accompanying-course/work/${state.work.id}.json`,
+        errors = []
+      ;
+
+      console.log('action subitting', payload, url);
+      commit('setIsPosting', true);
+
+      window.fetch(url, {
+        method: 'PUT',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(payload)
+      }).then(response => {
+        if (response.ok || response.status === 422) {
+          return response.json().then(data => ({data, status: response.status}));
+        }
+
+        throw new Error(response.status);
+      }).then(({data, status}) => {
+        if (status === 422) {
+          for (let i in data.violations) {
+            errors.push(data.violations[i].title);
+          }
+          commit('setErrors', errors);
+          commit('setIsPosting', false);
+        } else {
+          console.info('nothing to do here, bye bye');
+          window.location.assign(`/fr/person/accompanying-period/${state.work.accompanyingPeriod.id}/work`);
+        }
+      }).catch(e => {
+        commit('setErrors', [
+          'Erreur serveur ou réseau: veuillez ré-essayer. Code erreur: ' + e
+        ]);
+        commit('setIsPosting', false);
+      });
+    },
+    initAsync({ dispatch }) {
+      dispatch('getReachablesResultsForAction');
+      dispatch('getReachablesGoalsForAction');
+    },
+  }
+});
+
+store.dispatch('initAsync');
+
+export { store };

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

@@ -24,6 +24,12 @@
          <div v-if="errors.length > 0">
             {{ errors }}
          </div>
+         <div v-if="loading">
+            {{ $t('loading') }}
+         </div>
+         <div v-if="success">
+            {{ $t('household_address_move_success') }}
+         </div>
       </div>
       <div>
          <ul class="record_actions sticky-form-buttons">
@@ -65,6 +71,12 @@ export default {
       },
       errors() {
          return this.$store.state.errorMsg;
+      },
+      loading() {
+         return this.$store.state.loading;
+      },
+      success() {
+         return this.$store.state.success;
       }
    },
    methods: {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js

@@ -7,7 +7,9 @@ const appMessages = {
       add_an_address_to_household: 'Déménager le ménage',
       validFrom: 'Date du déménagement',
       move_date: 'Date du déménagement',
-      back_to_the_list: 'Retour à la liste'
+      back_to_the_list: 'Retour à la liste',
+      household_address_move_success: 'La nouvelle adresse du ménage est enregistrée',
+      loading: 'chargement en cours...'
    }
 };
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/store/index.js

@@ -12,7 +12,9 @@ const store = createStore({
       newAddress: {},
       household: {},
       validFrom: {},
-      errorMsg: []
+      errorMsg: [],
+      loading: false,
+      success: false
    },
    getters: {
    },
@@ -31,12 +33,18 @@ const store = createStore({
       addDateToAddress(state, validFrom) {
          console.log('@M addDateToAddress address.validFrom', validFrom);
          state.validFrom = validFrom;
+      },
+      setLoading(state, b) {
+         state.loading = b;
+      },
+      setSuccess(state, b) {
+         state.success = b;
       }
    },
    actions: {
       addAddress({ commit }, payload) {
          console.log('@A addAddress payload', payload);
-
+         commit('setLoading', true);
          if('newPostalCode' in payload){
             postPostalCode(payload.newPostalCode)
                .then(postalCode => {
@@ -46,9 +54,11 @@ const store = createStore({
                      .then(address => new Promise((resolve, reject) => {
                         commit('addAddress', address);
                         resolve();
+                        commit('setLoading', false);
                      }))
                      .catch((error) => {
                         commit('catchError', error);
+                        commit('setLoading', false);
                      });
                })
 
@@ -57,15 +67,17 @@ const store = createStore({
                .then(address => new Promise((resolve, reject) => {
                   commit('addAddress', address);
                   resolve();
+                  commit('setLoading', false);
                }))
                .catch((error) => {
                   commit('catchError', error);
+                  commit('setLoading', false);
                });
          }
       },
       addDateToAddressAndAddressToHousehold({ commit }, payload) {
          console.log('@A addDateToAddressAndAddressToHousehold payload', payload);
-
+         commit('setLoading', true);
          patchAddress(payload.addressId, payload.body)
             .then(address => new Promise((resolve, reject) => {
                commit('addDateToAddress', address.validFrom);
@@ -74,14 +86,18 @@ const store = createStore({
                postAddressToHousehold(payload.householdId, payload.addressId)
                   .then(household => new Promise((resolve, reject) => {
                      commit('addAddressToHousehold', household);
+                     commit('setSuccess', true);
+                     commit('setLoading', false);
                      resolve();
                }))
                .catch((error) => {
                   commit('catchError', error);
+                  commit('setLoading', false);
                })
             ))
             .catch((error) => {
                commit('catchError', error);
+               commit('setLoading', false);
             });
       },
    }

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/api.js

@@ -23,6 +23,21 @@ const householdMove = (payload) => {
     });
 };
 
+const fetchHouseholdSuggestionByAccompanyingPeriod = (personId) => {
+  const url = `/api/1.0/person/household/suggest/by-person/${personId}/through-accompanying-period-participation.json`;
+  return window.fetch(url)
+    .then(response => {
+      if (response.ok) {
+        return response.json();
+      }
+
+      throw Error ({m: 'Error while fetching household suggestion', status: response.status});
+    }).then(data => Promise.resolve(data.results))
+    .catch(e => console.err(e));
+  ;
+};
+
 export { 
   householdMove,
+  fetchHouseholdSuggestionByAccompanyingPeriod,
 };

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

@@ -14,6 +14,23 @@
   </div>
 
   <ul v-if="allowChangeHousehold" class="record_actions">
+    <li v-if="!showHouseholdSuggestion">
+      <button
+        class="sc-button"
+        @click="toggleHouseholdSuggestion"
+      >
+        {{ $tc('household_members_editor.show_household_suggestion', 
+          countHouseholdSuggestion) }}
+      </button>
+    </li>
+    <li v-if="showHouseholdSuggestion">
+      <button
+        class="sc-button"
+        @click="toggleHouseholdSuggestion"
+      >
+        {{ $t('household_members_editor.hide_household_suggestion') }}
+      </button>
+    </li>
     <li v-if="allowHouseholdCreate">
       <button class="sc-button bt-create" @click="createHousehold">
         {{ $t('household_members_editor.household.create_household') }}
@@ -31,11 +48,55 @@
     </li>
   </ul>
 
+  <div class="householdSuggestions">
+    <div v-if="showHouseholdSuggestion">
+      <p>{{ $t('household_members_editor.household_for_participants_accompanying_period') }}:</p>
+      <div class="householdSuggestionList">
+        <div
+          v-for="h in filterHouseholdSuggestionByAccompanyingPeriod"
+          class="item"
+        >
+          <household-viewer :household="h"></household-viewer>
+
+          <ul class="record_actions">
+            <li>
+              <button class="sc-button" @click="selectHousehold(h)">
+                {{ $t('household_members_editor.select_household') }}
+              </button>
+            </li>
+          </ul>
+        </div >
+      </div>
+    </div>
+  </div>
+  
 </template>
 
+<style lang="scss">
+
+.householdSuggestionList {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
+
+  & > .item {
+    margin-bottom: 0.8rem;
+    width: calc(50% - 1rem);
+    border: 1px solid var(--chill-light-gray);
+    padding: 0.5rem 0.5rem 0 0.5rem;
+
+    ul.record_actions {
+      margin-bottom: 0;
+    }
+  }
+}
+
+</style>
+
 <script>
 
-import { mapGetters } from 'vuex';
+import { mapGetters, mapState } from 'vuex';
 import HouseholdViewer from 'ChillPersonAssets/vuejs/_components/Household/Household.vue';
 
 export default {
@@ -47,6 +108,12 @@ export default {
     ...mapGetters([
       'hasHousehold',
       'isHouseholdNew',
+      'hasHouseholdSuggestion',
+      'countHouseholdSuggestion',
+      'filterHouseholdSuggestionByAccompanyingPeriod',
+    ]),
+    ...mapState([
+      'showHouseholdSuggestion',
     ]),
     household() {
       return this.$store.state.household;
@@ -74,6 +141,12 @@ export default {
     },
     forceLeaveWithoutHousehold() {
       this.$store.dispatch('forceLeaveWithoutHousehold');
+    },
+    toggleHouseholdSuggestion() {
+      this.$store.commit('toggleHouseholdSuggestion');
+    },
+    selectHousehold(h) {
+      this.$store.dispatch('selectHousehold', h);
     }
   },
 };

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js

@@ -5,7 +5,7 @@ const appMessages = {
    fr: {
      household_members_editor: {
       household: {
-        no_household_choose_one: "Aucun ménage de destination. Choisissez un ménage.",
+        no_household_choose_one: "Aucun ménage de destination. Choisissez un ménage. Les usagers concernés par la modification apparaitront ensuite.",
         new_household: "Nouveau ménage",
         create_household: "Créer un ménage",
         search_household: "Chercher un ménage",
@@ -13,7 +13,7 @@ const appMessages = {
         leave_without_household: "Sans nouveau ménage"
       },
       concerned: {
-        title: "Usagers concernés",
+        title: "Nouveaux membres du ménage",
         add_persons: "Ajouter d'autres usagers",
         search: "Rechercher des usagers",
         move_to: "Déplacer vers",
@@ -29,6 +29,10 @@ const appMessages = {
       remove_position: "Retirer des {position}",
       remove_concerned: "Ne plus transférer",
       household_part: "Ménage de destination",
+      hide_household_suggestion: "Masquer les suggestions",
+      show_household_suggestion: 'Aucune suggestion | Afficher une suggestion | Afficher {count} suggestions',
+      household_for_participants_accompanying_period: "Ces ménages partagent le même parcours",
+      select_household: "Choisir ce ménage",
       dates_title: "Période de validité",
       dates: {
         start_date: "Début de validité",

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js

@@ -1,5 +1,5 @@
 import { createStore } from 'vuex';
-import { householdMove, householdMoveTest } from './../api.js';
+import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod } from './../api.js';
 import { datetimeToISO } from 'ChillMainAssets/js/date.js';
 
 const debug = process.env.NODE_ENV !== 'production';
@@ -14,6 +14,8 @@ const concerned = window.household_members_editor_data.persons.map(p => {
   };
 });
 
+console.log('expand suggestions', window.household_members_editor_expand_suggestions === 1);
+
 const store = createStore({
   strict: debug,
   state: {
@@ -33,11 +35,16 @@ const store = createStore({
     allowHouseholdSearch: window.household_members_editor_data.allowHouseholdSearch,
     allowLeaveWithoutHousehold: window.household_members_editor_data.allowLeaveWithoutHousehold,
     forceLeaveWithoutHousehold: false,
+    householdSuggestionByAccompanyingPeriod: [],
+    showHouseholdSuggestion: window.household_members_editor_expand_suggestions === 1,
     warnings: [],
     errors: []
   },
   getters: {
     isHouseholdNew(state) {
+      if (state.household === null) {
+        return false;
+      }
       return !Number.isInteger(state.household.id);
     },
     hasHousehold(state) {
@@ -46,6 +53,21 @@ const store = createStore({
     hasHouseholdOrLeave(state) {
       return state.household !== null || state.forceLeaveWithoutHousehold;
     },
+    hasHouseholdSuggestion(state, getters) {
+      return getters.filterHouseholdSuggestionByAccompanyingPeriod.length > 0;
+    },
+    countHouseholdSuggestion(state, getters) {
+      return getters.filterHouseholdSuggestionByAccompanyingPeriod.length;
+    },
+    filterHouseholdSuggestionByAccompanyingPeriod(state) {
+      if (state.household === null) {
+        return state.householdSuggestionByAccompanyingPeriod;
+      }
+
+      return state.householdSuggestionByAccompanyingPeriod
+        .filter(h => h.id !== state.household.id)
+        ;
+    },
     hasPersonsWellPositionnated(state, getters) {
       return getters.needsPositionning === false
         || (getters.persons.length > 0 && getters.concUnpositionned.length === 0);
@@ -172,9 +194,25 @@ const store = createStore({
       state.household = null;
       state.forceLeaveWithoutHousehold = true;
     },
+    selectHousehold(state, household) {
+      state.household = household;
+      state.forceLeaveWithoutHousehold = false;
+    },
+    setHouseholdSuggestionByAccompanyingPeriod(state, households) {
+      let existingIds = state.householdSuggestionByAccompanyingPeriod
+        .map(h => h.id);
+      for (let i in households) {
+        if (!existingIds.includes(households[i].id)) {
+          state.householdSuggestionByAccompanyingPeriod.push(households[i]);
+        }
+      }
+    },
     setStartDate(state, dateI) {
       state.startDate = dateI;
     },
+    toggleHouseholdSuggestion(state) {
+      state.showHouseholdSuggestion = !state.showHouseholdSuggestion;
+    },
     setWarnings(state, warnings) {
       state.warnings = warnings;
       // reset errors, which should come from servers
@@ -213,6 +251,10 @@ const store = createStore({
       commit('forceLeaveWithoutHousehold');
       dispatch('computeWarnings');
     },
+    selectHousehold({ commit }, h) {
+      commit('selectHousehold', h);
+      dispatch('computeWarnings');
+    },
     setStartDate({ commit, dispatch }, date) {
       commit('setStartDate', date);
       dispatch('computeWarnings');
@@ -220,6 +262,12 @@ const store = createStore({
     setComment({ commit }, payload) {
       commit('setComment', payload);
     },
+    fetchHouseholdSuggestionForConcerned({ commit, state }, person) {
+      fetchHouseholdSuggestionByAccompanyingPeriod(person.id)
+        .then(households => {
+          commit('setHouseholdSuggestionByAccompanyingPeriod', households);
+        });
+    },
     computeWarnings({ commit, state, getters }) {
       let warnings = [],
         payload;
@@ -255,7 +303,7 @@ const store = createStore({
             if (household.type === 'household') {
               household_id = household.id;
               // nothing to do anymore here, bye-bye !
-              window.location.replace(`/fr/person/household/${household_id}/members`);
+              window.location.replace(`/fr/person/household/${household_id}/summary`);
             } else {
               // we assume the answer was 422...
               error = household;
@@ -274,4 +322,10 @@ const store = createStore({
 
 store.dispatch('computeWarnings');
 
+if (concerned.length > 0) {
+  concerned.forEach(c => {
+    store.dispatch('fetchHouseholdSuggestionForConcerned', c.person);
+  });
+}
+
 export { store };

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js

@@ -9,7 +9,7 @@ const personMessages = {
       item: {
          type_person: "Usager",
          type_user: "TMS",
-         type_thirdparty: "Tiers",
+         type_thirdparty: "Tiers professionnel",
          type_household: "Ménage"
       },
       person: {

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

@@ -24,3 +24,4 @@
         </div>
     </div>
 </div>
+<span id="banner-accompanying-course"></span>

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

@@ -39,12 +39,15 @@
             <ul>
               {% for p in withoutHousehold %}
               <li>
-                <input type="checkbox" name="persons[]" value="{{ p.id }}" />
+                <input type="checkbox" name="persons[]" value="{{ p.id }}" checked />
                 {{ p|chill_entity_render_box }}
               </li>
               {% endfor %}
             </ul>
 
+            <input type="hidden" name="expand_suggestions" value="true" />
+            <input type="hidden" name="accompanying_period_id", value="{{ accompanyingCourse.id }}" />
+
             <ul class="record_actions">
               <li>
                 <button type="submit" class="sc-button bt-edit">
@@ -222,9 +225,107 @@
 
     <h2>{{ 'Social actions'|trans }}</h2>
 
-    <h2>{{ 'Last events on accompanying course'|trans }}</h2>
+    <div id="accompanying_course_work_list">
+      {% for w in works %}
+      <div class="item">
+          <div class="title">
+            <h2 class="action_title">
+              {{ w.socialAction|chill_entity_render_box({ 'no-badge': false }) }}
+            </h2>
+          </div>
 
+          <div class="timeline">
+            <ul class="timeline">
+              <li class="completed">
+                <div class="date">
+                  <span>{{ w.createdAt|format_date('long') }}</span>
+                </div>
+                <div class="label">
+                  <span>{{ 'accompanying_course_work.create_date'|trans }}</span>
+                </div>
+              </li>
+              <li class="completed">
+                <div class="date">
+                  <span>{{ w.startDate|format_date('long') }}</span>
+                </div>
+                <div class="label">
+                  <span>{{ 'accompanying_course_work.start_date'|trans }}</span>
+                </div>
+              </li>
+              <li class="{%if date(w.endDate) < date('now') %}completed{% endif %}">
+                <div class="date">
+                  <span>{{ w.endDate|format_date('long') }}</span>
+                </div>
+                <div class="label">
+                  <span>{{ 'accompanying_course_work.end_date'|trans }}</span>
+                </div>
+              </li>
+            </ul>
+          </div>
+
+          {% if w.results|length > 0 %}
+            <div class="objective_results objective_results__without-objectives">
+              <div class="obj without_objective">
+                <p class="title_label">{{ 'accompanying_course_work.goal'|trans }}</p>
+                <p class="chill-no-data-statement">{{ 'accompanying_course_work.results without objective'|trans }}</p>
+              </div>
+              <div class="res results">
+                <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
+                <ul class="result_list">
+                  {% for r in w.results %}
+                    <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
+                  {% endfor %}
+                </ul>
+              </div>
+            </div>
+          {% endif %}
+
+          {% if w.goals|length > 0 %}
+            {% for g in w.goals %}
+              <div class="objective_results objective_results--with-objectives">
+                <div class="objective obj">
+                  <p class="title_label">{{ 'accompanying_course_work.goal'|trans }}</p>
+                  <h3 class="goal_title">{{ g.goal.title|localize_translatable_string }}</h3>
+                </div>
+                <div class="results res">
+                  {% if g.results|length == 0 %}
+                    <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
+                    <p class="chill-no-data-statement">{{ 'accompanying_course_work.no_results'|trans }}</p>
+                  {% else %}
+                    <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
+                    <ul class="result_list">
+                      {% for r in g.results %}
+                        <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
+                      {% endfor %}
+                    </ul>
+                  {% endif %}
+                </div>
+              </div>
+            {% endfor %}
+          {% endif %}
+
+          <div class="updatedBy">
+            {{ 'Last updated by'|trans}}: {{ w.updatedBy|chill_entity_render_box }}, {{ w.updatedAt|format_datetime('long', 'short') }}
+          </div>
+
+      </div>
+      {% else %}
+        <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>    
+      {% endfor %}
+    </div>
+
+
+    {% block contentActivity %}
+        {% set person = null %}
+        {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse', 'context': 'person'} %}
+    {% endblock %}
 
     {#  ==> insert accompanyingCourse vue component  #}
     <div id="accompanying-course"></div>
 {% endblock %}
+
+
+{% block css %}
+  {{ parent() }}
+  {{ encore_entry_link_tags('accompanying_course_work_list') }}
+{% endblock %}

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

@@ -0,0 +1,25 @@
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
+
+{% block title 'accompanying_course_work.Edit accompanying course work'|trans %}
+
+
+{% block content %}
+  <h1>{{ block('title') }}</h1>
+
+  <div id="accompanying_course_work_edit"></div>
+
+{% endblock %}
+
+{% block js %}
+  {{ parent() }}
+  <script type="text/javascript">
+    window.accompanyingCourseWork = {{ json|json_encode|raw }};
+  </script>
+
+  {{ encore_entry_script_tags('accompanying_course_work_edit') }}
+{% endblock %}
+
+{% block css %}
+  {{ parent() }}
+  {{ encore_entry_link_tags('accompanying_course_work_edit') }}
+{% endblock %}

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

@@ -0,0 +1,124 @@
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
+
+{% block title 'accompanying_course_work.List accompanying course work'|trans %}
+
+
+{% block content %}
+  <h1>{{ block('title') }}</h1>
+
+  <div id="accompanying_course_work_list">
+    {% for w in works %}
+      <div class="item">
+        <div class="title">
+          <p class="title_label">{{ 'accompanying_course_work.action'|trans }}</p >
+          <h2 class="action_title">
+            {{ w.socialAction|chill_entity_render_box({ 'no-badge': true }) }}
+          </h2>
+        </div>
+
+        <div class="timeline">
+          <ul class="timeline">
+            <li class="completed">
+              <div class="date">
+                <span>{{ w.createdAt|format_date('long') }}</span>
+              </div>
+              <div class="label">
+                <span>{{ 'accompanying_course_work.create_date'|trans }}</span>
+              </div>
+            </li>
+            <li class="completed">
+              <div class="date">
+                <span>{{ w.startDate|format_date('long') }}</span>
+              </div>
+              <div class="label">
+                <span>{{ 'accompanying_course_work.start_date'|trans }}</span>
+              </div>
+            </li>
+            <li class="{%if date(w.endDate) < date('now') %}completed{% endif %}">
+              <div class="date">
+                <span>{{ w.endDate|format_date('long') }}</span>
+              </div>
+              <div class="label">
+                <span>{{ 'accompanying_course_work.end_date'|trans }}</span>
+              </div>
+            </li>
+          </ul>
+        </div>
+
+        {% if w.results|length > 0 %}
+          <div class="objective_results objective_results__without-objectives">
+            <div class="obj without_objective">
+              <p class="title_label">{{ 'accompanying_course_work.goal'|trans }}</p>
+              <p class="chill-no-data-statement">{{ 'accompanying_course_work.results without objective'|trans }}</p>
+            </div>
+            <div class="res results">
+              <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
+              <ul class="result_list">
+                {% for r in w.results %}
+                  <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
+                {% endfor %}
+              </ul>
+            </div>
+          </div>
+        {% endif %}
+
+        {% if w.goals|length > 0 %}
+          {% for g in w.goals %}
+            <div class="objective_results objective_results--with-objectives">
+              <div class="objective obj">
+                <p class="title_label">{{ 'accompanying_course_work.goal'|trans }}</p>
+                <h3 class="goal_title">{{ g.goal.title|localize_translatable_string }}</h3>
+              </div>
+              <div class="results res">
+                {% if g.results|length == 0 %}
+                  <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
+                  <p class="chill-no-data-statement">{{ 'accompanying_course_work.no_results'|trans }}</p>
+                {% else %}
+                  <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
+                  <ul class="result_list">
+                    {% for r in g.results %}
+                      <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
+                    {% endfor %}
+                  </ul>
+                {% endif %}
+              </div>
+            </div>
+          {% endfor %}
+        {% endif %}
+
+        <div class="updatedBy">
+          {{ 'Last updated by'|trans}}: {{ w.updatedBy|chill_entity_render_box }}, {{ w.updatedAt|format_datetime('long', 'short') }}
+        </div>
+
+
+        <div class="actions">
+          <ul class="record_actions">
+            <li>
+              <a 
+                class="sc-button bt-edit"
+                href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}">{{ 'Update'|trans }}</a>
+            </li>
+          </ul>
+        </div>
+      </div>
+    {% else %}
+      <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>
+    {% endfor %}
+   </div>
+
+  <ul class="record_actions sticky-form-buttons">
+    <li>
+      <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
+        class="sc-button bt-new">
+        {{ 'accompanying_course_work.create'|trans }}
+      </a>
+    </li>
+  </ul>
+
+{% endblock %}
+
+
+{% block css %}
+  {{ parent() }}
+  {{ encore_entry_link_tags('accompanying_course_work_list') }}
+{% endblock %}

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

@@ -8,22 +8,28 @@
 
 <h1>{{ 'Accompanying period list'|trans }}</h1>
 
-<table class="rounded">
-    <thead>
-        <tr>
-            <th class="chill-red">{{ 'accompanying_period.dates'|trans }}</th>
-            {% if chill_accompanying_periods.fields.user == 'visible'  %}
-                <th class="chill-blue">{{ 'Accompanying user'|trans }}</th>
-            {% endif %}
-            <th class="chill-orange">{{ 'Remark'|trans }}</th>
-            <th>&nbsp;</th>
-        </tr>
 
-    </thead>
-    <tbody>
     {% for accompanying_period in accompanying_periods %}
-        <tr>
+
-            <td>
+    <div class="flex-table">
+        <div class="item-bloc">
+            <div class="item-row">
+                <div class="item-col">
+                    {{'Accompanying period'|trans}} #{{ accompanying_period.id }}
+                </div>
+
+                <div class="item-col">
+                {% if chill_accompanying_periods.fields.user == 'visible'  %}
+                    {% if accompanying_period.user %}
+                    {{ accompanying_period.user.username }}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No accompanying user'|trans }}</span>
+                    {% endif %}
+                {% endif %}
+                </div>
+
+            </div>
+            <div class="item-row">
                 {% if accompanying_period.closingDate == null %}
                     {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long') } ) }}
                 {% else %}
@@ -40,33 +46,43 @@
                     {% endif %}
 
                 {% endif %}
-            </td>
+            </div>
-            {% if chill_accompanying_periods.fields.user == 'visible'  %}
+            <div class="item-row">
-            <td>
-                {% if accompanying_period.user %}
-                {{ accompanying_period.user.username }}
-                {% else %}
-                    <span class="chill-no-data-statement">{{ 'No accompanying user'|trans }}</span>
-                {% endif %}
-            </td>
-            {% endif %}
-            <td>
-                {% if accompanying_period is not empty %}
-                    <blockquote class="chill-user-quote">
-                    {{ accompanying_period.remark|chill_markdown_to_html }}
-                    </blockquote>
-                {% else %}
-                    {{ null|chill_print_or_message('No remark', 'blockquote') }}
-                {% endif %}
-            </td>
-            <td>
-                <ul class="record_actions">
 
+                    <h3>{{ 'Participants'|trans }}</h3>
+                    {% if accompanying_period.participations.count > 0 %}
+                        {% for p in accompanying_period.participations %}
+                        <p>
+                            <a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}">
+                                {{ p.person.firstname ~ ' ' ~ p.person.lastname }}
+                            </a>
+                        </p>
+                        {% endfor %}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                    {% endif %}
+            </div>
+            <div class="item-col">
+                <h3>{{ 'Requestors'|trans }}</h3>
+                {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
+                    {% if accompanying_period.requestorPerson is not null %}
+                    <p>{{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}</p>
+                    {% endif %}
+                    {% if accompanying_period.requestorThirdParty is not null %}
+                      <p>{{ accompanying_period.requestorThirdParty.name }}</p>
+                    {% endif %}
+                {% else %}
+                    <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                {% endif %}
+            </div>
+
+            <div class="item-row">
+                <ul class="record_actions">
                     {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
                     <li>
                         <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}" class="sc-button bt-show"></a>
                     </li>
-
+                    {#
                     <li>
                         <a  href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}" class="sc-button bt-update no-content"></a>
                     </li>
@@ -84,13 +100,15 @@
                         </a>
                     </li>
                     {% endif %}
+                    #}
                 </ul>
+            </div>
 
-            </td>
+        </div>
-        </tr>
+    </div>
+    <p></p>
     {% endfor %}
-    </tbody>
+
-</table>
 
 <div  class="form_control">
     <ul class="record_actions">
@@ -99,6 +117,12 @@
                 {{ 'Person details'|trans }}
             </a>
         </li>
+        <li>
+            <a href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" class="sc-button bt-create">
+              {{ 'Create an accompanying period'|trans }}
+            </a>
+        </li>
+        {#
         <li>
             <a href="{{ path ('chill_person_accompanying_period_create', {'person_id' : person.id } ) }}" class="sc-button bt-create has-hidden">
                 <span class="show-on-hover">{{ 'Add an accompanying period in the past'|trans }}</span>
@@ -112,6 +136,7 @@
             </a>
         </li>
         {% endif %}
+        #}
     </ul>
 </div>
 

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

@@ -26,67 +26,83 @@
 
     <h1>{{ 'Addresses\'history for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) }}</h1>
     
-    <div class="person__address">
+    <div class="address-timeline grid">
         
-        <div class="row">
-            <div class="person__address--date"></div>
-            <div class="person__address--content">
-                <div class="cell">
-                    <div>
         {% if person.addresses|length == 0 %}
             <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+        {% else %}
+            <div class="top"><i class="fa fa-caret-up fa-3x"></i></div>
         {% endif %}
-                        <a class="sc-button bt-create"
-                        href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}">
-                        {{ 'Add an address'|trans }}
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
         
         {% for address in person.addresses %}
-        <div class="row">
+            
-            <div class="person__address--date">
+            {# if person address #}
-                <div class="cell">
+            <div class="col-a content{{ ' row' ~ loop.index }}">
-                    <div class="pill">
+                <div class="address">
-                    {% if address.validFrom is not empty %}
-                    {{ address.validFrom|format_date('long') }}
-                    {% endif %}
-                    </div>
-                </div>
-            </div>
-            <div class="person__address--content">
-                <div class="cell">
-                    <i class="dot"></i>
-                    <div>
                     {% if address.isNoAddress == true %}
                         <div class="chill_address_is_noaddress">{{ 'address.consider homeless'|trans }}</div>
                     {% else %}
-                        <div>
+                            
                         {% if address.street is not empty %}
                         <div class="street">
-                                <i class="fa fa-fw fa-map-marker"></i>
                             <span class="streetNumber">{{ address.street }}</span>
                             {% if address.streetNumber is not empty %}
                                 <span class="streetNumber">, {{ address.streetNumber }}</span>
                             {% endif %}
                         </div>
                         {% endif %}
+                        
                         {% if address.postCode is not empty %}
                         <div class="postCode">
                             <span>{{ address.postCode.code }}</span> <span>{{ address.postCode.name }}</span>
                             <span class="country">({{ address.postCode.country.name|localize_translatable_string }})</span>
                         </div>
                         {% endif %}
-                        </div>
+                        
                     {% endif %}
+                        
+                    <ul class="record_actions">
+                        <li>
                             <a href="{{ path('chill_person_address_edit', { 'person_id': person.id, 'address_id' : address.id } ) }}" class="sc-button bt-edit"></a>
+                        </li>
+                    </ul>
                 </div>
             </div>
+            {# endif #}
+            
+            <div class="col-b"></div>
+            
+            {# if household address #}{# 
+                <div class="col-c content rowXX">
+                    <div class="address">...</div>
                 </div>
+            #}{# endif #}
+            
+            <div class="date">
+                {% if address.validFrom is not empty %}
+                    {{ address.validFrom|format_date('long') }}
+                {% endif %}
             </div>
+                
         {% endfor %}
+        
+        {# TEST HOUSEHOLD POSITION 
+        #}
+        <div class="col-b"></div>
+        <div class="col-c content fake">
+            <div class="address">
+                <div class="street">
+                    <span class="streetNumber">549, chemin De Sousa</span>
+                    <span class="streetNumber">, 45, boulevard Aurore Roux</span>
+                </div>
+                <div class="postCode">
+                    <span>10850</span> <span>Nanterre</span> <span class="country">(France)</span>
+                </div>
+                <ul class="record_actions"><li><a href="" class="sc-button bt-edit"></a></li></ul>
+            </div>
+        </div>
+        <div class="date">01 janvier 1970</div>
+        
     </div>
 
     <ul class="record_actions">
@@ -95,7 +111,12 @@
                     {{ 'Back to the person details'|trans }}
                 </a>
         </li>
+        <li>
+            <a class="sc-button bt-create"
+                href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}">
+                {{ 'Add an address'|trans }}
+            </a>
+        </li>
     </ul>
 
-
 {% endblock personcontent %}

src/Bundle/ChillPersonBundle/Resources/views/Entity/social_action.html.twig

@@ -1,6 +1,6 @@
 {% set reversed_parents = parents|reverse %}
 <span class="chill-entity chill-entity__social-action">
-  <span class="badge badge-primary">
+  <span class="{% if not options['no-badge'] %}badge badge-primary{% endif %}">
     {%- for p in reversed_parents %}
     <span class="chill-entity__social-action__parent--{{ loop.revindex0 }}">
       {{ p.title|localize_translatable_string }}{{ options['default.separator'] }}

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

@@ -4,44 +4,26 @@
 
 {% block content %}
 <h1>{{ block('title') }}</h1>
-<div class="household">
 
-    <div class="household__address">
+<div class="address-timeline grid">
 
-        <div class="row">
+    {% if household.addresses|length == 0 %}
-            <div class="household__address--date"></div>
+        <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
-            <div class="household__address--content">
+    {% else %}
-                <div class="cell">
+        <div class="top"><i class="fa fa-caret-up fa-3x"></i></div>
-                    <a class="sc-button bt-create"
+    {% endif %}
-                    href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
-                    {{ 'Move household'|trans }}
-                    </a>
-                </div>
-            </div>
-        </div>
     
     {% for address in household.addresses %}
-        <div class="row">
+
-            <div class="household__address--date">
+        <div class="col-b"></div>
-                <div class="cell">
+    
-                    <div class="pill">
+        <div class="col-c content{{ ' row' ~ loop.index }}">
-                    {% if address.validFrom is not empty %}
+            <div class="address">
-                    {{ address.validFrom|format_date('long') }}
-                    {% endif %}
-                    </div>
-                </div>
-            </div>
-            <div class="household__address--content">
-                <div class="cell">
-                    <i class="dot"></i>
-                    <div>
                 {% if address.isNoAddress == true %}
                     <div class="chill_address_is_noaddress">{{ 'address.consider homeless'|trans }}</div>
                 {% else %}
-                        <div>
                     {% if address.street is not empty %}
                     <div class="street">
-                                <i class="fa fa-fw fa-map-marker"></i>
                         <span class="streetNumber">{{ address.street }}</span>
                         {% if address.streetNumber is not empty %}
                             <span class="streetNumber">, {{ address.streetNumber }}</span>
@@ -55,16 +37,33 @@
                         </div>
                     {% endif %}
 
-                        </div>
                 {% endif %}
-                        <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}" class="sc-button bt-edit"></a>
-                    </div>
-                </div>
-            </div>
-        </div>
-        {% endfor %}
             </div>
             
+            <ul class="record_actions">
+                <li>
+                    <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}" class="sc-button bt-edit"></a>
+                </li>
+            </ul>
         </div>
         
+        <div class="date">
+            {% if address.validFrom is not empty %}
+                {{ address.validFrom|format_date('long') }}
+            {% endif %}
+        </div>
+        
+    {% endfor %}
+    
+</div>
+
+<ul class="record_actions">
+    <li>
+        <a class="sc-button bt-create"
+        href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
+        {{ 'Move household'|trans }}
+        </a>
+    </li>
+</ul>
+
 {% endblock %}