diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index e6bad4e43..05359ca78 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -25,6 +25,8 @@
@@ -42,6 +44,18 @@ export default {
PersonItem,
AddPersons
},
+ data() {
+ return {
+ addNewPersons: {
+ key: 'persons_associated',
+ options: {
+ type: ['person'],
+ priority: null,
+ uniq: false,
+ }
+ }
+ }
+ },
computed: mapState({
participations: state => state.accompanyingCourse.participations,
counter: state => state.accompanyingCourse.participations.length
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index f41aa65a5..33a8abd1f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -40,6 +40,8 @@
@@ -56,6 +58,14 @@ export default {
},
data() {
return {
+ addNewPersons: {
+ key: 'requestor',
+ options: {
+ type: ['person', 'thirdparty'],
+ priority: null,
+ uniq: true,
+ }
+ }
}
},
computed: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/modules/addPersons.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/modules/addPersons.js
index 800846811..15cc7c5a6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/modules/addPersons.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/modules/addPersons.js
@@ -1,5 +1,4 @@
-import { searchPersons } from 'ChillPersonAssets/vuejs/_api/AddPersons'
-import { postParticipation } from '../../api';
+import { searchPersons } from 'ChillPersonAssets/vuejs/_api/AddPersons';
// initial state
@@ -46,10 +45,10 @@ const mutations = {
// actions
const actions = {
setQuery({ commit }, payload) {
- //console.log('## action: setquery: payload', payload);
+ console.log('## action: setquery: payload', payload);
commit('setQuery', payload.query);
if (payload.query.length >= 3) {
- searchPersons(payload.query)
+ searchPersons(payload)
.then(suggested => new Promise((resolve, reject) => {
commit('loadSuggestions', suggested.results);
resolve();
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js
index d5ac91ac5..ccf6764bf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js
@@ -8,7 +8,8 @@ const
*
* @query string - the query to search for
*/
-let searchPersons = (query) => {
+let searchPersons = ({ query, options }) => {
+ console.log('options 2', options);
let url = `/${locale}/search.${format}?name=person_regular&q=${query}`;
return fetch(url)
.then(response => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index a800331be..e2084c711 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -72,7 +72,7 @@ import PersonSuggestion from 'ChillPersonAssets/vuejs/_components/PersonSuggesti
export default {
name: 'AddPersons',
- props: ['buttonTitle'],
+ props: ['buttonTitle', 'options'],
components: {
Modal,
PersonSuggestion,
@@ -83,7 +83,6 @@ export default {
showModal: false,
modalDialogClass: "modal-dialog-scrollable modal-xl"
},
- //button: this.buttonTitle
}
},
computed: {
@@ -91,8 +90,8 @@ export default {
addPersons: state => state.addPersons
}),
query: {
- set(query) {
- this.$store.dispatch('setQuery', { query });
+ set(query, options) {
+ this.$store.dispatch('setQuery', { query, options });
},
get() {
return this.addPersons.query;
@@ -112,10 +111,14 @@ export default {
},
selectedAndSuggested() {
return this.$store.getters.selectedAndSuggested;
+ },
+ options() {
+ return this.options;
}
},
methods: {
openModal() {
+ console.log('options 1', this.options);
this.modal.showModal = true;
this.$nextTick(function() {
this.$refs.search.focus();