diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
index b291bc06d..43ac3bf5e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
@@ -9,7 +9,7 @@
{{ $t('household_members_editor.concerned.persons_will_be_moved') }} :
-
+
+
+
{{ $t('household_members_editor.concerned.persons_with_household') }}
+
+ -
+ {{ $t('household_members_editor.concerned.person') }} {{c.person.text}} {{$t('household_members_editor.concerned.already_belongs_to_household') }}
+ {{c.person.current_household_id}}.
+
+
+
+
@@ -59,7 +69,7 @@ export default {
},
computed: {
...mapState([
- 'concerned'
+ 'concerned', 'household'
]),
...mapGetters([
'persons',
@@ -67,6 +77,11 @@ export default {
noPerson () {
return this.$store.getters.persons.length === 0;
},
+ concernedPersonsWithHouseholds () {
+ return this.$store.state.concerned.filter(c =>
+ c.person.current_household_id !== null && c.person.current_household_id !== this.$store.state.household.id
+ );
+ }
},
data() {
return {
@@ -92,6 +107,9 @@ export default {
console.log('remove person in concerned', person);
this.$store.dispatch('removePerson', person);
},
+ makeHouseholdLink(id) {
+ return `/fr/person/household/${id}/summary`
+ }
}
}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index 32c57945b..c9cdd496d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -46,6 +46,9 @@ const appMessages = {
move_to: "Déplacer vers",
persons_leaving: "Usagers quittant leurs ménages",
no_person_in_position: "Aucun usager ne sera ajouté à cette position",
+ persons_with_household: "Attention, usagers avec ménages",
+ person: "L'usager",
+ already_belongs_to_household: "appartient déjà au ménage"
},
positioning: {
persons_to_positionnate: 'Usagers à positionner',
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 7bcc8c845..678fb98a0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -307,7 +307,7 @@ const store = createStore({
comment: "",
});
} else {
- console.err("person already included");
+ console.error("person already included");
}
},
markPosition(state, { person_id, position_id}) {