From 549f3a4c78f2e726a4a840bf941f2b7435fc991d Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 27 May 2021 22:53:35 +0200
Subject: [PATCH] AddPersons in activity

* modal button dont submit all form
* addNewPersons action mutation loop ready
---
 .../Resources/public/vuejs/Activity/App.vue   |  4 +-
 .../Resources/public/vuejs/Activity/i18n.js   |  2 +-
 .../public/vuejs/Activity/parcours.html       | 72 -------------------
 .../Resources/public/vuejs/Activity/store.js  |  9 +--
 .../Activity/editAccompanyingCourse.html.twig |  3 +-
 .../views/Activity/editPerson.html.twig       |  3 +-
 .../Activity/newAccompanyingCourse.html.twig  |  3 +-
 .../views/Activity/newPerson.html.twig        |  3 +-
 .../translations/messages.fr.yml              |  2 +-
 .../public/vuejs/_components/AddPersons.vue   | 11 ++-
 10 files changed, 25 insertions(+), 87 deletions(-)
 delete mode 100644 src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/parcours.html

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"> <!-- to cast child method -->
+        ref="addPersons">
      </add-persons>
   </teleport>
  
@@ -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 %}
-<script>
-{# window.activity = {{ activity_json|e('json') }}; #}
-window.activity = {
-  "type": "activity",
-  "persons": [
-    { type: person, id: xxx, ...}
-    { ...}
-  ],
-  ""
-};
-</script>
-{{ encore_entry_script_tags('activity_form') }}
-{% endblock %}
-
-
-{# -----
-   dans le fichier app.js: #}
-<script type="text/javascript">
-
-
-
-const store = createStore({
-   strict: debug,
-   state(): return {
-     activity: window.activity
-   },
-   getters: {
-
-   },
-   mutations: {
-      addPerson(state, payload) {
-
-      }
-   },
-   actions: {
-      addPerson() {
-        let el = document.getElementById('form['activity']['xxx']['xxxx']');
-        let option = document.createElement('option');
-        option.value = person.id;
-        el.appendChild(option);
-        commit('addPerson', payload)
-     }
-  }
-});
-
-const i18n = _createI18n(appMessages);
-
-const app = createApp({
-   template: `<app></app>`,
-})
-.use(store)
-.use(i18n)
-.component('app', App)
-.mount('#activity');
-
-
-</script>
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 %}
     <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
     <script type="text/javascript">
-        chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', 
+            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
         window.activity = {{ activity_json|json_encode|raw }}; 
     </script>
     {{ 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 %}
     <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
     <script type="text/javascript">
-        chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', 
+            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
         window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ 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 %}
     <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
     <script type="text/javascript">
-        chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', 
+            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
         window.activity = {{ activity_json|json_encode|raw }}; 
     </script>
     {{ 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 %}
     <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
     <script type="text/javascript">
-        chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', 
+            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
         window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ 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 @@
 <template>
    <ul class="record_actions">
-      <li>
-         <button class="sc-button bt-create" @click="openModal">
+      <li class="add-persons">
+         <a class="sc-button bt-create" @click="openModal">
             {{ $t(buttonTitle) }}
-         </button>
+         </a>
       </li>
    </ul>
 
@@ -213,6 +213,11 @@ export default {
 </script>
 
 <style lang="scss">
+   li.add-persons {
+      a {
+         cursor: pointer;
+      }
+   }
    div.body-head {
       overflow-y: unset;
       div.modal-body:first-child {