mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
remove entities which are present twice
This commit is contained in:
parent
c64ab86f8e
commit
eee9bff711
@ -109,7 +109,19 @@ export default {
|
|||||||
.filter((e) => e !== null)
|
.filter((e) => e !== null)
|
||||||
.filter((e) => e.type === 'person')
|
.filter((e) => e.type === 'person')
|
||||||
.filter(
|
.filter(
|
||||||
(p) => !state.accompanyingCourse.participations.map((pa) => pa.person.id).includes(p.id)
|
(p) => return !state.accompanyingCourse.participations.filter(pa => pa.endDate === null).map((pa) => pa.person.id).includes(p.id)
|
||||||
|
)
|
||||||
|
// filter persons appearing twice in requestor and resources
|
||||||
|
.filter(
|
||||||
|
(e, index, suggested) => {
|
||||||
|
for (let i = 0; i < suggested.length; i = i+1) {
|
||||||
|
if (i < index && e.id === suggested[i].id) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
)
|
)
|
||||||
}),
|
}),
|
||||||
...mapGetters([
|
...mapGetters([
|
||||||
|
@ -190,11 +190,23 @@ export default {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapState({
|
...mapState({
|
||||||
suggestedEntities: state => [
|
suggestedEntities: state => {
|
||||||
|
return [
|
||||||
...state.accompanyingCourse.participations.map(p => p.person),
|
...state.accompanyingCourse.participations.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)
|
||||||
|
// filter for same entity appearing twice
|
||||||
|
.filter((e, index, suggested) => {
|
||||||
|
for (let i = 0; i < suggested.length; i = i+1) {
|
||||||
|
if (i < index && e.id === suggested[i].id && e.type === suggested[i].type) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
})
|
||||||
|
}
|
||||||
}),
|
}),
|
||||||
accompanyingCourse() {
|
accompanyingCourse() {
|
||||||
return this.$store.state.accompanyingCourse
|
return this.$store.state.accompanyingCourse
|
||||||
|
@ -89,6 +89,18 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
// filter persons appearing twice in requestor and resources
|
||||||
|
.filter(
|
||||||
|
(e, index, suggested) => {
|
||||||
|
for (let i = 0; i < suggested.length; i = i+1) {
|
||||||
|
if (i < index && e.id === suggested[i].id) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
)
|
||||||
}),
|
}),
|
||||||
methods: {
|
methods: {
|
||||||
removeResource(item) {
|
removeResource(item) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user