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

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

@@ -56,14 +56,18 @@
    </div>
 
    <div>
-      <add-persons
-         buttonTitle="persons_associated.add_persons"
-         modalTitle="add_persons.title"
-         v-bind:key="addPersons.key"
-         v-bind:options="addPersons.options"
-         @addNewPersons="addNewPersons"
-         ref="addPersons"> <!-- to cast child method -->
-      </add-persons>
+      <ul class="record_actions">
+         <li class="add-persons">
+            <add-persons
+               buttonTitle="persons_associated.add_persons"
+               modalTitle="add_persons.title"
+               v-bind:key="addPersons.key"
+               v-bind:options="addPersons.options"
+               @addNewPersons="addNewPersons"
+               ref="addPersons"> <!-- to cast child method -->
+            </add-persons>
+         </li>
+      </ul>
    </div>
 
    <div v-if="!isParticipationValid" class="alert alert-warning to-confirm">

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

@@ -10,6 +10,7 @@
                addAge : true,
                hLevel : 3,
                isConfidential :  false,
+               isMultiline: true,
             }"
       :person="participation.person"
       :returnPath="getAccompanyingCourseReturnPath">
@@ -28,7 +29,7 @@
                </a>
             </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" :canCloseModal="canCloseOnTheFlyModal"></on-the-fly></li>
+            <li><on-the-fly :type="participation.person.type" :id="participation.person.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly" ref="onTheFly"></on-the-fly></li>
             <li>
                <button v-if="!participation.endDate"
                   class="btn btn-sm btn-remove"
@@ -90,7 +91,6 @@ export default {
                hLevel: 1
             }
          },
