Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue

@@ -20,7 +20,6 @@
             <div class="form-check" v-for="p in participationWithoutHousehold" :key="p.id">
                <input type="checkbox"
                   class="form-check-input"
-                  v-model="hasNoHousehold"
                   name="persons[]"
                   checked="checked"
                   :id="p.person.id"

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue

@@ -97,16 +97,10 @@ export default {
     ...mapGetters(['isJobValid', 'usersSuggestedFilteredByJob']),
     users: function () {
       let users = this.$store.getters.usersFilteredByJob;
-
-      console.log('users filtered by job', users);
-
       // ensure that the selected user is in the list. add it if necessary
       if (this.$store.state.accompanyingCourse.user !== null && users.find(u => this.$store.state.accompanyingCourse.user.id === u.id) === undefined) {
-        console.log('add user to users');
         users.push(this.$store.state.accompanyingCourse.user);
       }
-
-      console.log('users to return', users);
       return users;
     },
     valueJob: {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue

@@ -6,7 +6,7 @@
    <div v-if="accompanyingCourse.requestor && isAnonymous" class="flex-table">
 
       <label>
-         <input type="checkbox" v-model="isAnonymous" class="me-2" />
+         <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
       <confidential v-if="accompanyingCourse.requestor.type === 'thirdparty'">
@@ -72,7 +72,7 @@
 
    <div v-else-if="accompanyingCourse.requestor && !isAnonymous" class="flex-table">
       <label>
-         <input type="checkbox" v-model="isAnonymous" class="me-2" />
+         <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
 
@@ -199,7 +199,7 @@ export default {
       ...mapState({
          suggestedEntities: state => {
            return [
-               ...state.accompanyingCourse.participations.map(p => p.person),
+               ...state.accompanyingCourse.participations.filter((p) => p.endDate === null).map((p) => p.person),
                ...state.accompanyingCourse.resources.map(r => r.resource)
              ]
                .filter((e) => e !== null)
@@ -218,7 +218,7 @@ export default {
       accompanyingCourse() {
          return this.$store.state.accompanyingCourse
       },
-      isAnonymous: {
+      requestorIsAnonymous: {
          set(value) {
             this.$store.dispatch('requestorIsAnonymous', value);
          },
@@ -287,7 +287,9 @@ export default {
             body.name = payload.data.text;
             body.email = payload.data.email;
             body.telephone = payload.data.phonenumber;
-            body.address = { id: payload.data.address.address_id };
+            if (payload.data.address) {
+                body.address = { id: payload.data.address.address_id };
+            }
 
             makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
                .then(response => {

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

@@ -77,7 +77,7 @@ export default {
       counter: state => state.accompanyingCourse.resources.length,
       suggestedEntities: state => [
             state.accompanyingCourse.requestor,
-            ...state.accompanyingCourse.participations.map(p => p.person),
+            ...state.accompanyingCourse.participations.filter((p) => p.endDate === null).map((p) => p.person),
          ]
          .filter((e) => e !== null)
          .filter(

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue

@@ -159,18 +159,19 @@ export default {
                .catch((error) => {
                   if (error.name === 'ValidationException') {
                      for (let v of error.violations) {
-                         this.$toast.open({message: v });
+                        this.$toast.open({message: v });
                      }
                   } else {
-                      this.$toast.open({message: 'An error occurred'});
+                     this.$toast.open({message: 'An error occurred'});
                   }
                })
          }
          else if (payload.type === 'thirdparty') {
+            console.log('data', payload.data)
             body.name = payload.data.text;
             body.email = payload.data.email;
             body.telephone = payload.data.phonenumber;
-            body.address = { id: payload.data.address.address_id };
+            body.address = payload.data.address ? { id: payload.data.address.address_id } :  null;
 
             makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
                .then(response => {
@@ -180,10 +181,10 @@ export default {
                .catch((error) => {
                   if (error.name === 'ValidationException') {
                      for (let v of error.violations) {
-                         this.$toast.open({message: v });
+                        this.$toast.open({message: v });
                      }
                   } else {
-                      this.$toast.open({message: 'An error occurred'});
+                     this.$toast.open({message: 'An error occurred'});
                   }
                })
          }

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

@@ -428,42 +428,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                      throw error;
                   })
             },
-            /**
-             * On The Fly
-             */
-            patchOnTheFly({ commit }, payload) {
-               // TODO should be into the dedicated component, no ? JF
-               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.text;
-                  body.email = payload.data.email;
-                  body.telephone = payload.data.phonenumber;
-                  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) => {
-                        console.log('patch thirdparty', thirdparty);
-                        commit('updateThirdparty', { target: payload.target, thirdparty: thirdparty });
-                        resolve();
-                  }));
-               }
-            },
             /**
              * Update accompanying course intensity/emergency/confidentiality
              */