mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-08-21 07:03:49 +00:00
patch Address to accompanyingPeriod: build payload for differents cases
use uniq patch api endpoint, build payload body in action, call updateAddress action when submitting, assigning or removing.
This commit is contained in:
@@ -9,12 +9,26 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {mapState} from "vuex";
|
||||
|
||||
export default {
|
||||
name: "ButtonLocation",
|
||||
props: ['person'],
|
||||
computed: {
|
||||
...mapState({
|
||||
context: state => state.addressContext
|
||||
}),
|
||||
},
|
||||
methods: {
|
||||
assignAddress() {
|
||||
console.log('assignAddress id', this.person.current_household_address.address_id);
|
||||
console.log('assignAddress id', this.person.current_household_address);
|
||||
let payload = {
|
||||
entity: this.context.entity.type,
|
||||
entityId: this.context.entity.id,
|
||||
addressToPatch: 'person',
|
||||
personId: this.person.id
|
||||
};
|
||||
this.$store.dispatch('updateLocation', payload);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -23,7 +23,7 @@
|
||||
<ul class="record_actions">
|
||||
<li>
|
||||
<add-address
|
||||
v-if="hasTemporaryAddressButton"
|
||||
v-if="!isPersonLocation"
|
||||
:context="context"
|
||||
:key="addAddress.type"
|
||||
:options="addAddress.options"
|
||||
@@ -32,11 +32,12 @@
|
||||
ref="addAddress">
|
||||
</add-address>
|
||||
</li>
|
||||
<li>
|
||||
<button v-if="isContextEdit"
|
||||
<li v-if="isContextEdit && isPersonLocation">
|
||||
<button
|
||||
class="btn btn-remove"
|
||||
@click="removeAddress"
|
||||
:title="$t('courselocation.remove_button')"></button>
|
||||
:title="$t('courselocation.remove_button')">
|
||||
</button>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@@ -85,12 +86,12 @@ export default {
|
||||
accompanyingCourse: state => state.accompanyingCourse,
|
||||
context: state => state.addressContext
|
||||
}),
|
||||
hasTemporaryAddressButton() { // return true if locationStatus equal 'none' or 'address'
|
||||
return this.accompanyingCourse.locationStatus !== 'person';
|
||||
},
|
||||
isTemporaryAddress() {
|
||||
return this.accompanyingCourse.locationStatus === 'address';
|
||||
},
|
||||
isPersonLocation() {
|
||||
return this.accompanyingCourse.locationStatus === 'person';
|
||||
},
|
||||
isContextEdit() {
|
||||
return this.context.edit;
|
||||
}
|
||||
@@ -117,6 +118,12 @@ export default {
|
||||
},
|
||||
removeAddress() {
|
||||
console.log('remove address');
|
||||
let payload = {
|
||||
entity: this.context.entity.type,
|
||||
entityId: this.context.entity.id,
|
||||
addressToPatch: 'none'
|
||||
};
|
||||
this.$store.dispatch('updateLocation', payload);
|
||||
},
|
||||
displayErrors() {
|
||||
return this.$refs.addAddress.errorMsg;
|
||||
@@ -125,7 +132,9 @@ export default {
|
||||
console.log('@@@ click on Submit Address Button');
|
||||
|
||||
let payload = this.$refs.addAddress.submitNewAddress();
|
||||
console.log('payload from parent', payload);
|
||||
|
||||
// precise in payload that it is a temporary address
|
||||
payload['addressToPatch'] = 'address';
|
||||
|
||||
this.$store.dispatch('updateLocation', payload);
|
||||
}
|
||||
|
@@ -1,6 +1,5 @@
|
||||
import 'es6-promise/auto';
|
||||
import { createStore } from 'vuex';
|
||||
import { patchAddressToAccompanyingPeriod } from "../../_api/AddAddress.js";
|
||||
import { getAccompanyingCourse,
|
||||
patchAccompanyingCourse,
|
||||
confirmAccompanyingCourse,
|
||||
@@ -225,7 +224,21 @@ let initPromise = getAccompanyingCourse(id)
|
||||
/////
|
||||
updateLocation({ commit }, payload) {
|
||||
console.log('## action: updateLocation', payload);
|
||||
patchAddressToAccompanyingPeriod(payload.entityId, payload.addressId)
|
||||
let body = { 'type': payload.entity, 'id': payload.entityId };
|
||||
let location = {};
|
||||
if (payload.addressToPatch === 'person') {
|
||||
// payload to patch person address (don't remove addressLocation)
|
||||
location = { 'personLocation': { 'type': 'person', 'id': payload.personId }};
|
||||
}
|
||||
else if(payload.addressToPatch === 'address') {
|
||||
// payload to patch temporary address
|
||||
location = { 'personLocation': null, 'addressLocation': { 'id': payload.addressId }};
|
||||
}
|
||||
else {
|
||||
location = { 'personLocation': null };
|
||||
}
|
||||
Object.assign(body, location);
|
||||
patchAccompanyingCourse(payload.entityId, body)
|
||||
.then(accompanyingCourse => new Promise((resolve, reject) => {
|
||||
commit('updateLocation', {
|
||||
location: accompanyingCourse.location,
|
||||
|
Reference in New Issue
Block a user