From 4de106ec309b1e5d21026477e1775ccb7c57cf67 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 27 Sep 2021 10:21:11 +0200
Subject: [PATCH 01/64] accourse service: improve styles of checkboxes list

---
 .../AccompanyingCourse/components/Scopes.vue   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
index 903f85a86..1feb514db 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
@@ -1,18 +1,20 @@
 <template>
   <div class="vue-component">
-    <h2><a id="section-60"></a>{{ $t('scopes.title') }}</h2>
+     <h2><a id="section-60"></a>{{ $t('scopes.title') }}</h2>
 
-    <ul>
-      <li v-for="s in scopes">
-        <input type="checkbox" v-model="checkedScopes" :value="s" />
-        {{ s.name.fr }}
-      </li>
-    </ul>
+     <div class="mb-4">
+        <div class="form-check" v-for="s in scopes">
+          <input class="form-check-input" type="checkbox" v-model="checkedScopes" :value="s" />
+          <label class="form-check-label">
+             {{ s.name.fr }}
+          </label>
+        </div>
+     </div>
 
     <div v-if="!isScopeValid" class="alert alert-warning separator">
       {{ $t('scopes.add_at_least_one') }}
-
     </div>
+
   </div>
 </template>
 

From 349a0e69f182476a8e24c0d77d64f67f38c34331 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 27 Sep 2021 10:56:43 +0200
Subject: [PATCH 02/64] accourse: add warning alert box in each bloc with
 minimum confirm conditions

---
 .../Resources/public/vuejs/AccompanyingCourse/App.vue  |  7 ++++++-
 .../vuejs/AccompanyingCourse/components/Confirm.vue    |  2 +-
 .../AccompanyingCourse/components/CourseLocation.vue   |  9 ++++++++-
 .../components/PersonsAssociated.vue                   | 10 ++++++++--
 .../vuejs/AccompanyingCourse/components/Scopes.vue     |  2 +-
 .../AccompanyingCourse/components/SocialIssue.vue      |  9 ++++++++-
 .../public/vuejs/AccompanyingCourse/js/i18n.js         |  3 +++
 7 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
index e4baa082b..bd7705ca4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
@@ -87,8 +87,8 @@ export default {
          }
          padding: 0em 0em;
          margin: 1em 0;
-         border: 1px dotted tint-color($chill-accourse-context, 10%);
          border-radius: 5px;
+         border: 1px dotted tint-color($chill-accourse-context, 10%);
          border-left: 1px dotted tint-color($chill-accourse-context, 10%);
          border-right: 1px dotted tint-color($chill-accourse-context, 10%);
          dd {
@@ -96,10 +96,15 @@ export default {
          }
          & > div {
             margin: 1em 3em 0;
+
             &.flex-table,
             &.flex-bloc {
                margin: 1em 0 0;
             }
+            &.alert.to-confirm {
+               margin: 1em 0 0;
+               padding: 1em 3em;
+            }
          }
 
          div.flex-table {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
index b8d131f2d..f23a7c9e5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
@@ -91,7 +91,7 @@ export default {
             },
             scopes: {
               msg: 'confirm.set_a_scope',
-              anchor: '#section-65'
+              anchor: '#section-60'
             }
          }
       }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index afe13845c..fa1638b1c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -55,11 +55,15 @@
          </ul>
       </div>
 
+      <div v-if="!isLocationValid" class="alert alert-warning to-confirm">
+         {{ $t('courselocation.not_valid') }}
+      </div>
+
    </div>
 </template>
 
 <script>
-import { mapState } from "vuex";
+import {mapGetters, mapState} from "vuex";
 import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 
@@ -102,6 +106,9 @@ export default {
          accompanyingCourse: state => state.accompanyingCourse,
          context: state => state.addressContext
       }),
+      ...mapGetters([
+         'isLocationValid'
+      ]),
       isTemporaryAddress() {
          return this.accompanyingCourse.locationStatus === 'address';
       },
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 07761b31b..97a286d70 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -58,11 +58,14 @@
       </add-persons>
    </div>
 
+   <div v-if="!isParticipationValid" class="alert alert-warning to-confirm">
+      {{ $t('persons_associated.participation_not_valid') }}
+   </div>
 </div>
 </template>
 
 <script>
-import { mapState } from 'vuex';
+import {mapGetters, mapState} from 'vuex';
 import ParticipationItem from "./PersonsAssociated/ParticipationItem.vue"
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'
 
@@ -89,6 +92,9 @@ export default {
          courseId: state => state.accompanyingCourse.id,
          participations: state => state.accompanyingCourse.participations
       }),
+      ...mapGetters([
+         'isParticipationValid'
+      ]),
       currentParticipations() {
          return this.participations.filter(p => p.endDate === null)
       },