-         canCloseOnTheFlyModal: false
       }
    },
    computed: {
@@ -120,12 +120,14 @@ export default {
             if (payload.data.birthdate !== null) { body.birthdate = payload.data.birthdate; }
             body.phonenumber = payload.data.phonenumber;
             body.mobilenumber = payload.data.mobilenumber;
+            body.email = payload.data.email;
+            body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {
-                  this.$store.dispatch('addPerson', { target: payload.target, body: response })
-                  this.canCloseOnTheFlyModal = true;
+                  this.$store.dispatch('addPerson', { target: payload.target, body: response });
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {
@@ -143,10 +145,10 @@ export default {
             body.telephone = payload.data.phonenumber;
             body.address = { id: payload.data.address.address_id };
 
-            makeFetch('PATCH', `/api/1.0/third-party/third-party/${payload.data.id}.json`, body)
+            makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
                .then(response => {
                   this.$store.dispatch('addThirdparty', { target: payload.target, body: response })
-                  this.canCloseOnTheFlyModal = true;
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {

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

@@ -26,7 +26,7 @@
             <template v-slot:record-actions>
                <ul class="record_actions">
                   <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>
+                  <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly" ref="onTheFly"></on-the-fly></li>
                </ul>
             </template>
             </third-party-render-box>
@@ -52,7 +52,7 @@
                <template v-slot:record-actions>
                   <ul class="record_actions">
                      <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>
+                     <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly" ref="onTheFly"></on-the-fly></li>
                   </ul>
                </template>
             </person-render-box>
@@ -92,7 +92,7 @@
          <template v-slot:record-actions>
             <ul class="record_actions">
                <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>
+               <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly" ref="onTheFly"></on-the-fly></li>
             </ul>
          </template>
       </third-party-render-box>
@@ -114,7 +114,7 @@
          <template v-slot:record-actions>
             <ul class="record_actions">
                <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" :canCloseModal="canCloseOnTheFlyModal"></on-the-fly></li>
+               <li><on-the-fly :type="accompanyingCourse.requestor.type" :id="accompanyingCourse.requestor.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly" ref="onTheFly"></on-the-fly></li>
             </ul>
          </template>
       </person-render-box>
@@ -144,14 +144,18 @@
    </div>
 
    <div>
-      <add-persons v-if="accompanyingCourse.requestor === null"
-         buttonTitle="requestor.add_requestor"
-         modalTitle="requestor.add_requestor"
-         v-bind:key="addPersons.key"
-         v-bind:options="addPersons.options"
-         @addNewPersons="addNewPersons"
-         ref="addPersons"> <!-- to cast child method -->
-      </add-persons>
+      <ul class="record_actions">
+         <li class="add-persons">
+            <add-persons v-if="accompanyingCourse.requestor === null"
+               buttonTitle="requestor.add_requestor"
+               modalTitle="requestor.add_requestor"
+               v-bind:key="addPersons.key"
+               v-bind:options="addPersons.options"
+               @addNewPersons="addNewPersons"
+               ref="addPersons"> <!-- to cast child method -->
+            </add-persons>
+         </li>
+      </ul>
    </div>
 
 </div>
@@ -189,7 +193,6 @@ export default {
                uniq: true,
             }
          },
-         canCloseOnTheFlyModal: false
       }
    },
    computed: {
@@ -261,12 +264,14 @@ export default {
             if (payload.data.birthdate !== null) { body.birthdate = payload.data.birthdate; }
             body.phonenumber = payload.data.phonenumber;
             body.mobilenumber = payload.data.mobilenumber;
+            body.email = payload.data.email;
+            body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {
                   this.$store.dispatch('addPerson', { target: payload.target, body: response })
-                  this.canCloseOnTheFlyModal = true;
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {
@@ -284,10 +289,10 @@ export default {
             body.telephone = payload.data.phonenumber;
             body.address = { id: payload.data.address.address_id };
 
-            makeFetch('PATCH', `/api/1.0/third-party/third-party/${payload.data.id}.json`, body)
+            makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
                .then(response => {
                   this.$store.dispatch('addThirdparty', { target: payload.target, body: response })
-                  this.canCloseOnTheFlyModal = true;
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {

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

@@ -29,14 +29,18 @@
    </div>
 
    <div>
-      <add-persons
-      buttonTitle="resources.add_resources"
-      modalTitle="resources.add_resources"
-      v-bind:key="addPersons.key"
-      v-bind:options="addPersons.options"
-      @addNewPersons="addNewPersons"
-      ref="addPersons"> <!-- to cast child method -->
-      </add-persons>
+      <ul class="record_actions">
+         <li class="add-persons">
+            <add-persons
+            buttonTitle="resources.add_resources"
+            modalTitle="resources.add_resources"
+            v-bind:key="addPersons.key"
+            v-bind:options="addPersons.options"
+            @addNewPersons="addNewPersons"
+            ref="addPersons"> <!-- to cast child method -->
+            </add-persons>
+         </li>
+      </ul>
    </div>
 
 </div>

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

@@ -35,7 +35,7 @@
                   :id="resource.resource.id"
                   action="edit"
                   @saveFormOnTheFly="saveFormOnTheFly"
-                  :canCloseModal="canCloseOnTheFlyModal">
+                  ref="onTheFly">
                </on-the-fly>
             </li>
             <li>
@@ -82,7 +82,7 @@
                   :id="resource.resource.id"
                   action="edit"
                   @saveFormOnTheFly="saveFormOnTheFly"
-                  :canCloseModal="canCloseOnTheFlyModal">
+                  ref="onTheFly">
                </on-the-fly>
             </li>
             <li>
@@ -116,11 +116,6 @@ export default {
    },
    props: ['resource'],
    emits: ['remove'],
-   data() {
-      return {
-         canCloseOnTheFlyModal: false
-      }
-   },
    computed: {
       parent() {
          return {
@@ -152,12 +147,14 @@ export default {
             if (payload.data.birthdate !== null) { body.birthdate = payload.data.birthdate; }
             body.phonenumber = payload.data.phonenumber;
             body.mobilenumber = payload.data.mobilenumber;
+            body.email = payload.data.email;
+            body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {
                   this.$store.dispatch('addPerson', { target: payload.target, body: response })
-                  this.canCloseOnTheFlyModal = true;
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {
@@ -175,10 +172,10 @@ export default {
             body.telephone = payload.data.phonenumber;
             body.address = { id: payload.data.address.address_id };
 
-            makeFetch('PATCH', `/api/1.0/third-party/third-party/${payload.data.id}.json`, body)
+            makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
                .then(response => {
                   this.$store.dispatch('addThirdparty', { target: payload.target, body: response })
-                  this.canCloseOnTheFlyModal = true;
+                  this.$refs.onTheFly.closeModal();
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {