diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
index b78483bc5..aa2d32a16 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
@@ -7,7 +7,7 @@
v-bind:key="addPersons.key"
v-bind:options="addPersons.options"
@addNewPersons="addNewPersons"
- ref="addPersons">
+ ref="addPersons">
@@ -41,7 +41,7 @@ export default {
addNewPersons({ selected, modal }) {
console.log('@@@ CLICK button addNewPersons', selected);
selected.forEach(function(item) {
- //this.$store.dispatch('addResource', item);
+ this.$store.dispatch('addPersonsInvolved', item);
console.log('item', item);
}, this
);
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
index 91699e320..e74311d98 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
@@ -3,7 +3,7 @@ import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
const appMessages = {
fr: {
activities: {
- add_persons: "Ajouter des personnes"
+ add_persons: "Ajouter des personnes concernées"
}
}
}
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/parcours.html b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/parcours.html
deleted file mode 100644
index 0a7dd3df4..000000000
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/parcours.html
+++ /dev/null
@@ -1,72 +0,0 @@
-Controleur:
-
-activity_json = $this->serializer->serialize($activity, 'json', []);
-
-return render('@ChillActivity/...', [
- 'activity' => $activity,
- 'activity_json' => $activity_json
-])
-
-
-{# template twig de activity #}
-
-{{ form(activity) }}
-
-{% block js %}
-
-{{ encore_entry_script_tags('activity_form') }}
-{% endblock %}
-
-
-{# -----
- dans le fichier app.js: #}
-
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
index 769e87245..0c5f21669 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
@@ -13,17 +13,18 @@ const store = createStore({
},
mutations: {
- addPerson(state, payload) {
-
+ addPersonsInvolved(state, payload) {
+ console.log('### mutation addPersonsInvolved', payload);
}
},
actions: {
- addPerson() {
+ addPersonsInvolved({ commit }, payload) {
+ console.log('### action addPersonsInvolved', payload);
//let el = document.getElementById('form['activity']['xxx']['xxxx']');
//let option = document.createElement('option');
//option.value = person.id;
//el.appendChild(option);
- commit('addPerson', payload)
+ commit('addPersonsInvolved', payload)
}
}
});
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
index db4034fa7..f1af6e749 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
@@ -13,7 +13,8 @@
{% block js %}
{{ encore_entry_script_tags('vue_activity') }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
index 733912375..93d2eb307 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
@@ -28,7 +28,8 @@
{% block js %}
{{ encore_entry_script_tags('vue_activity') }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
index 163732e97..050dcd1e6 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
@@ -13,7 +13,8 @@
{% block js %}
{{ encore_entry_script_tags('vue_activity') }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
index 84f3f5ac3..0cea144ff 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
@@ -12,7 +12,8 @@
{% block js %}
{{ encore_entry_script_tags('vue_activity') }}
diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 0693d4a22..7c8a6b33d 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -20,7 +20,7 @@ present: présent
not present: absent
Delete: Supprimer
Update: Mettre à jour
-Update activity: Édition de l'activité
+Update activity: Modifier l'activité
Scope: Cercle
Activity data: Données de l'activité
No reason associated: Aucun sujet
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index a37f93e7e..fb06eedbb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -1,9 +1,9 @@
@@ -213,6 +213,11 @@ export default {