diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index c0d3271ef..438e94892 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -26,6 +26,12 @@
@@ -68,6 +74,12 @@ export default {
},
errors() {
return this.$store.state.errorMsg;
+ },
+ loading() {
+ return this.$store.state.loading;
+ },
+ success() {
+ return this.$store.state.success;
}
},
methods: {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
index b6f483894..d0e43266a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js
@@ -26,7 +26,9 @@ const addressMessages = {
date: 'Date de la nouvelle adresse',
add_an_address_to_person: 'Ajouter l\'adresse à la personne',
validFrom: 'Date de la nouvelle adresse',
- back_to_the_list: 'Retour à la liste'
+ back_to_the_list: 'Retour à la liste',
+ person_address_creation_success: 'La nouvelle adresse de la personne est enregistrée',
+ loading: 'chargement en cours...'
}
};
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
index acbf4dcbb..9db2a7298 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js
@@ -11,7 +11,9 @@ const store = createStore({
address: {},
editAddress: {}, //TODO or should be address?
person: {},
- errorMsg: []
+ errorMsg: [],
+ loading: false,
+ success: false
},
getters: {
},
@@ -39,11 +41,17 @@ const store = createStore({
console.log('@M getEditAddress address', address);
state.editAddress = address;
},
+ setLoading(state, b) {
+ state.loading = b;
+ },
+ setSuccess(state, b) {
+ state.success = b;
+ }
},
actions: {
addAddress({ commit }, payload) {
console.log('@A addAddress payload', payload);
-
+ commit('setLoading', true);
if('newPostalCode' in payload){
let postalCodeBody = payload.newPostalCode;
postalCodeBody = Object.assign(postalCodeBody, {'origin': 3});
@@ -55,9 +63,11 @@ const store = createStore({
.then(address => new Promise((resolve, reject) => {
commit('addAddress', address);
resolve();
+ commit('setLoading', false);
}))
.catch((error) => {
commit('catchError', error);
+ commit('setLoading', false);
});
})
@@ -66,15 +76,17 @@ const store = createStore({
.then(address => new Promise((resolve, reject) => {
commit('addAddress', address);
resolve();
+ commit('setLoading', false);
}))
.catch((error) => {
commit('catchError', error);
+ commit('setLoading', false);
});
}
},
addDateToAddressAndAddressToPerson({ commit }, payload) {
console.log('@A addDateToAddressAndAddressToPerson payload', payload);
-
+ commit('setLoading', true);
patchAddress(payload.addressId, payload.body)
.then(address => new Promise((resolve, reject) => {
commit('addDateToAddress', address.validFrom);
@@ -84,13 +96,17 @@ const store = createStore({
.then(person => new Promise((resolve, reject) => {
commit('addAddressToPerson', person);
resolve();
+ commit('setLoading', false);
+ commit('setSuccess', true);
}))
.catch((error) => {
commit('catchError', error);
+ commit('setLoading', false);
})
))
.catch((error) => {
commit('catchError', error);
+ commit('setLoading', false);
});
},
updateAddress({ commit }, payload) {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
index 3417a2d0d..e8bb3700b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
@@ -19,6 +19,10 @@
+
+ {{ $t('loading') }}
+
+
@@ -110,6 +114,7 @@ export default {
showModal: false,
modalDialogClass: "modal-dialog-scrollable modal-xl"
},
+ loading: false,
address: {
writeNewAddress: false,
writeNewPostalCode: false,
@@ -143,7 +148,7 @@ export default {
extra: null,
distribution: null,
},
- errorMsg: {}
+ errorMsg: {},
}
},
computed: {
@@ -170,33 +175,42 @@ export default {
},
getCountries() {
console.log('getCountries');
+ this.loading = true;
fetchCountries().then(countries => new Promise((resolve, reject) => {
this.address.loaded.countries = countries.results;
resolve()
+ this.loading = false;
}))
.catch((error) => {
this.errorMsg.push(error.message);
+ this.loading = false;
});
},
getCities(country) {
console.log('getCities for', country.name);
+ this.loading = true;
fetchCities(country).then(cities => new Promise((resolve, reject) => {
this.address.loaded.cities = cities.results.filter(c => c.origin !== 3); // filter out user-defined cities
resolve();
+ this.loading = false;
}))
.catch((error) => {
this.errorMsg.push(error.message);
+ this.loading = false;
});
},
getReferenceAddresses(city) {
+ this.loading = true;
console.log('getReferenceAddresses for', city.name);
fetchReferenceAddresses(city).then(addresses => new Promise((resolve, reject) => {
console.log('addresses', addresses);
this.address.loaded.addresses = addresses.results;
resolve();
+ this.loading = false;
}))
.catch((error) => {
this.errorMsg.push(error.message);
+ this.loading = false;
});
},
updateMapCenter(point) {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
index 89f2d94bc..da70d0ee2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMap.vue
@@ -23,7 +23,7 @@ export default {
},
methods:{
init() {
- map = L.map('address_map').setView([48.8589, 2.3469], 12);
+ map = L.map('address_map').setView([46.67059, -1.42683], 12);
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '©
OpenStreetMap contributors'
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMore.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMore.vue
index 1101fc49b..744f9ddc1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMore.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressMore.vue
@@ -5,6 +5,7 @@
@@ -13,6 +14,7 @@
@@ -21,6 +23,7 @@