merge master into branch

2025-08-20 22:53:49 +00:00 · 2022-03-21 09:40:39 +01:00
parent 6151d0ce54 ff5aeaae17
commit 2463a492c8
44 changed files with 522 additions and 187 deletions
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
@@ -222,6 +222,10 @@ class AccompanyingPeriodController extends AbstractController
        $accompanyingPeriodsRaw = $this->accompanyingPeriodACLAwareRepository
            ->findByPerson($person, AccompanyingPeriodVoter::SEE);

+        usort($accompanyingPeriodsRaw, static function ($a, $b) {
+            return $b->getOpeningDate() > $a->getOpeningDate();
+        });
+
        // filter visible or not visible
        $accompanyingPeriods = array_filter($accompanyingPeriodsRaw, function (AccompanyingPeriod $ap) {
            return $this->isGranted(AccompanyingPeriodVoter::SEE, $ap);
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
@@ -134,7 +134,7 @@ class HouseholdCompositionController extends AbstractController
    public function index(Household $household, Request $request): Response
    {
        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
-            throw new AccessDeniedException('not allowed to edit an household');
+            throw new AccessDeniedException('not allowed to edit a household');
        }

        $count = $this->householdCompositionRepository->countByHousehold($household);
@@ -146,6 +146,20 @@ class HouseholdCompositionController extends AbstractController
            $paginator->getCurrentPageFirstItemNumber()
        );

+        return new Response($this->engine->render(
+            '@ChillPerson/HouseholdComposition/index.html.twig',
+            [
+                'household' => $household,
+                'compositions' => $compositions,
+            ]
+        ));
+    }
+
+    /**
+     * @Route("/{_locale}/person/household/{id}/composition/new", name="chill_person_household_composition_new")
+     */
+    public function newAction(Household $household, Request $request): Response
+    {
        if ($this->security->isGranted(HouseholdVoter::EDIT, $household)) {
            $isEdit = $request->query->has('edit');

@@ -195,10 +209,9 @@ class HouseholdCompositionController extends AbstractController
        }

        return new Response($this->engine->render(
-            '@ChillPerson/HouseholdComposition/index.html.twig',
+            '@ChillPerson/HouseholdComposition/create.html.twig',
            [
                'household' => $household,
-                'compositions' => $compositions,
                'form' => isset($form) ? $form->createView() : null,
                'isPosted' => isset($form) ? $form->isSubmitted() : false,
                'editId' => $request->query->getInt('edit', -1),
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
@@ -78,6 +78,10 @@ class HouseholdController extends AbstractController
            }
        }

+        usort($accompanyingPeriods, static function ($a, $b) {
+            return $b->getOpeningDate() > $a->getOpeningDate();
+        });
+
        $oldMembers = $household->getNonCurrentMembers();
        $accompanyingPeriodsOld = [];

--- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
@@ -133,6 +133,19 @@ final class PersonResourceController extends AbstractController
        $personResources = [];
        $personResources = $this->personResourceRepository->findBy(['personOwner' => $personOwner->getId()]);

+        return $this->render(
+            'ChillPersonBundle:PersonResource:list.html.twig',
+            [
+                'person' => $personOwner,
+                'personResources' => $personResources,
+            ]
+        );
+    }
+
+    public function newAction(Request $request, $person_id)
+    {
+        $personOwner = $this->personRepository->find($person_id);
+
        $form = $this->createForm(PersonResourceType::class);

        $form->handleRequest($request);
@@ -165,11 +178,10 @@ final class PersonResourceController extends AbstractController
        }

        return $this->render(
-            'ChillPersonBundle:PersonResource:list.html.twig',
+            'ChillPersonBundle:PersonResource:create.html.twig',
            [
-                'person' => $personOwner,
-                'personResources' => $personResources,
                'form' => $form->createView(),
+                'person' => $personOwner,
            ]
        );
    }
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\DependencyInjection\MissingBundleException;
 use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 use Chill\PersonBundle\Controller\HouseholdCompositionTypeApiController;
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodCommentVoter;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodResourceVoter;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
@@ -415,6 +416,25 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                        ],
                    ],
                ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\AccompanyingPeriod\Comment::class,
