From d8b2d3cd901d81de8dc5de7a89e04acf7ea79ecb Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 2 Sep 2021 22:19:03 +0200 Subject: [PATCH 1/5] rename address-render-box component (cfr b9602aa72 - file had been moved and renamed, now we just rename component name into import and template ) --- .../public/vuejs/Address/components/ShowAddressPane.vue | 6 +++--- .../AccompanyingCourse/components/ButtonLocation.vue | 6 +++--- .../AccompanyingCourse/components/CourseLocation.vue | 8 ++++---- .../public/vuejs/AccompanyingCourseWorkEdit/App.vue | 8 ++++---- .../vuejs/HouseholdMembersEditor/components/Household.vue | 6 +++--- .../vuejs/_components/Entity/HouseholdRenderBox.vue | 6 +++--- .../public/vuejs/_components/Entity/PersonRenderBox.vue | 6 +++--- .../vuejs/_components/Entity/ThirdPartyRenderBox.vue | 6 +++--- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue index 738c1ab08..d3894f972 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue @@ -11,7 +11,7 @@ {{ $t(getSuccessText) }} - +

{{ $t(getValidFromDateText) }}

@@ -48,12 +48,12 @@ 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 5eeda6ac7..19d35381c 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue @@ -29,7 +29,7 @@ v-bind:options="this.options" v-bind:default="this.default" v-bind:entity="this.entity" - v-bind:valid="this.valid" + v-bind:valid="this.context.valid" v-bind:flag="this.flag" ref="showAddress"> @@ -55,7 +55,7 @@ v-bind:options="this.options" v-bind:default="this.default" v-bind:entity="this.entity" - v-bind:valid="this.valid" + v-bind:valid="this.context.valid" v-bind:flag="this.flag" ref="showAddress" v-bind:insideModal="false" @openEditPane="openEditPane" @@ -182,10 +182,6 @@ export default { zoom: 12 }, }, - valid: { - from: new Date(), - to: null - }, errorMsg: [] } }, @@ -475,17 +471,17 @@ export default { postPostalCode(postcodeBody) .then(postalCode => { payload.newAddress.postcode = {'id': postalCode.id }; - this.patchExistingAddress(payload.addressId, payload.newAddress); + this.patchExistingAddress(payload); }); } else { - this.patchExistingAddress(payload.addressId, payload.newAddress); + this.patchExistingAddress(payload); } }, - patchExistingAddress(addressId, newAddress) { - console.log('patchExistingAddress', addressId, newAddress); - patchAddress(addressId, newAddress) + patchExistingAddress(payload) { + console.log('patchExistingAddress', payload); + patchAddress(payload.addressId, payload.newAddress) .then(address => new Promise((resolve, reject) => { this.entity.address = address; this.flag.loading = false; @@ -499,7 +495,7 @@ export default { }, /* - * When submit address + * Method called by parent when submitting address * (get out step1 show pane, submit button) */ submitNewAddress() @@ -507,92 +503,16 @@ export default { let payload = { entity: this.context.entity.type, entityId: this.context.entity.id, - addressId: this.entity.address.address_id, - body: { - validFrom: { - datetime: `${this.valid.from.toISOString().split('T')[0]}T00:00:00+0100` - } - }, - backUrl: this.context.backUrl - } + addressId: this.entity.address.address_id + }; - if ( payload.entity !== 'person' && payload.entity !== 'household' ) { - - // just return payload to parent - // (changes will be patched in parent store) - this.initForm(); - this.flag.showPane = false; - return payload; - } - - console.log('submitNewAddress with', payload); - this.addDateToAddressAndAddressTo(payload); + console.log('submitNewAddress return', payload); this.initForm(); this.flag.showPane = false; - }, - - addDateToAddressAndAddressTo(payload) - { - console.log('addDateToAddressAndAddressTo', payload.entity) - this.flag.loading = true; - return patchAddress(payload.addressId, payload.body) - .then(address => new Promise((resolve, reject) => { - this.valid.from = address.validFrom; - resolve(); - }) - .then(this.postAddressTo(payload)) - ) - .catch((error) => { - this.errorMsg.push(error); - this.flag.loading = false; - }); - }, - - postAddressTo(payload) - { - console.log('postAddressTo', payload.entity); - if (!this.context.edit) { - switch (payload.entity) { - case 'household': - postAddressToHousehold(payload.entityId, payload.addressId) - .then(household => new Promise((resolve, reject) => { - console.log('postAddressToHousehold', household); - this.flag.loading = false; - this.flag.success = true; - window.location.assign(payload.backUrl); - resolve(); - })) - .catch((error) => { - this.errorMsg.push(error); - this.flag.loading = false; - }) - ; - break; - case 'person': - postAddressToPerson(payload.entityId, payload.addressId) - .then(person => new Promise((resolve, reject) => { - console.log('postAddressToPerson', person); - this.flag.loading = false; - this.flag.success = true; - window.location.assign(payload.backUrl); - resolve(); - })) - .catch((error) => { - this.errorMsg.push(error); - this.flag.loading = false; - }) - ; - break; - default: - this.errorMsg.push('That entity is not managed by address !'); - } - } else { - // address is already linked, just finish ! - window.location.assign(payload.backUrl); - } - }, + return payload; + } } }