From 34b3c6fa327a40c99c7507ebcd24ca9f753aa18b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 3 Mar 2022 14:15:20 +0100
Subject: [PATCH 01/64] bugfix when position of member is null

---
 .../vuejs/_components/Entity/HouseholdRenderBox.vue       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index 16d0fa2ff..163f49bcf 100644
--- 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) {

From 892be425807ff901efcd593c764bab132cfd46ab Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 3 Mar 2022 16:28:31 +0100
Subject: [PATCH 02/64] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bd743078..8dd9bbbe2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to
 * [confidential] Fix position of toggle button so it does not cover text nor fall outside of box (no issue)
 * [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474)
 * [template] do not list inactive templates (for doc generator)
+* [household] bugfix if position of member is null, renderbox no longer throws an error (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/480)
 
 ## Test releases
 

From 3ff92915809e0907eda8d4aa051725b6a01cc748 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 16:37:58 +0100
Subject: [PATCH 03/64] assign User to undsipatched acc period: filter users by
 job type

---
 .../public/mod/AccompanyingPeriod/setReferrer.js    | 13 ++++++-------
 .../_components/AccompanyingPeriod/SetReferrer.vue  |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/mod/AccompanyingPeriod/setReferrer.js b/src/Bundle/ChillPersonBundle/Resources/public/mod/AccompanyingPeriod/setReferrer.js
index b73c0afea..939075380 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/mod/AccompanyingPeriod/setReferrer.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/mod/AccompanyingPeriod/setReferrer.js
@@ -19,22 +19,21 @@ import {fetchResults} from 'ChillMainAssets/lib/api/apiMethods.js';
  */
 
 document.querySelectorAll('[data-set-referrer-app]').forEach(function (el) {
-  let
-    periodId = Number.parseInt(el.dataset.setReferrerAccompanyingPeriodId);
-
+  const periodId = Number.parseInt(el.dataset.setReferrerAccompanyingPeriodId);
+  const jobId = Number.parseInt(el.dataset.setReferrerJobId);
   const url = `/api/1.0/person/accompanying-course/${periodId}/referrers-suggested.json`;
 
   fetchResults(url).then(suggested => {
-
+    const filteredSuggested = suggested.filter((s) => s.user_job ? s.user_job.id === jobId : false);
     const app = createApp({
       components: {
         SetReferrer,
       },
       template:
-        '<set-referrer :suggested="suggested" :periodId="periodId" @referrerSet="onReferrerSet"></set-referrer>',
+        '<set-referrer :suggested="filteredSuggested" :periodId="periodId" @referrerSet="onReferrerSet"></set-referrer>',
       data() {
         return {
-          periodId, suggested, original: suggested,
+          periodId, filteredSuggested, original: filteredSuggested,
         }
       },
       methods: {
@@ -56,7 +55,7 @@ document.querySelectorAll('[data-set-referrer-app]').forEach(function (el) {
           label.textContent = ref.text;
           label.classList.remove('chill-no-data-statement');
 
-          this.suggested = this.original.filter(user => user.id !== ref.id);
+          this.filteredSuggested = this.original.filter(user => user.id !== ref.id);
         }
       }
     });
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
index 3d3675c73..38418f305 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
@@ -1,12 +1,12 @@
 <template>
 <ul class="list-suggest add-items" v-if="suggested.length > 0">
-  <li v-for="r in suggested" @click="setReferrer(r)"><span>{{ r.text }}</span></li>
+  <li v-for="(r, i) in suggested" @click="setReferrer(r)" :key="i"><span>{{ r.text }}</span></li>
 </ul>
 </template>
 
 <script>
 
-import {makeFetch} from 'ChillMainAssets/lib/api/apiMethods.js';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods.js';
 
 export default {
   name: "SetReferrer",

From 1c1dec1f5b735ca04438f7d769a7d492f635c7b9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 3 Mar 2022 17:21:54 +0100
Subject: [PATCH 04/64] upd CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a38f2ea47..d760a8b6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
+
+
 * [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)
 * [activity] do not override location if already exist (when validating new activity) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/470)
 * [parcours] Toggle emergency/intensity only by referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)

From 84f2e1c72ac7668a8d6c5dc08a23507197afa7d9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 10:34:47 +0100
Subject: [PATCH 05/64] Accompanying Period: set cascade persist on
 pinnedComment

---
 src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index d75ade12b..4d0c4895e 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -257,7 +257,8 @@ class AccompanyingPeriod implements
 
     /**
      * @ORM\ManyToOne(
-     *     targetEntity=Comment::class
+     *     targetEntity=Comment::class,
+     *     cascade={"persist"},
      * )
      * @Groups({"read"})
      */

From 6d46efa61062b1d472c291a740077034f1f9bdbe Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 11:53:27 +0100
Subject: [PATCH 06/64] accompanying course: fix posting of pinned comment

---
 .../vuejs/AccompanyingCourse/store/index.js   | 54 +++++++++++++++----
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index f7fd59b32..849a77289 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -203,9 +203,11 @@ 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;
+            addPinnedComment(state, value) {
+               state.accompanyingCourse.pinnedComment = value;
+            },
+            removePinnedComment(state, value) {
+               state.accompanyingCourse.pinnedComment = null;
             },
             updateSocialIssues(state, value) {
                console.log('updateSocialIssues', value);
@@ -337,6 +339,35 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                      throw error;
                   })
             },
+            /**
+             * Add/remove pinnedComment
+             */
+            removePinnedComment({ commit, dispatch }) {
+               const body = {};
+               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;
+                  })
+            },
+            addPinnedComment({ commit, dispatch }, payload) {
+               const body = payload ? { type: payload.type, content: payload.content } : {};
+               const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;
+
+               return makeFetch('POST', url, body)
+                  .then((response) => {
+                     dispatch('patchFirstComment', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
+            },
             /**
              * Add/remove/display anonymous requestor
              */
@@ -606,18 +637,23 @@ 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);
+                     commit('addPinnedComment', 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`;

From cde6e8f368e969af2886c692e02ecda435ecd293 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 13:01:01 +0100
Subject: [PATCH 07/64] accompanying course: allow PATCH on a comment entity

---
 .../ChillPersonExtension.php                  | 16 ++++++++
 .../AccompanyingCourse/components/Comment.vue | 39 ++++++++++++++++++-
 .../vuejs/AccompanyingCourse/store/index.js   | 17 +++++++-
 3 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index b05da5626..c527010ca 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -415,6 +415,22 @@ 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,
+                            ],
+                        ],
+                    ],
+                ],
                 [
                     'class' => \Chill\PersonBundle\Entity\AccompanyingPeriod\Resource::class,
                     'name' => 'accompanying_period_resource',
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index a852d71a0..8b3dee5c3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -17,6 +17,7 @@
                v-bind:placeholder="$t('comment.content')"
                :editor="editor"
                v-model="content"
+               @input="onContentChange"
                tag-name="textarea">
             </ckeditor>
 
@@ -82,8 +83,34 @@ export default {
       }
    },
    methods: {
-      submitform() {
-         this.$store.dispatch('postFirstComment', this.formdata)
+      onContentChange() {
+         console.log('content changed');
+         console.log(this.pinnedComment)
+         if (this.pinnedComment) {
+            let body = this.formdata;
+            Object.assign(body, {id: this.pinnedComment.id})
+            this.$store.dispatch('updatePinnedComment', body)
+               .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 {
+            this.$store.dispatch('addPinnedComment', 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'})
+                  }
+               });
+         }
+      },
+      submitform() { //TODO deprecated, to remove
+         console.log(this.formdata)
+         this.$store.dispatch('addPinnedComment', this.formdata)
             .catch(({name, violations}) => {
                if (name === 'ValidationException' || name === 'AccessException') {
                   violations.forEach((violation) => this.$toast.open({message: violation}));
@@ -91,6 +118,14 @@ export default {
                   this.$toast.open({message: 'An error occurred'})
                }
             });
+         // 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'})
+         //       }
+         //    });
       },
       removeComment() {
          this.$store.dispatch('postFirstComment', {})
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 849a77289..f27fcfb7f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -348,7 +348,7 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
 
                return makeFetch('DELETE', url, body)
                   .then((response) => {
-                        commit('removePinnedComment');
+                     commit('removePinnedComment');
                   })
                   .catch((error) => {
                      commit('catchError', error);
@@ -368,6 +368,21 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                      throw error;
                   })
             },
+            updatePinnedComment({ commit }, payload) {
+               console.log(payload)
+               const url = `/api/1.0/person/accompanying-period/comment/${payload.id}.json`;
+
+               return makeFetch('PATCH', url, payload)
+                  .then((response) => {
+                     console.log(response)
+                     commit('addPinnedComment', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
+
+            },
             /**
              * Add/remove/display anonymous requestor
              */

From f04118218d553ecc197c23b12d1a528df12fb035 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 13:56:03 +0100
Subject: [PATCH 08/64] accompanying course comment: tentative to delete the
 comment

---
 .../AccompanyingCourse/components/Comment.vue | 50 +++++--------------
 .../vuejs/AccompanyingCourse/store/index.js   |  5 +-
 2 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index 8b3dee5c3..0534551ba 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -14,7 +14,7 @@
 
             <ckeditor
                name="content"
-               v-bind:placeholder="$t('comment.content')"
+               :placeholder="$t('comment.content')"
                :editor="editor"
                v-model="content"
                @input="onContentChange"
@@ -23,16 +23,14 @@
 
             <div v-if="pinnedComment" class="metadata">
                {{ $t('comment.created_by', [
-               pinnedComment.creator.text,
-               $d(pinnedComment.createdAt.datetime, 'long')
-            ]) }}
+                     pinnedComment.creator.text,
+                     $d(pinnedComment.createdAt.datetime, 'long')
+                  ])
+               }}
             </div>
 
-            <div>
+            <!-- <div> //DOES NOT WORk
                <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">
@@ -40,7 +38,7 @@
                      </a>
                   </li>
                </ul>
-            </div>
+            </div> -->
 
          </form>
       </div>
@@ -60,7 +58,7 @@ export default {
    data() {
       return {
          editor: ClassicEditor,
-         formdata: {
+         formData: {
             type: "accompanying_period_comment",
             content: ''
          }
@@ -72,7 +70,7 @@ export default {
       },
       content: {
          set(value) {
-            this.formdata.content = value;
+            this.formData.content = value;
          },
          get() {
             return (this.pinnedComment)? this.pinnedComment.content : {};
@@ -87,7 +85,7 @@ export default {
          console.log('content changed');
          console.log(this.pinnedComment)
          if (this.pinnedComment) {
-            let body = this.formdata;
+            let body = this.formData;
             Object.assign(body, {id: this.pinnedComment.id})
             this.$store.dispatch('updatePinnedComment', body)
                .catch(({name, violations}) => {
@@ -98,7 +96,7 @@ export default {
                   }
                });
          } else {
-            this.$store.dispatch('addPinnedComment', this.formdata)
+            this.$store.dispatch('addPinnedComment', this.formData)
                .catch(({name, violations}) => {
                   if (name === 'ValidationException' || name === 'AccessException') {
                      violations.forEach((violation) => this.$toast.open({message: violation}));
@@ -108,27 +106,8 @@ export default {
                });
          }
       },
-      submitform() { //TODO deprecated, to remove
-         console.log(this.formdata)
-         this.$store.dispatch('addPinnedComment', 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'})
-               }
-            });
-         // 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'})
-         //       }
-         //    });
-      },
       removeComment() {
-         this.$store.dispatch('postFirstComment', {})
+         this.$store.dispatch('removePinnedComment', {})
             .catch(({name, violations}) => {
                if (name === 'ValidationException' || name === 'AccessException') {
                   violations.forEach((violation) => this.$toast.open({message: violation}));
@@ -139,11 +118,6 @@ 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">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index f27fcfb7f..dd2588d48 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -342,8 +342,8 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
             /**
              * Add/remove pinnedComment
              */
-            removePinnedComment({ commit, dispatch }) {
-               const body = {};
+            removePinnedComment({ commit }) { //DOES NOT WORK
+               const body = {type: "accompanying_period_comment"};
                const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;
 
                return makeFetch('DELETE', url, body)
@@ -381,7 +381,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                      commit('catchError', error);
                      throw error;
                   })
-
             },
             /**
              * Add/remove/display anonymous requestor

From 6472c554edc3f17a15fa4212637925d2acbc736d Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 14:22:25 +0100
Subject: [PATCH 09/64] accompanying course comment: more tentative to delete
 the comment

---
 src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php   | 1 +
 .../public/vuejs/AccompanyingCourse/components/Comment.vue   | 2 +-
 .../Resources/public/vuejs/AccompanyingCourse/store/index.js | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index 4d0c4895e..bd3211c5d 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -261,6 +261,7 @@ class AccompanyingPeriod implements
      *     cascade={"persist"},
      * )
      * @Groups({"read"})
+     * @ORM\JoinColumn(onDelete="SET NULL")
      */
     private ?Comment $pinnedComment = null;
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index 0534551ba..fde1319d7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -107,7 +107,7 @@ export default {
          }
       },
       removeComment() {
-         this.$store.dispatch('removePinnedComment', {})
+         this.$store.dispatch('removePinnedComment', {id: this.pinnedComment.id})
             .catch(({name, violations}) => {
                if (name === 'ValidationException' || name === 'AccessException') {
                   violations.forEach((violation) => this.$toast.open({message: violation}));
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index dd2588d48..5b196df10 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -342,8 +342,9 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
             /**
              * Add/remove pinnedComment
              */
-            removePinnedComment({ commit }) { //DOES NOT WORK
-               const body = {type: "accompanying_period_comment"};
+            removePinnedComment({ commit }, payload) { //DOES NOT WORK
+
+               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)

From 4b692edd7d6da22afd3c4ece196f4bb200d050af Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 15:09:50 +0100
Subject: [PATCH 10/64] accompanying course comment: autosave the comment

---
 .../AccompanyingCourse/components/Comment.vue | 53 ++++++++++---------
 .../vuejs/AccompanyingCourse/js/i18n.js       |  2 +-
 .../vuejs/AccompanyingCourse/store/index.js   |  2 -
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index fde1319d7..ffb848bcb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -24,7 +24,7 @@
             <div v-if="pinnedComment" class="metadata">
                {{ $t('comment.created_by', [
                      pinnedComment.creator.text,
-                     $d(pinnedComment.createdAt.datetime, 'long')
+                     $d(pinnedComment.updatedAt.datetime, 'long')
                   ])
                }}
             </div>
@@ -82,29 +82,34 @@ export default {
    },
    methods: {
       onContentChange() {
-         console.log('content changed');
-         console.log(this.pinnedComment)
-         if (this.pinnedComment) {
-            let body = this.formData;
-            Object.assign(body, {id: this.pinnedComment.id})
-            this.$store.dispatch('updatePinnedComment', body)
-               .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 {
-            this.$store.dispatch('addPinnedComment', 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'})
-                  }
-               });
-         }
+         let lastRecordedContent = this.formData.content;
+         setTimeout(() => {
+            if (lastRecordedContent === this.formData.content) {
+               if (this.pinnedComment) {
+                  let body = this.formData;
+                  Object.assign(body, {id: this.pinnedComment.id});
+
+                  this.$store.dispatch('updatePinnedComment', body)
+                     .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 {
+                  this.$store.dispatch('addPinnedComment', 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'})
+                        }
+                     });
+               }
+               lastRecordedContent = null;
+            }
+         }, 3000);
       },
       removeComment() {
          this.$store.dispatch('removePinnedComment', {id: this.pinnedComment.id})
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 5f0321c70..f1e2de958 100644
--- 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",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 5b196df10..bfb6412ff 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -370,12 +370,10 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                   })
             },
             updatePinnedComment({ commit }, payload) {
-               console.log(payload)
                const url = `/api/1.0/person/accompanying-period/comment/${payload.id}.json`;
 
                return makeFetch('PATCH', url, payload)
                   .then((response) => {
-                     console.log(response)
                      commit('addPinnedComment', response);
                   })
                   .catch((error) => {

From def90893deff1adfc59d7368ac51b86fd2df6391 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 4 Mar 2022 15:12:11 +0100
Subject: [PATCH 11/64] upd CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d760a8b6a..8fda3903f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [parcours] autosave of the pinned comment for draft accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/477)
 * [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
 
 

From 9b06ccc3e6466fe4f315ee9c6b21af8f4c3735e8 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 7 Mar 2022 11:13:11 +0100
Subject: [PATCH 12/64] user admin: use flex-table and flex-bloc in twig

---
 .../Resources/views/User/index.html.twig      | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index 53bd89482..a1f55e7d3 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -1,60 +1,60 @@
 {% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
 
 {% block admin_content -%}
-    {% embed '@ChillMain/CRUD/_index.html.twig' %}
-        {% block table_entities_thead_tr %}
-            <th>{{ 'crud.admin_user.index.is_active'|trans }}</th>
-            <th>{{ 'crud.admin_user.index.usernames'|trans }}</th>
-            <th>{{ 'crud.admin_user.index.mains'|trans }}</th>
-            <th>&nbsp;</th>
-        {% endblock %}
-        {% block table_entities_tbody %}
-            {% for entity in entities %}
-            <tr data-username="{{ entity.username|e('html_attr') }}">
-                <td>
+
+    <h1>{{"Users"|trans}}</h1>
+    {% for entity in entities %}
+    <div class="flex-table">
+        <div class="item-bloc">
+            <div class="item-row">
+                <div class="item-col">
+                    {{ entity.label }}
                     {% if entity.isEnabled %}
                         <i class="fa fa-check chill-green"></i>
                     {% else %}
                         <i class="fa fa-times chill-red"></i>
                     {% endif %}
-                </td>
-                <td>
-                    {{ entity.username }}
-                    <br/>
-                    {{ entity.label }}
-                    <br/>
-                    {{ entity.email }}
-                </td>
-                <td>
+                </div>
+                <div class="item-col"><i>{{ entity.email }}</i></div>
+            </div>
+            <div class="item-row">
+                <div class="item-col">
+                    login: {{ entity.username|e('html_attr') }}
+                </div>
+                <div class="item-col">
                     {% if entity.userJob %}
-                    {{ entity.userJob.label|localize_translatable_string }}
-                    <br/>
+                        {{ entity.userJob.label|localize_translatable_string }}
                     {% endif %}
+                </div>
+            </div>
+            <div class="item-row">
+                <div class="item-col">
                     {% if entity.mainScope %}
-                    {{ entity.mainScope.name|localize_translatable_string }}
-                    <br/>
+                        {{ entity.mainScope.name|localize_translatable_string }}
                     {% endif %}
                     {% if entity.mainCenter %}
-                    {{ entity.mainCenter.name }}
+                        , {{ entity.mainCenter.name }}
                     {% endif %}
-                </td>
-                <td>
-                    <ul class="record_actions">
+                </div>
+            </div>
+            <div class="item-row">
+               <ul class="record_actions">
+                    <li>
+                        <a class="btn btn-edit" href="{{ path('chill_crud_admin_user_edit', { 'id': entity.id }) }}"></a>
+                    </li>
+                    <li>
+                        <a class="btn btn-chill-red" href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}" title="{{ 'Edit password'|trans|e('html_attr') }}"><i class="fa fa-ellipsis-h"></i></a>
+                    </li>
+                    {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
                         <li>
-                            <a class="btn btn-edit" href="{{ path('chill_crud_admin_user_edit', { 'id': entity.id }) }}"></a>
+                            <a class="btn btn-chill-blue" href="{{ path('chill_main_homepage', {'_switch_user': entity.username }) }}" title="{{ "Impersonate"|trans|e('html_attr') }}"><i class="fa fa-user-secret"></i></a>
                         </li>
-                        <li>
-                            <a class="btn btn-chill-red" href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}" title="{{ 'Edit password'|trans|e('html_attr') }}"><i class="fa fa-ellipsis-h"></i></a>
-                        </li>
-                        {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
-                            <li>
-                                <a class="btn btn-chill-blue" href="{{ path('chill_main_homepage', {'_switch_user': entity.username }) }}" title="{{ "Impersonate"|trans|e('html_attr') }}"><i class="fa fa-user-secret"></i></a>
-                            </li>
-                        {% endif %}
-                    </ul>
-                </td>
-            </tr>
-            {% endfor %}
-        {% endblock %}
-    {% endembed %}
-{% endblock %}
+                    {% endif %}
+                </ul>
+            </div>
+        </div>
+
+    </div>
+    {% endfor %}
+
+{% endblock %}
\ No newline at end of file

From 388b666b5df010da79123963cd07c97dcb091cef Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 7 Mar 2022 14:36:44 +0100
Subject: [PATCH 13/64] person badge changed to include onTheFly + changelog
 updated

---
 CHANGELOG.md                                               | 1 +
 .../Resources/views/ResidentialAddress/list.html.twig      | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5be67840f..a51ba5266 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ and this project adheres to
 * [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478)
 * [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
 * [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
+* [address] person badge in address history changed to open OnTheFly with all person info (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/489)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
index 4cba32e47..64e5d3813 100644
--- 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")) %}

From 17e83deb55f7e652acaaec5c5031e655fa539345 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 8 Mar 2022 09:46:41 +0100
Subject: [PATCH 14/64] User admin: put pagination

---
 src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index a1f55e7d3..5a558b6a0 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -57,4 +57,6 @@
     </div>
     {% endfor %}
 
+    {{ chill_pagination(paginator) }}
+
 {% endblock %}
\ No newline at end of file

From 1860478aea1d54093106f35780bfb47a03839c7b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 8 Mar 2022 09:48:17 +0100
Subject: [PATCH 15/64] finding solution for toggle button position

---
 .../Resources/public/module/blur/blur.scss    | 37 ++++++-------------
 .../public/vuejs/_components/Confidential.vue | 14 +++----
 .../Resources/views/Entity/address.html.twig  |  6 +--
 .../Resources/public/chill/chillperson.scss   |  2 +
 .../components/Requestor.vue                  |  5 ++-
 5 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
index a53ea69d9..ba5d38edf 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
@@ -1,37 +1,22 @@
 .confidential {
     display: flex;
     position: relative;
-}
-.toggle-far-twig {
-    i {
-        bottom: 0px;
-        right: -30px;
-    }
+    margin-right: 20px
+    // margin-left 20px;
 }
 
-.toggle-close-twig {
-    i {
-        bottom: 0px;
-        right: -5px;
-    }
+.toggle-container {
+    position: absolute;
+    width: 100%;
+    top: 0;
+    left: 0;
+    cursor: pointer;
+    z-index: 5;
+    padding-right: 1rem;
 }
 .toggle{
-    margin-left: 30px;
-    margin-top: 5px;
-    cursor: pointer;
     position: absolute;
-    z-index: 5;
-    right: -30px
-}
-
-.toggle-far {
-    bottom: 0px;
-    right: 20px !important;
-}
-
-.toggle-close {
-    bottom: 125px;
-    right: 15px !important;
+    right: 4px;
 }
 
 .blur {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index f5a555520..af488cf0c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -3,8 +3,8 @@
         <div :class="{ 'blur': isBlurred }">
             <slot name="confidential-content"></slot>
         </div>
-        <div>
-            <i class="fa fa-eye toggle" :class="positionBtn" aria-hidden="true" @click="toggleBlur"></i>
+        <div class="toggle-container">
+            <i class="fa fa-eye toggle" :class="{ toggleIcon }" aria-hidden="true" @click="toggleBlur"></i>
         </div>
     </div>
 </template>
@@ -12,28 +12,24 @@
 <script>
 export default {
     name: "Confidential",
-    props: ['positionBtnFar'],
     data() {
         return {
             isBlurred: true,
+            toggleIcon: 'fa-eye',
         };
     },
     methods : {
         toggleBlur() {
             console.log(this.positionBtnFar);
             this.isBlurred = !this.isBlurred;
+            this.toggleIcon = this.isBlurred ? 'fa-eye' : 'fa-eye-slash';
         },
     },
-    computed: {
-        positionBtn() {
-            return this.positionBtnFar ? 'toggle-far' : 'toggle-close'
-        }
-    }
 }
 </script>
 
 <style scoped lang='scss'>
     .confidential{
-        align-items: center;
+        align-content: center;
     }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index 54a0b86b7..3dfc27d2f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -59,7 +59,7 @@
     must be shown in such list
 #}
 {%- if render == 'list' -%}
-    <li class="chill-entity entity-address {% if address.confidential %} confidential toggle-far-twig {% endif %}">
+    <li class="chill-entity entity-address {% if address.confidential %} confidential {% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-li fa-map-marker"></i>
         {% endif %}
@@ -68,7 +68,7 @@
 {%- endif -%}
 
 {%- if render == 'inline' -%}
-    <span class="chill-entity entity-address {% if address.confidential %} confidential toggle-far-twig {% endif %}">
+    <span class="chill-entity entity-address {% if address.confidential %} confidential {% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-fw fa-map-marker"></i>
         {% endif %}
@@ -77,7 +77,7 @@
 {%- endif -%}
 
 {%- if render == 'bloc' -%}
-    <div class="chill-entity entity-address {% if address.confidential %} confidential toggle-close-twig {% endif %}">
+    <div class="chill-entity entity-address {% if address.confidential %} confidential {% endif %}">
         {% if options['has_no_address'] == true and address.isNoAddress == true %}
             {% if address.postCode is not empty %}
             <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
index 92542f178..fba0516a7 100644
--- 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;
             }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 713693605..7cf0dcecc 100644
--- 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>

From 50a2de1559b6636476473658be753dd650cc61b5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 8 Mar 2022 11:20:06 +0100
Subject: [PATCH 16/64] order accompanying course by openingDate for Person

---
 .../Controller/AccompanyingPeriodController.php               | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
index bb0081c27..c34702ad1 100644
--- 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);

From dc5ff53a578f9d27394e2ef0b6d38d92f3dd7225 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 8 Mar 2022 11:21:59 +0100
Subject: [PATCH 17/64] order accompanying course by openingDate for Household

---
 .../ChillPersonBundle/Controller/HouseholdController.php      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
index 07fa34b5a..0a8b7eea1 100644
--- 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 = [];
 

From db95e935d91e7bc195a973ec91d9865f2089dfa5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 8 Mar 2022 11:37:08 +0100
Subject: [PATCH 18/64] order accompanying period by opening date in search
 person

---
 src/Bundle/ChillPersonBundle/Entity/Person.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index fab4b2845..7297754bd 100644
--- 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;
 

From b68b43118b48fc60456fee3d658fc794dd1dabf8 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 8 Mar 2022 11:38:40 +0100
Subject: [PATCH 19/64] update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5be67840f..cb821031d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] order accompanying period by opening date in search persons, person and household period lists (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/493)
+
 * [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
 * [person] Add url in accompanying period work evaluations entity and form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/476)
 * [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)

From 6f58a9a8bbed28f19668656b23698149354d3a74 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 11:06:00 +0100
Subject: [PATCH 20/64] separate create page

---
 .../Controller/PersonResourceController.php   | 18 ++++++++--
 .../views/PersonResource/create.html.twig     | 34 ++++++++++++-------
 .../views/PersonResource/list.html.twig       | 12 +++++--
 .../ChillPersonBundle/config/routes.yaml      |  4 +++
 4 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
index 210b507e5..004961594 100644
--- 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,
             ]
         );
     }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
index 8fea0bd70..e64d76362 100644
--- 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>
\ No newline at end of file
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index 1d480614f..6ccf1a0eb 100644
--- 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-sm btn-new"
+                title="{{ 'Create'|trans }}">{{ 'Add a person resource'|trans }}</a>
+    </li>
+</ul>
+{% endif %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/config/routes.yaml b/src/Bundle/ChillPersonBundle/config/routes.yaml
index 13d1c1227..1836826c5 100644
--- 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

From 85552778271592727180423f04fa256d7e31ab1d Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 11:06:10 +0100
Subject: [PATCH 21/64] changelog updated

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f0f00749..e26caae71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ and this project adheres to
 * [person] Change 'personne' with 'usager' and '&' with 'ET' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/499)
 * [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
 * [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
+* [person_resource] separate create page created to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/504)
 
 ## Test releases
 

From aefd09693bca3b32f3876bd775235e5f03048ac1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 12:10:33 +0100
Subject: [PATCH 22/64] position of toggle button improved (differentation
 between twig and vue) + fix fa-eye-slash in vue component

---
 .../Resources/public/module/blur/blur.scss               | 6 +++++-
 .../Resources/public/module/blur/index.js                | 9 +++++----
 .../Resources/public/vuejs/_components/Confidential.vue  | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
index ba5d38edf..9f2ef7bbe 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
@@ -2,7 +2,6 @@
     display: flex;
     position: relative;
     margin-right: 20px
-    // margin-left 20px;
 }
 
 .toggle-container {
@@ -17,6 +16,11 @@
 .toggle{
     position: absolute;
     right: 4px;
+    &-twig {
+        position: absolute;
+        right: -25px;
+        bottom: 20px;
+    }
 }
 
 .blur {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
index 1d66d25e6..3245512e9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
@@ -2,18 +2,19 @@ require('./blur.scss');
 
 document.querySelectorAll('.confidential').forEach(function (el) {
     let i = document.createElement('i');
-    const classes = ['fa', 'fa-eye', 'toggle'];
+    const classes = ['fa', 'fa-eye-slash', 'toggle-twig'];
     i.classList.add(...classes);
     el.appendChild(i);
+
     const toggleBlur = function(e) {
         for (let child of el.children) {
-            if (!child.classList.contains('toggle')) {
+            if (!child.classList.contains('toggle-twig')) {
                 child.classList.toggle('blur');
             }
         }
-        i.classList.toggle('fa-eye');
         i.classList.toggle('fa-eye-slash');
+        i.classList.toggle('fa-eye');
     }
     i.addEventListener('click', toggleBlur);
     toggleBlur();
-});
+});
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index af488cf0c..837440524 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -4,7 +4,7 @@
             <slot name="confidential-content"></slot>
         </div>
         <div class="toggle-container">
-            <i class="fa fa-eye toggle" :class="{ toggleIcon }" aria-hidden="true" @click="toggleBlur"></i>
+            <i class="fa toggle" :class="toggleIcon" aria-hidden="true" @click="toggleBlur"></i>
         </div>
     </div>
 </template>

From 4b899d337adceb5fd830815f812af1bda0c9580a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 13:36:26 +0100
Subject: [PATCH 23/64] changelog updated

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5be67840f..65f0d4528 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,7 @@ and this project adheres to
 * [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478)
 * [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
 * [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
-
+* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
 ## Test releases
 
 ### test release 2022-02-21

From e28da7e99b5cb4aef0350686caf5d51f8bba6f93 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 14:06:18 +0100
Subject: [PATCH 24/64] create-edit composition placed in separate page to
 avoid confusion

---
 .../HouseholdCompositionController.php        | 47 ++++++++++++-------
 .../HouseholdComposition/create.html.twig     | 26 ++++++++++
 .../HouseholdComposition/index.html.twig      | 35 +++++---------
 .../translations/messages.fr.yml              |  1 +
 4 files changed, 68 insertions(+), 41 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
index 22e92eb02..7064a083d 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
@@ -129,23 +129,10 @@ class HouseholdCompositionController extends AbstractController
     }
 
     /**
-     * @Route("/{_locale}/person/household/{id}/composition/index", name="chill_person_household_composition_index")
+     * @Route("/{_locale}/person/household/{id}/composition/new", name="chill_person_household_composition_new")
      */
-    public function index(Household $household, Request $request): Response
+    public function newAction(Household $household, Request $request): Response
     {
-        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
-            throw new AccessDeniedException('not allowed to edit an household');
-        }
-
-        $count = $this->householdCompositionRepository->countByHousehold($household);
-        $paginator = $this->paginatorFactory->create($count);
-        $compositions = $this->householdCompositionRepository->findByHousehold(
-            $household,
-            ['startDate' => 'DESC', 'id' => 'DESC'],
-            $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber()
-        );
-
         if ($this->security->isGranted(HouseholdVoter::EDIT, $household)) {
             $isEdit = $request->query->has('edit');
 
@@ -195,14 +182,40 @@ 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),
             ]
         ));
     }
+
+    /**
+     * @Route("/{_locale}/person/household/{id}/composition/index", name="chill_person_household_composition_index")
+     */
+    public function index(Household $household, Request $request): Response
+    {
+        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
+            throw new AccessDeniedException('not allowed to edit a household');
+        }
+
+        $count = $this->householdCompositionRepository->countByHousehold($household);
+        $paginator = $this->paginatorFactory->create($count);
+        $compositions = $this->householdCompositionRepository->findByHousehold(
+            $household,
+            ['startDate' => 'DESC', 'id' => 'DESC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+
+        return new Response($this->engine->render(
+            '@ChillPerson/HouseholdComposition/index.html.twig',
+            [
+                'household' => $household,
+                'compositions' => $compositions
+            ]
+        ));
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig
new file mode 100644
index 000000000..334832a63
--- /dev/null
+++ 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 %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
index 7ff72b2cd..cce83e64c 100644
--- 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,7 +54,7 @@
                             </div>
                         {% endif %}
                     </div>
-                {% else %}
+                {# {% else %}
                     {{ form_start(form) }}
 
                     {{ form_widget(form) }}
@@ -68,32 +68,19 @@
                         </li>
                     </ul>
                     {{ form_end(form) }}
-                {% endif %}
+                {% 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 editId == -1 %} #}
         <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-sm btn-new"
+                        title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
+            </li>
         </ul>
-    {% endif %}
+    {# {% endif %} #}
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index e4265fca0..bc238570d 100644
--- 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

From fb1552f6b709c8a0602eb5b6e4492248b96a2ca3 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 14:07:41 +0100
Subject: [PATCH 25/64] update changelog and csfixes

---
 CHANGELOG.md                                  |  1 +
 .../HouseholdCompositionController.php        | 54 +++++++++----------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 885068bc0..6fe2e95ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ and this project adheres to
 * [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
 * [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
 * [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
+* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
index 7064a083d..1144688fe 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
@@ -128,6 +128,33 @@ class HouseholdCompositionController extends AbstractController
         );
     }
 
+    /**
+     * @Route("/{_locale}/person/household/{id}/composition/index", name="chill_person_household_composition_index")
+     */
+    public function index(Household $household, Request $request): Response
+    {
+        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
+            throw new AccessDeniedException('not allowed to edit a household');
+        }
+
+        $count = $this->householdCompositionRepository->countByHousehold($household);
+        $paginator = $this->paginatorFactory->create($count);
+        $compositions = $this->householdCompositionRepository->findByHousehold(
+            $household,
+            ['startDate' => 'DESC', 'id' => 'DESC'],
+            $paginator->getItemsPerPage(),
+            $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")
      */
@@ -191,31 +218,4 @@ class HouseholdCompositionController extends AbstractController
             ]
         ));
     }
-
-    /**
-     * @Route("/{_locale}/person/household/{id}/composition/index", name="chill_person_household_composition_index")
-     */
-    public function index(Household $household, Request $request): Response
-    {
-        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
-            throw new AccessDeniedException('not allowed to edit a household');
-        }
-
-        $count = $this->householdCompositionRepository->countByHousehold($household);
-        $paginator = $this->paginatorFactory->create($count);
-        $compositions = $this->householdCompositionRepository->findByHousehold(
-            $household,
-            ['startDate' => 'DESC', 'id' => 'DESC'],
-            $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber()
-        );
-
-        return new Response($this->engine->render(
-            '@ChillPerson/HouseholdComposition/index.html.twig',
-            [
-                'household' => $household,
-                'compositions' => $compositions
-            ]
-        ));
-    }
 }

From c611f35cd61f7d50c5b5603680902c7f5780192a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 8 Mar 2022 09:48:17 +0100
Subject: [PATCH 26/64] finding solution for toggle button position

---
 .../Resources/public/module/blur/blur.scss    | 37 ++++++-------------
 .../public/vuejs/_components/Confidential.vue | 14 +++----
 .../Resources/views/Entity/address.html.twig  |  6 +--
 .../Resources/public/chill/chillperson.scss   |  2 +
 .../components/Requestor.vue                  |  5 ++-
 5 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
index a53ea69d9..ba5d38edf 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
@@ -1,37 +1,22 @@
 .confidential {
     display: flex;
     position: relative;
-}
-.toggle-far-twig {
-    i {
-        bottom: 0px;
-        right: -30px;
-    }
+    margin-right: 20px
+    // margin-left 20px;
 }
 
-.toggle-close-twig {
-    i {
-        bottom: 0px;
-        right: -5px;
-    }
+.toggle-container {
+    position: absolute;
+    width: 100%;
+    top: 0;
+    left: 0;
+    cursor: pointer;
+    z-index: 5;
+    padding-right: 1rem;
 }
 .toggle{
-    margin-left: 30px;
-    margin-top: 5px;
-    cursor: pointer;
     position: absolute;
-    z-index: 5;
-    right: -30px
-}
-
-.toggle-far {
-    bottom: 0px;
-    right: 20px !important;
-}
-
-.toggle-close {
-    bottom: 125px;
-    right: 15px !important;
+    right: 4px;
 }
 
 .blur {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index f5a555520..af488cf0c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -3,8 +3,8 @@
         <div :class="{ 'blur': isBlurred }">
             <slot name="confidential-content"></slot>
         </div>
-        <div>
-            <i class="fa fa-eye toggle" :class="positionBtn" aria-hidden="true" @click="toggleBlur"></i>
+        <div class="toggle-container">
+            <i class="fa fa-eye toggle" :class="{ toggleIcon }" aria-hidden="true" @click="toggleBlur"></i>
         </div>
     </div>
 </template>
@@ -12,28 +12,24 @@
 <script>
 export default {
     name: "Confidential",
-    props: ['positionBtnFar'],
     data() {
         return {
             isBlurred: true,
+            toggleIcon: 'fa-eye',
         };
     },
     methods : {
         toggleBlur() {
             console.log(this.positionBtnFar);
             this.isBlurred = !this.isBlurred;
+            this.toggleIcon = this.isBlurred ? 'fa-eye' : 'fa-eye-slash';
         },
     },
-    computed: {
-        positionBtn() {
-            return this.positionBtnFar ? 'toggle-far' : 'toggle-close'
-        }
-    }
 }
 </script>
 
 <style scoped lang='scss'>
     .confidential{
-        align-items: center;
+        align-content: center;
     }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index 54a0b86b7..3dfc27d2f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -59,7 +59,7 @@
     must be shown in such list
 #}
 {%- if render == 'list' -%}
-    <li class="chill-entity entity-address {% if address.confidential %} confidential toggle-far-twig {% endif %}">
+    <li class="chill-entity entity-address {% if address.confidential %} confidential {% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-li fa-map-marker"></i>
         {% endif %}
@@ -68,7 +68,7 @@
 {%- endif -%}
 
 {%- if render == 'inline' -%}
-    <span class="chill-entity entity-address {% if address.confidential %} confidential toggle-far-twig {% endif %}">
+    <span class="chill-entity entity-address {% if address.confidential %} confidential {% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-fw fa-map-marker"></i>
         {% endif %}
@@ -77,7 +77,7 @@
 {%- endif -%}
 
 {%- if render == 'bloc' -%}
-    <div class="chill-entity entity-address {% if address.confidential %} confidential toggle-close-twig {% endif %}">
+    <div class="chill-entity entity-address {% if address.confidential %} confidential {% endif %}">
         {% if options['has_no_address'] == true and address.isNoAddress == true %}
             {% if address.postCode is not empty %}
             <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
index 92542f178..fba0516a7 100644
--- 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;
             }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 713693605..7cf0dcecc 100644
--- 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>

From 3d1ded8b1cd7b4aed296cdf63fda210efb2c5f12 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 12:10:33 +0100
Subject: [PATCH 27/64] position of toggle button improved (differentation
 between twig and vue) + fix fa-eye-slash in vue component

---
 .../Resources/public/module/blur/blur.scss               | 6 +++++-
 .../Resources/public/module/blur/index.js                | 9 +++++----
 .../Resources/public/vuejs/_components/Confidential.vue  | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
index ba5d38edf..9f2ef7bbe 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss
@@ -2,7 +2,6 @@
     display: flex;
     position: relative;
     margin-right: 20px
-    // margin-left 20px;
 }
 
 .toggle-container {
@@ -17,6 +16,11 @@
 .toggle{
     position: absolute;
     right: 4px;
+    &-twig {
+        position: absolute;
+        right: -25px;
+        bottom: 20px;
+    }
 }
 
 .blur {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
index 1d66d25e6..3245512e9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js
@@ -2,18 +2,19 @@ require('./blur.scss');
 
 document.querySelectorAll('.confidential').forEach(function (el) {
     let i = document.createElement('i');
-    const classes = ['fa', 'fa-eye', 'toggle'];
+    const classes = ['fa', 'fa-eye-slash', 'toggle-twig'];
     i.classList.add(...classes);
     el.appendChild(i);
+
     const toggleBlur = function(e) {
         for (let child of el.children) {
-            if (!child.classList.contains('toggle')) {
+            if (!child.classList.contains('toggle-twig')) {
                 child.classList.toggle('blur');
             }
         }
-        i.classList.toggle('fa-eye');
         i.classList.toggle('fa-eye-slash');
+        i.classList.toggle('fa-eye');
     }
     i.addEventListener('click', toggleBlur);
     toggleBlur();
-});
+});
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index af488cf0c..837440524 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -4,7 +4,7 @@
             <slot name="confidential-content"></slot>
         </div>
         <div class="toggle-container">
-            <i class="fa fa-eye toggle" :class="{ toggleIcon }" aria-hidden="true" @click="toggleBlur"></i>
+            <i class="fa toggle" :class="toggleIcon" aria-hidden="true" @click="toggleBlur"></i>
         </div>
     </div>
 </template>

From 8ff80ac65e3a1663a6833b559f98f3eccf07ac4b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 9 Mar 2022 13:36:26 +0100
Subject: [PATCH 28/64] changelog updated

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 885068bc0..9c30ef9ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,7 +37,7 @@ and this project adheres to
 * [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
 * [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
 * [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
-
+* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
 ## Test releases
 
 ### test release 2022-02-21

From 2628e58ea0476e90e3850143398fe413c15bd6a6 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 10 Mar 2022 12:28:17 +0100
Subject: [PATCH 29/64] document title added + concerned users

---
 .../Workflow/_evaluation_document.html.twig   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index 488f31661..addc619f7 100644
--- 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 @@
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc evaluation-item bg-chill-llight-gray">
+        <div class="item-row mb-2">
+            {% for d in evaluation.documents %}
+                <h1>{{ d.title }}</h1>
+            {% endfor %}
+        </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>

From bf2d9acc5a67991c9a0df240de68f32b900c470b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 10 Mar 2022 14:03:37 +0100
Subject: [PATCH 30/64] correction of template, display title linked to
 workflow doc

---
 .../Resources/views/Workflow/_evaluation_document.html.twig   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index addc619f7..bd37226cc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -1,9 +1,7 @@
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc evaluation-item bg-chill-llight-gray">
         <div class="item-row mb-2">
-            {% for d in evaluation.documents %}
-                <h1>{{ d.title }}</h1>
-            {% endfor %}
+                <h1>{{ doc.title }}</h1>
         </div>
         <div class="item-row mb-2">
             <h2 class="badge-title">

From f2edc1ef0cad3a2f89e206e0195f8c285063ad9f Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 14:23:00 +0100
Subject: [PATCH 31/64] set constrint ondelete for comment in
 AccompanyingPeriod

---
 .../migrations/Version20220310124318.php      | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php

diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php b/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
new file mode 100644
index 000000000..6b58b24a3
--- /dev/null
+++ 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');
+    }
+}

From 9284a4bc29e22a8a81c340026e364e910f37b1e5 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 10 Mar 2022 14:30:19 +0100
Subject: [PATCH 32/64] ACL added and buttons to download and edit document

---
 .../views/Workflow/_evaluation_document.html.twig   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index bd37226cc..398b5221e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -1,7 +1,9 @@
+{%- 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>
+            <h1>{{ doc.title }}</h1>git st
         </div>
         <div class="item-row mb-2">
             <h2 class="badge-title">
@@ -113,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 %}

From 0a2730540e7e01179bcaeb0f16dac2394c370581 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 10 Mar 2022 14:45:43 +0100
Subject: [PATCH 33/64] lost text removed plus condition to editing file
 uncommented

---
 .../Resources/views/Workflow/_evaluation_document.html.twig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index 398b5221e..2e05a6648 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -3,7 +3,7 @@
 <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>git st
+            <h1>{{ doc.title }}</h1>
         </div>
         <div class="item-row mb-2">
             <h2 class="badge-title">
@@ -118,11 +118,11 @@
     {% 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) %} #}
+        {% if chill_document_is_editable(doc.storedObject) %}
             <li>
                 {{ doc.storedObject|chill_document_edit_button }}
             </li>
-        {# {% endif %} #}
+        {% endif %}
         <li>
             <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
                 {{ 'Show'|trans }}

From 16a0dc462182e2b3efec9543282a61b789b80711 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 16:46:10 +0100
Subject: [PATCH 34/64] fix role for AccPeriod Comment API

---
 .../DependencyInjection/ChillPersonExtension.php              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index c527010ca..1f85e4ad0 100644
--- 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;
@@ -428,6 +429,9 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                                 Request::METHOD_HEAD => false,
                                 Request::METHOD_DELETE => false,
                             ],
+                            'roles' => [
+                                Request::METHOD_PATCH => AccompanyingPeriodCommentVoter::EDIT,
+                            ],
                         ],
                     ],
                 ],

From ded2ac7d487bac87407ec900551049dfe32e26c5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 17:01:52 +0100
Subject: [PATCH 35/64] accompanyiing period comment: fix removing of comment

---
 .../vuejs/AccompanyingCourse/components/Comment.vue | 13 +++++++------
 .../public/vuejs/AccompanyingCourse/store/index.js  |  3 +--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index ffb848bcb..5ae646570 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -29,7 +29,7 @@
                }}
             </div>
 
-            <!-- <div> //DOES NOT WORk
+            <div>
                <ul class="record_actions">
                   <li v-if="pinnedComment !== null">
                      <a class="btn btn-delete"
@@ -38,7 +38,7 @@
                      </a>
                   </li>
                </ul>
-            </div> -->
+            </div>
 
          </form>
       </div>
@@ -49,6 +49,7 @@
 <script>
 import CKEditor from '@ckeditor/ckeditor5-vue';
 import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+import { mapState } from "vuex";
 
 export default {
    name: "Comment",
@@ -65,15 +66,15 @@ export default {
       }
    },
    computed: {
-      pinnedComment() {
-         return this.$store.state.accompanyingCourse.pinnedComment;
-      },
+      ...mapState({
+         pinnedComment: state => state.accompanyingCourse.pinnedComment,
+      }),
       content: {
          set(value) {
             this.formData.content = value;
          },
          get() {
-            return (this.pinnedComment)? this.pinnedComment.content : {};
+            return this.pinnedComment ? this.pinnedComment.content : '';
          }
       },
       errors() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index bfb6412ff..4e51b608f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -342,8 +342,7 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
             /**
              * Add/remove pinnedComment
              */
-            removePinnedComment({ commit }, payload) { //DOES NOT WORK
-
+            removePinnedComment({ commit }, payload) {
                const body = {type: "accompanying_period_comment", id: payload.id};
                const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;
 

From a8b6609dbf9a0a13fa013e3679f207a7a90b45b8 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 18:12:42 +0100
Subject: [PATCH 36/64] comment in accompanying course: add loader + fix when
 resetting to empty string

---
 .../AccompanyingCourse/components/Comment.vue | 76 ++++++++++++-------
 1 file changed, 47 insertions(+), 29 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index 5ae646570..3fa555ec4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -21,12 +21,17 @@
                tag-name="textarea">
             </ckeditor>
 
-            <div v-if="pinnedComment" class="metadata">
-               {{ $t('comment.created_by', [
-                     pinnedComment.creator.text,
-                     $d(pinnedComment.updatedAt.datetime, 'long')
-                  ])
-               }}
+            <div class="sub-comment">
+               <div v-if="pinnedComment" 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>
@@ -62,7 +67,8 @@ export default {
          formData: {
             type: "accompanying_period_comment",
             content: ''
-         }
+         },
+         loading: false
       }
    },
    computed: {
@@ -83,33 +89,37 @@ export default {
    },
    methods: {
       onContentChange() {
+         this.loading = true;
          let lastRecordedContent = this.formData.content;
          setTimeout(() => {
-            if (lastRecordedContent === this.formData.content) {
-               if (this.pinnedComment) {
-                  let body = this.formData;
-                  Object.assign(body, {id: this.pinnedComment.id});
+            if (this.formData.content !== '') {
+               if (lastRecordedContent === this.formData.content) {
+                  if (this.pinnedComment) {
+                     let body = this.formData;
+                     Object.assign(body, {id: this.pinnedComment.id});
 
-                  this.$store.dispatch('updatePinnedComment', body)
-                     .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 {
-                  this.$store.dispatch('addPinnedComment', 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'})
-                        }
-                     });
+                     this.$store.dispatch('updatePinnedComment', body)
+                        .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 {
+                     this.$store.dispatch('addPinnedComment', 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'})
+                           }
+                        });
+                  }
+                  lastRecordedContent = null;
                }
-               lastRecordedContent = null;
             }
+            this.loading = false;
          }, 3000);
       },
       removeComment() {
@@ -130,4 +140,12 @@ export default {
 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>

From fc1fe7c2774914074ae8c830a1acb4400e7b6e98 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 10 Mar 2022 18:14:57 +0100
Subject: [PATCH 37/64] php cs fix

---
 .../ChillPersonBundle/migrations/Version20220310124318.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php b/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
index 6b58b24a3..211a2e68a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220310124318.php
@@ -15,7 +15,7 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Change constraint on pinnedComment in Accompanying period
+ * Change constraint on pinnedComment in Accompanying period.
  */
 final class Version20220310124318 extends AbstractMigration
 {

From 99f8aeb6cd011c3c0a115e7a999ab39e93a4c249 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 10:01:20 +0100
Subject: [PATCH 38/64] AccompanyingPeriodWorkEvaluation: fix circular
 reference when serialising

---
 .../AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index 07c9f526c..de8b2a234 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -39,7 +39,6 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
      *     targetEntity=AccompanyingPeriodWork::class,
      *     inversedBy="accompanyingPeriodWorkEvaluations"
      * )
-     * @Serializer\Groups({"read:evaluation:include-work"})
      * @Serializer\Context(normalizationContext={"groups": {"read:accompanyingPeriodWork:light"}}, groups={"read:evaluation:include-work"})
      */
     private ?AccompanyingPeriodWork $accompanyingPeriodWork = null;

From ee8f331de497665f250ee6ac1cff3b2e86449038 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 10:18:14 +0100
Subject: [PATCH 39/64] Revert "AccompanyingPeriodWorkEvaluation: fix circular
 reference when serialising"

This reverts commit 99f8aeb6cd011c3c0a115e7a999ab39e93a4c249.
---
 .../AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index de8b2a234..07c9f526c 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -39,6 +39,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
      *     targetEntity=AccompanyingPeriodWork::class,
      *     inversedBy="accompanyingPeriodWorkEvaluations"
      * )
+     * @Serializer\Groups({"read:evaluation:include-work"})
      * @Serializer\Context(normalizationContext={"groups": {"read:accompanyingPeriodWork:light"}}, groups={"read:evaluation:include-work"})
      */
     private ?AccompanyingPeriodWork $accompanyingPeriodWork = null;

From 44e93dd5f8bb9c01cde749294285a81949f268a0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 10:20:42 +0100
Subject: [PATCH 40/64] AccompanyingPeriodWorkEvaluation: fix circular
 reference when serialising

---
 .../AccompanyingPeriodWorkEvaluationNormalizer.php          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
index fc9b6003a..e8febcf5d 100644
--- 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

From f9e8bf4f2d9ff5a5a738a3941a6a0da462f85432 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 10:22:09 +0100
Subject: [PATCH 41/64] upd CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 885068bc0..38f300662 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] AccompanyingPeriodWorkEvaluation: fix circular reference when serialising (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/495)
+
 * [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
 * [person] Add url in accompanying period work evaluations entity and form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/476)
 * [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)

From 13f0b8610c00f1c86bae54829fffafabcd092994 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 11 Mar 2022 16:37:26 +0100
Subject: [PATCH 42/64] quick fix: missing translation in Task

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

diff --git a/src/Bundle/ChillTaskBundle/translations/messages.fr.yml b/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
index 5633c0219..a2a57708f 100644
--- a/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
@@ -46,6 +46,7 @@ User: Utilisateur
 "Associated tasks": "Tâches associées"
 "My tasks": "Mes tâches"
 "Tasks for this accompanying period": "Tâches pour ce parcours d'accompagnement"
+"Tasks for {{ name }}": "Tâches pour {{ name }}"
 "No description": "Pas de description"
 "No dates specified": "Dates non spécifiées"
 "No one assignee": "Aucune personne assignée"

From bd79391efcb264b8895b0f3c6201a7e7c0a3ef9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 13:04:29 +0100
Subject: [PATCH 43/64] fix autosave of comment

---
 .../Resources/public/lib/api/apiMethods.js    | 13 ++-
 .../AccompanyingCourse/components/Comment.vue | 85 ++++++++---------
 .../vuejs/AccompanyingCourse/store/index.js   | 91 ++++++++++++++++---
 3 files changed, 131 insertions(+), 58 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js
index 67f3e2f42..75f1a21c8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js
@@ -1,17 +1,22 @@
 /**
  * Generic api method that can be adapted to any fetch request
  */
-const makeFetch = (method, url, body) => {
-    return fetch(url, {
+const makeFetch = (method, url, body, options) => {
+    let opts = {
         method: method,
         headers: {
             'Content-Type': 'application/json;charset=utf-8'
         },
         body: (body !== null) ? JSON.stringify(body) : null
-    })
+    };
+
+    if (typeof options !== 'undefined') {
+        opts = Object.assign(opts, options);
+    }
+
+    return fetch(url, opts)
     .then(response => {
         if (response.ok) {
-            console.log('200 error')
             return response.json();
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index 3fa555ec4..8ae7dfff4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -17,12 +17,11 @@
                :placeholder="$t('comment.content')"
                :editor="editor"
                v-model="content"
-               @input="onContentChange"
                tag-name="textarea">
             </ckeditor>
 
             <div class="sub-comment">
-               <div v-if="pinnedComment" class="metadata">
+               <div v-if="pinnedComment !== null && typeof pinnedComment.creator !== 'undefined'" class="metadata">
                   {{ $t('comment.created_by', [
                         pinnedComment.creator.text,
                         $d(pinnedComment.updatedAt.datetime, 'long')
@@ -64,11 +63,8 @@ export default {
    data() {
       return {
          editor: ClassicEditor,
-         formData: {
-            type: "accompanying_period_comment",
-            content: ''
-         },
-         loading: false
+         loading: false,
+         lastRecordedContent: null,
       }
    },
    computed: {
@@ -77,10 +73,48 @@ export default {
       }),
       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() {
@@ -89,38 +123,7 @@ export default {
    },
    methods: {
       onContentChange() {
-         this.loading = true;
          let lastRecordedContent = this.formData.content;
-         setTimeout(() => {
-            if (this.formData.content !== '') {
-               if (lastRecordedContent === this.formData.content) {
-                  if (this.pinnedComment) {
-                     let body = this.formData;
-                     Object.assign(body, {id: this.pinnedComment.id});
-
-                     this.$store.dispatch('updatePinnedComment', body)
-                        .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 {
-                     this.$store.dispatch('addPinnedComment', 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'})
-                           }
-                        });
-                  }
-                  lastRecordedContent = null;
-               }
-            }
-            this.loading = false;
-         }, 3000);
       },
       removeComment() {
          this.$store.dispatch('removePinnedComment', {id: this.pinnedComment.id})
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 4e51b608f..06a3606ab 100644
--- 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,12 +207,36 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                //console.log('### mutation: toggleConfidential');
                state.accompanyingCourse.confidential = value;
             },
-            addPinnedComment(state, value) {
-               state.accompanyingCourse.pinnedComment = value;
+            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);
                state.accompanyingCourse.socialIssues = value;
@@ -355,28 +383,68 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                      throw error;
                   })
             },
-            addPinnedComment({ commit, dispatch }, payload) {
-               const body = payload ? { type: payload.type, content: payload.content } : {};
+            /**
+             * 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, body)
+               return makeFetch('POST', url, {type: "accompanying_period_comment", content})
                   .then((response) => {
-                     dispatch('patchFirstComment', response);
+                     commit('setPinnedCommentDetails', response);
+                     return dispatch('patchFirstComment', response);
                   })
                   .catch((error) => {
                      commit('catchError', error);
                      throw error;
                   })
             },
-            updatePinnedComment({ commit }, payload) {
+            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`;
 
-               return makeFetch('PATCH', url, payload)
+               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('addPinnedComment', response);
+                     commit('setPinCommentAbortController', null);
+                     commit('setPinnedCommentDetails', response);
                   })
                   .catch((error) => {
                      commit('catchError', error);
+                     commit('setPinCommentAbortController', null);
                      throw error;
                   })
             },
@@ -659,9 +727,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                   }
                };
                return makeFetch('PATCH', url, body)
