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

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

Browse Source
This commit is contained in:
Julien Fastré
2021-11-22 14:06:27 +01:00
parent 3ce3613c71 764bb6a21f
commit f3792b2ed6
110 changed files with 3491 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
View File

@@ -55,6 +55,9 @@ const store = createStore({
.filter((p) => !existingPersonIds.includes(p.id));
},
suggestedRequestor(state) {
if (state.activity.accompanyingPeriod.requestor === null) {
return [];
}
const existingPersonIds = state.activity.persons.map((p) => p.id);
const existingThirdPartyIds = state.activity.thirdParties.map(
(p) => p.id
@@ -74,7 +77,7 @@ const store = createStore({
return state.activity.activityType.usersVisible === 0
? []
: [state.activity.accompanyingPeriod.user].filter(
(u) => !existingUserIds.includes(u.id)
(u) => u !== null && !existingUserIds.includes(u.id)
);
},
suggestedResources(state) {