Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 21:34:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'issue415_filter_suggested_entities_by_close_participations' into 'master'

Browse Source 
accompanying course: filter suggested entities by open participations

See merge request Chill-Projet/chill-bundles!339
This commit is contained in:
Julien Fastré 2022-02-17 20:46:03 +00:00
commit 672fa48140
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -9,7 +9,7 @@ and this project adheres to
* date versioning for test releases * date versioning for test releases
## Unreleased ## Unreleased
* [person] accompanying course: filter suggested entities by open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/415)
[activity] can click through the cross icon for removing person in concerned group (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476) [activity] can click through the cross icon for removing person in concerned group (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
[activity] correct associated persons by considering only open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476) [activity] correct associated persons by considering only open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)

2
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
View File

@ -199,7 +199,7 @@ export default {
...mapState({ ...mapState({
suggestedEntities: state => { suggestedEntities: state => {
return [ return [
...state.accompanyingCourse.participations.map(p => p.person), ...state.accompanyingCourse.participations.filter((p) => p.endDate === null).map((p) => p.person),
...state.accompanyingCourse.resources.map(r => r.resource) ...state.accompanyingCourse.resources.map(r => r.resource)
] ]
.filter((e) => e !== null) .filter((e) => e !== null)

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

@ -77,7 +77,7 @@ export default {
counter: state => state.accompanyingCourse.resources.length, counter: state => state.accompanyingCourse.resources.length,
suggestedEntities: state => [ suggestedEntities: state => [
state.accompanyingCourse.requestor, state.accompanyingCourse.requestor,
...state.accompanyingCourse.participations.map(p => p.person), ...state.accompanyingCourse.participations.filter((p) => p.endDate === null).map((p) => p.person),
] ]
.filter((e) => e !== null) .filter((e) => e !== null)
.filter( .filter(