Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-06 23:04:58 +00:00
Code Issues Actions Projects Releases Wiki Activity

prepare vue Address to be used too in accompanyingCourse context

Browse Source 
i18n is managed by root component:
* ok for person and household implementation (=> they use Address root component)
* but must be imported in vue i18n file if called from another component

submitAddress is emit to parent, it allow to control final action:
* casting final submitNewAddress with POST requests (for person or household entity);
* or dispatching changes from store, casting only payload to be used.

remove and simplify some options: backurl is always used with person/household,
and never if called from another vue component.
This commit is contained in:
Mathieu Jaumotte
2021-08-13 15:43:37 +02:00
parent 4b69f97e2f
commit 2f28e02f65
4 changed files with 79 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
View File

@@ -18,7 +18,7 @@
<h2 class="modal-title">{{ $t(getTextTitle) }}
<span v-if="flag.loading" class="loading">
<i class="fa fa-circle-o-notch fa-spin fa-fw"></i>
<span class="sr-only">Loading...</span>
<span class="sr-only">{{ $t('loading') }}</span>
</span>
</h2>
</template>
@@ -41,7 +41,7 @@
{{ $t('action.edit')}}
</button>
<button class="btn btn-save"
@click="submitAddress">
@click.prevent="$emit('submitAddress')">
{{ $t('action.save')}}
</button>
</template>
@@ -59,7 +59,7 @@
v-bind:flag="this.flag"
ref="showAddress"
v-bind:insideModal="false" @openEditPane="openEditPane"
@submitAddress="submitAddress">
@submitAddress="$emit('submitAddress')">
</show-address>
</div>
@@ -73,7 +73,7 @@
<h2 class="modal-title">{{ $t(getTextTitle) }}
<span v-if="flag.loading" class="loading">
<i class="fa fa-circle-o-notch fa-spin fa-fw"></i>
<span class="sr-only">Loading...</span>
<span class="sr-only">{{ $t('loading') }}</span>
</span>
</h2>
</template>
@@ -125,14 +125,10 @@ import { postAddressToPerson, postAddressToHousehold } from "ChillPersonAssets/v
import ShowAddress from './ShowAddress.vue';
import EditAddress from './EditAddress.vue';
import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
import { addressMessages } from '../i18n'
const i18n = _createI18n(addressMessages);
export default {
name: "AddAddress",
props: ['context', 'options', 'result'],
i18n,
emits: ['submitAddress'],
components: {
Modal,
ShowAddress,
@@ -519,9 +515,10 @@ export default {
* When submit address
* (get out step1 show pane, submit button)
*/
submitAddress()
submitNewAddress()
{
let payload = {
entity: this.context.entity.type,
entityId: this.context.entity.id,
addressId: this.entity.address.address_id,
body: {
@@ -532,25 +529,32 @@ export default {
backUrl: this.context.backUrl
}
console.log('@@@ CLICK button submitAddress for', this.context.entity.type, 'with payload', payload);
this.addDateToAddressAndAddressTo(payload, this.context.entity.type);
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);
this.initForm();
this.flag.showPane = false;
},
addDateToAddressAndAddressTo(payload, postTo)
addDateToAddressAndAddressTo(payload)
{
console.log('addDateToAddressAndAddressTo', postTo)
console.log('addDateToAddressAndAddressTo', payload.entity)
this.flag.loading = true;
patchAddress(payload.addressId, payload.body)
return patchAddress(payload.addressId, payload.body)
.then(address => new Promise((resolve, reject) => {
this.valid.from = address.validFrom;
resolve();
})
.then(
this.postAddressTo(payload, postTo)
)
.then(this.postAddressTo(payload))
)
.catch((error) => {
this.errorMsg.push(error);
@@ -558,11 +562,11 @@ export default {
});
},
postAddressTo(payload, postTo)
postAddressTo(payload)
{
console.log('postAddressTo', postTo);
console.log('postAddressTo', payload.entity);
if (!this.context.edit) {
switch (postTo) {
switch (payload.entity) {
case 'household':
postAddressToHousehold(payload.entityId, payload.addressId)
.then(household => new Promise((resolve, reject) => {
@@ -571,9 +575,7 @@ export default {
this.flag.loading = false;
this.flag.success = true;
if (this.options.redirectToBackUrl) {
window.location.assign(payload.backUrl);
}
window.location.assign(payload.backUrl);
resolve();
}))
.catch((error) => {
@@ -582,9 +584,7 @@ export default {
})
;
break;
case 'person':
default:
postAddressToPerson(payload.entityId, payload.addressId)
.then(person => new Promise((resolve, reject) => {
@@ -593,9 +593,7 @@ export default {
this.flag.loading = false;
this.flag.success = true;
if (this.options.redirectToBackUrl) {
window.location.assign(payload.backUrl);
}
window.location.assign(payload.backUrl);
resolve();
}))
.catch((error) => {
@@ -603,12 +601,12 @@ export default {
this.flag.loading = false;
})
;
break;
default:
this.errorMsg.push('That entity is not managed by address !');
}
} else {
// address is already posted, just finish !
if (this.options.redirectToBackUrl) {
window.location.assign(payload.backUrl);
}
} else { // address is already linked, just finish !
window.location.assign(payload.backUrl);
}
},