diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index f97f8a243..b0c60de82 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -169,7 +169,7 @@ use Symfony\Component\Validator\Constraints as Assert;
* orphanRemoval=true
* )
* @Serializer\Groups({"read"})
- * @internal /!\ the serialization for read / write evaluations is handled in `AccompanyingPeriodWorkDenormalizer`
+ * @internal /!\ the serialization for write evaluations is handled in `AccompanyingPeriodWorkDenormalizer`
*/
private Collection $accompanyingPeriodWorkEvaluations;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index bc7e9fb3a..05746429c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -28,7 +28,7 @@
:key="addAddress.key"
:options="addAddress.options"
:result="addAddress.result"
- @submitAddress="setHouseholdAddress"
+ @submitAddress="setHouseholdCreatedAddress"
ref="addAddress">
@@ -38,7 +38,7 @@
-
-
@@ -171,7 +171,7 @@ export default {
addAddress: {
context: {
entity: {
- type: 'household',
+ type: 'household_create',
id: 0
},
edit: false,
@@ -256,8 +256,15 @@ export default {
this.$store.dispatch('removeHousehold');
},
setHouseholdAddress(a) {
+ let payload = this.$refs.addAddress.submitNewAddress();
+ console.log('setHouseholdAddress', a);
this.$store.commit('setHouseholdAddress', a);
},
+ setHouseholdCreatedAddress() {
+ let payload = this.$refs.addAddress.submitNewAddress();
+ console.log('setHouseholdAddress', payload);
+ this.$store.dispatch('setHouseholdNewAddress', payload);
+ },
removeHouseholdAddress() {
this.$store.commit('removeHouseholdAddress');
}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index f213a64be..dc4f9812e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -277,7 +277,7 @@ const store = createStore({
state.addressesSuggestion.push(addresses[i]);
}
}
- }
+ },
},
actions: {
addConcerned({ commit, dispatch }, person) {
@@ -310,6 +310,19 @@ const store = createStore({
commit('createHousehold');
dispatch('computeWarnings');
},
+ setHouseholdNewAddress({ commit }, payload) {
+ let url = `/api/1.0/main/address/${payload.addressId}.json`;
+ window.fetch(url).then(r => {
+ if (r.ok) {
+ return r.json();
+ }
+ throw new Error("error while fetch address");
+ }).then(data => {
+ commit('setHouseholdAddress', data);
+ }).catch(e => {
+ console.error(e);
+ });
+ },
forceLeaveWithoutHousehold({ commit, dispatch }) {
commit('forceLeaveWithoutHousehold');
dispatch('computeWarnings');
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
index 4a025f0b6..9e6ee90a1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
@@ -104,7 +104,6 @@ export default {
i18n,
methods: {
hasCurrentMembers() {
- console.log(this.household);
return this.household.current_members_id.length > 0;
},
currentMembers() {