-                  .then((response) => {
-                     commit('addPinnedComment', response.pinnedComment);
-                  })
                   .catch((error) => {
                      commit('catchError', error);
                      throw error;

From a2f8f7ae43d111cf284c0f1d1dc4a1d865a4c9f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 13:18:41 +0100
Subject: [PATCH 44/64] add badge on third party in residential address list

---
 .../Resources/views/ResidentialAddress/list.html.twig      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
index 64e5d3813..b568703da 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig
@@ -67,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 %}

From e9cacbb74a8cc65e1f46625ff3dde7a8ccee6cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 13:26:07 +0100
Subject: [PATCH 45/64] add comment for future refactorisation

---
 src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
index 1dbc85dee..b1489bfb6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
@@ -22,6 +22,7 @@ const fetchCountries = () => {
 */
 const fetchCities = (country) => {
    //console.log('<<< fetching cities for', country);
+    // warning: do not use fetchResults (in apiMethods): we need only a **part** of the results in the db
    const url = `/api/1.0/main/postal-code.json?item_per_page=1000&country=${country.id}`;
    return fetch(url)
       .then(response => {

From 873258fc84aaf04d397e3bf05523c9aecab31ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 13:35:03 +0100
Subject: [PATCH 46/64] update button person ressource creation

---
 .../Resources/views/PersonResource/list.html.twig             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index 6ccf1a0eb..48773c236 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -89,8 +89,8 @@
 <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-sm btn-new"
-                title="{{ 'Create'|trans }}">{{ 'Add a person resource'|trans }}</a>
+                class="btn btn-new"
+                title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
     </li>
 </ul>
 {% endif %}

From 28509f651d1ebdb388db621207f272f979976fd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 13:39:33 +0100
Subject: [PATCH 47/64] fix button and acl in household composition list

---
 .../HouseholdComposition/index.html.twig      | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
index cce83e64c..7d3adc04a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig
@@ -54,33 +54,18 @@
                             </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 %}
 
-    {# {% if editId == -1 %} #}
+    {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
         <ul class="record_actions sticky-form-buttons">
             <li>
                 <a href="{{ chill_path_add_return_path('chill_person_household_composition_new', {'id': household.id,}) }}"
-                        class="btn btn-sm btn-new"
+                        class="btn btn-new"
                         title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
             </li>
         </ul>
-    {# {% endif %} #}
+    {% endif %}
 </div>
 {% endblock %}

From 5c68879509afa3f8ffa708ef0a38826f575c38b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 13:41:11 +0100
Subject: [PATCH 48/64] fix doctrine annotation to make it comply with cs

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

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 7297754bd..fd07b0489 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -109,7 +109,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
      *     mappedBy="person",
      * cascade={"persist", "remove", "merge", "detach"})
-     * @ORM\OrderBy({"startDate" = "DESC"})
+     * @ORM\OrderBy({"startDate": "DESC"})
      */
     private $accompanyingPeriodParticipations;
 

From 90bebbad7de90779ae13e629dd6ba3e6c8339159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 21:27:21 +0100
Subject: [PATCH 49/64] fix normalization for docgen

---
 src/Bundle/ChillMainBundle/Entity/UserJob.php |  1 +
 .../Normalizer/PhonenumberNormalizer.php      | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/UserJob.php b/src/Bundle/ChillMainBundle/Entity/UserJob.php
index 5f0bea45d..99db5d4f1 100644
--- a/src/Bundle/ChillMainBundle/Entity/UserJob.php
+++ b/src/Bundle/ChillMainBundle/Entity/UserJob.php
@@ -40,6 +40,7 @@ class UserJob
      * @var array|string[]A
      * @ORM\Column(name="label", type="json")
      * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     protected array $label = [];
 
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index 3562c1361..677199ad4 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -16,10 +16,11 @@ use libphonenumber\PhoneNumber;
 use libphonenumber\PhoneNumberUtil;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-class PhonenumberNormalizer implements NormalizerInterface, DenormalizerInterface
+class PhonenumberNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
     private string $defaultCarrierCode;
 
@@ -53,6 +54,10 @@ class PhonenumberNormalizer implements NormalizerInterface, DenormalizerInterfac
 
     public function normalize($object, ?string $format = null, array $context = []): string
     {
+        if ($format === 'docgen' && null === $object) {
+            return '';
+        }
+
         return $this->phoneNumberUtil->formatOutOfCountryCallingNumber($object, $this->defaultCarrierCode);
     }
 
@@ -61,8 +66,18 @@ class PhonenumberNormalizer implements NormalizerInterface, DenormalizerInterfac
         return 'libphonenumber\PhoneNumber' === $type;
     }
 
-    public function supportsNormalization($data, ?string $format = null)
+    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
     {
-        return $data instanceof PhoneNumber;
+        if ($data instanceof PhoneNumber && $format === 'json') {
+            return true;
+        }
+
+        if ($format === 'docgen' && (
+            $data instanceof PhoneNumber || PhoneNumber::class === ($context['docgen:expects'] ?? null)
+            )) {
+            return true;
+        }
+
+        return false;
     }
 }

From f51279e83e1486bcbb0ba167063d59075428d63f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 21:46:01 +0100
Subject: [PATCH 50/64] fix saving maxDate when denormalizing object

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

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index 07c9f526c..ed3200370 100644
--- 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;

From d04f5a527bc56ddeeedebddec2e95eb8f6b12b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 14 Mar 2022 21:46:21 +0100
Subject: [PATCH 51/64] remove link to action on homepage, in evaluation list

---
 .../Resources/public/vuejs/HomepageWidget/MyEvaluations.vue  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
index 7cd40f45a..a872a2f43 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
@@ -42,9 +42,6 @@
                   <a class="btn btn-sm btn-show" :href="getUrl(e)">
                      {{ $t('show_entity', { entity: $t('the_evaluation') }) }}
                   </a>
-                  <a class="btn btn-sm btn-update" :href="getUrl(e.accompanyingPeriodWork)">
-                     {{ $t('show_entity', { entity: $t('the_action') }) }}
-                  </a>
                   <a class="btn btn-sm btn-show" :href="getUrl(e.accompanyingPeriodWork.accompanyingPeriod)">
                      {{ $t('show_entity', { entity: $t('the_course') }) }}
                   </a>
@@ -102,4 +99,4 @@ export default {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>

From 1e63d0076742fed283dc9475ad4bddf7b8588370 Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc.ducobu@champs-libres.coop>
Date: Wed, 16 Mar 2022 16:26:18 +0100
Subject: [PATCH 52/64] Fix pbm importing CP from France on 4 digits

---
 .../ChillMainBundle/Command/LoadPostalCodesCommand.php     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index a3b1c1a26..5d577a0b4 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -118,6 +118,13 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
+        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+            // CP in FRANCE are on 5 digit
+            // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
+            // add a zero if CP from FR and on 4 digit
+            $row[0] = '0'.$row[0];
+        }
+
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
             $output->writeln('handling row: ' . $row[0] . ' | ' . $row[1] . ' | ' . $row[2]);
         }

From 2c02150b1a7e0d7f4c74e264bd0d445cad48f779 Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc.ducobu@champs-libres.coop>
Date: Thu, 17 Mar 2022 18:29:16 +0100
Subject: [PATCH 53/64] Use CS Fixer

---
 src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index 5d577a0b4..b02d9c44a 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -118,7 +118,7 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
-        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+        if ($row[2] == 'FR' && strlen($row[0]) == 4) {
             // CP in FRANCE are on 5 digit
             // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
             // add a zero if CP from FR and on 4 digit

From 288f0dbf691e644e84e592dba8baecd08429428e Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc.ducobu@champs-libres.coop>
Date: Wed, 16 Mar 2022 16:26:18 +0100
Subject: [PATCH 54/64] Fix pbm importing CP from France on 4 digits

---
 .../ChillMainBundle/Command/LoadPostalCodesCommand.php     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index a3b1c1a26..5d577a0b4 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -118,6 +118,13 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
+        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+            // CP in FRANCE are on 5 digit
+            // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
+            // add a zero if CP from FR and on 4 digit
+            $row[0] = '0'.$row[0];
+        }
+
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
             $output->writeln('handling row: ' . $row[0] . ' | ' . $row[1] . ' | ' . $row[2]);
         }

From b84e161399425b803861c72c0672a9faaec2d2a9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 18 Mar 2022 12:35:14 +0100
Subject: [PATCH 55/64] quick fix css class in acc period evaluation form,
 issue client 557

---
 .../AccompanyingCourseWorkEdit/components/FormEvaluation.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 24e1c202f..8e47560bb 100644
--- 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"

From bfd51c6615d0782d268d1d63757821735831d1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Mar 2022 13:55:23 +0100
Subject: [PATCH 56/64] allow downloads in LO editor

---
 .../ChillWopiBundle/src/Resources/public/page/editor/index.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js b/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
index 613a51d63..99b4ae707 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
+++ b/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
@@ -14,7 +14,7 @@ window.addEventListener('DOMContentLoaded', function(e) {
     office_frame.setAttribute('allowfullscreen', 'true');
 
     // The sandbox attribute is needed to allow automatic redirection to the O365 sign-in page in the business user flow
-    office_frame.setAttribute('sandbox', 'allow-scripts allow-same-origin allow-forms allow-popups allow-top-navigation allow-popups-to-escape-sandbox');
+    office_frame.setAttribute('sandbox', 'allow-downloads allow-scripts allow-same-origin allow-forms allow-popups allow-top-navigation allow-popups-to-escape-sandbox');
     frameholder.appendChild(office_frame);
 
     document.getElementById('office_form').submit();

From fdb36ab047f9ef009072baaa584df15537361793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Mar 2022 14:18:47 +0100
Subject: [PATCH 57/64] add document title to workflow EvaluationDocument
 handler

---
 ...ccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index 1e02d0465..d7a196a6c 100644
--- 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

From da67fa4c4fa25d4848b1c316ceb7a5060eea157a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Mar 2022 14:33:05 +0100
Subject: [PATCH 58/64] fix role for creating activity in person

---
 .../Resources/views/Activity/listPerson.html.twig               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
index ac4266f8c..8b30bc6c7 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -46,7 +46,7 @@
 
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
 
-    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
+    {% if is_granted('CHILL_ACTIVITY_CREATE_PERSON', person) %}
     <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"

From 8d92cc0ba7a2367b47d209798720822281a85ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Mar 2022 15:40:01 +0100
Subject: [PATCH 59/64] remove history from menus, temporarily

---
 .../Menu/AccompanyingCourseMenuBuilder.php         | 14 ++++++++------
 src/Bundle/ChillPersonBundle/config/routes.yaml    |  5 -----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index 827dfb0a6..8f1ecb0d1 100644
--- 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',
diff --git a/src/Bundle/ChillPersonBundle/config/routes.yaml b/src/Bundle/ChillPersonBundle/config/routes.yaml
index 1836826c5..bec2af134 100644
--- a/src/Bundle/ChillPersonBundle/config/routes.yaml
+++ b/src/Bundle/ChillPersonBundle/config/routes.yaml
@@ -95,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"

From 184a664bf9effe7fcee57264dc18c6f78e33ab66 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Sat, 19 Mar 2022 11:25:56 +0100
Subject: [PATCH 60/64] english text translated in thirdparty view page

---
 CHANGELOG.md                                                  | 1 +
 .../Resources/views/ThirdParty/view.html.twig                 | 4 ++--
 src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff62b029c..f25611dc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ and this project adheres to
 * [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
 * [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
 * [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
+* [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
index c4f2bcfbd..759ba5918 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
@@ -60,7 +60,7 @@
                         {% if types|length > 0 %}
                             {{ types|join(', ') }}
                         {% else %}
-                            <p class="chill-no-data-statement">{{ 'thirdParty.Any categories' }}</p>
+                            <p class="chill-no-data-statement">{{ 'thirdparty.no_categories' }}</p>
                         {% endif %}
                     </dd>
 
@@ -110,7 +110,7 @@
                         <dt>{{ 'Contacts'|trans }}</dt>
                         <dd>
                             {% if thirdParty.activeChildren|length == 0 %}
-                            <p class="chill-no-data-statement">{{ 'Any contacts associated'|trans }}</p>
+                            <p class="chill-no-data-statement">{{ 'No contacts associated'|trans }}</p>
                             {% else %}
                                 <div class="flex-table">
                                     {% for tp in thirdParty.activeChildren %}
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index 20b45a398..9c8091307 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -63,13 +63,13 @@ Show thirdparty: Voir le tiers
 Add a contact: Ajouter un contact
 Remove a contact: Supprimer
 Contacts: Contacts
-Any contact: Aucun contact
+No contacts associated: Aucun contact
 
 No nameCompany given: Aucune raison sociale renseignée
 No acronym given: Aucun sigle renseigné
 No phone given: Aucun téléphone renseigné
 No email given:  Aucune adresse courriel renseignée
-thirdparty.Any categories: Aucune catégorie
+thirdparty.no_categories: Aucune catégorie
 
 The party is visible in those centers: Le tiers est visible dans ces centres
 The party is not visible in any center: Le tiers n'est associé à aucun centre

From ff5aeaae17243319ebf51b48696cd09ef4bf1270 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Sat, 19 Mar 2022 11:32:16 +0100
Subject: [PATCH 61/64] translation changed in action evaluation section

---
 CHANGELOG.md                                                    | 1 +
 .../Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f25611dc5..e74bd2abe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ and this project adheres to
 * [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
 * [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
 * [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
+* [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index a0d88d1bf..3920182c8 100644
--- 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",
       }

From fced8ef4b70c076b7083ff359bbaab56f2caf32e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 11:34:54 +0100
Subject: [PATCH 62/64] try to fix test with null id

---
 .../Normalizer/HouseholdNormalizerTest.php          | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
index ac015155b..102108f90 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
@@ -16,6 +16,8 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
 use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
@@ -27,15 +29,22 @@ final class HouseholdNormalizerTest extends KernelTestCase
 {
     private ?NormalizerInterface $normalizer;
 
+    private EntityManagerInterface $entityManager;
+
+    private array $toDelete;
+
     protected function setUp(): void
     {
         self::bootKernel();
         $this->normalizer = self::$container->get(NormalizerInterface::class);
+        $this->entityManager = self::$container->get(EntityManagerInterface::class);
     }
 
     public function testNormalizationRecursive()
     {
         $person = new Person();
+        $person->setFirstName('ok')->setLastName('ok');
+        $this->entityManager->persist($person);
         $member = new HouseholdMember();
         $household = new Household();
         $position = (new Position())
@@ -44,7 +53,9 @@ final class HouseholdNormalizerTest extends KernelTestCase
 
         $member->setPerson($person)
             ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('1 month ago'));
+            ->setEndDate(new DateTimeImmutable('1 month ago'))
+            ->setPosition($position)
+        ;
 
         $household->addMember($member);
 

From 99276dc41c893434b2908c71f94f6c6e3cb97716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 11:35:50 +0100
Subject: [PATCH 63/64] fix cs

---
 .../ChillMainBundle/Command/LoadPostalCodesCommand.php   | 5 +++--
 .../Serializer/Normalizer/PhonenumberNormalizer.php      | 9 ++++-----
 .../Menu/AccompanyingCourseMenuBuilder.php               | 2 +-
 ...anyingPeriodWorkEvaluationDocumentWorkflowHandler.php | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index 5d577a0b4..bc4616b7b 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -26,6 +26,7 @@ use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 use function count;
+use function strlen;
 
 class LoadPostalCodesCommand extends Command
 {
@@ -118,11 +119,11 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
-        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+        if ('FR' === $row[2] && strlen($row[0]) === 4) {
             // CP in FRANCE are on 5 digit
             // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
             // add a zero if CP from FR and on 4 digit
-            $row[0] = '0'.$row[0];
+            $row[0] = '0' . $row[0];
         }
 
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index 677199ad4..7eb323754 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -18,7 +18,6 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class PhonenumberNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
@@ -54,7 +53,7 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
 
     public function normalize($object, ?string $format = null, array $context = []): string
     {
-        if ($format === 'docgen' && null === $object) {
+        if ('docgen' === $format && null === $object) {
             return '';
         }
 
@@ -68,13 +67,13 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
 
     public function supportsNormalization($data, ?string $format = null, array $context = []): bool
     {
-        if ($data instanceof PhoneNumber && $format === 'json') {
+        if ($data instanceof PhoneNumber && 'json' === $format) {
             return true;
         }
 
-        if ($format === 'docgen' && (
+        if ('docgen' === $format && (
             $data instanceof PhoneNumber || PhoneNumber::class === ($context['docgen:expects'] ?? null)
-            )) {
+        )) {
             return true;
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index 8f1ecb0d1..929fb2ae0 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -75,7 +75,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
                         'accompanying_period_id' => $period->getId(),
                     ], ])
                     ->setExtras(['order' => 30]);
-            */
+             */
 
             $menu->addChild($this->translator->trans('Accompanying Course Comment'), [
                 'route' => 'chill_person_accompanying_period_comment_list',
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index d7a196a6c..d7ce1ed4b 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -62,7 +62,7 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
             'workflow.Doc for evaluation (n°%eval%)',
             ['%eval%' => $entityWorkflow->getRelatedEntityId()]
         ) . ' (' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
-            ->getEvaluation()->getTitle()).') '.$doc->getTitle();
+            ->getEvaluation()->getTitle()) . ') ' . $doc->getTitle();
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluationDocument

From 2c55cfe1dc01bef84e1b211f54f5526a6af57ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 21 Mar 2022 11:41:16 +0100
Subject: [PATCH 64/64] by default, translate menu items

---
 .../ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
index 51be6c2c3..e15e64374 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
@@ -27,7 +27,7 @@
     </a>
     {% for menu in menus %}
         <a class="list-group-item list-group-item-action" href="{{ menu.uri }}">
-            {{ menu.label|upper }}
+            {{ menu.label|trans|upper }}
         </a>
     {% endfor %}
 </div>