@@ -126,7 +132,7 @@ export default {
 <style lang="scss" scoped>
 div#accompanying-course {
    div.vue-component {
-      & > div.alert {
+      & > div.alert.no-household {
          margin: 0 0 -1em;
       }
       div.no-household {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
index 1feb514db..3217afd25 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
@@ -11,7 +11,7 @@
         </div>
      </div>
 
-    <div v-if="!isScopeValid" class="alert alert-warning separator">
+    <div v-if="!isScopeValid" class="alert alert-warning to-confirm">
       {{ $t('scopes.add_at_least_one') }}
     </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
index 6faaa5083..cbf305af0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
@@ -21,13 +21,17 @@
         </VueMultiselect>
      </div>
 
+     <div v-if="!isSocialIssueValid" class="alert alert-warning to-confirm">
+        {{ $t('social_issue.not_valid') }}
+     </div>
+
   </div>
 </template>
 
 <script>
 import VueMultiselect from 'vue-multiselect';
 import { getSocialIssues } from '../api';
-import { mapState } from 'vuex';
+import {mapGetters, mapState} from 'vuex';
 
 export default {
    name: "SocialIssue",
@@ -41,6 +45,9 @@ export default {
       ...mapState({
          value: state => state.accompanyingCourse.socialIssues,
       }),
+      ...mapGetters([
+         'isSocialIssueValid'
+      ])
    },
    mounted() {
       this.getOptions();
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 cf3a0fb7e..550479895 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -50,6 +50,7 @@ const appMessages = {
          show_household: "Voir le ménage",
          person_without_household_warning: "Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible.",
          update_household: "Modifier l'appartenance",
+         participation_not_valid: "Sélectionnez ou créez au minimum 1 usager",
       },
       requestor: {
          title: "Demandeur",
@@ -72,6 +73,7 @@ const appMessages = {
       social_issue: {
          title: "Problématiques sociales",
          label: "Choisir les problématiques sociales",
+         not_valid: "Sélectionnez au minimum une problématique sociale",
       },
       courselocation: {
          title: "Localisation du parcours",
@@ -84,6 +86,7 @@ const appMessages = {
          sure_description: "Voulez-vous faire de cette adresse l'adresse du parcours ?",
          ok: "Désigner comme adresse du parcours",
          person_locator: "Parcours localisé auprès de {0}",
+         not_valid: "Indiquez au minimum une localisation temporaire du parcours",
          no_address: "Il n'y a pas d'adresse associée au parcours"
       },
       scopes: {

From 82db55cfec7f3188513e32dd63a39c6a56a7850a Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 27 Sep 2021 11:17:13 +0200
Subject: [PATCH 03/64] CourseLocation: change add-address key, cleaning
 add-address options

---
 .../components/CourseLocation.vue             | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index fa1638b1c..b422ba23d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -37,9 +37,9 @@
             <li>
                <add-address
                   v-if="!isPersonLocation"
+                  :key="key"
                   :context="context"
-                  :key="addAddress.type"
-                  :options="addAddress.options"
+                  :options="options"
                   :addressChangedCallback="submitTemporaryAddress"
                   ref="addAddress">
                </add-address>
@@ -76,10 +76,7 @@ export default {
    data() {
       return {
          addAddress: {
-            type: 'accompanying_course_location',
             options: {
-               /// Options override default.
-               /// null value take default component value
                button: {
                   text:  {
                      create: 'courselocation.add_temporary_address',
@@ -90,12 +87,6 @@ export default {
                   create: 'courselocation.add_temporary_address',
                   edit: 'courselocation.edit_temporary_address'
                },
-               /// Display each step in page or Modal
-               openPanesInModal: true,
-               // Use Date fields
-               //useDate: {
-               //   validFrom: true
-               //},
                hideAddress: true
             }
          }
@@ -109,6 +100,13 @@ export default {
       ...mapGetters([
          'isLocationValid'
       ]),
+      options() {
+         return this.addAddress.options;
+      },
+      key() {
+         return (this.context.edit) ? 'address_' + this.context.addressId
+            : this.accompanyingCourse.type + '_' + this.accompanyingCourse.id ;
+      },
       isTemporaryAddress() {
          return this.accompanyingCourse.locationStatus === 'address';
       },

From eb89fa2cd47c3cbb0b62fda17ca135bcf2d39199 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 27 Sep 2021 13:03:17 +0200
Subject: [PATCH 04/64] CourseLocation: replace in accourse vue component the
 old resume _warning_address.html.twig message

---
 .../components/CourseLocation.vue             | 75 +++++++++++++++++--
 .../components/PersonsAssociated.vue          |  2 +-
 .../vuejs/AccompanyingCourse/js/i18n.js       |  3 +-
 3 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index b422ba23d..3e6b40c28 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -14,6 +14,18 @@
          </label>
       </div>
 
+      <div v-if="hasNoPersonLocation" class="alert alert-danger no-person-location">
+         <i class="fa fa-warning fa-2x"></i>
+         <div>
+            <p>
+               {{ $t('courselocation.associate_at_least_one_person_with_one_household_with_address') }}
+               <a href="#section-10">
+                  <i class="fa fa-level-up fa-fw"></i>
+               </a>
+            </p>
+         </div>
+      </div>
+
       <div class="flex-table" v-if="accompanyingCourse.location">
          <div class="item-bloc">
             <address-render-box
@@ -27,7 +39,10 @@
             </div>
 
             <div v-if="isTemporaryAddress" class="alert alert-warning separator">
-               <p>{{ $t('courselocation.temporary_address_must_be_changed') }}</p>
+               <p>
+                  {{ $t('courselocation.temporary_address_must_be_changed') }}
+                  <i class="fa fa-fw fa-map-marker"></i>
+               </p>
             </div>
          </div>
       </div>
@@ -116,11 +131,35 @@ export default {
       hasNoLocation() {
          return this.accompanyingCourse.locationStatus === 'none';
       },
+      currentParticipations() {
+         return this.accompanyingCourse.participations.filter(p => p.enddate !== null);
+      },
+      hasNoPersonLocation() {
+         let addressInParticipations_ = []
+         this.currentParticipations.forEach(p => {
+            addressInParticipations_.push(this.checkHouseholdAddressForParticipation(p));
+         });
+         const booleanReducer = (previousValue, currentValue) => previousValue || currentValue;
+         let addressInParticipations = addressInParticipations_.reduce(booleanReducer);
+         //console.log(addressInParticipations_, addressInParticipations);
+         return (
+            this.accompanyingCourse.step !== 'DRAFT'
+            && this.isTemporaryAddress
+            && !addressInParticipations
+            )
+         ;
+      },
       isContextEdit() {
          return this.context.edit;
       }
    },
    methods: {
+      checkHouseholdAddressForParticipation(participation) {
+         if (participation.person.current_household_id === null) {
+            return false;
+         }
+         return participation.person.current_household_address !== null;
+      },
       initAddressContext() {
          let context = {
             target: {
@@ -166,12 +205,36 @@ export default {
 </script>
 <style lang="scss" scoped>
 
-div.flex-table {
-   div.item-bloc {
-      div.alert {
-         margin: 0 -0.9em -1em;
+div#accompanying-course {
+   div.vue-component {
+      & > div.alert.no-person-location {
+         margin: 0 0 -1em;
+      }
+      div.no-person-location {
+         padding-bottom: 1.5em;
+         display: flex;
+         flex-direction: row;
+         & > i {
+            flex-basis: 1.5em; flex-grow: 0; flex-shrink: 0;
+            padding-top: 0.2em;
+            opacity: 0.75;
+         }
+         & > div {
+            flex-basis: auto;
+            div.action {
+               button.btn-update {
+                  margin-right: 2em;
+               }
+            }
+         }
+      }
+      div.flex-table {
+         div.item-bloc {
+            div.alert {
+               margin: 0 -0.9em -1em;
+            }
+         }
       }
    }
 }
-
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 97a286d70..52b538284 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -26,7 +26,7 @@
                   :id="p.person.id"
                   :value="p.person.id"
                />
-               <label class="form-check-label" for="hasNoHousehold">
+               <label class="form-check-label">
                   {{ p.person.text }}
                </label>
             </div>
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 550479895..b1da665a7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -81,7 +81,8 @@ const appMessages = {
          edit_temporary_address: "Modifier l'adresse temporaire",
          assign_course_address: "Désigner comme l'adresse du parcours",
          remove_button: "Enlever l'adresse",
-         temporary_address_must_be_changed: "Cette adresse est temporaire et devrait être remplacée par celle d'un usager de référence.",
+         temporary_address_must_be_changed: "Cette adresse est temporaire. Le parcours devrait être localisé auprès d'un usager concerné.",
+         associate_at_least_one_person_with_one_household_with_address: "Associez au moins un membre du parcours à un ménage, et indiquez une adresse à ce ménage.",
          sure: "Êtes-vous sûr ?",
          sure_description: "Voulez-vous faire de cette adresse l'adresse du parcours ?",
          ok: "Désigner comme adresse du parcours",

From 5da332a06ee59213e2bb2f4ff1a7207eaaaaba00 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 27 Sep 2021 13:14:42 +0200
Subject: [PATCH 05/64] fix error on previous commit, when creating new
 accourse

---
 .../vuejs/AccompanyingCourse/components/CourseLocation.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 3e6b40c28..7ae25b25c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -135,12 +135,17 @@ export default {
          return this.accompanyingCourse.participations.filter(p => p.enddate !== null);
       },
       hasNoPersonLocation() {
+
          let addressInParticipations_ = []
          this.currentParticipations.forEach(p => {
             addressInParticipations_.push(this.checkHouseholdAddressForParticipation(p));
          });
+
          const booleanReducer = (previousValue, currentValue) => previousValue || currentValue;
-         let addressInParticipations = addressInParticipations_.reduce(booleanReducer);
+
+         let addressInParticipations = (addressInParticipations_.length > 0) ?
+            addressInParticipations_.reduce(booleanReducer) : false;
+
          //console.log(addressInParticipations_, addressInParticipations);
          return (
             this.accompanyingCourse.step !== 'DRAFT'

From ca7ba90717da8d9ca9eedc5d527f7528811d3715 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 28 Sep 2021 14:53:00 +0200
Subject: [PATCH 06/64] hotfix: repair creation activity (was an error linked
 to ListenToActivityCreate)

---
 .../Event/ListenToActivityCreate.php             | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
index f3c4e7a59..d7073597a 100644
--- a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
+++ b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
@@ -29,17 +29,19 @@ class ListenToActivityCreate
             $activityData = $request->query->get('activityData');
             if (array_key_exists('calendarId', $activityData)) {
                 $calendarId = $activityData['calendarId'];
+
+                // Attach the activity to the calendar
+                $em = $event->getObjectManager();
+
+                $calendar = $em->getRepository(\Chill\CalendarBundle\Entity\Calendar::class)->find($calendarId);
+                $calendar->setActivity($activity);
+
+                $em->persist($calendar);
+                $em->flush();
             }
         }
 
-        // Attach the activity to the calendar
-        $em = $event->getObjectManager();
 
-        $calendar = $em->getRepository(\Chill\CalendarBundle\Entity\Calendar::class)->find($calendarId);
-        $calendar->setActivity($activity);
-
-        $em->persist($calendar);
-        $em->flush();
 
     }
 }

From e72ba4c940da286bbc63f5d942ccb7f4b395f58a Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 28 Sep 2021 15:34:15 +0200
Subject: [PATCH 07/64] bypass ACL restriction

---
 .../ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
index a1ce94e25..7b3e4e5b1 100644
--- a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
+++ b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
@@ -56,6 +56,8 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
+        return true;
+
         $user = $token->getUser();
         
         if (!$user instanceof User) {

From d5d12c4a17e1f52e797727833ba1e37dfc437601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Sep 2021 15:50:09 +0200
Subject: [PATCH 08/64] fix tests for user controller

---
 .../Resources/views/User/index.html.twig      |  2 +-
 .../Tests/Controller/UserControllerTest.php   | 87 ++++++++++---------
 2 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index c57d9ed5f..53bd89482 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -10,7 +10,7 @@
         {% endblock %}
         {% block table_entities_tbody %}
             {% for entity in entities %}
-            <tr>
+            <tr data-username="{{ entity.username|e('html_attr') }}">
                 <td>
                     {% if entity.isEnabled %}
                         <i class="fa fa-check chill-green"></i>
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
index 1953439dd..0017fbb4e 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
@@ -2,12 +2,17 @@
 
 namespace Chill\MainBundle\Tests\Controller;
 
+use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 
 class UserControllerTest extends WebTestCase
 {
     private $client;
 
+    private array $toDelete = [];
+
     public function setUp()
     {
         self::bootKernel();
@@ -22,18 +27,14 @@ class UserControllerTest extends WebTestCase
     public function testList()
     {
         // get the list
-        $crawler = $this->client->request('GET', '/fr/admin/user/');
+        $crawler = $this->client->request('GET', '/fr/admin/main/user');
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode(),
-                "Unexpected HTTP status code for GET /admin/user/");
-
-        $link = $crawler->selectLink('Ajouter un nouvel utilisateur')->link();
-        $this->assertInstanceOf('Symfony\Component\DomCrawler\Link', $link);
-        $this->assertRegExp('|/fr/admin/user/new$|', $link->getUri());
+                "Unexpected HTTP status code for GET /admin/main/user");
     }
 
     public function testNew()
     {
-        $crawler = $this->client->request('GET', '/fr/admin/user/new');
+        $crawler = $this->client->request('GET', '/fr/admin/main/user/new');
 
         $username = 'Test_user'.  uniqid();
         $password = 'Password1234!';
@@ -54,22 +55,15 @@ class UserControllerTest extends WebTestCase
         $this->assertGreaterThan(0, $crawler->filter('td:contains("Test_user")')->count(),
                 'Missing element td:contains("Test user")');
 
-        $update = $crawler->selectLink('Modifier')->link();
-
-        $this->assertInstanceOf('Symfony\Component\DomCrawler\Link', $update);
-        $this->assertRegExp('|/fr/admin/user/[0-9]{1,}/edit$|', $update->getUri());
-
         //test the auth of the new client
         $this->isPasswordValid($username, $password);
-
-        return $update;
     }
 
     protected function isPasswordValid($username, $password)
     {
         /* @var $passwordEncoder \Symfony\Component\Security\Core\Encoder\UserPasswordEncoder */
-        $passwordEncoder = self::$kernel->getContainer()
-                ->get('security.password_encoder');
+        $passwordEncoder = self::$container
+                ->get(UserPasswordEncoderInterface::class);
 
         $user = self::$kernel->getContainer()
                 ->get('doctrine.orm.entity_manager')
@@ -81,46 +75,33 @@ class UserControllerTest extends WebTestCase
 
     /**
      *
-     * @param \Symfony\Component\DomCrawler\Link $update
-     * @depends testNew
+     * @dataProvider dataGenerateUserId
      */
-    public function testUpdate(\Symfony\Component\DomCrawler\Link $update)
+    public function testUpdate(int $userId, string $username)
     {
-        $crawler = $this->client->click($update);
+        $crawler = $this->client->request('GET', "/fr/admin/main/user/$userId/edit");
 
         $username = 'Foo bar '.uniqid();
-        $form = $crawler->selectButton('Mettre à jour')->form(array(
+        $form = $crawler->selectButton('Enregistrer & fermer')->form(array(
             'chill_mainbundle_user[username]'  => $username,
         ));
 
         $this->client->submit($form);
         $crawler = $this->client->followRedirect();
         // Check the element contains an attribute with value equals "Foo"
-        $this->assertGreaterThan(0, $crawler->filter('[value="'.$username.'"]')->count(),
-                'Missing element [value="Foo bar"]');
-
-        $updatePassword = $crawler->selectLink('Modifier le mot de passe')->link();
-
-        $this->assertInstanceOf('Symfony\Component\DomCrawler\Link', $updatePassword);
-        $this->assertRegExp('|/fr/admin/user/[0-9]{1,}/edit_password$|',
-                $updatePassword->getUri());
-
-        return array('link' => $updatePassword, 'username' => $username);
+        $this->assertGreaterThan(0, $crawler->filter('[data-username="'.$username.'"]')->count(),
+                'Missing element [data-username="Foo bar"]');
     }
 
     /**
      *
-     * @param \Symfony\Component\DomCrawler\Link $updatePassword
-     * @depends testUpdate
+     * @dataProvider dataGenerateUserId
      */
-    public function testUpdatePassword(array $params)
+    public function testUpdatePassword(int $userId, $username)
     {
-        $link = $params['link'];
-        $username = $params['username'];
+        $crawler = $this->client->request('GET', "/fr/admin/user/$userId/edit_password");
         $newPassword = '1234Password!';
 
-        $crawler = $this->client->click($link);
-
         $form = $crawler->selectButton('Changer le mot de passe')->form(array(
             'chill_mainbundle_user_password[new_password][first]' => $newPassword,
             'chill_mainbundle_user_password[new_password][second]' => $newPassword,
@@ -130,10 +111,38 @@ class UserControllerTest extends WebTestCase
 
         $this->assertTrue($this->client->getResponse()->isRedirect(),
                 "the response is a redirection");
-        $this->client->followRedirect();
 
         $this->isPasswordValid($username, $newPassword);
     }
 
+    protected function tearDown()
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
 
+        foreach ($this->toDelete as list($class, $id)) {
+            $obj = $em->getRepository($class)->find($id);
+            $em->remove($obj);
+        }
+
+        $em->flush();
+    }
+
+    public function dataGenerateUserId()
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $user = new User();
+        $user->setUsername('Test_user '.uniqid());
+        $user->setPassword(self::$container->get(UserPasswordEncoderInterface::class)->encodePassword($user,
+            'password'));
+
+        $em->persist($user);
+        $em->flush();
+
+        $this->toDelete[] = [User::class, $user->getId()];
+
+        yield [ $user->getId(), $user->getUsername() ];
+    }
 }

From 472866ce91cdb2dc5f5a72967e7ca58ffdfa4cb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Sep 2021 15:53:41 +0200
Subject: [PATCH 09/64] fix search by birthdate

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

diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
index d15e8cd7a..cd4f8c9ce 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -199,7 +199,7 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         }
 
         if (NULL !== $birthdate) {
-            $qb->andWhere($qb->expr()->eq('s.birthdate', ':birthdate'))
+            $qb->andWhere($qb->expr()->eq('p.birthdate', ':birthdate'))
                 ->setParameter('birthdate', $birthdate);
         }
 

From e2230409b807eb29b820cf3cc1ac15595e5b2ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Sep 2021 15:59:31 +0200
Subject: [PATCH 10/64] remove dump

---
 src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
index 848e8f874..adc37d5b5 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
@@ -247,7 +247,6 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         if (\random_int(0, 10) > 3) {
             // always add social scope:
             $accompanyingPeriod->addScope($this->getReference('scope_social'));
-            var_dump(count($accompanyingPeriod->getScopes()));
 
             $accompanyingPeriod->setAddressLocation($this->createAddress());
             $manager->persist($accompanyingPeriod->getAddressLocation());

From 644d0420ceaa5bc485ce9dd0099ff39cc5d0a574 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 28 Sep 2021 16:23:24 +0200
Subject: [PATCH 11/64] creation of endpoints POST, PUT, PATCH, but still
 errors

---
 .../ChillThirdPartyExtension.php              | 18 +++-
 .../Entity/ThirdParty.php                     | 10 +-
 .../Security/Voter/ThirdPartyVoter.php        |  2 +
 .../chill.api.specs.yaml                      | 97 ++++++++++++++++++-
 4 files changed, 116 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
index 9b23222c6..2fd0f723d 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
@@ -59,7 +59,7 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
                     'class' => \Chill\ThirdPartyBundle\Entity\ThirdParty::class,
                     'name' => 'thirdparty',
                     'base_path' => '/api/1.0/thirdparty/thirdparty',
-                    'base_role' => \Chill\ThirdPartyBundle\Security\Authorization\ThirdPartyVoter::class,
+                    //'base_role' => \Chill\ThirdPartyBundle\Security\Authorization\ThirdPartyVoter::SHOW,
                     //'controller' => \Chill\ThirdPartyBundle\Controller\ThirdPartyApiController::class,
                     'actions' => [
                         '_index' => [
@@ -67,19 +67,31 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
                                 Request::METHOD_POST => true,
+                                Request::METHOD_PATCH => true,
+                                Request::METHOD_PUT => true
+                            ],
+                            'roles' => [
+                                Request::METHOD_GET => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::SHOW,
+                                Request::METHOD_HEAD => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::SHOW,
+                                Request::METHOD_POST => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE,
+                                Request::METHOD_PUT => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE,
+                                Request::METHOD_PATCH => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE
                             ],
                         ],
                         '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
-                                Request::METHOD_POST=> true,
+                                Request::METHOD_POST => true,
+                                Request::METHOD_PUT => true,
+                                Request::METHOD_PATCH => true
                             ],
                             'roles' => [
                                 Request::METHOD_GET => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::SHOW,
                                 Request::METHOD_HEAD => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::SHOW,
                                 Request::METHOD_POST => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE,
-
+                                Request::METHOD_PUT => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE,
+                                Request::METHOD_PATCH => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE
                             ],
                         ]
                     ]
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 0b0b3e56b..842e57b8b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -60,7 +60,7 @@ class ThirdParty
      * @var string
      * @ORM\Column(name="name", type="string", length=255)
      * @Assert\Length(min="2")
-     * @Groups({"read"})
+     * @Groups({"read", "write"})
      */
     private $name;
 
@@ -69,6 +69,7 @@ class ThirdParty
      * @var string
      * @ORM\Column(name="name_company", type="string", length=255, nullable=true)
      * @Assert\Length(min="3")
+     * @Groups({"read", "write"})
     */
     private $nameCompany;
 
@@ -77,6 +78,7 @@ class ThirdParty
      * @var string
      * @ORM\Column(name="acronym", type="string", length=64, nullable=true)
      * @Assert\Length(min="2")
+     * @Groups({"read", "write"})
     */
     private $acronym;
 
@@ -130,7 +132,7 @@ class ThirdParty
      * @Assert\Regex("/^([\+{1}])([0-9\s*]{4,20})$/",
      *   message="Invalid phone number: it should begin with the international prefix starting with ""+"", hold only digits and be smaller than 20 characters. Ex: +33123456789"
      * )
-     * @Groups({"read"})
+     * @Groups({"read", "write"})
      */
     private $telephone;
 
@@ -138,7 +140,7 @@ class ThirdParty
      * @var string|null
      * @ORM\Column(name="email", type="string", length=255, nullable=true)
      * @Assert\Email(checkMX=false)
-     * @Groups({"read"})
+     * @Groups({"read", "write"})
      */
     private $email;
 
@@ -147,7 +149,7 @@ class ThirdParty
      * @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address",
      *   cascade={"persist", "remove"})
      * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
-     * @Groups({"read"})
+     * @Groups({"read", "write"})
      */
     private $address;
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
index a1ce94e25..986bfb2b9 100644
--- a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
+++ b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
@@ -61,6 +61,8 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy
         if (!$user instanceof User) {
             return false;
         }
+
+        return true;
         
         $centers = $this->authorizationHelper
             ->getReachableCenters($user, new Role($attribute));
diff --git a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
index 957bf9324..c5d9346ba 100644
--- a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
@@ -8,17 +8,47 @@ servers:
   - url: "/api"
     description: "Your current dev server"
 
+components:
+  schemas:
+    Thirdparty:
+      type: object
+      properties:
+        id:
+          type: integer
+          readOnly: true
+        name:
+          type: string
+        nameCompany:
+          type: string
+        acronym:
+          type: string
+        email:
+          type: string
+
 paths:
   /1.0/thirdparty/thirdparty.json:
-    get:
+    post:
       tags:
         - thirdparty
-      summary: Return a list of all thirdparty items
+      summary: Create a single thirdparty
+      requestBody:
+        description: "A thirdparty"
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/Thirdparty"
       responses:
         200:
-          description: "ok"
-        401:
+          description: "OK"
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Thirdparty"
+        403:
           description: "Unauthorized"
+        422:
+          description: "Invalid data"
 
   /1.0/thirdparty/thirdparty/{id}.json:
     get:
@@ -41,3 +71,62 @@ paths:
           description: "not found"
         401:
           description: "Unauthorized"
+    patch:
+      tags:
+        - thirdparty
+      summary: "Alter a thirdparty"
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The thirdparty's id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      requestBody:
+        description: "A thirdparty"
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/Thirdparty"
+      responses:
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
+        422:
+          description: "Object with validation errors"
+    put:
+      tags:
+        - thirdparty
+      summary: Edit an existing thirdparty
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The thirdparty's id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/Thirdparty"
+      responses:
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
+        422:
+          description: "Unprocessable entity (validation errors)"
+        400:
+          description: "Bad Request"

From c5fa1b883cd355ebe7d1c6dd06fd76ae84b2b3f8 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 28 Sep 2021 16:25:38 +0200
Subject: [PATCH 12/64] onthefly: adding tp i18n file

---
 .../public/vuejs/AccompanyingCourse/js/i18n.js        |  5 +++--
 .../public/vuejs/_components/OnTheFly/ThirdParty.vue  |  9 ++-------
 .../Resources/public/vuejs/_js/i18n.js                | 11 +++++++++++
 3 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js

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 cf3a0fb7e..0ab012954 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -1,4 +1,5 @@
-import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n';
+import { thirdpartyMessages } from 'ChillThirdPartyAssets/vuejs/_js/i18n';
 import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n';
 
 const appMessages = {
@@ -137,7 +138,7 @@ const appMessages = {
    }
 };
 
-Object.assign(appMessages.fr, personMessages.fr, addressMessages.fr);
+Object.assign(appMessages.fr, personMessages.fr, thirdpartyMessages.fr, addressMessages.fr);
 
 export {
    appMessages
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 1b1207131..6d1497e2b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -19,15 +19,10 @@
       </div>
    </div>
    <div v-else-if="action === 'edit' || action === 'create'">
-      
-      <div class="form-floating mb-3">
-         <input class="form-control form-control-lg" id="firstname" v-model="thirdparty.firstName" v-bind:placeholder="$t('thirdparty.firstname')" />
-         <label for="firstname">{{ $t('thirdparty.firstname') }}</label>
-      </div>
 
       <div class="form-floating mb-3">
-         <input class="form-control form-control-lg" id="lastname" v-model="thirdparty.lastName" v-bind:placeholder="$t('thirdparty.lastname')" />
-         <label for="lastname">{{ $t('thirdparty.lastname') }}</label>
+         <input class="form-control form-control-lg" id="name" v-model="thirdparty.name" v-bind:placeholder="$t('thirdparty.name')" />
+         <label for="name">{{ $t('thirdparty.name') }}</label>
       </div>
 
       <div class="input-group mb-3">
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js
new file mode 100644
index 000000000..37d09320d
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js
@@ -0,0 +1,11 @@
+const thirdpartyMessages = {
+    fr: {
+        thirdparty: {
+            name: "Dénomination",
+            email: "Courriel",
+            phonenumber: "Téléphone",
+        }
+    }
+};
+
+export { thirdpartyMessages };

From adc94aaeea34a9e46f7c4738cddcdee307ee3322 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 28 Sep 2021 16:26:32 +0200
Subject: [PATCH 13/64] javascript syntax correction

---
 .../vuejs/_components/Entity/PersonRenderBox.vue     |  6 +++---
 .../vuejs/_components/Entity/ThirdPartyRenderBox.vue | 12 ++++++------
 .../public/vuejs/_components/OnTheFly/ThirdParty.vue |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 0f397211e..2bc5f0b3b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -27,7 +27,7 @@
 
                 </div>
 
-                <p v-if="options.addInfo == true" class="moreinfo">
+                <p v-if="options.addInfo === true" class="moreinfo">
                     <i :class="'fa fa-fw ' + getGenderIcon" title="{{ getGender }}"></i>
                     <time v-if="person.birthdate && !person.deathdate" datetime="{{ person.birthdate }}" title="{{ birthdate }}">
                         {{ $t(getGenderTranslation) + ' ' + $d(birthdate, 'text') }}
@@ -142,7 +142,7 @@ export default {
     props: ['person', 'options', 'render', 'returnPath'],
     computed: {
         getGenderTranslation: function() {
-            return this.person.gender == 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man';
+            return this.person.gender === 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man';
         },
         isMultiline: function() {
             if(this.options.isMultiline){
@@ -152,7 +152,7 @@ export default {
             }
         },
         getGenderIcon: function() {
-            return this.person.gender == 'woman' ? 'fa-venus' : this.person.gender == 'man' ? 'fa-mars' : 'fa-neuter';
+            return this.person.gender === 'woman' ? 'fa-venus' : this.person.gender === 'man' ? 'fa-mars' : 'fa-neuter';
         },
         birthdate: function(){
             if(this.person.birthdate !== null){
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 720d9903b..eddde6a67 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -8,17 +8,17 @@
 
                 <div :class="'denomination h' + options.hLevel">
 
-                    <a v-if="this.options.addLink ==  true" href="#">
+                    <a v-if="this.options.addLink ===  true" href="#">
                         <span class="name">{{ thirdparty.text }}</span>
                     </a>
                     <span class="name">{{ thirdparty.text }}</span>
 
                     <span v-if="options.addId ==  true" class="id-number" :title="'n° ' + thirdparty.id">{{ thirdparty.id }}</span>
-                    <span v-if="options.addEntity ==  true && thirdparty.type == 'thirdparty'" class="badge rounded-pill bg-secondary">{{ $t('renderbox.type.thirdparty') }}</span>
+                    <span v-if="options.addEntity ==  true && thirdparty.type === 'thirdparty'" class="badge rounded-pill bg-secondary">{{ $t('renderbox.type.thirdparty') }}</span>
 
                 </div>
 
-                <p v-if="this.options.addInfo == true" class="moreinfo">
+                <p v-if="this.options.addInfo === true" class="moreinfo">
                     <i v-if="thirdparty.birthdate" :class="'fa fa-fw ' + getGenderIcon" title="{{ getGender }}"></i>
                     <time v-if="thirdparty.birthdate" datetime="{{ thirdparty.birthdate.datetime }}" title="{{ birthdate }}">
                         {{ $t(getGender) + ' ' + $d(birthdate, 'short') }}
@@ -26,7 +26,7 @@
                     <time v-else-if="thirdparty.deathdate" datetime="{{ thirdparty.deathdate.datetime }}" title="{{ thirdparty.deathdate }}">
                         {{ birthdate }} - {{ deathdate }}
                     </time>
-                    <span v-if="options.addAge == true" class="age">{{ thirdparty.age }}</span>
+                    <span v-if="options.addAge === true" class="age">{{ thirdparty.age }}</span>
                 </p>
             </div>
         </div>
@@ -80,10 +80,10 @@ export default {
             }
         },
         getGender: function() {
-            return this.thirdparty.gender == 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man';
+            return this.thirdparty.gender === 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man';
         },
         getGenderIcon: function() {
-            return this.thirdparty.gender == 'woman' ? 'fa-venus' : this.thirdparty.gender == 'man' ? 'fa-mars' : 'fa-neuter';
+            return this.thirdparty.gender === 'woman' ? 'fa-venus' : this.thirdparty.gender === 'man' ? 'fa-mars' : 'fa-neuter';
         },
         birthdate: function(){
             var date = new Date(this.thirdparty.birthdate.datetime);
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 6d1497e2b..016db598c 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="action === 'show'">
+   <div v-if="action === 'show'">
       <div class="flex-table">
          <third-party-render-box
             :thirdparty="thirdparty"

From 3040ed9483c3937051d6de85077c5c02aee87bbb Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 28 Sep 2021 16:26:59 +0200
Subject: [PATCH 14/64] tp onthefly: add add-address (wip)

---
 .../vuejs/_components/OnTheFly/ThirdParty.vue | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 016db598c..1f1df7e5f 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -43,11 +43,19 @@
             aria-describedby="phonenumber" />
       </div>
 
+      <add-address
+         :options="this.addAddress.options"
+         :address-changed-callback="submitAddress"
+         :context="this.addAddress.context"
+         >
+      </add-address>
+
    </div>
 </template>
 
 <script>
 import ThirdPartyRenderBox from '../Entity/ThirdPartyRenderBox.vue';
+import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress';
 import { getThirdparty, postThirdparty } from '../../_api/OnTheFly';
 
 export default {
@@ -55,11 +63,31 @@ export default {
    props: ['id', 'type', 'action'],
    components: {
       ThirdPartyRenderBox,
+      AddAddress
    },
    data: function() {
       return {
          thirdparty: {
             type: 'thirdparty'
+         },
+         addAddress: {
+            context: {
+               
+            },
+            options: {
+               //button: {
+               //   text:  {
+               //      create: 'courselocation.add_temporary_address',
+               //      edit: 'courselocation.edit_temporary_address'
+               //   }
+               //},
+               //title: {
+               //   create: 'courselocation.add_temporary_address',
+               //   edit: 'courselocation.edit_temporary_address'
+               //},
+               openPanesInModal: true,
+               hideAddress: true
+            }
          }
       }
    },
@@ -70,6 +98,9 @@ export default {
             resolve();
          }));
       },
+      submitAddress(payload) {
+         console.log(payload);
+      },
       postData() {
          postThirdparty(this.thirdparty).then(thirdparty => new Promise((resolve, reject) => {
             this.thirdparty = thirdparty;

From e43ae56e733c7a5e242b54b8327f9c488d24021e Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 28 Sep 2021 17:39:23 +0200
Subject: [PATCH 15/64] Update root composer.json.

---
 composer.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/composer.json b/composer.json
index 747747290..0d134cbf8 100644
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,7 @@
         "league/csv": "^9.7.1",
         "nyholm/psr7": "^1.4",
         "phpoffice/phpspreadsheet": "^1.16",
+        "ramsey/uuid-doctrine": "^1.7",
         "sensio/framework-extra-bundle": "^5.5",
         "symfony/asset": "4.*",
         "symfony/browser-kit": "^5.2",
@@ -29,6 +30,7 @@
         "symfony/expression-language": "4.*",
         "symfony/form": "4.*",
         "symfony/intl": "4.*",
+        "symfony/mime": "^4 || ^5",
         "symfony/monolog-bundle": "^3.5",
         "symfony/security-bundle": "4.*",
         "symfony/serializer": "^5.2",

From 0aec2fc1d1a27d6c930b52e2dbb28b5d8cfe835a Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 28 Sep 2021 17:39:42 +0200
Subject: [PATCH 16/64] Update local `ChillWopiBundle` composer.json.

---
 src/Bundle/ChillWopiBundle/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillWopiBundle/composer.json b/src/Bundle/ChillWopiBundle/composer.json
index 7f7e6a4ed..41737c8b1 100644
--- a/src/Bundle/ChillWopiBundle/composer.json
+++ b/src/Bundle/ChillWopiBundle/composer.json
@@ -19,7 +19,7 @@
         "php": ">= 7.4",
         "champs-libres/wopi-bundle": "dev-master",
         "nyholm/psr7": "^1.4",
-        "php-opencloud/openstack": "^3.2.1"
+        "symfony/mime": "^4 || ^5"
     },
     "autoload": {
         "psr-4": {

From 59fcd1e96b7ffbac0649f953e4f1f28932b5fd06 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 28 Sep 2021 17:40:49 +0200
Subject: [PATCH 17/64] Update local `ChillDocStore` composer.json.

---
 src/Bundle/ChillDocStoreBundle/composer.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillDocStoreBundle/composer.json b/src/Bundle/ChillDocStoreBundle/composer.json
index 384f6c093..c011ce29b 100644
--- a/src/Bundle/ChillDocStoreBundle/composer.json
+++ b/src/Bundle/ChillDocStoreBundle/composer.json
@@ -3,9 +3,12 @@
     "description": "A Chill bundle to store documents",
     "type": "symfony-bundle",
     "autoload": {
-      "psr-4": { "Chill\\DocStoreBundle\\" : "" }
+        "psr-4": {
+            "Chill\\DocStoreBundle\\": ""
+        }
     },
     "require": {
+        "symfony/mime": "^4 || ^5"
     },
     "license": "AGPL-3.0"
 }

From dcb92b13787c351bc6cbf5050972c3da3b6ec807 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 28 Sep 2021 17:42:28 +0200
Subject: [PATCH 18/64] Update `StoredObject` entity.

---
 .../Entity/StoredObject.php                    | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index 9c88e502d..7ba21b5da 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -7,7 +7,9 @@ namespace Chill\DocStoreBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 use ChampsLibres\AsyncUploaderBundle\Model\AsyncFileInterface;
 use ChampsLibres\AsyncUploaderBundle\Validator\Constraints\AsyncFileExists;
+use ChampsLibres\WopiLib\Contract\Entity\Document;
 use DateTimeInterface;
+use Ramsey\Uuid\Uuid;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
@@ -19,7 +21,7 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  *  message="The file is not stored properly"
  * )
  */
-class StoredObject implements AsyncFileInterface
+class StoredObject implements AsyncFileInterface, Document
 {
     /**
      * @ORM\Id()
@@ -47,6 +49,11 @@ class StoredObject implements AsyncFileInterface
      */
     private array $iv = [];
 
+    /**
+     * @ORM\Column(type="uuid", unique=true)
+     */
+    private Uuid $uuid;
+
     /**
      * @ORM\Column(type="datetime", name="creation_date")
      * @Serializer\Groups({"read"})
@@ -68,6 +75,7 @@ class StoredObject implements AsyncFileInterface
     public function __construct()
     {
         $this->creationDate = new \DateTime();
+        $this->uuid = Uuid::uuid4();
     }
 
     public function getId()
@@ -155,5 +163,13 @@ class StoredObject implements AsyncFileInterface
         return $this;
     }
 
+    public function getUuid(): Uuid
+    {
+        return $this->uuid;
+    }
 
+    public function getWopiDocId(): string
+    {
+        return (string) $this->uuid;
+    }
 }

From ab845d4569dd3537490920f9bb894b0a9551959e Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 28 Sep 2021 17:50:53 +0200
Subject: [PATCH 19/64] Synchronize `ChillWopiBundle` with latest upstream WOPI
 packages.

---
 .../ChillWopiBundle/src/Controller/Test.php   |  29 ++-
 .../src/Resources/config/services.php         |  12 +-
 .../src/Service/Wopi/ChillDocumentManager.php | 243 ++++++++++++++++++
 .../src/Service/Wopi/ChillWopi.php            | 225 +++-------------
 4 files changed, 308 insertions(+), 201 deletions(-)
 create mode 100644 src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php

diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Test.php b/src/Bundle/ChillWopiBundle/src/Controller/Test.php
index 202af20aa..283328f21 100644
--- a/src/Bundle/ChillWopiBundle/src/Controller/Test.php
+++ b/src/Bundle/ChillWopiBundle/src/Controller/Test.php
@@ -9,9 +9,10 @@ declare(strict_types=1);
 
 namespace Chill\WopiBundle\Controller;
 
-use ChampsLibres\WopiLib\Configuration\WopiConfigurationInterface;
-use ChampsLibres\WopiLib\Discovery\WopiDiscoveryInterface;
-use Chill\DocStoreBundle\Repository\StoredObjectRepository;
+use ChampsLibres\WopiLib\Contract\Service\Configuration\ConfigurationInterface;
+use ChampsLibres\WopiLib\Contract\Service\Discovery\DiscoveryInterface;
+use ChampsLibres\WopiLib\Contract\Service\DocumentManagerInterface;
+use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\WopiBundle\Service\Controller\ResponderInterface;
 use Exception;
 use loophp\psr17\Psr17Interface;
@@ -23,11 +24,11 @@ use Symfony\Component\Security\Core\Security;
 
 final class Test
 {
-    private StoredObjectRepository $storedObjectRepository;
+    private DiscoveryInterface $wopiDiscovery;
 
-    private WopiDiscoveryInterface $wopiDiscovery;
+    private DocumentManagerInterface $documentManager;
 
-    private WopiConfigurationInterface $wopiConfiguration;
+    private ConfigurationInterface $wopiConfiguration;
 
     private ResponderInterface $responder;
 
@@ -38,15 +39,15 @@ final class Test
     private RouterInterface $router;
 
     public function __construct(
-        StoredObjectRepository $storedObjectRepository,
-        WopiConfigurationInterface $wopiConfiguration,
-        WopiDiscoveryInterface $wopiDiscovery,
+        ConfigurationInterface $wopiConfiguration,
+        DiscoveryInterface $wopiDiscovery,
+        DocumentManagerInterface $documentManager,
         ResponderInterface $responder,
         Security $security,
         Psr17Interface $psr17,
         RouterInterface $router
     ) {
-        $this->storedObjectRepository = $storedObjectRepository;
+        $this->documentManager = $documentManager;
         $this->wopiConfiguration = $wopiConfiguration;
         $this->wopiDiscovery = $wopiDiscovery;
         $this->responder = $responder;
@@ -58,11 +59,11 @@ final class Test
     public function __invoke(string $fileId): Response
     {
         $configuration = $this->wopiConfiguration->jsonSerialize();
-
-        $storedObject = $this->storedObjectRepository->findOneBy(['filename' => $fileId]);
+        /** @var StoredObject $storedObject */
+        $storedObject = $this->documentManager->findByDocumentId($fileId);
 
         if (null === $storedObject) {
-            throw new NotFoundHttpException(sprintf('Unable to find object named %s', $fileId));
+            throw new NotFoundHttpException(sprintf('Unable to find object %s', $fileId));
         }
 
         if ([] === $discoverExtension = $this->wopiDiscovery->discoverMimeType($storedObject->getType())) {
@@ -83,7 +84,7 @@ final class Test
                             ->generate(
                                 'checkFileInfo',
                                 [
-                                    'fileId' => $storedObject->getFilename(),
+                                    'fileId' => $this->documentManager->getDocumentId($storedObject),
                                 ],
                                 UrlGeneratorInterface::ABSOLUTE_URL
                             ),
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
index 455e658e2..4925404b3 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
+++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
@@ -10,8 +10,10 @@ declare(strict_types=1);
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface;
-use ChampsLibres\WopiLib\Service\Contract\WopiInterface;
 use Chill\WopiBundle\Service\Wopi\ChillWopi;
+use ChampsLibres\WopiBundle\Service\Wopi as CLWopi;
+use ChampsLibres\WopiLib\Contract\Service\DocumentManagerInterface;
+use Chill\WopiBundle\Service\Wopi\ChillDocumentManager;
 
 return static function (ContainerConfigurator $container) {
     $services = $container
@@ -30,8 +32,14 @@ return static function (ContainerConfigurator $container) {
         ->tag('controller.service_arguments');
 
     $services
-        ->alias(WopiInterface::class, ChillWopi::class);
+        ->set(ChillWopi::class)
+        ->decorate(CLWopi::class)
+        ->arg('$wopi', service('.inner'));
 
+    $services
+        ->alias(DocumentManagerInterface::class, ChillDocumentManager::class);
+
+    // TODO: Move this into the async bundle (low priority)
     $services
         ->alias(TempUrlGeneratorInterface::class, 'async_uploader.temp_url_generator');
 };
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
new file mode 100644
index 000000000..bfa3ee8b0
--- /dev/null
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
@@ -0,0 +1,243 @@
+<?php
+
+/**
+ * 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\WopiBundle\Service\Wopi;
+
+use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface;
+use ChampsLibres\WopiLib\Contract\Entity\Document;
+use ChampsLibres\WopiLib\Contract\Service\DocumentLockManagerInterface;
+use ChampsLibres\WopiLib\Contract\Service\DocumentManagerInterface;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Repository\StoredObjectRepository;
+use DateTimeInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Error;
+use loophp\psr17\Psr17Interface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\StreamInterface;
+use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Mime\MimeTypes;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Throwable;
+
+final class ChillDocumentManager implements DocumentManagerInterface
+{
+    private DocumentLockManagerInterface $documentLockManager;
+
+    private EntityManagerInterface $entityManager;
+
+    private HttpClientInterface $httpClient;
+
+    private Psr17Interface $psr17;
+
+    private RequestInterface $request;
+
+    private StoredObjectRepository $storedObjectRepository;
+
+    private TempUrlGeneratorInterface $tempUrlGenerator;
+
+    public function __construct(
+        DocumentLockManagerInterface $documentLockManager,
+        EntityManagerInterface $entityManager,
+        HttpClientInterface $httpClient,
+        Psr17Interface $psr17,
+        StoredObjectRepository $storedObjectRepository,
+        TempUrlGeneratorInterface $tempUrlGenerator,
+        HttpMessageFactoryInterface $httpMessageFactory,
+        RequestStack $requestStack
+    ) {
+        $this->entityManager = $entityManager;
+        $this->psr17 = $psr17;
+        $this->storedObjectRepository = $storedObjectRepository;
+        $this->documentLockManager = $documentLockManager;
+        $this->tempUrlGenerator = $tempUrlGenerator;
+        $this->httpClient = $httpClient;
+        $this->request = $httpMessageFactory->createRequest($requestStack->getCurrentRequest());
+    }
+
+    public function create(array $data): Document
+    {
+        /** @var StoredObject $document */
+        $document = (new ObjectNormalizer())->denormalize([], StoredObject::class);
+
+        // Mime types / extension handling.
+        $mimeTypes = new MimeTypes();
+        $mimeTypes->getMimeTypes($data['extension']);
+        $document->setType(reset($mimeTypes));
+
+        $document->setFilename($data['name']);
+
+        $this->entityManager->persist($document);
+        $this->entityManager->flush($document);
+
+        // TODO : Ask proper mapping.
+        // Available: basename, name, extension, content, size
+        $this->setContent($document, $data['content']);
+
+        return $document;
+    }
+
+    public function deleteLock(Document $document): void {
+        $this->documentLockManager->deleteLock($document, $this->request);
+    }
+
+    /**
+     * @param string $documentFilename without extension !
+     */
+    public function findByDocumentFilename(string $documentFilename): ?Document {
+        return $this->storedObjectRepository->findOneBy(
+            [
+                'filename' => $documentFilename,
+            ]
+        );
+    }
+
+    public function findByDocumentId(string $documentId): ?Document {
+        return $this->storedObjectRepository->findOneBy(
+            [
+                'uuid' => $documentId,
+            ]
+        );
+    }
+
+    /**
+     * @param StoredObject $document
+     */
+    public function getCreationDate(Document $document): DateTimeInterface
+    {
+        return $document->getCreationDate();
+    }
+
+    /**
+     * @param StoredObject $document
+     */
+    public function getLastModifiedDate(Document $document): DateTimeInterface
+    {
+        // TODO: Add column 'LastModifiedDate' in StoredObject entity
+        return $document->getCreationDate();
+    }
+
+    public function getLock(Document $document): string {
+        return $this->documentLockManager->getLock($document, $this->request);
+    }
+
+    public function getVersion(Document $document): string {
+        // TODO ?
+        return '0';
+    }
+
+    public function hasLock(Document $document): bool {
+        return $this->documentLockManager->hasLock($document, $this->request);
+    }
+
+    public function lock(Document $document, string $lock): void {
+        $this->documentLockManager->setLock($document, $lock, $this->request);
+    }
+
+    public function remove(Document $document): void {
+        $entityIsDeleted = false;
+
+        try {
+            $this->entityManager->remove($document);
+            $entityIsDeleted = true;
+        } catch (Throwable $e) {
+            $entityIsDeleted = false;
+        }
+
+        if ($entityIsDeleted === true) {
+            $this->deleteContent($document);
+        }
+    }
+
+    public function write(Document $document, array $properties = []): void
+    {
+        $this->setContent($document, $properties['content']);
+    }
+
+    /**
+     * @param StoredObject $document
+     *
+     * @return string The document filename with its extension.
+     */
+    public function getBasename(Document $document): string {
+        $exts = (new MimeTypes())->getExtensions($document->getType());
+
+        if ([] === $exts) {
+            throw new Error('Unknown mimetype for stored document.');
+        }
+
+        return sprintf('%s.%s', $document->getFilename(), reset($exts));
+    }
+
+    /**
+     * @param StoredObject $document
+     */
+    public function getDocumentId(Document $document): string {
+        return (string) $document->getUuid();
+    }
+
+    public function getSha256(Document $document): string {
+        return base64_encode(hash('sha256', $this->getContent($document)));
+    }
+
+    public function getSize(Document $document): int {
+        return strlen(stream_get_contents($this->read($document)));
+    }
+
+    public function read(Document $document): StreamInterface {
+        return $this
+            ->psr17
+            ->createStream($this->getContent($document));
+    }
+
+    private function deleteContent(StoredObject $storedObject): string
+    {
+        /** @var StdClass $object */
+        $object = $this->tempUrlGenerator->generate('DELETE', $storedObject->getFilename());
+
+        $response = $this->httpClient->request('DELETE', $object->url);
+
+        if (200 !== $response->getStatusCode())
+        {
+            throw new Error('Unable to delete stored object.');
+        }
+    }
+
+    private function getContent(StoredObject $storedObject): string
+    {
+        /** @var StdClass $object */
+        $object = $this->tempUrlGenerator->generate('GET', $storedObject->getFilename());
+
+        $response = $this->httpClient->request('GET', $object->url);
+
+        if (200 !== $response->getStatusCode())
+        {
+            throw new Error('Unable to retrieve stored object.');
+        }
+
+        return $response->getContent();
+    }
+
+    private function setContent(StoredObject $storedObject, string $content): void
+    {
+        // TODO: Add strict typing in champs-libres/async-uploader-bundle
+        /** @var StdClass $object */
+        $object = $this->tempUrlGenerator->generate('PUT', $storedObject->getFilename());
+
+        $response = $this->httpClient->request('PUT', $object->url, ['body' => $content]);
+
+        if (200 !== $response->getStatusCode())
+        {
+            throw new Error('Unable to save stored object.');
+        }
+    }
+
+}
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
index fc4e526a1..7061c5735 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
@@ -9,46 +9,28 @@ declare(strict_types=1);
 
 namespace Chill\WopiBundle\Service\Wopi;
 
-use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface;
-use ChampsLibres\WopiLib\Discovery\WopiDiscoveryInterface;
-use ChampsLibres\WopiLib\Service\Contract\WopiInterface;
-use Chill\DocStoreBundle\Repository\StoredObjectRepository;
-use Exception;
+use ChampsLibres\WopiLib\Contract\Service\DocumentManagerInterface;
+use ChampsLibres\WopiLib\Contract\Service\WopiInterface;
 use loophp\psr17\Psr17Interface;
-use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
-use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 final class ChillWopi implements WopiInterface
 {
+    private DocumentManagerInterface $documentManager;
+
     private Psr17Interface $psr17;
 
-    private WopiDiscoveryInterface $wopiDiscovery;
-
-    private StoredObjectRepository $storedObjectRepository;
-
-    private ClientInterface $httpClient;
-
-    private TempUrlGeneratorInterface $tempUrlGenerator;
-
-    private UserProviderInterface $userProvider;
+    private WopiInterface $wopi;
 
     public function __construct(
+        DocumentManagerInterface $documentManager,
         Psr17Interface $psr17,
-        WopiDiscoveryInterface $wopiDiscovery,
-        StoredObjectRepository $storedObjectRepository,
-        ClientInterface $httpClient,
-        TempUrlGeneratorInterface $tempUrlGenerator,
-        UserProviderInterface $userProvider
+        WopiInterface $wopi
     ) {
+        $this->documentManager = $documentManager;
         $this->psr17 = $psr17;
-        $this->wopiDiscovery = $wopiDiscovery;
-        $this->storedObjectRepository = $storedObjectRepository;
-        $this->httpClient = $httpClient;
-        $this->tempUrlGenerator = $tempUrlGenerator;
-        $this->userProvider = $userProvider;
+        $this->wopi = $wopi;
     }
 
     public function checkFileInfo(
@@ -56,59 +38,31 @@ final class ChillWopi implements WopiInterface
         ?string $accessToken,
         RequestInterface $request
     ): ResponseInterface {
-        try {
-            $user = $this->userProvider->loadUserByUsername($accessToken);
-        } catch (UsernameNotFoundException $e) {
-            return $this
-                ->psr17
-                ->createResponse(401);
-        }
+        $response = $this->wopi->checkFileInfo($fileId, $accessToken, $request);
+        $document = $this->documentManager->findByDocumentId($fileId);
 
-        $storedObject = $this->storedObjectRepository->findOneBy(['filename' => $fileId]);
+        $body = json_decode((string) $response->getBody(), true);
 
-        if (null === $storedObject) {
-            throw new Exception(sprintf('Unable to find object named %s', $fileId));
-        }
-
-        $mimeType = $storedObject->getType();
-
-        if ([] === $this->wopiDiscovery->discoverMimeType($mimeType)) {
-            throw new Exception(sprintf('Unable to find mime type %s', $mimeType));
-        }
-
-        return $this
-            ->psr17
-            ->createResponse()
-            ->withHeader('Content-Type', 'application/json')
-            ->withBody($this->psr17->createStream((string) json_encode(
-                [
-                    'BaseFileName' => $storedObject->getFilename(),
-                    'OwnerId' => uniqid(),
-                    'Size' => 0,
-                    'UserId' => uniqid(),
-//                    'Version' => 'v' . uniqid(),
-                    'ReadOnly' => false,
-                    'UserCanWrite' => true,
-                    'UserCanNotWriteRelative' => true,
-                    'SupportsLocks' => false,
-                    'UserFriendlyName' => sprintf('User %s', $user->getUsername()),
-                    'UserExtraInfo' => [],
-                    'LastModifiedTime' => date('Y-m-d\TH:i:s.u\Z', $storedObject->getCreationDate()->getTimestamp()),
-                    'CloseButtonClosesWindow' => true,
-                    'EnableInsertRemoteImage' => true,
-                    'EnableShare' => false,
-                    'SupportsUpdate' => true,
-                    'SupportsRename' => false,
-                    'DisablePrint' => false,
-                    'DisableExport' => false,
-                    'DisableCopy' => false,
-                ]
-            )));
+        return $response
+            ->withBody(
+                $this
+                    ->psr17
+                    ->createStream(
+                        (string) json_encode(
+                            $body +
+                            [
+                                'Version' => sprintf('v%s', $this->documentManager->getVersion($document)),
+                                // TODO: Add column 'LastModifiedDate' in StoredObject entity
+                                'LastModifiedTime' => $this->documentManager->getLastModifiedDate($document)->format('Y-m-d\TH:i:s.uP'),
+                            ]
+                        )
+                    )
+            );
     }
 
     public function deleteFile(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface
     {
-        return $this->getDebugResponse(__FUNCTION__, $request);
+        return $this->wopi->deleteFile($fileId, $accessToken, $request);
     }
 
     public function enumerateAncestors(
@@ -116,57 +70,17 @@ final class ChillWopi implements WopiInterface
         ?string $accessToken,
         RequestInterface $request
     ): ResponseInterface {
-        return $this->getDebugResponse(__FUNCTION__, $request);
+        return $this->wopi->enumerateAncestors($fileId, $accessToken, $request);
     }
 
     public function getFile(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface
     {
-        try {
-            $user = $this->userProvider->loadUserByUsername($accessToken);
-        } catch (UsernameNotFoundException $e) {
-            return $this
-                ->psr17
-                ->createResponse(401);
-        }
-
-        $storedObject = $this->storedObjectRepository->findOneBy(['filename' => $fileId]);
-
-        if (null === $storedObject) {
-            return $this
-                ->psr17
-                ->createResponse(404);
-        }
-
-        // TODO: Add strict typing in champs-libres/async-uploader-bundle
-        /** @var StdClass $object */
-        $object = $this->tempUrlGenerator->generate('GET', $storedObject->getFilename());
-
-        $response = $this->httpClient->sendRequest($this->psr17->createRequest('GET', $object->url));
-
-        if (200 !== $response->getStatusCode())
-        {
-            return $this
-                ->psr17
-                ->createResponse(500);
-        }
-
-        return $this
-            ->psr17
-            ->createResponse()
-            ->withHeader(
-                'Content-Type',
-                'application/octet-stream',
-            )
-            ->withHeader(
-                'Content-Disposition',
-                sprintf('attachment; filename=%s', $storedObject->getFilename())
-            )
-            ->withBody($response->getBody());
+        return $this->wopi->getFile($fileId, $accessToken, $request);
     }
 
     public function getLock(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface
     {
-        return $this->getDebugResponse(__FUNCTION__, $request);
+        return $this->wopi->getLock($fileId, $accessToken, $request);
     }
 
     public function getShareUrl(
@@ -174,7 +88,7 @@ final class ChillWopi implements WopiInterface
         ?string $accessToken,
         RequestInterface $request
     ): ResponseInterface {
-        return $this->getDebugResponse(__FUNCTION__, $request);
+        return $this->wopi->getShareUrl($fileId, $accessToken, $request);
     }
 
     public function lock(
@@ -183,7 +97,7 @@ final class ChillWopi implements WopiInterface
         string $xWopiLock,
         RequestInterface $request
     ): ResponseInterface {
-        return $this->getDebugResponse(__FUNCTION__, $request);
+        return $this->wopi->lock($fileId, $accessToken, $xWopiLock, $request);
     }
 
     public function putFile(
@@ -193,49 +107,17 @@ final class ChillWopi implements WopiInterface
         string $xWopiEditors,
         RequestInterface $request
     ): ResponseInterface {
-        try {
-            $user = $this->userProvider->loadUserByUsername($accessToken);
-        } catch (UsernameNotFoundException $e) {
-            return $this
-                ->psr17
-                ->createResponse(401);
-        }
-
-        $storedObject = $this->storedObjectRepository->findOneBy(['filename' => $fileId]);
-
-        if (null === $storedObject) {
-            throw new Exception(sprintf('Unable to find object named %s', $fileId));
-        }
-
-        // TODO: Add strict typing in champs-libres/async-uploader-bundle
-        /** @var StdClass $object */
-        $object = $this->tempUrlGenerator->generate('PUT', $storedObject->getFilename());
-
-        $response = $this->httpClient->sendRequest($this->psr17->createRequest('PUT', $object->url)->withBody($request->getBody()));
-
-        if (201 !== $response->getStatusCode())
-        {
-            return $this
-                ->psr17
-                ->createResponse(500);
-        }
-
-        return $this
-            ->psr17
-            ->createResponse()
-            ->withHeader('Content-Type', 'application/json')
-            ->withAddedHeader('X-WOPI-Lock', $xWopiLock)
-            ->withBody($this->psr17->createStream((string) json_encode([])));
+        return $this->wopi->putFile($fileId, $accessToken, $xWopiLock, $xWopiEditors, $request);
     }
 
     public function putRelativeFile(string $fileId, string $accessToken, ?string $suggestedTarget, ?string $relativeTarget, bool $overwriteRelativeTarget, int $size, RequestInterface $request): ResponseInterface
     {
-        return $this->getDebugResponse(__FUNCTION__, $request);
+        return $this->wopi->putRelativeFile($fileId, $accessToken, $suggestedTarget, $relativeTarget, $overwriteRelativeTarget, $size, $request);
     }
 
     public function putUserInfo(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface
     {
-        return $this->getDebugResponse(__FUNCTION__, $request);
+        return $this->wopi->putUserInfo($fileId, $accessToken, $request);
     }
 
     public function refreshLock(
@@ -244,7 +126,7 @@ final class ChillWopi implements WopiInterface
         string $xWopiLock,
         RequestInterface $request
     ): ResponseInterface {
-        return $this->getDebugResponse(__FUNCTION__, $request);
+        return $this->wopi->refreshLock($fileId, $accessToken, $xWopiLock, $request);
     }
 
     public function renameFile(
@@ -254,7 +136,7 @@ final class ChillWopi implements WopiInterface
         string $xWopiRequestedName,
         RequestInterface $request
     ): ResponseInterface {
-        return $this->getDebugResponse(__FUNCTION__, $request);
+        return $this->wopi->renameFile($fileId, $accessToken, $xWopiLock, $xWopiRequestedName, $request);
     }
 
     public function unlock(
@@ -263,7 +145,7 @@ final class ChillWopi implements WopiInterface
         string $xWopiLock,
         RequestInterface $request
     ): ResponseInterface {
-        return $this->getDebugResponse(__FUNCTION__, $request);
+        return $this->wopi->unlock($fileId, $accessToken, $xWopiLock, $request);
     }
 
     public function unlockAndRelock(
@@ -273,33 +155,6 @@ final class ChillWopi implements WopiInterface
         string $xWopiOldLock,
         RequestInterface $request
     ): ResponseInterface {
-        return $this->getDebugResponse(__FUNCTION__, $request);
-    }
-
-    private function getDebugResponse(string $method, RequestInterface $request): ResponseInterface
-    {
-        $params = [];
-        parse_str($request->getUri()->getQuery(), $params);
-
-        $data = (string) json_encode(array_merge(
-            ['method' => $method],
-            $params,
-            $request->getHeaders()
-        ));
-
-        return $this
-            ->psr17
-            ->createResponse()
-            ->withHeader('content', 'application/json')
-            ->withBody($this->psr17->createStream($data));
-    }
-
-    private function getLockFilepath(string $fileId): string
-    {
-        return sprintf(
-            '%s/%s.lock',
-            $this->filesRepository,
-            $fileId
-        );
+        return $this->wopi->unlockAndRelock($fileId, $accessToken, $xWopiLock, $xWopiOldLock, $request);
     }
 }

From ba53ce40fa8c71464a221aa1b1abeecc6e24bacc Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 28 Sep 2021 20:32:43 +0200
Subject: [PATCH 20/64] Add migration file.

---
 .../migrations/Version20210928182542.php      | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php

diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php
new file mode 100644
index 000000000..756faf654
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\DocStore;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20210928182542 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create UUID column on StoredObject table.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD uuid UUID NOT NULL');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_49604E36D17F50A6 ON chill_doc.stored_object (uuid)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('DROP INDEX UNIQ_49604E36D17F50A6');
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP uuid');
+    }
+}

From 6020ee2cb24479ac0dac4bbe0e9fb4a87514b728 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 28 Sep 2021 20:35:19 +0200
Subject: [PATCH 21/64] chore: Update `.editorconfig` file.

---
 .editorconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.editorconfig b/.editorconfig
index d769b46a4..fe115d4c0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,6 +7,7 @@ charset = utf-8
 end_of_line = LF
 insert_final_newline = true
 trim_trailing_whitespace = true
+indent_size = 4
 
 [*.{php,html,twig}]
 indent_style = space

From 704ec76ca43c5d1bd9326e6d0f03419c8022ace1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Sep 2021 21:35:41 +0200
Subject: [PATCH 22/64] rewrite the destination for household / leave household

---
 .../components/Household.vue                  | 285 +++++++-----------
 .../vuejs/HouseholdMembersEditor/js/i18n.js   |   9 +-
 .../HouseholdMembersEditor/store/index.js     |  54 ++++
 3 files changed, 165 insertions(+), 183 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index bdbacf2bd..51b86fefa 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -2,171 +2,110 @@
 
   <h2 class="mt-4">{{ $t('household_members_editor.household_part') }}</h2>
 
-  <div v-if="hasHousehold">
+  <div v-if="mode == null">
 
-    <div class="flex-table">
-       <div class="item-bloc">
-          <household-render-box :household="household" :isAddressMultiline="true"></household-render-box>
-       </div>
-    </div>
+    <div class="alert alert-info">{{ $t('household_members_editor.household.no_household_choose_one') }}</div>
 
-    <div v-if="isHouseholdNew && !hasHouseholdAddress">
-
-      <div v-if="hasAddressSuggestion" class="householdAddressSuggestion my-5">
-          <h4 class="mb-3">
-             {{ $t('household_members_editor.household.where_live_the_household') }}
-          </h4>
-          <div class="accordion" id="addressSuggestions">
-             <div class="accordion-item">
-                <h2 class="accordion-header" id="heading_address_suggestions">
-                   <button v-if="!showAddressSuggestion"
-                      class="accordion-button collapsed"
-                      type="button"
-                      data-bs-toggle="collapse"
-                      aria-expanded="false"
-                      @click="toggleAddressSuggestion">
-                      {{ $tc('household_members_editor.show_household_suggestion', countAddressSuggestion) }}
-                   </button>
-                   <button v-if="showAddressSuggestion"
-                      class="accordion-button"
-                      type="button"
-                      data-bs-toggle="collapse"
-                      aria-expanded="true"
-                      @click="toggleAddressSuggestion">
-                      {{ $t('household_members_editor.hide_household_suggestion') }}
-                   </button>
-                </h2>
-                <div class="accordion-collapse" id="collapse_address_suggestions"
-                   aria-labelledby="heading_address_suggestions" data-bs-parent="#addressSuggestions">
-                   <div v-if="showAddressSuggestion">
-                      <div class="flex-table householdAddressSuggestionList">
-                         <div v-for="a in filterAddressesSuggestion" class="item-bloc">
-                            <div class="float-button bottom">
-                               <div class="box">
-                                  <div class="action">
-                                     <ul class="record_actions">
-                                        <li>
-                                           <button class="btn btn-sm btn-choose" @click="setHouseholdAddress(a)">
-                                              {{ $t('household_members_editor.household.household_live_to_this_address') }}
-                                           </button>
-                                        </li>
-                                     </ul>
-                                  </div>
-                                  <ul class="list-content fa-ul">
-                                     <li>
-                                        <i class="fa fa-li fa-map-marker"></i>
-                                        <address-render-box :address="a"></address-render-box>
-                                     </li>
-                                  </ul>
-                               </div>
-                            </div>
-                         </div>
-                      </div>
-                   </div>
+    <div class="flex-table householdSuggestionList">
+      <div v-if="isModeNewAllowed" class="item-bloc">
+        <div>
+          <section>
+            <div class="item-row">
+              <div class="item-col">
+                <div class="h4">
+                  <i class="fa fa-home"></i> {{ $t('household_members_editor.household.new_household') }}
                 </div>
-             </div>
+              </div>
+            </div>
+          </section>
+          <ul class="record_actions">
+            <li>
+              <button @click="setModeNew" class="btn btn-sm btn-create">{{ $t('household_members_editor.household.create_household') }}</button>
+            </li>
+          </ul>
+        </div>
+      </div>
+
+      <!-- if allow leave household -->
+      <div v-if="isModeLeaveAllowed" class="item-bloc">
+        <div>
+          <section>
+            <div class="item-row">
+              <div class="item-col">
+                <div class="h4">
+                  <span class="fa-stack fa-lg">
+                     <i class="fa fa-home fa-stack-1x"></i>
+                     <i class="fa fa-ban fa-stack-2x text-danger"></i>
+                  </span>
+                   {{ $t('household_members_editor.household.leave_without_household') }}
+                </div>
+              </div>
+            </div>
+            <div class="item-row">
+             {{ $t('household_members_editor.household.will_leave_any_household_explanation')}}
+            </div>
+          </section>
+          <ul class="record_actions">
+            <li>
+              <button @click="setModeLeave" class="btn btn-sm">
+                <i class="fa fa-sign-out"></i>
+                {{ $t('household_members_editor.household.leave') }}
+              </button>
+            </li>
+          </ul>
+        </div>
+      </div>
+
+      <div v-for="item in getSuggestions">
+          <div class="item-bloc">
+            <household-render-box :household="item.household"></household-render-box>
+            <ul class="record_actions">
+              <li>
+                <button class="btn btn-sm btn-choose" @click="selectHousehold(item.household)">
+                  {{ $t('household_members_editor.select_household') }}
+                </button>
+              </li>
+            </ul>
           </div>
       </div>
-
-      <ul class="record_actions">
-        <li >
-          <add-address
-              :context="addAddress.context"
-              :key="addAddress.key"
-              :options="addAddress.options"
-              :result="addAddress.result"
-              @addressChangedCallback="setHouseholdCreatedAddress"
-              ref="addAddress">
-          </add-address>
-        </li>
-      </ul>
     </div>
-
-    <div v-if="isHouseholdNew && hasHouseholdAddress">
-      <ul class="record_actions">
-        <li >
-          <button class="btn btn-misc" @click="removeHouseholdAddress">
-             {{ $t('household_members_editor.household.delete_this_address') }}
-          </button>
-        </li>
-      </ul>
-    </div>
-
   </div>
-  <div v-else-if="isForceLeaveWithoutHousehold">
-      {{ $t('household_members_editor.household.will_leave_any_household') }}
-  </div>
-  <div v-else class="alert alert-info">{{ $t('household_members_editor.household.no_household_choose_one') }}</div>
 
-  <ul v-if="allowChangeHousehold" class="record_actions">
-    <li v-if="allowHouseholdCreate">
-      <button class="btn btn-create" @click="createHousehold">
-        {{ $t('household_members_editor.household.create_household') }}
-      </button>
-    </li>
-    <li v-if="allowHouseholdSearch">
-      <button class="btn btn-misc">
-        <i class="fa fa-search"></i>{{ $t('household_members_editor.household.search_household') }}
-      </button>
-    </li>
-    <li v-if="allowLeaveWithoutHousehold" >
-      <button @click="forceLeaveWithoutHousehold" class="btn btn-orange">
-        <i class="fa fa-sign-out"></i>{{ $t('household_members_editor.household.leave_without_household') }}
-      </button>
-    </li>
-    <li v-if="allowRemoveHousehold">
-      <button @click="removeHousehold" class="btn">
-        {{ $t('household_members_editor.household.change') }}
-      </button>
-    </li>
-  </ul>
-
-   <div v-if="hasHouseholdSuggestion" class="householdSuggestions my-5">
-      <h4 class="mb-3">
-         {{ $t('household_members_editor.household_for_participants_accompanying_period') }} :
-      </h4>
-      <div class="accordion" id="householdSuggestions">
-         <div class="accordion-item">
-            <h2 class="accordion-header" id="heading_household_suggestions">
-               <button v-if="!showHouseholdSuggestion"
-                  class="accordion-button collapsed"
-                  type="button"
-                  data-bs-toggle="collapse"
-                  aria-expanded="false"
-                  @click="toggleHouseholdSuggestion">
-                  {{ $tc('household_members_editor.show_household_suggestion', countHouseholdSuggestion) }}
-               </button>
-               <button v-if="showHouseholdSuggestion"
-                  class="accordion-button"
-                  type="button"
-                  data-bs-toggle="collapse"
-                  aria-expanded="true"
-                  @click="toggleHouseholdSuggestion">
-                  {{ $t('household_members_editor.hide_household_suggestion') }}
-               </button>
-               <!-- disabled bootstrap behaviour:  data-bs-target="#collapse_household_suggestions" aria-controls="collapse_household_suggestions" -->
-            </h2>
-            <div class="accordion-collapse" id="collapse_household_suggestions"
-                 aria-labelledby="heading_household_suggestions" data-bs-parent="#householdSuggestions">
-               <div v-if="showHouseholdSuggestion">
-                  <div class="flex-table householdSuggestionList">
-                     <div v-for="h in filterHouseholdSuggestionByAccompanyingPeriod" class="item-bloc">
-                        <household-render-box :household="h"></household-render-box>
-                        <ul class="record_actions">
-                           <li>
-                              <button class="btn btn-sm btn-choose" @click="selectHousehold(h)">
-                                 {{ $t('household_members_editor.select_household') }}
-                              </button>
-                           </li>
-                        </ul>
-                     </div>
-                  </div>
-               </div>
+  <div v-else>
+    <div class="flex-table">
+      <div class="item-bloc">
+        <template v-if="isModeLeave">
+          <section>
+            <div class="item-row">
+              <div class="item-col">
+                <div class="h4">
+                <span class="fa-stack fa-lg">
+                   <i class="fa fa-home fa-stack-1x"></i>
+                   <i class="fa fa-ban fa-stack-2x text-danger"></i>
+                </span>
+                  {{ $t('household_members_editor.household.leave_without_household') }}
+                </div>
+              </div>
             </div>
-         </div>
-      </div>
-   </div>
+            <div class="item-row">
+              {{ $t('household_members_editor.household.will_leave_any_household_explanation')}}
+            </div>
+          </section>
+      </template>
+      <template v-else>
+        <household-render-box :household="household" :isAddressMultiline="true"></household-render-box>
+      </template>
+    </div>
 
+    <ul v-if="isModeNewAllowed || isModeLeaveAllowed || getModeSuggestions.length > 0" class="record_actions">
+      <li>
+        <button class="btn btn-sm btn-chill-beige" @click="resetMode">
+          {{ $t('household_members_editor.household.reset_mode') }}
+        </button>
+      </li>
+    </ul>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -214,6 +153,9 @@ export default {
   },
   computed: {
     ...mapGetters([
+      'isModeNewAllowed',
+      'isModeLeaveAllowed',
+      'getSuggestions',
       'hasHousehold',
       'isHouseholdNew',
       'hasHouseholdSuggestion',
@@ -223,47 +165,31 @@ export default {
       'countAddressSuggestion',
       'filterAddressesSuggestion',
       'hasHouseholdAddress',
+      'isModeLeave'
     ]),
     ...mapState([
       'showHouseholdSuggestion',
-      'showAddressSuggestion'
+      'showAddressSuggestion',
+      'mode',
     ]),
     household() {
       return this.$store.state.household;
     },
-    allowHouseholdCreate() {
-      return this.$store.state.allowHouseholdCreate && !this.$store.getters.hasHousehold;
-    },
     allowHouseholdSearch() {
       return false;
       return this.$store.state.allowHouseholdSearch && !this.$store.getters.hasHousehold;
     },
-    allowLeaveWithoutHousehold() {
-      return this.$store.state.allowLeaveWithoutHousehold && !this.$store.getters.hasHousehold;
-    },
-    allowRemoveHousehold() {
-      return this.$store.getters.hasHousehold &&
-        (
-          this.allowHouseholdCreate || this.allowHouseholdSearch ||
-            this.allowLeaveWithoutHousehold
-        )
-      ;
-    },
-    allowChangeHousehold() {
-      return this.allowHouseholdCreate || this.allowHouseholdSearch ||
-        this.allowLeaveWithoutHousehold;
-    },
-    isForceLeaveWithoutHousehold() {
-      return this.$store.state.forceLeaveWithoutHousehold;
-    }
   },
   methods: {
-    createHousehold() {
+    setModeNew() {
       this.$store.dispatch('createHousehold');
     },
-    forceLeaveWithoutHousehold() {
+    setModeLeave() {
       this.$store.dispatch('forceLeaveWithoutHousehold');
     },
+    resetMode() {
+      this.$store.commit('resetMode');
+    },
     toggleHouseholdSuggestion() {
       this.$store.commit('toggleHouseholdSuggestion');
     },
@@ -272,7 +198,6 @@ export default {
     },
     selectHousehold(h) {
       this.$store.dispatch('selectHousehold', h);
-      this.toggleHouseholdSuggestion();
     },
     removeHousehold() {
       this.$store.dispatch('removeHousehold');
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index 635f9788c..da147ab75 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -7,9 +7,11 @@ const appMessages = {
       household: {
         no_household_choose_one: "Aucun ménage de destination. Choisissez un ménage. Les usagers concernés par la modification apparaitront ensuite.",
         new_household: "Nouveau ménage",
-        create_household: "Créer un nouveau ménage de destination",
+        create_household: "Créer",
         search_household: "Chercher un ménage",
-        will_leave_any_household: "Ne rejoignent pas de ménage",
+        will_leave_any_household: "Les usagers ne rejoignent pas de ménage",
+        leave: "Quitter",
+        will_leave_any_household_explanation: "Les usagers quitteront leur ménage actuel, et ne seront pas associés à un autre ménage. Par ailleurs, ils seront enregistrés comme étant sans adresse connue.",
         leave_without_household: "Sans nouveau ménage",
         where_live_the_household: "À quelle adresse habite ce ménage ?",
         household_live_to_this_address: "Sélectionner l'adresse",
@@ -17,6 +19,7 @@ const appMessages = {
         delete_this_address: "Supprimer cette adresse",
         create_new_address: "Créer une nouvelle adresse",
         or_create_new_address: "Ou créer une nouvelle adresse",
+        reset_mode: "Modifier la destination",
       },
       concerned: {
         title: "Nouveaux membres du ménage",
@@ -34,7 +37,7 @@ const appMessages = {
       is_not_holder: "N'est pas titulaire",
       remove_position: "Retirer des {position}",
       remove_concerned: "Ne plus transférer",
-      household_part: "Ménage de destination",
+      household_part: "Destination",
       suggestions: "Suggestions",
       hide_household_suggestion: "Masquer les suggestions",
       show_household_suggestion: 'Aucune suggestion | Afficher une suggestion | Afficher {count} suggestions',
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index ce9ee9340..2cfe0055b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -29,6 +29,15 @@ const store = createStore({
         return 0;
       }),
     startDate: new Date(),
+    /**
+     * Indicates if the destination is:
+     *
+     * * "new" => a new household
+     * * "existing" => an existing household
+     * * "leave" => leave without household
+     * * null if not set
+     */
+    mode: window.household_members_editor_data.household === null ? null : "existing",
     allowHouseholdCreate: window.household_members_editor_data.allowHouseholdCreate,
     allowHouseholdSearch: window.household_members_editor_data.allowHouseholdSearch,
     allowLeaveWithoutHousehold: window.household_members_editor_data.allowLeaveWithoutHousehold,
@@ -41,11 +50,48 @@ const store = createStore({
     errors: []
   },
   getters: {
+    /**
+     * return true if this page allow to create a new household
+     *
+     * @returns {boolean}
+     */
+    isModeNewAllowed(state) {
+      return state.allowHouseholdCreate;
+    },
+    /**
+     * return true if this page allow to "leave without household"
+     *
+     * @returns {boolean}
+     */
+    isModeLeaveAllowed(state) {
+      return state.allowLeaveWithoutHousehold;
+    },
+    /**
+     * return true if the mode "leave" is selected
+     *
+     * @returns {boolean}
+     */
+    isModeLeave(state) {
+      return state.mode === "leave";
+    },
+    getSuggestions(state) {
+      let suggestions = [];
+      state.householdSuggestionByAccompanyingPeriod.forEach(h => {
+        console.log(h);
+        suggestions.push({household: h});
+      });
+
+      return suggestions;
+    },
     isHouseholdNew(state) {
+      return state.mode === "new";
+    /*
       if (state.household === null) {
         return false;
       }
       return !Number.isInteger(state.household.id);
+
+     */
     },
     hasHouseholdAddress(state) {
       if (null === state.household) {
@@ -180,6 +226,11 @@ const store = createStore({
     },
   },
   mutations: {
+    resetMode(state) {
+      state.mode = null;
+      state.household = null;
+      state.forceLeaveWithoutHousehold = false;
+    },
     addConcerned(state, person) {
       let persons = state.concerned.map(conc => conc.person.id);
       if (!persons.includes(person.id)) {
@@ -222,6 +273,7 @@ const store = createStore({
         current_address: null,
         current_members_id: []
       };
+      state.mode = "new";
       state.forceLeaveWithoutHousehold = false;
     },
     removeHousehold(state) {
@@ -246,10 +298,12 @@ const store = createStore({
     },
     forceLeaveWithoutHousehold(state) {
       state.household = null;
+      state.mode = "leave";
       state.forceLeaveWithoutHousehold = true;
     },
     selectHousehold(state, household) {
       state.household = household;
+      state.mode = "existing";
       state.forceLeaveWithoutHousehold = false;
     },
     setHouseholdSuggestionByAccompanyingPeriod(state, households) {

From 8853359405df1eb187d754a845295135effbcd96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Sep 2021 15:59:31 +0200
Subject: [PATCH 23/64] remove dump

(cherry picked from commit e2230409b807eb29b820cf3cc1ac15595e5b2ff3)
---
 src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
index 848e8f874..adc37d5b5 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
@@ -247,7 +247,6 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         if (\random_int(0, 10) > 3) {
             // always add social scope:
             $accompanyingPeriod->addScope($this->getReference('scope_social'));
-            var_dump(count($accompanyingPeriod->getScopes()));
 
             $accompanyingPeriod->setAddressLocation($this->createAddress());
             $manager->persist($accompanyingPeriod->getAddressLocation());

From 2b3c4b7af9989b348b7a11b3a9bb5d8ae4f5292d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Sep 2021 23:06:40 +0200
Subject: [PATCH 24/64] fix boundary in getCurrentMembers/getNonCurrentMembers

---
 src/Bundle/ChillPersonBundle/Entity/Household/Household.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
index edf94bd67..46ae02ce0 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
@@ -229,7 +229,7 @@ class Household
             ))
             ->andWhere($expr->orX(
                 $expr->isNull('endDate'),
-                $expr->gte('endDate', $date)
+                $expr->gt('endDate', $date)
             ));
 
         return $criteria;
@@ -306,7 +306,7 @@ class Household
             )
             ->orWhere(
                 $expr->andX(
-                    $expr->lt('endDate', $date),
+                    $expr->lte('endDate', $date),
                     $expr->neq('endDate', null)
                 )
             );

From 9641fd3fcc9106ddeca4d2f5c14229ae9e1c8686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 Sep 2021 23:06:59 +0200
Subject: [PATCH 25/64] WIP add address to new household

---
 .../components/Household.vue                  | 35 ++++++++++++-------
 .../vuejs/HouseholdMembersEditor/js/i18n.js   |  5 ++-
 .../HouseholdMembersEditor/store/index.js     |  5 +++
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 51b86fefa..a8c832d1d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -94,8 +94,18 @@
       </template>
       <template v-else>
         <household-render-box :household="household" :isAddressMultiline="true"></household-render-box>
+        <ul v-if="!hasHouseholhdAddress" class="record_actions">
+          <li>
+            <add-address
+              :context="getAddressContext"
+              :key="addAddress.key"
+              :options="addAddress.options"
+              :addressChangedCallback="addressChanged"
+              ></add-address>
+          </li>
+        </ul>
       </template>
-    </div>
+      </div>
 
     <ul v-if="isModeNewAllowed || isModeLeaveAllowed || getModeSuggestions.length > 0" class="record_actions">
       <li>
@@ -124,6 +134,7 @@ export default {
   data() {
     return {
       addAddress: {
+        /*
         context: {
           target: {
             name: 'household_create',
@@ -132,14 +143,17 @@ export default {
           edit: false,
           addressId: null
         },
+
+         */
         key: 'household_new',
         options: {
           useDate: {
-             validFrom: true
+             validFrom: false,
+             validTo: false,
           },
           button: {
             text:  {
-              create: 'household_members_editor.household.or_create_new_address',
+              create: 'household_members_editor.household.set_address',
               edit: null,
             }
           },
@@ -165,7 +179,8 @@ export default {
       'countAddressSuggestion',
       'filterAddressesSuggestion',
       'hasHouseholdAddress',
-      'isModeLeave'
+      'isModeLeave',
+      'getAddressContext',
     ]),
     ...mapState([
       'showHouseholdSuggestion',
@@ -190,18 +205,14 @@ export default {
     resetMode() {
       this.$store.commit('resetMode');
     },
-    toggleHouseholdSuggestion() {
-      this.$store.commit('toggleHouseholdSuggestion');
-    },
-    toggleAddressSuggestion() {
-      this.$store.commit('toggleAddressSuggestion');
+    addressChanged(payload) {
+      console.log("addressChanged", payload);
     },
     selectHousehold(h) {
       this.$store.dispatch('selectHousehold', h);
     },
-    removeHousehold() {
-      this.$store.dispatch('removeHousehold');
-    },
+
+
     setHouseholdAddress(a) {
       let payload = this.$refs.addAddress.submitNewAddress();
       console.log('setHouseholdAddress', a);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index da147ab75..40201af77 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -13,13 +13,16 @@ const appMessages = {
         leave: "Quitter",
         will_leave_any_household_explanation: "Les usagers quitteront leur ménage actuel, et ne seront pas associés à un autre ménage. Par ailleurs, ils seront enregistrés comme étant sans adresse connue.",
         leave_without_household: "Sans nouveau ménage",
+        set_address: "Indiquer une adresse",
+        reset_mode: "Modifier la destination",
+        // remove ?
         where_live_the_household: "À quelle adresse habite ce ménage ?",
         household_live_to_this_address: "Sélectionner l'adresse",
         no_suggestions: "Aucune adresse à suggérer",
         delete_this_address: "Supprimer cette adresse",
         create_new_address: "Créer une nouvelle adresse",
         or_create_new_address: "Ou créer une nouvelle adresse",
-        reset_mode: "Modifier la destination",
+        // end remove ?
       },
       concerned: {
         title: "Nouveaux membres du ménage",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index 2cfe0055b..a32a432bf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -93,6 +93,11 @@ const store = createStore({
 
      */
     },
+    getAddressContext(state) {
+      return {
+        edit: false,
+      };
+    },
     hasHouseholdAddress(state) {
       if (null === state.household) {
         return false;

From a26d27851008e2b5d859076945398b422e0ceaf8 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 29 Sep 2021 11:16:18 +0200
Subject: [PATCH 26/64] comment console.log

---
 .../ChillMainBundle/Resources/public/lib/api/scope.js       | 4 ++--
 .../vuejs/AccompanyingCourse/components/CourseLocation.vue  | 6 +++---
 .../public/vuejs/AccompanyingCourse/store/index.js          | 2 +-
 .../Resources/public/vuejs/_components/AddPersons.vue       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js b/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js
index a8df4ed88..9073822bb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js
@@ -4,9 +4,9 @@ const fetchScopes = () => {
       return response.json();
     }
   }).then(data => {
-    console.log(data);
+    //console.log(data);
     return new Promise((resolve, reject) => {
-      console.log(data);
+      //console.log(data);
       resolve(data.results);
     });
   });
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index afe13845c..b983c89b6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -153,9 +153,9 @@ export default {
    created() {
       this.initAddressContext();
 
-      console.log('ac.locationStatus', this.accompanyingCourse.locationStatus);
-      console.log('ac.location (temporary location)', this.accompanyingCourse.location);
-      console.log('ac.personLocation', this.accompanyingCourse.personLocation);
+      //console.log('ac.locationStatus', this.accompanyingCourse.locationStatus);
+      //console.log('ac.location (temporary location)', this.accompanyingCourse.location);
+      //console.log('ac.personLocation', this.accompanyingCourse.personLocation);
    }
 }
 </script>
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 5784e8d4c..b66f4d957 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -48,7 +48,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                return state.accompanyingCourse.location !== null;
             },
             isScopeValid(state) {
-               console.log('is scope valid', state.accompanyingCourse.scopes.length > 0);
+               //console.log('is scope valid', state.accompanyingCourse.scopes.length > 0);
                return state.accompanyingCourse.scopes.length > 0;
             },
             validationKeys(state, getters) {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 160d5d00b..a0e8fbebf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -229,7 +229,7 @@ export default {
          return item.result.type + item.result.id;
       },
       addPriorSuggestion() {
-         console.log('echo', this.hasPriorSuggestion);
+         //console.log('addPriorSuggestion', this.hasPriorSuggestion);
          if (this.hasPriorSuggestion) {
             console.log('addPriorSuggestion',);
             this.suggested.unshift(this.priorSuggestion);

From 0fe248320dbeb86da63736e817b942a0604b2bf4 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 29 Sep 2021 11:21:45 +0200
Subject: [PATCH 27/64] OnTheFly (otf): fix clickable radio tab on create modal

---
 .../Resources/public/vuejs/_components/OnTheFly/Create.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue
index 3ffb3f7df..7644043fd 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue
@@ -3,7 +3,7 @@
       <li class="nav-item">
          <a class="nav-link" :class="{ active: isActive('person') }">
             <label for="person">
-               <input type="radio" name="person" v-model="radioType" value="person">
+               <input type="radio" name="person" id="person" v-model="radioType" value="person">
                {{ $t('onthefly.create.person') }}
             </label>
          </a>
@@ -11,7 +11,7 @@
       <li class="nav-item">
          <a class="nav-link" :class="{ active: isActive('thirdparty') }">
             <label for="thirdparty">
-               <input type="radio" name="thirdparty" v-model="radioType" value="thirdparty">
+               <input type="radio" name="thirdparty" id="thirdparty" v-model="radioType" value="thirdparty">
                {{ $t('onthefly.create.thirdparty') }}
             </label>
          </a>

From af24637dc47d3ea9fb2416a37c5484fc7fc9c17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Sep 2021 11:31:44 +0200
Subject: [PATCH 28/64] update return type for prepare client trait

---
 .../ChillMainBundle/Test/PrepareClientTrait.php     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
index 0ae7c235a..5df0b57dd 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
@@ -17,32 +17,31 @@
  */
 namespace Chill\MainBundle\Test;
 
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
- * Prepare a client authenticated with a user 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Prepare a client authenticated with a user
  */
 trait PrepareClientTrait
 {
     /**
      * Create a new client with authentication information.
-     * 
+     *
      * @param string $username the username (default 'center a_social')
      * @param string $password the password (default 'password')
      * @return \Symfony\Component\BrowserKit\Client
      * @throws \LogicException
      */
     public function getClientAuthenticated(
-        $username = 'center a_social', 
+        $username = 'center a_social',
         $password = 'password'
-    ) {
+    ): KernelBrowser {
         if (!$this instanceof WebTestCase) {
             throw new \LogicException(sprintf("The current class does not "
                 . "implements %s", WebTestCase::class));
         }
-        
+
         return static::createClient(array(), array(
            'PHP_AUTH_USER' => $username,
            'PHP_AUTH_PW'   => $password,

From 315253589ef3f43bdc0b0be2edbe02cfac5e85a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Sep 2021 11:32:23 +0200
Subject: [PATCH 29/64] create api endpoint for duplciating address

---
 .../Controller/AddressApiController.php       | 38 ++++++++++++++
 .../ChillMainExtension.php                    |  2 +
 src/Bundle/ChillMainBundle/Entity/Address.php | 18 +++++--
 .../Repository/AddressRepository.php          |  6 +++
 .../Controller/AddressControllerTest.php      | 49 +++++++++++++++++++
 .../ChillMainBundle/chill.api.specs.yaml      | 26 ++++++++++
 6 files changed, 136 insertions(+), 3 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Controller/AddressApiController.php
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php

diff --git a/src/Bundle/ChillMainBundle/Controller/AddressApiController.php b/src/Bundle/ChillMainBundle/Controller/AddressApiController.php
new file mode 100644
index 000000000..5c90cc9a7
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/AddressApiController.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Entity\Address;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+
+class AddressApiController extends ApiController
+{
+    /**
+     * Duplicate an existing address
+     *
+     * @Route("/api/1.0/main/address/{id}/duplicate.json", name="chill_api_main_address_duplicate",
+     *  methods={"POST"})
+     *
+     * @param Address $address
+     */
+    public function duplicate(Address $address): JsonResponse
+    {
+        $this->denyAccessUnlessGranted('ROLE_USER');
+        $new = Address::createFromAddress($address);
+
+        $em = $this->getDoctrine()->getManager();
+
+        $em->persist($new);
+        $em->flush();
+
+        return $this->json($new, Response::HTTP_OK, [], [
+            AbstractNormalizer::GROUPS => ['read']
+        ]);
+
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index f196b8a2b..21217c80e 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -19,6 +19,7 @@
 
 namespace Chill\MainBundle\DependencyInjection;
 
+use Chill\MainBundle\Controller\AddressApiController;
 use Chill\MainBundle\Controller\UserController;
 use Chill\MainBundle\Doctrine\DQL\STContains;
 use Chill\MainBundle\Doctrine\DQL\StrictWordSimilarityOPS;
@@ -319,6 +320,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
             'apis' => [
                 [
                     'class' => \Chill\MainBundle\Entity\Address::class,
+                    'controller' => AddressApiController::class,
                     'name' => 'address',
                     'base_path' => '/api/1.0/main/address',
                     'base_role' => 'ROLE_USER',
diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index 22e4848bf..4cc5c37ba 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -376,10 +376,22 @@ class Address
     public static function createFromAddress(Address $original) : Address
     {
         return (new Address())
+            ->setBuildingName($original->getBuildingName())
+            ->setCorridor($original->getCorridor())
+            ->setCustoms($original->getCustoms())
+            ->setDistribution($original->getDistribution())
+            ->setExtra($original->getExtra())
+            ->setFlat($original->getFlat())
+            ->setFloor($original->getFloor())
+            ->setIsNoAddress($original->getIsNoAddress())
+            ->setLinkedToThirdParty($original->getLinkedToThirdParty())
+            ->setPoint($original->getPoint())
             ->setPostcode($original->getPostcode())
-            ->setStreetAddress1($original->getStreetAddress1())
-            ->setStreetAddress2($original->getStreetAddress2())
+            ->setSteps($original->getSteps())
+            ->setStreet($original->getStreet())
+            ->setStreetNumber($original->getStreetNumber())
             ->setValidFrom($original->getValidFrom())
+            ->setValidTo($original->getValidTo())
             ;
     }
 
@@ -506,7 +518,7 @@ class Address
         return $this->validTo;
     }
 
-    public function setValidTo(\DateTimeInterface $validTo): self
+    public function setValidTo(?\DateTimeInterface $validTo = null): self
     {
         $this->validTo = $validTo;
 
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
index 76f6c93bb..08e2da708 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
@@ -7,6 +7,7 @@ namespace Chill\MainBundle\Repository;
 use Chill\MainBundle\Entity\Address;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
 final class AddressRepository implements ObjectRepository
@@ -47,4 +48,9 @@ final class AddressRepository implements ObjectRepository
     public function getClassName() {
         return Address::class;
     }
+
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
new file mode 100644
index 000000000..2000a05bf
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Controller;
+
+use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Repository\AddressRepository;
+use Chill\MainBundle\Test\PrepareClientTrait;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+
+class AddressControllerTest extends \Symfony\Bundle\FrameworkBundle\Test\WebTestCase
+{
+    private KernelBrowser $client;
+
+    use PrepareClientTrait;
+
+    public function setUp()
+    {
+        self::bootKernel();
+        $this->client = $this->getClientAuthenticated();
+    }
+
+    /**
+     * @dataProvider generateAddressIds
+     * @param int $addressId
+     */
+    public function testDuplicate(int $addressId)
+    {
+        $this->client->request('POST', "/api/1.0/main/address/$addressId/duplicate.json");
+
+        $this->assertResponseIsSuccessful('test that duplicate is successful');
+    }
+
+    public function generateAddressIds()
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $qb = $em->createQueryBuilder();
+        $addresses = $qb->select('a')->from(Address::class, 'a')
+            ->setMaxResults(2)
+            ->getQuery()
+            ->getResult();
+
+        foreach ($addresses as $a) {
+            yield [ $a->getId() ];
+        }
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index 8ee69e96d..874ae669b 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
@@ -293,6 +293,32 @@ paths:
         401:
           description: "Unauthorized"
 
+  /1.0/main/address/{id}/duplicate.json:
+    post:
+      tags:
+        - address
+      summary: Duplicate an existing address
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The address id that will be duplicated
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      responses:
+        200:
+          description: "ok"
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Address'
+        404:
+          description: "not found"
+        401:
+          description: "Unauthorized"
+
   /1.0/main/address-reference.json:
     get:
       tags:

From 3824a380ff389484689d629ae6635a67331fb052 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 29 Sep 2021 11:37:53 +0200
Subject: [PATCH 30/64] otf: prepare with debug (wip)

---
 .../public/vuejs/_components/OnTheFly.vue     | 12 +++++++-----
 .../vuejs/_components/OnTheFly/Create.vue     |  1 +
 .../vuejs/_components/OnTheFly/Person.vue     | 12 ++++++++++--
 .../vuejs/_components/OnTheFly/ThirdParty.vue | 19 ++++++++++---------
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
index 9e5efd86c..43cd0c686 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
@@ -134,6 +134,8 @@ export default {
    },
    methods: {
       openModal() {
+         console.log('## OPEN ON THE FLY MODAL');
+         console.log('## type:', this.type, ', action:', this.action);
          this.modal.showModal = true;
          this.$nextTick(function() {
             //this.$refs.search.focus();
@@ -173,11 +175,11 @@ export default {
 
          this.modal.showModal = false;
       },
-      goToLocation(id, type){
-         if(type == 'person'){
-            window.location = `../../person/${id}/general`
-         } else if(type == 'thirdparty') {
-            window.location = `../../thirdparty/thirdparty/${id}/show`
+      goToLocation(id, type) {
+         if (type == 'person') {
+            window.location = `../../person/${id}/general`;
+         } else if (type == 'thirdparty') {
+            window.location = `../../thirdparty/thirdparty/${id}/show`;
          }
       }
    }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue
index 7644043fd..c5d949c4e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly/Create.vue
@@ -56,6 +56,7 @@ export default {
       radioType: {
          set(type) {
             this.type = type;
+            console.log('## type:', type, ', action:', this.action);
          },
          get() {
             return this.type;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 5261b2c81..bf559fd41 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -40,7 +40,7 @@
          <option value="man">{{ $t('person.gender.man') }}</option>
          <option value="neuter">{{ $t('person.gender.neuter') }}</option>
       </select>
-      <label for="gender">{{ $t('person.gender.title') }}</label>
+      <label>{{ $t('person.gender.title') }}</label>
    </div>
 
    <div class="input-group mb-3">
@@ -159,9 +159,17 @@ export default {
          getPerson(this.id)
             .then(person => new Promise((resolve, reject) => {
                this.person = person;
-               //console.log('get person', this.person);
+               console.log('get person', this.person);
                resolve();
          }));
+      },
+      postData() {
+         postPerson(this.person)
+            .then(person => new Promise((resolve, reject) => {
+               this.person = person;
+               console.log('post person', this.person);
+               resolve();
+         }))
       }
    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 1f1df7e5f..7fc8fd827 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -45,9 +45,8 @@
 
       <add-address
          :options="this.addAddress.options"
-         :address-changed-callback="submitAddress"
          :context="this.addAddress.context"
-         >
+         :address-changed-callback="submitAddress">
       </add-address>
 
    </div>
@@ -72,7 +71,7 @@ export default {
          },
          addAddress: {
             context: {
-               
+
             },
             options: {
                //button: {
@@ -92,25 +91,27 @@ export default {
       }
    },
    methods: {
-      loadThirdparty(){
+      loadData(){
          getThirdparty(this.id).then(thirdparty => new Promise((resolve, reject) => {
             this.thirdparty = thirdparty;
+            console.log('get thirdparty', thirdparty);
             resolve();
          }));
       },
-      submitAddress(payload) {
-         console.log(payload);
-      },
       postData() {
          postThirdparty(this.thirdparty).then(thirdparty => new Promise((resolve, reject) => {
             this.thirdparty = thirdparty;
+            console.log('post thirdparty', thirdparty);
             resolve();
          }))
+      },
+      submitAddress(payload) {
+         console.log('submitAddress', payload);
       }
    },
    mounted() {
-      if (this.action !== 'create'){
-         this.loadThirdparty();
+      if (this.action !== 'create') {
+         this.loadData();
       }
    },
 }

From fc1dd499c48b3acc160f292e3b756ad4f6601c11 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 29 Sep 2021 11:41:08 +0200
Subject: [PATCH 31/64] POST, PUT, PATCH working for thirdparty and added to
 swagger. Assert for 'centers'(temporarily) removed from thirdparty entity

---
 .../ChillThirdPartyExtension.php              | 16 ------------
 .../Entity/ThirdParty.php                     |  7 +++--
 .../chill.api.specs.yaml                      | 26 ++++++++++++++++---
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
index 2fd0f723d..5ebac821b 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
@@ -62,22 +62,6 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
                     //'base_role' => \Chill\ThirdPartyBundle\Security\Authorization\ThirdPartyVoter::SHOW,
                     //'controller' => \Chill\ThirdPartyBundle\Controller\ThirdPartyApiController::class,
                     'actions' => [
-                        '_index' => [
-                            'methods' => [
-                                Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true,
-                                Request::METHOD_POST => true,
-                                Request::METHOD_PATCH => true,
-                                Request::METHOD_PUT => true
-                            ],
-                            'roles' => [
-                                Request::METHOD_GET => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::SHOW,
-                                Request::METHOD_HEAD => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::SHOW,
-                                Request::METHOD_POST => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE,
-                                Request::METHOD_PUT => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE,
-                                Request::METHOD_PATCH => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE
-                            ],
-                        ],
                         '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 842e57b8b..30f28791b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -96,7 +96,7 @@ class ThirdParty
      * @ORM\Column(name="types", type="json", nullable=true)
      * @Assert\Count(min=1)
      */
-    private $type;
+    private $types;
 
     /**
      * Contact Persons: One Institutional ThirdParty has Many Contact Persons
@@ -170,7 +170,6 @@ class ThirdParty
      * @var Collection
      * @ORM\ManyToMany(targetEntity="\Chill\MainBundle\Entity\Center")
      * @ORM\JoinTable(name="chill_3party.party_center")
-     * @Assert\Count(min=1)
      */
     private $centers;
 
@@ -327,7 +326,7 @@ class ThirdParty
      * @param array|null $type
      * @return ThirdParty
      */
-    public function setType(array $type = null)
+    public function setTypes(array $type = null)
     {
         // remove all keys from the input data
         $this->type = \array_values($type);
@@ -340,7 +339,7 @@ class ThirdParty
      *
      * @return array|null
      */
-    public function getType()
+    public function getTypes()
     {
         return $this->type;
     }
diff --git a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
index c5d9346ba..50f0af70f 100644
--- a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
@@ -16,14 +16,32 @@ components:
         id:
           type: integer
           readOnly: true
+        type:
+          type: string
+          enum:
+            - "thirdparty"
         name:
           type: string
-        nameCompany:
-          type: string
-        acronym:
-          type: string
         email:
           type: string
+        telephone:
+          type: string
+        comment:
+          type: string
+    #     centers:
+    #       type: array
+    #       items:
+    #         type: object
+    #         $ref: "#/components/schemas/CenterById"
+    # CenterById:
+    #   type: object
+    #   properties:
+    #     type:
+    #       type: string
+    #       enum:
+    #         - "Center"
+    #     id:
+    #       type: integer
 
 paths:
   /1.0/thirdparty/thirdparty.json:

From 302f60e722f73ecf91b7fb37f7d52fff4555df95 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 29 Sep 2021 12:14:58 +0200
Subject: [PATCH 32/64] addAddress: remove commented old method

---
 .../public/vuejs/Address/components/AddAddress.vue  | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 38afeae80..8f60ef1c1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -705,20 +705,7 @@ export default {
                this.errorMsg.push(error);
                this.flag.loading = false;
             });
-      },
-
-      /*
-      *  Method just add closing pane to the callback method
-      *  (get out step1 show pane, submit button)
-      closePaneAndCallbackSubmit(payload)
-      {
-         //this.initForm();
-         //this.resetPane(); // because parent callback will cast afterLastPaneAction()
-         console.log('will call parent callback method', payload);
-         // callback props method from parent
-         this.addressChangedCallback(payload);
       }
-      */
    }
 }
 </script>

From f4999548ac236d5304d1a5b5df4e8b4a81d2a9c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Sep 2021 12:48:18 +0200
Subject: [PATCH 33/64] handle suggestion in addAddress component

---
 .../Resources/public/vuejs/Address/api.js     | 33 +++++++++---
 .../vuejs/Address/components/AddAddress.vue   | 52 +++++++++++++++++--
 .../vuejs/Address/components/SuggestPane.vue  | 18 ++++---
 .../components/Household.vue                  |  3 +-
 .../HouseholdMembersEditor/store/index.js     |  6 +++
 5 files changed, 95 insertions(+), 17 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
index 14fa0490f..62065b3ad 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
@@ -1,4 +1,4 @@
-/*
+/**
 * Endpoint chill_api_single_country__index
 * method GET, get Country Object
 * @returns {Promise} a promise containing all Country object
@@ -14,7 +14,7 @@ const fetchCountries = () => {
       });
 };
 
-/*
+/**
 * Endpoint chill_api_single_postal_code__index
 * method GET, get Country Object
 * @returns {Promise} a promise containing all Postal Code objects filtered with country
@@ -29,7 +29,7 @@ const fetchCities = (country) => {
       });
 };
 
-/*
+/**
 * Endpoint chill_api_single_address_reference__index
 * method GET, get AddressReference Object
 * @returns {Promise} a promise containing all AddressReference objects filtered with postal code
@@ -44,7 +44,7 @@ const fetchReferenceAddresses = (postalCode) => {
        });
 };
 
-/*
+/**
 * Endpoint chill_api_single_address_reference__index
 * method GET, get AddressReference Object
 * @returns {Promise} a promise containing all AddressReference objects filtered with postal code
@@ -60,7 +60,7 @@ const fetchAddresses = () => {
       });
 };
 
-/*
+/**
 * Endpoint chill_api_single_address__entity__create
 * method POST, post Address Object
 * @returns {Promise}
@@ -81,8 +81,28 @@ const postAddress = (address) => {
    });
 };
 
+/**
+ *
+ * @param address
+ * @returns {Promise<Response>}
+ */
+const duplicateAddress = (address) => {
+  const url = `/api/1.0/main/address/${address.address_id}/duplicate.json`;
+  return fetch(url, {
+      'method': 'POST',
+      headers: {
+        'Content-Type': 'application/json;charset=utf-8'
+      },
+    }).then(response => {
+        if (response.ok) {
+          return response.json();
+        }
+        throw Error('Error with request resource response');
+    });
+};
 
-/*
+
+/**
 * Endpoint chill_api_single_address__entity__create
 * method PATCH, patch Address Instance
 *
@@ -142,6 +162,7 @@ const getAddress = (id) => {
 };
 
 export {
+   duplicateAddress,
    fetchCountries,
    fetchCities,
    fetchReferenceAddresses,
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 38afeae80..265b45d70 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -34,6 +34,7 @@
                v-bind:defaultz="this.defaultz"
                v-bind:entity="this.entity"
                v-bind:flag="this.flag"
+               @pick-address="this.pickAddress"
                ref="suggestAddress">
             </suggest-pane>
          </template>
@@ -55,6 +56,7 @@
          v-bind:entity="this.entity"
          v-bind:flag="this.flag"
          v-bind:insideModal="false"
+         @pick-address="this.pickAddress"
          ref="suggestAddress">
 
          <template v-slot:before v-if="!bypassFirstStep">
@@ -217,7 +219,16 @@
 
 <script>
 import Modal from 'ChillMainAssets/vuejs/_components/Modal';
-import { getAddress, fetchCountries, fetchCities, fetchReferenceAddresses, patchAddress, postAddress, postPostalCode } from '../api';
+import {
+  duplicateAddress,
+  fetchCountries,
+  fetchCities,
+  fetchReferenceAddresses,
+  getAddress,
+  patchAddress,
+  postAddress,
+  postPostalCode,
+} from '../api';
 import { postAddressToPerson, postAddressToHousehold } from "ChillPersonAssets/vuejs/_api/AddAddress.js";
 import ShowPane from './ShowPane.vue';
 import SuggestPane from './SuggestPane.vue';
@@ -234,6 +245,9 @@ export default {
       EditPane,
       DatePane
    },
+   emits: {
+     pickAddress: null
+   },
    data() {
       return {
          flag: {
@@ -311,7 +325,10 @@ export default {
          return (this.validFrom || this.validTo) ? true : false;
       },
       hasSuggestions() {
-         // TODO
+         console.log(this.context.suggestions);
+         if (typeof(this.context.suggestions) !== 'undefined') {
+           return this.context.suggestions.length > 0;
+         }
          //return addressSuggestions.length > 0
          return false;
       },
@@ -647,9 +664,12 @@ export default {
                this.flag.loading = false;
                this.flag.success = true;
                resolve({
+                 address,
+                 targetOrigin: this.context.target,
+                 // for "legacy" use:
                   target: this.context.target.name,
                   targetId: this.context.target.id,
-                  addressId: this.entity.address.address_id
+                  addressId: this.entity.address.address_id,
                   }
                );
             }))
@@ -695,6 +715,9 @@ export default {
                   this.flag.loading = false;
                   this.flag.success = true;
                   return resolve({
+                    address,
+                    targetOrigin: this.context.target,
+                    // for "legacy" use:
                      target: this.context.target.name,
                      targetId: this.context.target.id,
                      addressId: this.entity.address.address_id
@@ -707,6 +730,29 @@ export default {
             });
       },
 
+     /**
+      *
+      * @param address the address selected
+      */
+      pickAddress(address) {
+         console.log('pickAddress', address);
+         duplicateAddress(address).then(newAddress => {
+           this.entity.address = newAddress;
+           this.flag.loading = false;
+           this.flag.success = true;
+           let payload = {
+             address: newAddress,
+             targetOrigin: this.context.target,
+             // for "legacy" use:
+             target: this.context.target.name,
+             targetId: this.context.target.id,
+             addressId: this.entity.address.address_id
+           };
+           this.addressChangedCallback(payload);
+           this.closeSuggestPane();
+         });
+      }
+
       /*
       *  Method just add closing pane to the callback method
       *  (get out step1 show pane, submit button)
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
index fa1a08530..15c77e414 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
@@ -10,13 +10,14 @@
    <h4 class="h3">{{ $t('address_suggestions') }}</h4>
 
    <div class="flex-table AddressSuggestionList">
-      <div class="item-bloc">
+      <div v-for="a in context.suggestions" class="item-bloc">
          <div class="float-button bottom">
             <div class="box">
                <div class="action">
+                 <!-- QUESTION normal que ça vienne avant l'adresse ? pourquoi pas après avoir affiché le address-render-box ? -->
                   <ul class="record_actions">
                      <li>
-                        <button class="btn btn-sm btn-choose">
+                        <button class="btn btn-sm btn-choose" @click="this.pickAddress(a)">
                            {{ $t('use_this_address') }}
                         </button>
                      </li>
@@ -25,9 +26,7 @@
                <ul class="list-content fa-ul">
                   <li>
                      <i class="fa fa-li fa-map-marker"></i>
-                     <!--
-                     <address-render-box></address-render-box>
-                     -->
+                     <address-render-box :address="a"></address-render-box>
                   </li>
                </ul>
             </div>
@@ -68,9 +67,14 @@ export default {
       'flag',
       'entity',
       'errorMsg',
-      'insideModal'
+      'insideModal',
    ],
    computed: {},
-   methods: {}
+   methods: {
+     pickAddress(address) {
+       console.log('pickAddress in suggest pane', address);
+       this.$emit('pickAddress', address);
+     },
+   }
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index a8c832d1d..a2ebc83da 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -94,7 +94,7 @@
       </template>
       <template v-else>
         <household-render-box :household="household" :isAddressMultiline="true"></household-render-box>
-        <ul v-if="!hasHouseholhdAddress" class="record_actions">
+        <ul v-if="!hasHouseholdAddress" class="record_actions">
           <li>
             <add-address
               :context="getAddressContext"
@@ -151,6 +151,7 @@ export default {
              validFrom: false,
              validTo: false,
           },
+          hideAddress: true,
           button: {
             text:  {
               create: 'household_members_editor.household.set_address',
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index a32a432bf..edebde459 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -96,6 +96,12 @@ const store = createStore({
     getAddressContext(state) {
       return {
         edit: false,
+        addressId: null,
+        target: {
+          name: state.household.type,
+          id: state.household.id
+        },
+        suggestions: state.addressesSuggestion
       };
     },
     hasHouseholdAddress(state) {

From 53e82f1b2a1c3bdcace6a708358e6b76c3ff5710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Sep 2021 12:54:53 +0200
Subject: [PATCH 34/64] store created address into new household

---
 .../components/Household.vue                      |  1 +
 .../vuejs/HouseholdMembersEditor/store/index.js   | 15 +++------------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index a2ebc83da..5bb7fdb04 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -208,6 +208,7 @@ export default {
     },
     addressChanged(payload) {
       console.log("addressChanged", payload);
+      this.$store.dispatch('setHouseholdNewAddress', payload.address);
     },
     selectHousehold(h) {
       this.$store.dispatch('selectHousehold', h);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index edebde459..9e1e047ea 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -292,6 +292,7 @@ const store = createStore({
       state.forceLeaveWithoutHousehold = false;
     },
     setHouseholdAddress(state, address) {
+      console.log('setHouseholdAddress commit', address);
       if (null === state.household) {
         console.error("no household");
         throw new Error("No household");
@@ -385,18 +386,8 @@ const store = createStore({
       commit('createHousehold');
       dispatch('computeWarnings');
     },
-    setHouseholdNewAddress({ commit }, payload) {
-      let url = `/api/1.0/main/address/${payload.addressId}.json`;
-      window.fetch(url).then(r => {
-        if (r.ok) {
-          return r.json();
-        }
-        throw new Error("error while fetch address");
-      }).then(data => {
-        commit('setHouseholdAddress', data);
-      }).catch(e => {
-        console.error(e);
-      });
+    setHouseholdNewAddress({ commit }, address) {
+        commit('setHouseholdAddress', address);
     },
     forceLeaveWithoutHousehold({ commit, dispatch }) {
       commit('forceLeaveWithoutHousehold');

From 0e54b8cdf0807acacc3f01c1b655836a311ed4dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Sep 2021 13:26:54 +0200
Subject: [PATCH 35/64] add a changelog

---
 CHANGELOG.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..cf27b41f2
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,18 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to
+
+* [Semantic Versioning](https://semver.org/spec/v2.0.0.html) for stable releases;
+* date versioning for test releases
+
+## Unreleased
+
+* [Household editor][UI] Update how household suggestion and addresses are picked;
+* [AddAddress] Handle address suggestion;
+
+## Test release yyyy-mm-dd
+
+ 

From 86c5376cc27d366243a79cc7456839137f9b820a Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 29 Sep 2021 13:35:33 +0200
Subject: [PATCH 36/64] bypass ACL restriction

fix response 500 when otf create new person
---
 .../ChillPersonBundle/Controller/PersonApiController.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
index b3f4087eb..17635a8fa 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
@@ -45,9 +45,9 @@ class PersonApiController extends ApiController
         $person = parent::createEntity($action, $request);
 
         // TODO temporary hack to allow creation of person with fake center
-        $centers = $this->authorizationHelper->getReachableCenters($this->getUser(),
+        /* $centers = $this->authorizationHelper->getReachableCenters($this->getUser(),
             new Role(PersonVoter::CREATE));
-        $person->setCenter($centers[0]);
+        $person->setCenter($centers[0]); */
 
         return $person;
     }

From 0ec095b59a62b456da3685700cd9c09b2001ff44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Sep 2021 13:57:36 +0200
Subject: [PATCH 37/64] allow to remove / update address in household member
 editor

---
 .../components/Household.vue                  | 64 ++++---------------
 .../vuejs/HouseholdMembersEditor/js/i18n.js   |  5 ++
 .../HouseholdMembersEditor/store/index.js     | 31 ++++++---
 3 files changed, 38 insertions(+), 62 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 5bb7fdb04..98f5b0e45 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -94,7 +94,7 @@
       </template>
       <template v-else>
         <household-render-box :household="household" :isAddressMultiline="true"></household-render-box>
-        <ul v-if="!hasHouseholdAddress" class="record_actions">
+        <ul class="record_actions">
           <li>
             <add-address
               :context="getAddressContext"
@@ -103,6 +103,12 @@
               :addressChangedCallback="addressChanged"
               ></add-address>
           </li>
+          <li v-if="hasHouseholdAddress">
+            <button class="btn btn-remove"
+                    @click="removeHouseholdAddress">
+              {{ $t('household_members_editor.household.remove_address') }}
+            </button>
+          </li>
         </ul>
       </template>
       </div>
@@ -134,37 +140,26 @@ export default {
   data() {
     return {
       addAddress: {
-        /*
-        context: {
-          target: {
-            name: 'household_create',
-            id: 0
-          },
-          edit: false,
-          addressId: null
-        },
-
-         */
         key: 'household_new',
         options: {
           useDate: {
-             validFrom: false,
-             validTo: false,
+            validFrom: false,
+            validTo: false,
           },
           hideAddress: true,
           button: {
             text:  {
               create: 'household_members_editor.household.set_address',
-              edit: null,
+              edit: 'household_members_editor.household.update_address',
             }
           },
           title: {
             create: 'household_members_editor.household.create_new_address',
-            edit: null,
+            edit: 'household_members_editor.household.update_address_title',
           },
         }
       }
-    }
+    };
   },
   computed: {
     ...mapGetters([
@@ -213,17 +208,6 @@ export default {
     selectHousehold(h) {
       this.$store.dispatch('selectHousehold', h);
     },
-
-
-    setHouseholdAddress(a) {
-      let payload = this.$refs.addAddress.submitNewAddress();
-      console.log('setHouseholdAddress', a);
-      this.$store.commit('setHouseholdAddress', a);
-    },
-    setHouseholdCreatedAddress(payload) {
-      console.log('setHouseholdAddress', payload);
-      this.$store.dispatch('setHouseholdNewAddress', payload);
-    },
     removeHouseholdAddress() {
       this.$store.commit('removeHouseholdAddress');
     },
@@ -248,28 +232,4 @@ div.householdSuggestionList {
       }
    }
 }
-
-/*
-div.householdAddressSuggestionList {
-  display: flex;
-  list-style-type: none;
-  padding: 0;
-  & > li {}
-}
-.householdSuggestionList {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  justify-content: space-between;
-  & > .item {
-    margin-bottom: 0.8rem;
-    width: calc(50% - 1rem);
-    border: 1px solid var(--chill-light-gray);
-    padding: 0.5rem 0.5rem 0 0.5rem;
-    ul.record_actions {
-      margin-bottom: 0;
-    }
-  }
-}
-*/
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index 40201af77..c2d1d3dc3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -15,13 +15,18 @@ const appMessages = {
         leave_without_household: "Sans nouveau ménage",
         set_address: "Indiquer une adresse",
         reset_mode: "Modifier la destination",
+        remove_address: "Supprimer l'adresse",
+        update_address: "Mettre à jour l'adresse",
         // remove ?
+        /*
         where_live_the_household: "À quelle adresse habite ce ménage ?",
         household_live_to_this_address: "Sélectionner l'adresse",
         no_suggestions: "Aucune adresse à suggérer",
         delete_this_address: "Supprimer cette adresse",
         create_new_address: "Créer une nouvelle adresse",
         or_create_new_address: "Ou créer une nouvelle adresse",
+
+         */
         // end remove ?
       },
       concerned: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index 9e1e047ea..5f45e31eb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -93,16 +93,27 @@ const store = createStore({
 
      */
     },
-    getAddressContext(state) {
-      return {
-        edit: false,
-        addressId: null,
-        target: {
-          name: state.household.type,
-          id: state.household.id
-        },
-        suggestions: state.addressesSuggestion
-      };
+    getAddressContext(state, getters) {
+      if (!getters.hasHouseholdAddress) {
+        return {
+          edit: false,
+          addressId: null,
+          target: {
+            name: state.household.type,
+            id: state.household.id
+          },
+          suggestions: state.addressesSuggestion
+        };
+      } else {
+        return {
+          edit: true,
+          addressId: state.household.current_address.id,
+          target: {
+            name: state.household.type,
+            id: state.household.id
+          },
+        };
+      }
     },
     hasHouseholdAddress(state) {
       if (null === state.household) {

From f2ebb1f33c695b223f05ee4eaea7d5a676be6a0b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 29 Sep 2021 14:22:55 +0200
Subject: [PATCH 38/64] PATCH added for person endpoint

---
 .../ChillPersonExtension.php                  |  3 +-
 .../ChillPersonBundle/chill.api.specs.yaml    | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 485185ce7..d597e3572 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -640,12 +640,13 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
                                 Request::METHOD_POST=> true,
+                                Request::METHOD_PATCH => true
                             ],
                             'roles' => [
                                 Request::METHOD_GET => \Chill\PersonBundle\Security\Authorization\PersonVoter::SEE,
                                 Request::METHOD_HEAD => \Chill\PersonBundle\Security\Authorization\PersonVoter::SEE,
                                 Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\PersonVoter::CREATE,
-
+                                Request::METHOD_PATCH => \Chill\PersonBundle\Security\Authorization\PersonVoter::CREATE,
                             ],
                         ],
                         'address' => [
diff --git a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
index 020fa409f..2ebb35d00 100644
--- a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
@@ -298,6 +298,35 @@ paths:
                 $ref: "#/components/schemas/Person"
         403:
           description: "Unauthorized"
+    patch:
+      tags:
+        - person
+      summary: "Alter a person"
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The person's id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      requestBody:
+        description: "A person"
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/Person"
+      responses:
+      401:
+        description: "Unauthorized"
+      404:
+        description: "Not found"
+      200:
+        description: "OK"
+      422:
+        description: "Object with validation errors"
 
   /1.0/person/person.json:
     post:

From 664fcd07efa08ac0d8ac68a4e02e9836861548af Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 29 Sep 2021 14:52:22 +0200
Subject: [PATCH 39/64] fix: Update `StoredObject` uuid property.

---
 src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index 7ba21b5da..8d350c2b2 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -9,6 +9,7 @@ use ChampsLibres\AsyncUploaderBundle\Model\AsyncFileInterface;
 use ChampsLibres\AsyncUploaderBundle\Validator\Constraints\AsyncFileExists;
 use ChampsLibres\WopiLib\Contract\Entity\Document;
 use DateTimeInterface;
+use Ramsey\Uuid\Rfc4122\UuidInterface;
 use Ramsey\Uuid\Uuid;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
@@ -52,7 +53,7 @@ class StoredObject implements AsyncFileInterface, Document
     /**
      * @ORM\Column(type="uuid", unique=true)
      */
-    private Uuid $uuid;
+    private UuidInterface $uuid;
 
     /**
      * @ORM\Column(type="datetime", name="creation_date")
@@ -163,7 +164,7 @@ class StoredObject implements AsyncFileInterface, Document
         return $this;
     }
 
-    public function getUuid(): Uuid
+    public function getUuid(): UuidInterface
     {
         return $this->uuid;
     }

From bfd95bff39b2935b560aa7d09050d4b8d2bac011 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 29 Sep 2021 14:56:25 +0200
Subject: [PATCH 40/64] otf: add patch api endpoint for person and thirdparty

---
 .../Resources/public/vuejs/_api/OnTheFly.js   | 27 +++++++++++++---
 .../vuejs/_components/OnTheFly/Person.vue     |  7 +++--
 .../Resources/public/vuejs/_api/OnTheFly.js   | 31 +++++++++++++++----
 .../vuejs/_components/OnTheFly/ThirdParty.vue |  8 ++---
 4 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
index 6adbc7028..c8031da58 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
@@ -27,8 +27,27 @@ const postPerson = (body) => {
          throw Error('Error with request resource response');
       });
 };
-   
-export { 
-   getPerson, 
-   postPerson 
+
+/*
+* PATCH an existing person
+*/
+const patchPerson = (id, body) => {
+    const url = `/api/1.0/person/person/${id}.json`;
+    return fetch(url, {
+        method: 'PATCH',
+        headers: {
+            'Content-Type': 'application/json;charset=utf-8'
+        },
+        body: JSON.stringify(body)
+    })
+        .then(response => {
+            if (response.ok) { return response.json(); }
+            throw Error('Error with request resource response');
+        });
+};
+
+export {
+   getPerson,
+   postPerson,
+   patchPerson
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index bf559fd41..1956034cb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -163,11 +163,12 @@ export default {
                resolve();
          }));
       },
-      postData() {
-         postPerson(this.person)
+      patchData() {
+         console.log('id', this.id, 'and body', this.person);
+         patchPerson(this.id, this.person)
             .then(person => new Promise((resolve, reject) => {
                this.person = person;
-               console.log('post person', this.person);
+               console.log('patch person', this.person);
                resolve();
          }))
       }
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js
index ed91ef415..91ea41b7d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js
@@ -13,7 +13,7 @@ const getThirdparty = (id) => {
 };
 
 /*
-* POST a new person
+* POST a new thirdparty
 */
 const postThirdparty = (body) => {
    const url = `/api/1.0/thirdparty/thirdparty.json`;
@@ -29,8 +29,27 @@ const postThirdparty = (body) => {
          throw Error('Error with request resource response');
       });
 };
-   
-export { 
-   getThirdparty, 
-   postThirdparty 
-};
\ No newline at end of file
+
+/*
+* PATCH an existing thirdparty
+*/
+const patchThirdparty = (id, body) => {
+    const url = `/api/1.0/thirdparty/thirdparty/${id}.json`;
+    return fetch(url, {
+        method: 'PATCH',
+        headers: {
+            'Content-Type': 'application/json;charset=utf-8'
+        },
+        body: JSON.stringify(body)
+    })
+        .then(response => {
+            if (response.ok) { return response.json(); }
+            throw Error('Error with request resource response');
+        });
+};
+
+export {
+   getThirdparty,
+   postThirdparty,
+   patchThirdparty
+};
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 7fc8fd827..d89012afc 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -55,7 +55,7 @@
 <script>
 import ThirdPartyRenderBox from '../Entity/ThirdPartyRenderBox.vue';
 import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress';
-import { getThirdparty, postThirdparty } from '../../_api/OnTheFly';
+import { getThirdparty, patchThirdparty } from '../../_api/OnTheFly';
 
 export default {
    name: "OnTheFlyThirdParty",
@@ -98,10 +98,10 @@ export default {
             resolve();
          }));
       },
-      postData() {
-         postThirdparty(this.thirdparty).then(thirdparty => new Promise((resolve, reject) => {
+      patchData() {
+         patchThirdparty(this.thirdparty).then(thirdparty => new Promise((resolve, reject) => {
             this.thirdparty = thirdparty;
-            console.log('post thirdparty', thirdparty);
+            console.log('patch thirdparty', thirdparty);
             resolve();
          }))
       },

From ba982833486b71cc04f1dabedb4eab2a2fb99382 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 29 Sep 2021 15:02:54 +0200
Subject: [PATCH 41/64] fix specs.yaml indentation

---
 .../ChillPersonBundle/chill.api.specs.yaml       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
index 2ebb35d00..646d1fb19 100644
--- a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
@@ -319,14 +319,14 @@ paths:
             schema:
               $ref: "#/components/schemas/Person"
       responses:
-      401:
-        description: "Unauthorized"
-      404:
-        description: "Not found"
-      200:
-        description: "OK"
-      422:
-        description: "Object with validation errors"
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
+        422:
+          description: "Object with validation errors"
 
   /1.0/person/person.json:
     post:

From 86c2a5c3e80ad6070ce868179fdd742ec2649747 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 29 Sep 2021 15:07:27 +0200
Subject: [PATCH 42/64] fix: Update `ChillDocumentManager`. Fix statuscode and
 return types.

---
 .../src/Service/Wopi/ChillDocumentManager.php              | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
index bfa3ee8b0..1924edd01 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
@@ -21,6 +21,7 @@ use Error;
 use loophp\psr17\Psr17Interface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
+use Ramsey\Uuid\Uuid;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Mime\MimeTypes;
@@ -103,7 +104,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
     public function findByDocumentId(string $documentId): ?Document {
         return $this->storedObjectRepository->findOneBy(
             [
-                'uuid' => $documentId,
+                'uuid' => Uuid::fromString($documentId),
             ]
         );
     }
@@ -198,7 +199,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
             ->createStream($this->getContent($document));
     }
 
-    private function deleteContent(StoredObject $storedObject): string
+    private function deleteContent(StoredObject $storedObject): void
     {
         /** @var StdClass $object */
         $object = $this->tempUrlGenerator->generate('DELETE', $storedObject->getFilename());
@@ -234,7 +235,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
 
         $response = $this->httpClient->request('PUT', $object->url, ['body' => $content]);
 
-        if (200 !== $response->getStatusCode())
+        if (201 !== $response->getStatusCode())
         {
             throw new Error('Unable to save stored object.');
         }

From 2c1d3d08c31da6945ea73bb0f06c29362b19147f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Sep 2021 15:15:10 +0200
Subject: [PATCH 43/64] temporary stored object fixes

---
 .../Controller/DocGeneratorTemplateController.php         | 2 +-
 src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php    | 6 ++++--
 .../migrations/Version20210928182542.php                  | 8 ++++----
 .../components/AddEvaluation.vue                          | 2 +-
 .../src/Service/Wopi/ChillDocumentManager.php             | 3 ++-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index f8fd69431..93068de3f 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -138,7 +138,7 @@ class DocGeneratorTemplateController extends AbstractController
                 $em->flush();
 
                 return $this->redirectToRoute('chill_wopi_file_edit', [
-                    'fileId' => $genDocName,
+                    'fileId' => $storedObject->getUuid(),
                     'returnPath' => $request->query->get('returnPath', "/")
                 ]);
             }
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index 7ba21b5da..a0e614025 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -10,6 +10,7 @@ use ChampsLibres\AsyncUploaderBundle\Validator\Constraints\AsyncFileExists;
 use ChampsLibres\WopiLib\Contract\Entity\Document;
 use DateTimeInterface;
 use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\UuidInterface;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
@@ -51,8 +52,9 @@ class StoredObject implements AsyncFileInterface, Document
 
     /**
      * @ORM\Column(type="uuid", unique=true)
+     * @Serializer\Groups({"read"})
      */
-    private Uuid $uuid;
+    private UuidInterface $uuid;
 
     /**
      * @ORM\Column(type="datetime", name="creation_date")
@@ -163,7 +165,7 @@ class StoredObject implements AsyncFileInterface, Document
         return $this;
     }
 
-    public function getUuid(): Uuid
+    public function getUuid(): UuidInterface
     {
         return $this->uuid;
     }
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php
index 756faf654..20d45ca37 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php
@@ -16,15 +16,15 @@ final class Version20210928182542 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_doc.stored_object ADD uuid UUID NOT NULL');
+        $this->addSql('CREATE EXTENSION IF NOT EXISTS "uuid-ossp"');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ADD uuid UUID DEFAULT NULL');
+        $this->addSql('UPDATE chill_doc.stored_object SET uuid=uuid_generate_v4()');
+        $this->addSql('ALTER TABLE chill_doc.stored_object ALTER uuid SET NOT NULL');
         $this->addSql('CREATE UNIQUE INDEX UNIQ_49604E36D17F50A6 ON chill_doc.stored_object (uuid)');
     }
 
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP INDEX UNIQ_49604E36D17F50A6');
         $this->addSql('ALTER TABLE chill_doc.stored_object DROP uuid');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
index 3321a8005..f05f9fca3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
@@ -109,7 +109,7 @@ export default {
          this.toggleEditEvaluation();
       },
       buildEditLink(storedObject) {
-        return `/fr/chill_wopi/edit/${storedObject.filename}?returnPath=` + encodeURIComponent(
+        return `/fr/chill_wopi/edit/${storedObject.uuid}?returnPath=` + encodeURIComponent(
             window.location.pathname + window.location.search + window.location.hash);
       },
    }
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
index bfa3ee8b0..a6cf08063 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
@@ -21,6 +21,7 @@ use Error;
 use loophp\psr17\Psr17Interface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
+use Ramsey\Uuid\Uuid;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Mime\MimeTypes;
@@ -103,7 +104,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
     public function findByDocumentId(string $documentId): ?Document {
         return $this->storedObjectRepository->findOneBy(
             [
-                'uuid' => $documentId,
+                'uuid' => Uuid::fromString($documentId),
             ]
         );
     }

From c7931595938cc06f454efe27ce13907048b4dbd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Sep 2021 15:27:11 +0200
Subject: [PATCH 44/64] quick fix stored boject

---
 src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index 4ad013fce..a0e614025 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -9,7 +9,6 @@ use ChampsLibres\AsyncUploaderBundle\Model\AsyncFileInterface;
 use ChampsLibres\AsyncUploaderBundle\Validator\Constraints\AsyncFileExists;
 use ChampsLibres\WopiLib\Contract\Entity\Document;
 use DateTimeInterface;
-use Ramsey\Uuid\Rfc4122\UuidInterface;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
 use Symfony\Component\Serializer\Annotation as Serializer;

From a2df3c8144d71c0c5e2a59446f2a66cac4c7ef24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Sep 2021 16:04:05 +0200
Subject: [PATCH 45/64] =?UTF-8?q?rdv=20avant=20=C3=A9changes=20dans=20le?=
 =?UTF-8?q?=20menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
index 244d7db78..4f0cf7b30 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -41,7 +41,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
                 'routeParameters' => [
                     'accompanying_period_id' => $period->getId(),
                 ]])
-                ->setExtras(['order' => 41]);
+                ->setExtras(['order' => 35]);
         }
     }
 }

From 008a10dab80a34b8d16f86c085948c30be57b29d Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 29 Sep 2021 17:35:37 +0200
Subject: [PATCH 46/64] otf: patch person and thirdparty from the store, emit
 parent method saveFormOnTheFly()

---
 .../PersonsAssociated/ParticipationItem.vue   | 23 +++----
 .../components/Requestor.vue                  | 13 ++--
 .../components/Resources/ResourceItem.vue     | 11 +++-
 .../vuejs/AccompanyingCourse/store/index.js   | 64 +++++++++++++++++++
 .../public/vuejs/_components/AddPersons.vue   | 19 +++---
 .../vuejs/_components/OnTheFly/Person.vue     | 11 +---
 .../vuejs/_components/OnTheFly/ThirdParty.vue |  9 +--
 7 files changed, 103 insertions(+), 47 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index 7f01c87e9..6566b00e4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -19,20 +19,8 @@
                v-if="hasCurrentHouseholdAddress"
                v-bind:person="participation.person">
             </button-location>
-            <li>
-               <on-the-fly
-                  v-bind:type="participation.person.type"
-                  v-bind:id="participation.person.id"
-                  action="show">
-               </on-the-fly>
-            </li>
-            <li>
-               <on-the-fly
-                  v-bind:type="participation.person.type"
-                  v-bind:id="participation.person.id"
-                  action="edit">
-               </on-the-fly>
-            </li>
+            <li><on-the-fly :type="participation.person.type" :id="participation.person.id" action="show"></on-the-fly></li>
+            <li><on-the-fly :type="participation.person.type" :id="participation.person.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
             <!-- <li>
                <button class="btn btn-delete"
                   :title="$t('action.delete')"
@@ -112,6 +100,13 @@ export default {
       getAccompanyingCourseReturnPath() {
          return `fr/parcours/${this.$store.state.accompanyingCourse.id}/edit#section-10`;
       }
+   },
+   methods: {
+      saveFormOnTheFly(payload) {
+         console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
+         payload.target = 'participation';
+         this.$store.dispatch('patchOnTheFly', payload);
+      }
    }
 }
 
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 7342eed66..4ea404729 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -10,7 +10,7 @@
          {{ $t('requestor.is_anonymous') }}
       </label>
 
-      <third-party-render-box v-if="accompanyingCourse.requestor.type == 'thirdparty'"
+      <third-party-render-box v-if="accompanyingCourse.requestor.type === 'thirdparty'"
          :thirdparty="accompanyingCourse.requestor"
          :options="{
             addLink: false,
@@ -25,12 +25,12 @@
          <ul class="record_actions">
             <button-location v-if="hasCurrentHouseholdAddress" :thirdparty="accompanyingCourse.requestor"></button-location>
             <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="show"></on-the-fly></li>
-            <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit"></on-the-fly></li>
+            <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
          </ul>
       </template>
       </third-party-render-box>
 
-      <person-render-box render="bloc" v-else-if="accompanyingCourse.requestor.type == 'person'"
+      <person-render-box render="bloc" v-else-if="accompanyingCourse.requestor.type === 'person'"
          :person="accompanyingCourse.requestor"
          :options="{
             addLink: false,
@@ -46,7 +46,7 @@
          <ul class="record_actions">
             <button-location v-if="hasCurrentHouseholdAddress" :person="accompanyingCourse.requestor"></button-location>
             <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="show"></on-the-fly></li>
-            <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit"></on-the-fly></li>
+            <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
          </ul>
       </template>
       </person-render-box>
@@ -129,6 +129,11 @@ export default {
          this.$store.dispatch('addRequestor', selected.shift());
          this.$refs.addPersons.resetSearch(); // to cast child method
          modal.showModal = false;
+      },
+      saveFormOnTheFly(payload) {
+         console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
+         payload.target = 'requestor';
+         this.$store.dispatch('patchOnTheFly', payload);
       }
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index fe66366f0..0a43a3589 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -8,7 +8,7 @@
          <ul class="record_actions">
             <button-location v-if="hasCurrentHouseholdAddress" :person="resource.resource"></button-location>
             <li><on-the-fly :type="resource.resource.type" :id="resource.resource.id" action="show"></on-the-fly></li>
-            <li><on-the-fly :type="resource.resource.type" :id="resource.resource.id" action="edit"></on-the-fly></li>
+            <li><on-the-fly :type="resource.resource.type" :id="resource.resource.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
             <li><button class="btn btn-sm btn-remove" :title="$t('action.remove')" @click.prevent="$emit('remove', resource)"></button></li>
          </ul>
       </template>
@@ -22,7 +22,7 @@
       <template v-slot:record-actions>
          <ul class="record_actions">
             <li><on-the-fly :type="resource.resource.type" :id="resource.resource.id" action="show"></on-the-fly></li>
-            <li><on-the-fly :type="resource.resource.type" :id="resource.resource.id" action="edit"></on-the-fly></li>
+            <li><on-the-fly :type="resource.resource.type" :id="resource.resource.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
             <li><button class="btn btn-sm btn-remove" :title="$t('action.remove')" @click.prevent="$emit('remove', resource)"></button></li>
          </ul>
       </template>
@@ -53,6 +53,13 @@ export default {
          }
          return false;
       }
+   },
+   methods: {
+      saveFormOnTheFly(payload) {
+         console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
+         payload.target = 'resource';
+         this.$store.dispatch('patchOnTheFly', payload);
+      }
    }
 }
 </script>
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 b66f4d957..382d2c0c3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -11,6 +11,8 @@ import { getAccompanyingCourse,
    addScope,
    removeScope,
 } from '../api';
+import { patchPerson } from "ChillPersonAssets/vuejs/_api/OnTheFly";
+import { patchThirdparty } from "ChillThirdPartyAssets/vuejs/_api/OnTheFly";
 
 
 const debug = process.env.NODE_ENV !== 'production';
@@ -107,6 +109,36 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                //console.log('### mutation: addResource', resource);
                state.accompanyingCourse.resources.push(resource);
             },
+            updatePerson(state, payload) {
+               console.log('### mutation: updatePerson', payload);
+               let i = null;
+               switch (payload.target) {
+                  case 'participation':
+                     i = state.accompanyingCourse.participations.findIndex(e => e.person.id === payload.person.id );
+                     state.accompanyingCourse.participations[i].person = payload.person;
+                     break;
+                  case 'requestor':
+                     state.accompanyingCourse.requestor = payload.person;
+                     break;
+                  case 'resource':
+                     i = state.accompanyingCourse.resources.findIndex(e => e.resource.id === payload.person.id );
+                     state.accompanyingCourse.resources[i].resource = payload.person;
+                     break;
+               }
+            },
+            updateThirdparty(state, payload) {
+               console.log('### mutation: updateThirdparty', payload);
+               let i = null;
+               switch (payload.target) {
+                  case 'requestor':
+                     state.accompanyingCourse.requestor = payload.thirdparty;
+                     break;
+                  case 'resource':
+                     i = state.accompanyingCourse.resources.findIndex(e => e.resource.id === payload.thirdparty.id );
+                     state.accompanyingCourse.resources[i].resource = payload.thirdparty;
+                     break;
+               }
+            },
             toggleIntensity(state, value) {
                state.accompanyingCourse.intensity = value;
             },
@@ -239,6 +271,38 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                   resolve();
                })).catch((error) => { commit('catchError', error) });
             },
+            patchOnTheFly({ commit }, payload) {
+               console.log('## action: patch OnTheFly', payload);
+               let body = { type: payload.type };
+               if (payload.type === 'person') {
+                  body.firstName = payload.data.firstName;
+                  body.lastName = payload.data.lastName;
+                  if (payload.data.birthdate !== null) { body.birthdate = payload.data.birthdate; }
+                  body.phonenumber = payload.data.phonenumber;
+                  body.mobilenumber = payload.data.mobilenumber;
+                  body.gender = payload.data.gender;
+                  console.log('id', payload.data.id, 'and body', body);
+                  patchPerson(payload.data.id, body)
+                      .then(person => new Promise((resolve, reject) => {
+                         console.log('patch person', person);
+                         commit('updatePerson', { target: payload.target, person: person });
+                         resolve();
+                      }));
+               }
+               else if (payload.type === 'thirdparty') {
+                  body.name = payload.data.name;
+                  body.email = payload.data.email;
+                  body.phonenumber = payload.data.phonenumber;
+                  body.address = { address_id: payload.data.address.address_id };
+                  console.log('id', payload.data.id, 'and body', body);
+                  patchThirdparty(payload.data.id, body)
+                      .then(thirdparty => new Promise((resolve, reject) => {
+                          console.log('patch thirdparty', thirdparty);
+                          commit('updateThirdparty', { target: payload.target, thirdparty: thirdparty });
+                          resolve();
+                  }));
+               }
+            },
             toggleIntensity({ commit }, payload) {
                //console.log(payload);
                patchAccompanyingCourse(id, { type: "accompanying_period", intensity: payload })
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index a0e8fbebf..82243c96f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -92,6 +92,7 @@ import OnTheFly from 'ChillMainAssets/vuejs/_components/OnTheFly.vue';
 import PersonSuggestion from './AddPersons/PersonSuggestion';
 import { searchPersons, searchPersons_2 } from 'ChillPersonAssets/vuejs/_api/AddPersons';
 import { postPerson } from "ChillPersonAssets/vuejs/_api/OnTheFly";
+import { postThirdparty } from "ChillThirdPartyAssets/vuejs/_api/OnTheFly";
 
 export default {
    name: 'AddPersons',
@@ -254,25 +255,25 @@ export default {
          }
       },
       saveFormOnTheFly({ type, data }) {
-         console.log('saveFormOnTheFly from addPersons', { type, data });
-
-         // create/edit person
+         console.log('saveFormOnTheFly from addPersons, type', type, ', data', data);
          if (type === 'person') {
-
             console.log('type person with', data);
             postPerson(data)
                .then(person => new Promise((resolve, reject) => {
-                  //this.person = person;
+                  console.log('onthefly create: post person', person);
                   this.newPriorSuggestion(person);
                   resolve();
                }));
          }
-
-         // create/edit thirdparty
          else if (type === 'thirdparty') {
-            console.log('not yet implemented: type thirdparty with', type, data);
+            console.log('type thirdparty with', data);
+            postThirdparty(data)
+               .then(thirdparty => new Promise((resolve, reject) => {
+                  console.log('onthefly create: post thirdparty', thirdparty);
+                  this.newPriorSuggestion(thirdparty);
+                  resolve();
+               }));
          }
-
       }
    },
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 1956034cb..d0627753a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -75,7 +75,7 @@
 </template>
 
 <script>
-import { getPerson, postPerson } from '../../_api/OnTheFly';
+import { getPerson } from '../../_api/OnTheFly';
 import PersonRenderBox from '../Entity/PersonRenderBox.vue';
 
 export default {
@@ -162,15 +162,6 @@ export default {
                console.log('get person', this.person);
                resolve();
          }));
-      },
-      patchData() {
-         console.log('id', this.id, 'and body', this.person);
-         patchPerson(this.id, this.person)
-            .then(person => new Promise((resolve, reject) => {
-               this.person = person;
-               console.log('patch person', this.person);
-               resolve();
-         }))
       }
    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index d89012afc..f68b00c4c 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -55,7 +55,7 @@
 <script>
 import ThirdPartyRenderBox from '../Entity/ThirdPartyRenderBox.vue';
 import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress';
-import { getThirdparty, patchThirdparty } from '../../_api/OnTheFly';
+import { getThirdparty } from '../../_api/OnTheFly';
 
 export default {
    name: "OnTheFlyThirdParty",
@@ -98,13 +98,6 @@ export default {
             resolve();
          }));
       },
-      patchData() {
-         patchThirdparty(this.thirdparty).then(thirdparty => new Promise((resolve, reject) => {
-            this.thirdparty = thirdparty;
-            console.log('patch thirdparty', thirdparty);
-            resolve();
-         }))
-      },
       submitAddress(payload) {
          console.log('submitAddress', payload);
       }

From bac8e8d0b8da36c89a63bd115e6c063ecf4f020c Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 29 Sep 2021 19:27:22 +0200
Subject: [PATCH 47/64] cleaning

---
 .../public/vuejs/_components/OnTheFly.vue        |  1 -
 .../PersonsAssociated/ParticipationItem.vue      | 16 ----------------
 .../public/vuejs/_components/AddPersons.vue      |  2 +-
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
index 43cd0c686..329672f4e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
@@ -146,7 +146,6 @@ export default {
       },
       saveAction() {
          console.log('saveAction button: create/edit action with', this.type);
-
          let
             type = this.type,
             data = {} ;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index 6566b00e4..c349ce159 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -109,20 +109,4 @@ export default {
       }
    }
 }
-
-/*
- *  dates of participation
- *
- *
- *
- *   <tr>
- *      <td><span v-if="participation.startDate">
- *          {{ $d(participation.startDate.datetime, 'short') }}</span>
- *      </td>
- *      <td><span v-if="participation.endDate">
- *          {{ $d(participation.endDate.datetime, 'short') }}</span>
- *      </td>
- *   </tr>
- *
-*/
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 82243c96f..a31089f76 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -249,7 +249,7 @@ export default {
                result: entity
             }
             this.search.priorSuggestion = suggestion;
-            console.log('ici', this.search.priorSuggestion);
+            console.log('search priorSuggestion', this.search.priorSuggestion);
          } else {
             this.search.priorSuggestion = {};
          }

From 74b649fb2c4f9fd96784bcf636ba08daf5e3b3fb Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 29 Sep 2021 19:27:49 +0200
Subject: [PATCH 48/64] no location button for requestor

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

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 4ea404729..437cc23e1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -23,7 +23,6 @@
       >
       <template v-slot:record-actions>
          <ul class="record_actions">
-            <button-location v-if="hasCurrentHouseholdAddress" :thirdparty="accompanyingCourse.requestor"></button-location>
             <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="show"></on-the-fly></li>
             <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
          </ul>
@@ -44,7 +43,6 @@
       >
       <template v-slot:record-actions>
          <ul class="record_actions">
-            <button-location v-if="hasCurrentHouseholdAddress" :person="accompanyingCourse.requestor"></button-location>
             <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="show"></on-the-fly></li>
             <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
          </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index 0a43a3589..f8a61b930 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -6,7 +6,9 @@
       >
       <template v-slot:record-actions>
          <ul class="record_actions">
+            <!--
             <button-location v-if="hasCurrentHouseholdAddress" :person="resource.resource"></button-location>
+            -->
             <li><on-the-fly :type="resource.resource.type" :id="resource.resource.id" action="show"></on-the-fly></li>
             <li><on-the-fly :type="resource.resource.type" :id="resource.resource.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
             <li><button class="btn btn-sm btn-remove" :title="$t('action.remove')" @click.prevent="$emit('remove', resource)"></button></li>

From d8c34c3089c11f84d349a08fe41f167e462493e2 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 29 Sep 2021 19:53:28 +0200
Subject: [PATCH 49/64] otf: thirdparty corrections

---
 .../vuejs/AccompanyingCourse/store/index.js   |  2 +-
 .../Entity/ThirdPartyRenderBox.vue            | 28 ++-----------------
 2 files changed, 4 insertions(+), 26 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 382d2c0c3..c0946f702 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -290,7 +290,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                       }));
                }
                else if (payload.type === 'thirdparty') {
-                  body.name = payload.data.name;
+                  body.name = payload.data.text;
                   body.email = payload.data.email;
                   body.phonenumber = payload.data.phonenumber;
                   body.address = { address_id: payload.data.address.address_id };
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index eddde6a67..c2714126a 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -19,14 +19,6 @@
                 </div>
 
                 <p v-if="this.options.addInfo === true" class="moreinfo">
-                    <i v-if="thirdparty.birthdate" :class="'fa fa-fw ' + getGenderIcon" title="{{ getGender }}"></i>
-                    <time v-if="thirdparty.birthdate" datetime="{{ thirdparty.birthdate.datetime }}" title="{{ birthdate }}">
-                        {{ $t(getGender) + ' ' + $d(birthdate, 'short') }}
-                    </time>
-                    <time v-else-if="thirdparty.deathdate" datetime="{{ thirdparty.deathdate.datetime }}" title="{{ thirdparty.deathdate }}">
-                        {{ birthdate }} - {{ deathdate }}
-                    </time>
-                    <span v-if="options.addAge === true" class="age">{{ thirdparty.age }}</span>
                 </p>
             </div>
         </div>
@@ -42,9 +34,9 @@
                        <i class="fa fa-li fa-map-marker"></i>
                        <address-render-box :address="thirdparty.address" :isMultiline="isMultiline"></address-render-box>
                     </li>
-                    <li v-if="thirdparty.telephone">
+                    <li v-if="thirdparty.phonenumber">
                        <i class="fa fa-li fa-mobile"></i>
-                       <a :href="'tel: ' + thirdparty.telephone">{{ thirdparty.telephone }}</a>
+                       <a :href="'tel: ' + thirdparty.phonenumber">{{ thirdparty.phonenumber }}</a>
                     </li>
                     <li v-if="thirdparty.email">
                        <i class="fa fa-li fa-envelope-o"></i>
@@ -78,21 +70,7 @@ export default {
             } else {
                 return false
             }
-        },
-        getGender: function() {
-            return this.thirdparty.gender === 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man';
-        },
-        getGenderIcon: function() {
-            return this.thirdparty.gender === 'woman' ? 'fa-venus' : this.thirdparty.gender === 'man' ? 'fa-mars' : 'fa-neuter';
-        },
-        birthdate: function(){
-            var date = new Date(this.thirdparty.birthdate.datetime);
-            return dateToISO(date);
-        },
-        deathdate: function(){
-            var date = new Date(this.thirdparty.deathdate.datetime);
-            return dateToISO(date);
-        },
+        }
     }
 }
 </script>

From fb8b8b354f5c501a22c53f10202ef7c2e831fa32 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 29 Sep 2021 16:11:46 +0200
Subject: [PATCH 50/64] refactor: Update `Wopi::checkFileInfo()` so it can
 authenticate users from access token.

---
 .../src/Service/Wopi/ChillWopi.php            | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
index 7061c5735..e9e7e47cc 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
@@ -14,6 +14,8 @@ use ChampsLibres\WopiLib\Contract\Service\WopiInterface;
 use loophp\psr17\Psr17Interface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 final class ChillWopi implements WopiInterface
 {
@@ -21,15 +23,19 @@ final class ChillWopi implements WopiInterface
 
     private Psr17Interface $psr17;
 
+    private UserProviderInterface $userProvider;
+
     private WopiInterface $wopi;
 
     public function __construct(
         DocumentManagerInterface $documentManager,
         Psr17Interface $psr17,
+        UserProviderInterface $userProvider,
         WopiInterface $wopi
     ) {
         $this->documentManager = $documentManager;
         $this->psr17 = $psr17;
+        $this->userProvider = $userProvider;
         $this->wopi = $wopi;
     }
 
@@ -38,6 +44,52 @@ final class ChillWopi implements WopiInterface
         ?string $accessToken,
         RequestInterface $request
     ): ResponseInterface {
+        try {
+            $user = $this->userProvider->loadUserByUsername($accessToken);
+        } catch (UsernameNotFoundException $e) {
+            return $this
+                ->psr17
+                ->createResponse(401);
+        }
+
+        // @ TODO : Replace this with a call to decorated object once authentication is done.
+        $document = $this->documentManager->findByDocumentId($fileId);
+        $userIdentifier = $user->getUsername();
+        $userCacheKey = sprintf('wopi_putUserInfo_%s', $userIdentifier);
+
+        return $this
+            ->psr17
+            ->createResponse()
+            ->withHeader('Content-Type', 'application/json')
+            ->withBody($this->psr17->createStream((string) json_encode(
+                [
+                    'BaseFileName' => $this->documentManager->getBasename($document),
+                    'OwnerId' => 'Symfony',
+                    'Size' => $this->documentManager->getSize($document),
+                    'UserId' => $userIdentifier,
+                    'ReadOnly' => false,
+                    'UserCanAttend' => true,
+                    'UserCanPresent' => true,
+                    'UserCanRename' => true,
+                    'UserCanWrite' => true,
+                    'UserCanNotWriteRelative' => false,
+                    'SupportsUserInfo' => true,
+                    'SupportsDeleteFile' => true,
+                    'SupportsLocks' => true,
+                    'SupportsGetLock' => true,
+                    'SupportsExtendedLockLength' => true,
+                    'UserFriendlyName' => $userIdentifier,
+                    'SupportsUpdate' => true,
+                    'SupportsRename' => true,
+                    'DisablePrint' => false,
+                    'AllowExternalMarketplace' => true,
+                    'SupportedShareUrlTypes' => [
+                        'ReadOnly',
+                    ],
+                    'SHA256' => $this->documentManager->getSha256($document),
+                    'UserInfo' => (string) $this->cache->getItem($userCacheKey)->get(),
+                ]
+            )));
         $response = $this->wopi->checkFileInfo($fileId, $accessToken, $request);
         $document = $this->documentManager->findByDocumentId($fileId);
 

From 00259dae209d4eda914c9969e8930830cf0ec6db Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 29 Sep 2021 21:46:47 +0200
Subject: [PATCH 51/64] fix: Update `ChillDocumentManager::getSize()`.

---
 .../ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
index 1924edd01..73a4dd285 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
@@ -190,7 +190,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
     }
 
     public function getSize(Document $document): int {
-        return strlen(stream_get_contents($this->read($document)));
+        return strlen($this->read($document)->getContents());
     }
 
     public function read(Document $document): StreamInterface {

From 9a34aa59bb20cba83dda2f51f9309bf0693485ee Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 29 Sep 2021 21:50:44 +0200
Subject: [PATCH 52/64] fix: Add missing dependency.

---
 src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
index e9e7e47cc..12bc1b178 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
@@ -12,6 +12,7 @@ namespace Chill\WopiBundle\Service\Wopi;
 use ChampsLibres\WopiLib\Contract\Service\DocumentManagerInterface;
 use ChampsLibres\WopiLib\Contract\Service\WopiInterface;
 use loophp\psr17\Psr17Interface;
+use Psr\Cache\CacheItemPoolInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
@@ -19,6 +20,8 @@ use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 final class ChillWopi implements WopiInterface
 {
+    private CacheItemPoolInterface $cache;
+
     private DocumentManagerInterface $documentManager;
 
     private Psr17Interface $psr17;
@@ -28,11 +31,13 @@ final class ChillWopi implements WopiInterface
     private WopiInterface $wopi;
 
     public function __construct(
+        CacheItemPoolInterface $cache,
         DocumentManagerInterface $documentManager,
         Psr17Interface $psr17,
         UserProviderInterface $userProvider,
         WopiInterface $wopi
     ) {
+        $this->cache = $cache;
         $this->documentManager = $documentManager;
         $this->psr17 = $psr17;
         $this->userProvider = $userProvider;

From 7f721da08a6eebc82351dad89f49a0277433a1e2 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 29 Sep 2021 22:38:48 +0200
Subject: [PATCH 53/64] fix: Remove obsolete code.

---
 .../src/Service/Wopi/ChillWopi.php            | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
index 12bc1b178..ba289630e 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
@@ -95,26 +95,6 @@ final class ChillWopi implements WopiInterface
                     'UserInfo' => (string) $this->cache->getItem($userCacheKey)->get(),
                 ]
             )));
-        $response = $this->wopi->checkFileInfo($fileId, $accessToken, $request);
-        $document = $this->documentManager->findByDocumentId($fileId);
-
-        $body = json_decode((string) $response->getBody(), true);
-
-        return $response
-            ->withBody(
-                $this
-                    ->psr17
-                    ->createStream(
-                        (string) json_encode(
-                            $body +
-                            [
-                                'Version' => sprintf('v%s', $this->documentManager->getVersion($document)),
-                                // TODO: Add column 'LastModifiedDate' in StoredObject entity
-                                'LastModifiedTime' => $this->documentManager->getLastModifiedDate($document)->format('Y-m-d\TH:i:s.uP'),
-                            ]
-                        )
-                    )
-            );
     }
 
     public function deleteFile(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface

From f8f019cfe629b2fff0ebd53a6e5d6709b186cd51 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 30 Sep 2021 11:09:43 +0200
Subject: [PATCH 54/64] fix: Fix bug in `getSize()` method.

---
 .../ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
index 73a4dd285..62362d48f 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
@@ -190,7 +190,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
     }
 
     public function getSize(Document $document): int {
-        return strlen($this->read($document)->getContents());
+        return strlen($this->getContent());
     }
 
     public function read(Document $document): StreamInterface {

From bd7f2d997edd47367cdafb4ea57311a8dc115779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 30 Sep 2021 11:51:26 +0200
Subject: [PATCH 55/64] fix link to edit in wopi

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

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
index f05f9fca3..9dee7693a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
@@ -109,7 +109,7 @@ export default {
          this.toggleEditEvaluation();
       },
       buildEditLink(storedObject) {
-        return `/fr/chill_wopi/edit/${storedObject.uuid}?returnPath=` + encodeURIComponent(
+        return `/edit/${storedObject.uuid}?returnPath=` + encodeURIComponent(
             window.location.pathname + window.location.search + window.location.hash);
       },
    }

From 14a13c7bd529104ea98ce7b358cad407744db9ff Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 30 Sep 2021 11:55:28 +0200
Subject: [PATCH 56/64] CourseLocation: improve warning alerts

manually cherrypick from 5b0b1441d3c7ef0717f21adac8566e1beb1af52c on local branch resume_accourse
---
 .../components/CourseLocation.vue             | 28 +++++++++----------
 .../vuejs/AccompanyingCourse/js/i18n.js       |  4 +--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index e47b5d74f..047446be5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -14,18 +14,6 @@
          </label>
       </div>
 
-      <div v-if="hasNoPersonLocation" class="alert alert-danger no-person-location">
-         <i class="fa fa-warning fa-2x"></i>
-         <div>
-            <p>
-               {{ $t('courselocation.associate_at_least_one_person_with_one_household_with_address') }}
-               <a href="#section-10">
-                  <i class="fa fa-level-up fa-fw"></i>
-               </a>
-            </p>
-         </div>
-      </div>
-
       <div class="flex-table" v-if="accompanyingCourse.location">
          <div class="item-bloc">
             <address-render-box
@@ -47,6 +35,18 @@
          </div>
       </div>
 
+      <div v-if="hasNoPersonLocation" class="alert alert-danger no-person-location">
+         <i class="fa fa-warning fa-2x"></i>
+         <div>
+            <p>
+               {{ $t('courselocation.associate_at_least_one_person_with_one_household_with_address') }}
+               <a href="#section-10">
+                  <i class="fa fa-level-up fa-fw"></i>
+               </a>
+            </p>
+         </div>
+      </div>
+
       <div>
          <ul class="record_actions">
             <li>
@@ -213,10 +213,10 @@ export default {
 div#accompanying-course {
    div.vue-component {
       & > div.alert.no-person-location {
-         margin: 0 0 -1em;
+         margin: 1px 0 0;
       }
       div.no-person-location {
-         padding-bottom: 1.5em;
+         padding-top: 1.5em;
          display: flex;
          flex-direction: row;
          & > i {
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 35f05b60e..5d1451ff3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -49,7 +49,7 @@ const appMessages = {
          ok: "Oui, l'usager quitte le parcours",
          show_household_number: "Voir le ménage (n° {id})",
          show_household: "Voir le ménage",
-         person_without_household_warning: "Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible.",
+         person_without_household_warning: "Certaines usagers n'appartiennent actuellement à aucun ménage. Renseignez leur appartenance dès que possible.",
          update_household: "Modifier l'appartenance",
          participation_not_valid: "Sélectionnez ou créez au minimum 1 usager",
       },
@@ -83,7 +83,7 @@ const appMessages = {
          assign_course_address: "Désigner comme l'adresse du parcours",
          remove_button: "Enlever l'adresse",
          temporary_address_must_be_changed: "Cette adresse est temporaire. Le parcours devrait être localisé auprès d'un usager concerné.",
-         associate_at_least_one_person_with_one_household_with_address: "Associez au moins un membre du parcours à un ménage, et indiquez une adresse à ce ménage.",
+         associate_at_least_one_person_with_one_household_with_address: "Commencez d'abord par associer un membre du parcours à un ménage, et indiquez une adresse à ce ménage.",
          sure: "Êtes-vous sûr ?",
          sure_description: "Voulez-vous faire de cette adresse l'adresse du parcours ?",
          ok: "Désigner comme adresse du parcours",

From e2feea15f99c2eddad4502c9a9ad480b66314295 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 30 Sep 2021 11:57:20 +0200
Subject: [PATCH 57/64] stash commit

---
 .../vuejs/AccompanyingCourse/store/index.js   |  2 +-
 .../vuejs/_components/OnTheFly/ThirdParty.vue | 49 ++++++++++++-------
 2 files changed, 32 insertions(+), 19 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 c0946f702..22c91b0ef 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -292,7 +292,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                else if (payload.type === 'thirdparty') {
                   body.name = payload.data.text;
                   body.email = payload.data.email;
-                  body.phonenumber = payload.data.phonenumber;
+                  body.telephone = payload.data.phonenumber;
                   body.address = { address_id: payload.data.address.address_id };
                   console.log('id', payload.data.id, 'and body', body);
                   patchThirdparty(payload.data.id, body)
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index f68b00c4c..701bf38e8 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -21,7 +21,7 @@
    <div v-else-if="action === 'edit' || action === 'create'">
 
       <div class="form-floating mb-3">
-         <input class="form-control form-control-lg" id="name" v-model="thirdparty.name" v-bind:placeholder="$t('thirdparty.name')" />
+         <input class="form-control form-control-lg" id="name" v-model="thirdparty.text" v-bind:placeholder="$t('thirdparty.name')" />
          <label for="name">{{ $t('thirdparty.name') }}</label>
       </div>
 
@@ -42,12 +42,13 @@
             v-bind:aria-label="$t('thirdparty.phonenumber')"
             aria-describedby="phonenumber" />
       </div>
-
+      <!--
       <add-address
+         :context="this.context"
          :options="this.addAddress.options"
-         :context="this.addAddress.context"
          :address-changed-callback="submitAddress">
       </add-address>
+      -->
 
    </div>
 </template>
@@ -64,32 +65,44 @@ export default {
       ThirdPartyRenderBox,
       AddAddress
    },
-   data: function() {
+   data() {
       return {
          thirdparty: {
             type: 'thirdparty'
          },
          addAddress: {
-            context: {
-
-            },
             options: {
-               //button: {
-               //   text:  {
-               //      create: 'courselocation.add_temporary_address',
-               //      edit: 'courselocation.edit_temporary_address'
-               //   }
-               //},
-               //title: {
-               //   create: 'courselocation.add_temporary_address',
-               //   edit: 'courselocation.edit_temporary_address'
-               //},
                openPanesInModal: true,
-               hideAddress: true
+               hideAddress: false,
+               /*
+               button: {
+                  text:  {
+                     create: 'courselocation.add_temporary_address',
+                     edit: 'courselocation.edit_temporary_address'
+                  }
+               },
+               title: {
+                  create: 'courselocation.add_temporary_address',
+                  edit: 'courselocation.edit_temporary_address'
+               } */
             }
          }
       }
    },
+   computed: {
+      context() {
+         let context = {
+            target: {
+               name: this.type,
+               id: this.id
+            },
+            edit: false,
+            addressId: null
+         };
+         console.log('context', context);
+         return context;
+      },
+   },
    methods: {
       loadData(){
          getThirdparty(this.id).then(thirdparty => new Promise((resolve, reject) => {

From e9b1f442bc6d7925620ae14813ce055cd8b14839 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 30 Sep 2021 12:02:54 +0200
Subject: [PATCH 58/64] api docs adjusted to patch/post address on thirdparty

---
 .../chill.api.specs.yaml                      | 54 +++----------------
 1 file changed, 8 insertions(+), 46 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
index 50f0af70f..52db7589c 100644
--- a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
@@ -26,22 +26,14 @@ components:
           type: string
         telephone:
           type: string
-        comment:
-          type: string
-    #     centers:
-    #       type: array
-    #       items:
-    #         type: object
-    #         $ref: "#/components/schemas/CenterById"
-    # CenterById:
-    #   type: object
-    #   properties:
-    #     type:
-    #       type: string
-    #       enum:
-    #         - "Center"
-    #     id:
-    #       type: integer
+        address:
+          $ref: "#/components/schemas/Address"
+    Address:
+      type: object
+      properties:
+        id:
+          type: integer
+
 
 paths:
   /1.0/thirdparty/thirdparty.json:
@@ -118,33 +110,3 @@ paths:
           description: "OK"
         422:
           description: "Object with validation errors"
-    put:
-      tags:
-        - thirdparty
-      summary: Edit an existing thirdparty
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The thirdparty's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/Thirdparty"
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "Unprocessable entity (validation errors)"
-        400:
-          description: "Bad Request"

From 2f60ab4d17941040aa618d05d4ba4cfdba0e927a Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 30 Sep 2021 12:35:36 +0200
Subject: [PATCH 59/64] fix chill_resolve_center in person banner when n
 centers > 1

---
 .../Resources/views/Person/banner_custom.html.twig   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
index 564f1803e..378eda5c5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
@@ -17,11 +17,19 @@
         {%- endif -%}
     </div>
     <div class="text-md-end">
-        {% if person|chill_resolve_center is not null%}
+        {% if person|chill_resolve_center is not null %}
             <span class="open_sansbold">
                 {{ 'Center'|trans|upper}} :
             </span>
-            {{  person|chill_resolve_center.name|upper }}
+
+            {% if person|chill_resolve_center is iterable %}
+                {% for c in person|chill_resolve_center %}
+                    {{  c.name|upper }}{% if not loop.last %}, {% endif %}
+                {% endfor %}
+            {% else %}
+                {{  person|chill_resolve_center.name|upper }}
+            {% endif %}
+
         {%- endif -%}
     </div>
 </div>

From 1eb8d04a329d05248b86b4c9bd35b36d605f68a1 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 30 Sep 2021 13:23:11 +0200
Subject: [PATCH 60/64] fix property into json body with endpoint PATCH
 thirdparty

---
 .../Resources/public/vuejs/AccompanyingCourse/store/index.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 22c91b0ef..ca1a89aa9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -293,7 +293,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                   body.name = payload.data.text;
                   body.email = payload.data.email;
                   body.telephone = payload.data.phonenumber;
-                  body.address = { address_id: payload.data.address.address_id };
+                  body.address = { id: payload.data.address.address_id };
                   console.log('id', payload.data.id, 'and body', body);
                   patchThirdparty(payload.data.id, body)
                       .then(thirdparty => new Promise((resolve, reject) => {

From decc3c7463db70002adfdc4cd0e7b5152a1e2ab3 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 30 Sep 2021 13:44:04 +0200
Subject: [PATCH 61/64] otf: replace button by link in show modale

---
 .../public/vuejs/_components/OnTheFly.vue       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
index 329672f4e..5f116e057 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
@@ -42,16 +42,16 @@
          </template>
 
          <template v-slot:footer>
-            <button v-if="action === 'show'"
-               @click="goToLocation(id, type)"
+            <a v-if="action === 'show'"
+               :href="buildLocation(id, type)"
                :title="$t(titleMessage)"
                class="btn btn-show">{{ $t(buttonMessage) }}
-            </button>
-            <button v-else
+            </a>
+            <a v-else
                class="btn btn-save"
                @click="saveAction">
                {{ $t('action.save')}}
-            </button>
+            </a>
          </template>
 
       </modal>
@@ -174,11 +174,12 @@ export default {
 
          this.modal.showModal = false;
       },
-      goToLocation(id, type) {
+      buildLocation(id, type) {
          if (type == 'person') {
-            window.location = `../../person/${id}/general`;
+            // TODO i18n
+            return `/fr/person/${id}/general`;
          } else if (type == 'thirdparty') {
-            window.location = `../../thirdparty/thirdparty/${id}/show`;
+            return `/fr/thirdparty/thirdparty/${id}/show`;
          }
       }
    }

From 577d665f0937afd22f383596ec1c0c933a4cbb77 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 30 Sep 2021 14:36:01 +0200
Subject: [PATCH 62/64] batch replace hideAddress option by onlyButton

---
 .../public/vuejs/Address/components/AddAddress.vue        | 2 +-
 .../public/vuejs/Address/components/ShowPane.vue          | 8 ++++----
 .../Resources/public/vuejs/Address/index.js               | 2 +-
 .../Resources/views/Address/_insert_vue_address.html.twig | 4 ++--
 .../AccompanyingCourse/components/CourseLocation.vue      | 2 +-
 .../vuejs/HouseholdMembersEditor/components/Household.vue | 2 +-
 .../Resources/views/Household/summary.html.twig           | 2 +-
 .../public/vuejs/_components/OnTheFly/ThirdParty.vue      | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 0a2904bff..0aa16d5e3 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -271,7 +271,7 @@ export default {
                validFrom: false,
                validTo: false
             },
-            hideAddress: false
+            onlyButton: false
          },
          entity: {
             address: {}, // <== loaded and returned
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index a4e5c571d..10161f761 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -1,6 +1,6 @@
 <template>
 
-   <div v-if="!hideAddress">
+   <div v-if="!onlyButton">
       <div class="loading">
          <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
          <span class="sr-only">{{ $t('loading') }}</span>
@@ -86,9 +86,9 @@ export default {
       getSuccessText() {
          return (this.context.edit) ? 'address_edit_success' : 'address_new_success';
       },
-      hideAddress() {
-         return (typeof this.options.hideAddress !== 'undefined') ?
-            this.options.hideAddress : this.defaultz.hideAddress;
+      onlyButton() {
+         return (typeof this.options.onlyButton !== 'undefined') ?
+            this.options.onlyButton : this.defaultz.onlyButton;
       },
       forceRedirect() {
          return (!(this.context.backUrl === null || typeof this.context.backUrl === 'undefined'));
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index f0a308b7b..9241aa29d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -53,7 +53,7 @@ containers.forEach((container) => {
                         },
 
                         /// Don't display show renderbox Address: showPane display only a button
-                        hideAddress: container.dataset.hideAddress === 'true'       //boolean, default: false
+                        onlyButton: container.dataset.onlyButton === 'true'       //boolean, default: false
                     }
                 }
             }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
index f4f63c4eb..571f4257f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Address/_insert_vue_address.html.twig
@@ -18,7 +18,7 @@
     * stickyActions         bool (default: false)
     * useValidFrom          bool (default: false)
     * useValidTo            bool (default: false)
-    * hideAddress           bool (default: false)
+    * onlyButton           bool (default: false)
 #}
 <div class="address-container"
 
@@ -69,7 +69,7 @@
         data-use-valid-to="true"
     {% endif %}
 
-    {% if hideAddress is defined and hideAddress == 1 %}
+    {% if onlyButton is defined and onlyButton == 1 %}
         data-hide-address="true"
     {% endif %}
 ></div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 047446be5..79e983301 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -102,7 +102,7 @@ export default {
                   create: 'courselocation.add_temporary_address',
                   edit: 'courselocation.edit_temporary_address'
                },
-               hideAddress: true
+               onlyButton: true
             }
          }
       }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 98f5b0e45..5904737c8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -146,7 +146,7 @@ export default {
             validFrom: false,
             validTo: false,
           },
-          hideAddress: true,
+          onlyButton: true,
           button: {
             text:  {
               create: 'household_members_editor.household.set_address',
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index ceb835d2e..9946bc8bf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -32,7 +32,7 @@
                     {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
                         targetEntity: { name: 'household', id: household.id },
                         backUrl: path('chill_person_household_summary', { 'household_id': household.id }),
-                        hideAddress: true,
+                        onlyButton: true,
                         mode: 'new',
                         buttonSize: 'btn-sm',
                         buttonText: 'Move household',
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 701bf38e8..048b7b013 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -73,7 +73,7 @@ export default {
          addAddress: {
             options: {
                openPanesInModal: true,
-               hideAddress: false,
+               onlyButton: false,
                /*
                button: {
                   text:  {

From 59fed905e97ed9b3e6477cc57b351078e4ef2c30 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 30 Sep 2021 14:37:05 +0200
Subject: [PATCH 63/64] AddAddress: in onlyButton case, button is not in
 ul.record_actions

---
 .../vuejs/Address/components/ActionButtons.vue       | 12 +++++-------
 .../public/vuejs/Address/components/ShowPane.vue     | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
index 501d14e03..a90cb4bb9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
@@ -1,17 +1,18 @@
 <template>
-   <ul class="record_actions"
+   <ul class="record_actions" v-if="!options.onlyButton"
       :class="{ 'sticky-form-buttons': isStickyForm }">
 
       <li v-if="isStickyForm" class="cancel">
          <slot name="before"></slot>
       </li>
-
-      <slot name="action"></slot>
-
+      <li>
+        <slot name="action"></slot>
+      </li>
       <li v-if="isStickyForm">
          <slot name="after"></slot>
       </li>
    </ul>
+    <slot v-else name="action"></slot>
 </template>
 
 <script>
@@ -23,9 +24,6 @@ export default {
          return (typeof this.options.stickyActions !== 'undefined') ?
             this.options.stickyActions : this.defaultz.stickyActions;
       },
-   },
-   methods: {
-
    }
 }
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index 10161f761..8f80b840e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -28,13 +28,11 @@
       :options="this.options"
       :defaultz="this.defaultz">
       <template v-slot:action>
-         <li>
-            <button @click.prevent="$emit('openEditPane')"
-               class="btn" :class="getClassButton"
-               type="button" name="button" :title="$t(getTextButton)">
-               <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
-            </button>
-         </li>
+         <button @click.prevent="$emit('openEditPane')"
+            class="btn" :class="getClassButton"
+            type="button" name="button" :title="$t(getTextButton)">
+            <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
+         </button>
       </template>
    </action-buttons>
 

From 92e6506ecbba4d2ff12acbcf142e720738ecdcce Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 30 Sep 2021 14:46:21 +0200
Subject: [PATCH 64/64] tp: adapt controller/entity/formtype to works with new
 ACL (TO BE CHECKED)

* rename type by types -> getTypes() getter
* adapt controller to fix centers errors
* remove voteOnAttribute return always true in voter
---
 .../Controller/ThirdPartyController.php       | 53 +++++--------------
 .../Entity/ThirdParty.php                     |  2 +-
 .../Form/ThirdPartyType.php                   |  6 +--
 .../views/ThirdParty/index.html.twig          |  2 +-
 .../Resources/views/ThirdParty/new.html.twig  |  2 +-
 .../Resources/views/ThirdParty/show.html.twig |  2 +-
 .../views/ThirdParty/update.html.twig         |  2 +-
 .../Security/Voter/ThirdPartyVoter.php        |  2 -
 8 files changed, 22 insertions(+), 49 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
index d16934b18..23b8d3542 100644
--- a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
@@ -60,22 +60,12 @@ class ThirdPartyController extends Controller
         $this->denyAccessUnlessGranted(ThirdPartyVoter::SHOW);
         $repository = $this->getDoctrine()->getManager()
             ->getRepository(ThirdParty::class);
-        
-        $centers = $this->authorizationHelper
-            ->getReachableCenters(
-                $this->getUser(), 
-                new Role(ThirdPartyVoter::SHOW)
-                );
-        
-        $nbThirdParties = $repository->countByMemberOfCenters($centers);
+
+        $nbThirdParties = $repository->count([]); //$repository->countByMemberOfCenters($centers);
         $pagination = $this->paginatorFactory->create($nbThirdParties);
-        
-        $thirdParties = $repository->findByMemberOfCenters(
-            $centers,
-            $pagination->getCurrentPage()->getFirstItemNumber(),
-            $pagination->getItemsPerPage()
-        );
-        
+
+        $thirdParties = $repository->findAll();
+
         return $this->render('ChillThirdPartyBundle:ThirdParty:index.html.twig', array(
             'third_parties' => $thirdParties,
             'pagination' => $pagination
@@ -88,18 +78,9 @@ class ThirdPartyController extends Controller
     public function newAction(Request $request)
     {
         $this->denyAccessUnlessGranted(ThirdPartyVoter::CREATE);
-        
-        $centers = $this->authorizationHelper
-            ->getReachableCenters(
-                $this->getUser(), 
-                new Role(ThirdPartyVoter::CREATE)
-                );
-        
-        if (count($centers) === 0) {
-            throw new \LogicException("There should be at least one center reachable "
-                . "if role ".ThirdPartyVoter::CREATE." is granted");
-        }
-        
+
+        $centers = [];
+
         $thirdParty = new ThirdParty();
         $thirdParty->setCenters(new ArrayCollection($centers));
         
@@ -141,18 +122,12 @@ class ThirdPartyController extends Controller
     public function updateAction(ThirdParty $thirdParty, Request $request)
     {
        $this->denyAccessUnlessGranted(ThirdPartyVoter::CREATE);
-        
-        $centers = $this->authorizationHelper
-            ->getReachableCenters(
-                $this->getUser(), 
-                new Role(ThirdPartyVoter::CREATE)
-                );
-        
-        if (count($centers) === 0) {
-            throw new \LogicException("There should be at least one center reachable "
-                . "if role ".ThirdPartyVoter::CREATE." is granted");
-        }
-        
+
+        $repository = $this->getDoctrine()->getManager()
+            ->getRepository(ThirdParty::class);
+
+        $centers = $repository->findAll();
+
         // we want to keep centers the users has no access to. So we will add them
         // later if they are removed. (this is a ugly hack but it will works
         $centersAssociatedNotForUsers = \array_diff(
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 30f28791b..21d74f17e 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -341,7 +341,7 @@ class ThirdParty
      */
     public function getTypes()
     {
-        return $this->type;
+        return $this->types;
     }
 
     /**
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index 2ec113eb9..8eae938f6 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -64,10 +64,10 @@ class ThirdPartyType extends AbstractType
         }
         if (count($types) === 1) {
             $builder
-                ->add('type', HiddenType::class, [
+                ->add('types', HiddenType::class, [
                     'data' => array_values($types)
                 ])
-                ->get('type')
+                ->get('types')
                     ->addModelTransformer(new CallbackTransformer(
                     function (?array $typeArray): ?string {
                         if (null === $typeArray) {
@@ -84,7 +84,7 @@ class ThirdPartyType extends AbstractType
                 ))
             ;
         } else {
-            $builder->add('type', ChoiceType::class, [
+            $builder->add('types', ChoiceType::class, [
                 'choices' => $types,
                 'expanded' => true,
                 'multiple' => true,
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
index fa9ad8b8b..1cd1a6257 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
@@ -51,7 +51,7 @@
                             <th>{{ (tp.active ? '<i class="fa fa-check chill-green">' : '<i class="fa fa-times chill-red">')|raw }}</th>
                             <td>{{ tp.name }}</td>
                             {% set types = [] %}
-                            {% for t in tp.type %}
+                            {% for t in tp.types %}
                                 {% set types = types|merge( [ ('chill_3party.key_label.'~t)|trans ] ) %}
                             {% endfor %}
                             <td>{{ types|join(', ') }}</td>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
index 002cc87e8..319083649 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
@@ -26,7 +26,7 @@
                 {{ form_row(form.profession) }}
             {% endif %}
 
-            {{ form_row(form.type) }}
+            {{ form_row(form.types) }}
             {{ form_row(form.categories) }}
 
             {{ form_row(form.telephone) }}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
index d711bdefa..a8dc587d7 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
@@ -48,7 +48,7 @@
 
                 <dt>{{ 'Type'|trans }}</dt>
                 {% set types = [] %}
-                {% for t in thirdParty.type %}
+                {% for t in thirdParty.types %}
                     {% set types = types|merge( [ ('chill_3party.key_label.'~t)|trans ] ) %}
                 {% endfor %}
                 <dd>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index 01837db05..4433d934b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -43,7 +43,7 @@
                 {{ form_row(form.profession) }}
             {% endif %}
 
-            {{ form_row(form.type) }}
+            {{ form_row(form.types) }}
             {{ form_row(form.categories) }}
 
             {{ form_row(form.telephone) }}
diff --git a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
index ab78c7701..986bfb2b9 100644
--- a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
+++ b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
@@ -56,8 +56,6 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        return true;
-
         $user = $token->getUser();
         
         if (!$user instanceof User) {