+                    'name' => 'accompanying_period_comment',
+                    'base_path' => '/api/1.0/person/accompanying-period/comment',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => false,
+                                Request::METHOD_PATCH => true,
+                                Request::METHOD_HEAD => false,
+                                Request::METHOD_DELETE => false,
+                            ],
+                            'roles' => [
+                                Request::METHOD_PATCH => AccompanyingPeriodCommentVoter::EDIT,
+                            ],
+                        ],
+                    ],
+                ],
                [
                    'class' => \Chill\PersonBundle\Entity\AccompanyingPeriod\Resource::class,
                    'name' => 'accompanying_period_resource',
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -257,9 +257,11 @@ class AccompanyingPeriod implements

    /**
     * @ORM\ManyToOne(
-     *     targetEntity=Comment::class
+     *     targetEntity=Comment::class,
+     *     cascade={"persist"},
     * )
     * @Groups({"read"})
+     * @ORM\JoinColumn(onDelete="SET NULL")
     */
    private ?Comment $pinnedComment = null;

--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -124,6 +124,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
    /**
     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Groups({"write"})
     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
     */
    private ?DateTimeImmutable $maxDate = null;
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -109,6 +109,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
     *     mappedBy="person",
     * cascade={"persist", "remove", "merge", "detach"})
+     * @ORM\OrderBy({"startDate": "DESC"})
     */
    private $accompanyingPeriodParticipations;

