Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into issue541_change_moving_date

Browse Source
This commit is contained in:
Julien Fastré 2022-04-14 00:04:30 +02:00
commit 31731c6f44
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ and this project adheres to
<!-- write down unreleased development here --> <!-- write down unreleased development here -->
* [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541) * [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
* [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)
* [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person); * [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);
* [docgen] add a new context with a list of activities in course * [docgen] add a new context with a list of activities in course
* [docgen] add a comment in budget lines * [docgen] add a comment in budget lines

2
src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue
View File

@ -53,7 +53,7 @@ export default {
return null; return null;
}, },
set(value) { set(value) {
this.$store.commit('setHouseholdCompositionType', value); this.$store.dispatch('setHouseholdCompositionType', value);
}, },
}, },
numberOfChildren: { numberOfChildren: {

10
src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
View File

@ -430,7 +430,7 @@ const store = createStore({
state.householdCompositionTypes = types; state.householdCompositionTypes = types;
}, },
setHouseholdCompositionType(state, id) { setHouseholdCompositionType(state, id) {
state.householdCompositionType = state.householdCompositionTypes.find(t => t.id = id); state.householdCompositionType = state.householdCompositionTypes.find(t => t.id === id);
}, },
setNumberOfChildren(state, number) { setNumberOfChildren(state, number) {
state.numberOfChildren = Number.parseInt(number); state.numberOfChildren = Number.parseInt(number);
@ -495,6 +495,12 @@ const store = createStore({
setComment({ commit }, payload) { setComment({ commit }, payload) {
commit('setComment', payload); commit('setComment', payload);
}, },
setHouseholdCompositionTypes({ commit }, payload) {
commit('setHouseholdCompositionTypes', payload);
},
setHouseholdCompositionType({ commit }, payload) {
commit('setHouseholdCompositionType', payload);
},
fetchHouseholdSuggestionForConcerned({ commit, state }, person) { fetchHouseholdSuggestionForConcerned({ commit, state }, person) {
fetchHouseholdSuggestionByAccompanyingPeriod(person.id) fetchHouseholdSuggestionByAccompanyingPeriod(person.id)
.then(households => { .then(households => {
@ -597,7 +603,7 @@ if (concerned.length > 0) {
} }
fetchResults(`/api/1.0/person/houehold/composition/type.json`).then(types => { fetchResults(`/api/1.0/person/houehold/composition/type.json`).then(types => {
store.commit('setHouseholdCompositionTypes', types); store.dispatch('setHouseholdCompositionTypes', types);
}) })
export { store }; export { store };