--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -68,12 +68,14 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
        }

        if ($this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $period)) {
-            $menu->addChild($this->translator->trans('Accompanying Course History'), [
-                'route' => 'chill_person_accompanying_course_history',
-                'routeParameters' => [
-                    'accompanying_period_id' => $period->getId(),
-                ], ])
-                ->setExtras(['order' => 30]);
+            /*
+                $menu->addChild($this->translator->trans('Accompanying Course History'), [
+                    'route' => 'chill_person_accompanying_course_history',
+                    'routeParameters' => [
+                        'accompanying_period_id' => $period->getId(),
+                    ], ])
+                    ->setExtras(['order' => 30]);
+            */

            $menu->addChild($this->translator->trans('Accompanying Course Comment'), [
                'route' => 'chill_person_accompanying_period_comment_list',
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
@@ -33,6 +33,8 @@ div.banner {
        padding-top: 1em;
        padding-bottom: 1em;
        div.contact {
+            display: flex;
+            align-content: center;
            & > * {
                margin-right: 1em;
            }
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -14,24 +14,27 @@

            <ckeditor
               name="content"
-               v-bind:placeholder="$t('comment.content')"
+               :placeholder="$t('comment.content')"
               :editor="editor"
               v-model="content"
               tag-name="textarea">
            </ckeditor>

-            <div v-if="pinnedComment" class="metadata">
-               {{ $t('comment.created_by', [
-               pinnedComment.creator.text,
-               $d(pinnedComment.createdAt.datetime, 'long')
-            ]) }}
+            <div class="sub-comment">
+               <div v-if="pinnedComment !== null && typeof pinnedComment.creator !== 'undefined'" class="metadata">
+                  {{ $t('comment.created_by', [
+                        pinnedComment.creator.text,
+                        $d(pinnedComment.updatedAt.datetime, 'long')
+                     ])
+                  }}
+               </div>
+               <div class="loading">
+                  <i v-if="loading" class="fa fa-circle-o-notch fa-spin" :title="$t('loading')"></i>
+               </div>
            </div>

            <div>
               <ul class="record_actions">
-                  <li>
-                     <button type="submit" class="btn btn-save">{{ $t('action.save') }}</button>
-                  </li>
                  <li v-if="pinnedComment !== null">
                     <a class="btn btn-delete"
                        @click="removeComment">
@@ -50,6 +53,7 @@
 <script>
 import CKEditor from '@ckeditor/ckeditor5-vue';
 import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+import { mapState } from "vuex";

 export default {
   name: "Comment",
@@ -59,22 +63,58 @@ export default {
   data() {
      return {
         editor: ClassicEditor,
-         formdata: {
-            type: "accompanying_period_comment",
-            content: ''
-         }
+         loading: false,
+         lastRecordedContent: null,
      }
   },
   computed: {
-      pinnedComment() {
-         return this.$store.state.accompanyingCourse.pinnedComment;
-      },
+      ...mapState({
+         pinnedComment: state => state.accompanyingCourse.pinnedComment,
+      }),
      content: {
         set(value) {
-            this.formdata.content = value;
+           console.log('new comment value', value);
+            console.log('previous value', this.lastRecordedContent);
+            this.lastRecordedContent = value;
+
+           setTimeout(() => {
+               console.log('performing test on ', value);
+               if (this.lastRecordedContent === value) {
+                 this.loading = true;
+                 if (value !== '') {
+                   this.$store.dispatch('updatePinnedComment', value)
+                       .then(() => {
+                         this.loading = false;
+                       })
+                       .catch(({name, violations}) => {
+                         if (name === 'ValidationException' || name === 'AccessException') {
+                           violations.forEach((violation) => this.$toast.open({message: violation}));
+                         } else {
+                           this.$toast.open({message: 'An error occurred'})
+                         }
+                       });
+                 } else {
+                   if (this.$store.state.accompanyingCourse.pinnedComment !== null) {
+                     this.$store.dispatch('removePinnedComment', {id: this.pinnedComment.id})
+                         .then(() => {
+                           this.loading = false;
+                           this.lastRecoredContent = null;
+                         })
+                         .catch(({name, violations}) => {
+                           if (name === 'ValidationException' || name === 'AccessException') {
+                             violations.forEach((violation) => this.$toast.open({message: violation}));
+                           } else {
+                             this.$toast.open({message: 'An error occurred'})
+                           }
+                         });
+                   }
+                 }
+               }
+           }, 3000);
+
         },
-         get() {
-            return (this.pinnedComment)? this.pinnedComment.content : {};
+        get() {
+          return this.pinnedComment ? this.pinnedComment.content : '';
         }
      },
      errors() {
@@ -82,18 +122,11 @@ export default {
      }
   },
   methods: {
-      submitform() {
-         this.$store.dispatch('postFirstComment', this.formdata)
-            .catch(({name, violations}) => {
-               if (name === 'ValidationException' || name === 'AccessException') {
-                  violations.forEach((violation) => this.$toast.open({message: violation}));
-               } else {
-                  this.$toast.open({message: 'An error occurred'})
-               }
-            });
+      onContentChange() {
+         let lastRecordedContent = this.formData.content;
      },
      removeComment() {
-         this.$store.dispatch('postFirstComment', {})
+         this.$store.dispatch('removePinnedComment', {id: this.pinnedComment.id})
            .catch(({name, violations}) => {
               if (name === 'ValidationException' || name === 'AccessException') {
                  violations.forEach((violation) => this.$toast.open({message: violation}));
@@ -104,15 +137,18 @@ export default {
      }
   }
 }
-/*
-* TODO
-* - [x] delete button in ul record_actions, but not in form
-* - [ ] display updatedAt => pinnedComment fetch PATCH content changes MUST NOT change object id !!
-*/
 </script>

 <style lang="scss">
 div.ck-editor.ck-reset {
   margin: 0.6em 0;
 }
+div.sub-comment {
+   display: flex;
+   justify-content: space-between;
+   div.loading {
+      margin-right: 6px;
+      margin-left: 6px;
+   }
+}
 </style>
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -9,7 +9,7 @@
         <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
         {{ $t('requestor.is_anonymous') }}
      </label>
-      <confidential :positionBtn="false" v-if="accompanyingCourse.requestor.type === 'thirdparty'">
+      <confidential v-if="accompanyingCourse.requestor.type === 'thirdparty'">
         <template v-slot:confidential-content>
            <third-party-render-box
               :thirdparty="accompanyingCourse.requestor"
@@ -33,7 +33,7 @@
         </template>
      </confidential>

-      <confidential :positionBtnFar="false" v-else-if="accompanyingCourse.requestor.type === 'person'">
+      <confidential v-else-if="accompanyingCourse.requestor.type === 'person'">
         <template v-slot:confidential-content>
            <person-render-box render="bloc"
               :person="accompanyingCourse.requestor"
@@ -339,5 +339,6 @@ div.flex-table {

 .confidential {
   display: block;
+   margin-right: 0px !important;
 }
 </style>
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -122,7 +122,7 @@ const appMessages = {
         title: "Observations",
         label: "Ajout d'une note",
         content: "Rédigez une première note…",
-         created_by: "créé par {0}, le {1}"
+         created_by: "créé par {0}, mis à jour le {1}"
      },
      confirm: {
         title: "Confirmation",
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -42,7 +42,11 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
            referrersSuggested: [],
            // all the users available
            users: [],
-            permissions: {}
+            permissions: {},
+            // controller for updating comment
+            updateCommentAbortController: null,
+            // waiting response for inserting first comment
+            postFirstPinnedCommentResponse: null,
         },
         getters: {
            isParticipationValid(state) {
@@ -203,9 +207,35 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
               //console.log('### mutation: toggleConfidential');
               state.accompanyingCourse.confidential = value;
            },
-            postFirstComment(state, comment) {
-               //console.log('### mutation: postFirstComment', comment);
-               state.accompanyingCourse.pinnedComment = comment;
+            setPinnedComment(state, content) {
+               if (null === state.accompanyingCourse.pinnedComment) {
+                  state.accompanyingCourse.pinnedComment = {
+                     id: -1,
+                     content,
+                     type: "accompanying_period_comment",
+                  };
+               } else {
+                  state.accompanyingCourse.pinnedComment.content = content;
+               }
+            },
+            setPinnedCommentDetails(state, value) {
+               state.accompanyingCourse.pinnedComment.id = value.id;
+               if (typeof value.creator !== 'undefined') {
+                  state.accompanyingCourse.pinnedComment.creator = value.creator;
+                  state.accompanyingCourse.pinnedComment.updatedBy = value.updatedBy;
+                  state.accompanyingCourse.pinnedComment.updatedAt = value.updatedAt;
+                  state.accompanyingCourse.pinnedComment.createdAt = value.createdAt;
+
+               }
+            },
+            removePinnedComment(state, value) {
+               state.accompanyingCourse.pinnedComment = null;
+            },
+            setPinCommentAbortController(state, value) {
+               state.updateCommentAbortController = value;
+            },
+            setPostFirstPinnedCommentResponse(state, value) {
+               state.postFirstPinnedCommentResponse = value;
            },
            updateSocialIssues(state, value) {
               console.log('updateSocialIssues', value);
@@ -337,6 +367,87 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                     throw error;
                  })
            },
+            /**
+             * Add/remove pinnedComment
+             */
+            removePinnedComment({ commit }, payload) {
+               const body = {type: "accompanying_period_comment", id: payload.id};
+               const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;
+
+               return makeFetch('DELETE', url, body)
+                  .then((response) => {
+                     commit('removePinnedComment');
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
+            },
+            /**
+             * internal method to insert a new comment
+             *
+             * @param commit
+             * @param dispatch
+             * @param content
+             * @returns {*}
+             */
+            addPinnedComment({ commit, dispatch }, content) {
+               const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;
+
+               return makeFetch('POST', url, {type: "accompanying_period_comment", content})
+                  .then((response) => {
+                     commit('setPinnedCommentDetails', response);
+                     return dispatch('patchFirstComment', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
+            },
+            updatePinnedComment({ commit, state, dispatch }, content) {
+               commit('setPinnedComment', content);
+               if (state.accompanyingCourse.pinnedComment.id === -1 && state.postFirstPinnedCommentResponse === null) {
+                  let r = dispatch('addPinnedComment', content).then(() => {
+                     commit('setPostFirstPinnedCommentResponse', null);
+                  });
+                  commit('setPostFirstPinnedCommentResponse', r);
+               } else {
+                  (state.postFirstPinnedCommentResponse === null ? Promise.resolve() : state.postFirstPinnedCommentResponse).then(() => {
+                     dispatch('updateExistingPinnedComment', content);
+                  });
+               }
+            },
+            /**
+             * internal method to patch an existing comment
+             *
+             * @param commit
+             * @param state
+             * @param comment
+             * @returns {*}
+             */
+            updateExistingPinnedComment({ commit, state }, content) {
+               const payload = {type: "accompanying_period_comment",  content, id: state.accompanyingCourse.pinnedComment.id};
+               const url = `/api/1.0/person/accompanying-period/comment/${payload.id}.json`;
+
+               if (state.updateCommentAbortController !== null) {
+                  state.updateCommentAbortController.abort();
+                  commit('setPinCommentAbortController', null);
+               }
+
+               let controller = new AbortController();
+               commit('setPinCommentAbortController', controller);
+
+               return makeFetch('PATCH', url, payload, { signal: controller.signal })
+                  .then((response) => {
+                     commit('setPinCommentAbortController', null);
+                     commit('setPinnedCommentDetails', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     commit('setPinCommentAbortController', null);
+                     throw error;
+                  })
+            },
            /**
             * Add/remove/display anonymous requestor
             */
@@ -606,18 +717,20 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou

               return Promise.all(promises);
            },
-            postFirstComment({ commit }, payload) {
-               const url = `/api/1.0/person/accompanying-course/${id}.json`
-               const body = { type: "accompanying_period", pinnedComment: payload }
-
+            patchFirstComment({ commit }, payload) {
+               const url = `/api/1.0/person/accompanying-course/${id}.json`;
+               const body = {
+                  type: "accompanying_period",
+                  pinnedComment: {
+                     type: "accompanying_period_comment",
+                     id: payload.id
+                  }
+               };
               return makeFetch('PATCH', url, body)
-                  .then((response) => {
-                     commit('postFirstComment', response.pinnedComment);
-                  })
                  .catch((error) => {
                     commit('catchError', error);
                     throw error;
-                  })
+                  });
            },
            updateSocialIssues({ state, commit, dispatch }, { payload, body, method }) {
               const url = `/api/1.0/person/accompanying-course/${id}/socialissue.json`;
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -319,7 +319,7 @@ const i18n = {
         add_thirdparties: "Ajouter des tiers",
         choose_thirdparties: "Choisir des tiers",
         fix_these_errors: "Veuillez corriger les erreurs suivantes :",
-         available_evaluations_text: "Évaluations disponibles pour ajout :",
+         available_evaluations_text: "Documents disponibles pour ajout :",
         no_evaluations_available: "Aucune évaluation disponible",
         no_goals_available: "Aucun objectif disponible",
      }
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -70,7 +70,7 @@
               <div class="input-group input-group-lg mb-3">
                  <div>
                     <input
-                         class="form-control form-control-lg"
+                         class="form-control"
                         style="font-weight: bold;"
                         type="text"
                         :value="d.title"
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -87,10 +87,14 @@ export default {
    currentMembers() {
      let members = this.household.members.filter(m => this.household.current_members_id.includes(m.id))
        .sort((a, b) => {
-          if (a.position.ordering < b.position.ordering) {
+
+          const orderA = a.position ? a.position.ordering : 0;
+          const orderB = b.position ? b.position.ordering : 0;
+
+          if (orderA < orderB) {
            return -1;
          }
-          if (a.position.ordering > b.position.ordering) {
+          if (orderA > orderB) {
            return 1;
          }
          if (a.holder && !b.holder) {
--- a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig
@@ -0,0 +1,26 @@
+{% extends '@ChillPerson/Household/layout.html.twig' %}
+
+{% block title 'household_composition.create'|trans %}
+
+{% block block_post_menu %}
+    <div class="post-menu"></div>
+{% endblock %}
+
+{% block content %}
+
+<h1>{{ 'household_composition.Create'|trans }}</h1>
+
+    <div>
+        {{ form_start(form) }}
+
+        {{ form_widget(form) }}
+
+        <ul class="record_actions">
+            <li>
+                <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
+            </li>
+        </ul>
+        {{ form_end(form) }}
+    </div>
+
+{% endblock %}
--- a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
@@ -15,7 +15,7 @@
    {% else %}
        <div class="flex-table">
            {% for c in compositions %}
-                {% if c.id != editId %}
+                {# {% if c.id != editId %} #}
                    <div class="item-bloc">
                        <div class="item-row">
                            <div class="item-col">
@@ -42,7 +42,7 @@
                            <div class="item-row">
                                <ul class="record_actions">
                                    <li>
-                                        <a href="{{ path('chill_person_household_composition_index', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
+                                        <a href="{{ path('chill_person_household_composition_new', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
                                    </li>
                                    <li>
                                        <a href="{{ chill_path_add_return_path('chill_person_household_composition_delete', {'composition_id': c.id,
@@ -54,45 +54,17 @@
                            </div>
                        {% endif %}
                    </div>
-                {% else %}
-                    {{ form_start(form) }}
-
-                    {{ form_widget(form) }}
-
-                    <ul class="record_actions">
-                        <li class="cancel" style="margin-right: auto;">
-                            <a class="btn btn-cancel" href="{{ path('chill_person_household_composition_index', {'id': c.household.id}) }}">{{ 'Cancel'|trans }}</a>
-                        </li>
-                        <li>
-                            <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-                        </li>
-                    </ul>
-                    {{ form_end(form) }}
-                {% endif %}
            {% endfor %}
        </div>
    {% endif %}

-    <div id="collapseForm" class="{% if not isPosted %}collapse{% endif %}">
-        {{ form_start(form) }}
-
-        {{ form_widget(form) }}
-
-        <ul class="record_actions">
-           <li>
-               <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-           </li>
-        </ul>
-        {{ form_end(form) }}
-    </div>
-
-    {% if editId == -1 %}
+    {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
        <ul class="record_actions sticky-form-buttons">
-                <li>
-                    <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
-                        {{ 'Create'|trans }}
-                    </button>
-                </li>
+            <li>
+                <a href="{{ chill_path_add_return_path('chill_person_household_composition_new', {'id': household.id,}) }}"
+                        class="btn btn-new"
+                        title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
+            </li>
        </ul>
    {% endif %}
 </div>
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
@@ -1,15 +1,25 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_person_resource_list' %}
+
+{% block title %}{{ 'Person resources'|trans|capitalize ~ ' ' ~ person|chill_entity_render_string }}{% endblock %}
+
+{% block js %}
+    {{ encore_entry_script_tags('page_person_resource_showhide_input') }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('page_person_resource_showhide_input') }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block personcontent %}
+
+<h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
+
 <div class="col-md col-xxl">
-    <div id="collapseForm" class="{% if not form.vars.submitted %}collapse{% endif %}">
        <h3 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h3>
        {% include "@ChillPerson/PersonResource/form.html.twig" %}
-    </div>
-
-    <ul class="record_actions sticky-form-buttons">
-        <li>
-            <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
-                {{ 'Add a person resource'|trans }}
-            </button>
-        </li>
-    </ul>
-
-</div>
+</div>
+{% endblock %}
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -85,8 +85,14 @@
    <p class="chill-no-data-statement">{{ 'There are no available resources'|trans }}</p>
 {% endif %}

-<h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
-
-{% include "@ChillPerson/PersonResource/create.html.twig" %}
+{% if is_granted('CHILL_PERSON_UPDATE', person) %}
+<ul class="record_actions sticky-form-buttons">
+    <li>
+        <a href="{{ chill_path_add_return_path('chill_person_resource_new', {'person_id': person.id,}) }}"
+                class="btn btn-new"
+                title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
+    </li>
+</ul>
+{% endif %}

 {% endblock %}
--- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
@@ -49,7 +49,12 @@
                                        <li>
                                            <i class="fa fa-li fa-home"></i>
                                            <span class="item-key">{{ "Address of"|trans}} </span>
-                                            <span class="chill-entity entity-person badge-person">{{ a.hostPerson|chill_entity_render_box }}</span>
+                                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                                    action: 'show', displayBadge: true,
+                                                    targetEntity: { name: 'person', id: a.hostPerson.id },
+                                                    buttonText: a.hostPerson|chill_entity_render_string,
+                                                    isDead: a.hostPerson.deathdate is not null
+                                                } %}
                                        </li>
                                        <li>
                                            {% set address_date = date(a.startDate|date("m/d/Y")) %}
@@ -62,7 +67,12 @@
                                        <li>
                                            <i class="fa fa-li fa-home"></i>
                                            <span class="item-key">{{ "Address of"|trans}}</span>
-                                            <span class="chill-entity entity-person badge-thirdparty">{{ a.hostThirdParty|chill_entity_render_box }}</span>
+                                            {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                                action: 'show', displayBadge: true,
+                                                targetEntity: { name: 'thirdparty', id: a.hostThirdParty.id },
+                                                buttonText: a.hostThirdParty|chill_entity_render_string,
+                                                isDead: false,
+                                            } %}
                                        </li>
                                        <li>
                                            {% if a.hostThirdParty.address is not null %}
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -1,5 +1,10 @@
+{%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
+
 <div class="flex-table accompanying_course_work-list">
    <div class="item-bloc evaluation-item bg-chill-llight-gray">
+        <div class="item-row mb-2">
+            <h1>{{ doc.title }}</h1>
+        </div>
        <div class="item-row mb-2">
            <h2 class="badge-title">
                <span class="title_label"></span>
@@ -20,6 +25,24 @@
                </span>
            </h2>
        </div>
+        <div class="item-row mb-2">
+            <div class="item-col" style="width: 17%;">
+                <h4 class="title_label">
+                    {{ 'Participants'|trans }}
+                </h4>
+            </div>
+            <div class="item-col list">
+                {% for p in evaluation.accompanyingPeriodWork.persons %}
+                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                        targetEntity: { name: 'person', id: p.id },
+                        action: 'show',
+                        displayBadge: true,
+                        buttonText: p|chill_entity_render_string,
+                        isDead: p.deathdate is not null
+                    } %}
+                {% endfor %}
+            </div>
+        </div>
        <div class="item-row column">
            <table class="obj-res-eval my-3" style="font-size: 110% !important;">
                <thead>
@@ -92,12 +115,19 @@
 </div>

 {% if display_action is defined and display_action == true %}
-    {# TODO add acl #}
+    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', evaluation.accompanyingPeriodWork) %}
    <ul class="record_actions">
+        <li>{{ m.download_button(doc.storedObject, doc.title) }}</li>
+        {% if chill_document_is_editable(doc.storedObject) %}
+            <li>
+                {{ doc.storedObject|chill_document_edit_button }}
+            </li>
+        {% endif %}
        <li>
            <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
                {{ 'Show'|trans }}
            </a>
        </li>
    </ul>
+    {% endif %}
 {% endif %}
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Serializer\Normalizer;
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
@@ -46,7 +47,10 @@ class AccompanyingPeriodWorkEvaluationNormalizer implements ContextAwareNormaliz
    {
        $initial = $this->normalizer->normalize($object, $format, array_merge(
            $context,
-            [self::IGNORE_EVALUATION => spl_object_hash($object)]
+            [self::IGNORE_EVALUATION => spl_object_hash($object)],
+            [AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => static function ($object, $format, $context) {
+                return $object->getId();
+            }]
        ));

        // due to bug: https://api-platform.com/docs/core/serialization/#collection-relation
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -61,8 +61,8 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
        return $this->translator->trans(
            'workflow.Doc for evaluation (n°%eval%)',
            ['%eval%' => $entityWorkflow->getRelatedEntityId()]
-        ) . ' - ' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
-            ->getEvaluation()->getTitle());
+        ) . ' (' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
+            ->getEvaluation()->getTitle()).') '.$doc->getTitle();
    }

    public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluationDocument
--- a/src/Bundle/ChillPersonBundle/config/routes.yaml
+++ b/src/Bundle/ChillPersonBundle/config/routes.yaml
@@ -59,6 +59,10 @@ chill_person_resource_list:
    path: /{_locale}/person/{person_id}/resources/list
    controller: Chill\PersonBundle\Controller\PersonResourceController::listAction

+chill_person_resource_new:
+    path: /{_locale}/person/{person_id}/resources/new
+    controller: Chill\PersonBundle\Controller\PersonResourceController::newAction
+
 chill_person_resource_edit:
    path: /{_locale}/person/{person_id}/resources/{resource_id}/edit
    controller: Chill\PersonBundle\Controller\PersonResourceController::editAction
@@ -91,11 +95,6 @@ chill_person_address_update:
 chill_person_timeline:
    path: /{_locale}/person/{person_id}/timeline
    controller: Chill\PersonBundle\Controller\TimelinePersonController::personAction
-    options:
-        menus:
-            person:
-                order: 60
-                label: Timeline

 chill_person_admin:
    path: "/{_locale}/admin/person"
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Change constraint on pinnedComment in Accompanying period.
+ */
+final class Version20220310124318 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT fk_e260a868b0804e90');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT fk_e260a868b0804e90 FOREIGN KEY (pinnedcomment_id) REFERENCES chill_person_accompanying_period_comment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Change constraint on pinnedComment in Accompanying period';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A868B0804E90');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A868B0804E90 FOREIGN KEY (pinnedComment_id) REFERENCES chill_person_accompanying_period_comment (id) ON DELETE SET NULL NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+}
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -566,6 +566,7 @@ household_composition:
    Currently no composition: Aucune composition familiale renseignée.
    Add a composition: Ajouter une composition familiale
    Update composition: Modifier la composition familiale
+    Create: Créér une nouvelle composition familiale

 # docgen
 Linked evaluations: Évaluations associées