From cc8de353d4234e0e6deb9c40110bbf234f7848c9 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 4 May 2021 10:48:58 +0200
Subject: [PATCH] moving selected counter + cleaning code

---
 .../Resources/public/vuejs/_js/i18n.js        |  9 ---------
 .../components/PersonsAssociated.vue          | 16 ----------------
 .../vuejs/AccompanyingCourse/store/index.js   |  7 +++++--
 .../public/vuejs/_components/AddPersons.vue   | 19 +++++++++++++++----
 .../Resources/public/vuejs/_js/i18n.js        |  2 +-
 5 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index 2d786039d..39933ec0f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -18,14 +18,6 @@ const datetimeFormats = {
       }
    }
 };
-//const pluralizationRules = {
-//   'fr': (choice, choicesLength) => {
-//      if (choice === 0) {
-//         return 0;
-//      }
-//      return (choicesLength < 4) ? 2 : 3;
-//   }
-//};
 const messages = {
    fr: {
       action: {
@@ -55,7 +47,6 @@ const _createI18n = (appMessages) => {
       fallbackLocale: 'fr',
       datetimeFormats,
       messages,
-      //pluralizationRules
    })
 };
 
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 14e95e7b1..22fae5d79 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -23,11 +23,6 @@
    </table>
    <add-persons></add-persons>
    <ul class="record_actions">
-      <li>
-         <!--button class="sc-button bt-create" @click="addPerson">
-            {{ $t('persons_associated.addPerson') }}
-         </button-->
-      </li>
       <li>
          <button class="sc-button orange" @click="savePersons">
             {{ $t('action.save') }}
@@ -42,8 +37,6 @@ import { mapState } from 'vuex';
 import PersonItem from "./PersonItem.vue"
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'
 
-//let SimpsonId = 10000
-
 export default {
    name: 'PersonsAssociated',
    components: { 
@@ -55,15 +48,6 @@ export default {
       counter: state => state.accompanying_course.participations.length
    }),
    methods: {
-      //addPerson() {
-      //   console.log('[wip] opening add persons modal');
-      //   this.$store.dispatch('addParticipation', {
-      //      id: SimpsonId++,
-      //      person: { firstName: "Lisa", lastName: "Simpson", id: SimpsonId },
-      //      startDate: { datetime: "1975-09-15T00:00:00+0100" }, 
-      //      endDate: { datetime: "1975-09-28T00:00:00+0100" }, 
-      //   })
-      //},
       removePerson(item) {
          this.$store.dispatch('removeParticipation', item)
       },
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 9cabfd0b1..c53decdfa 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -38,8 +38,11 @@ let getDataPromise = getAccompanyingCourse(id)
                //console.log('q=', query);
                state.add_persons = Object.assign({}, state.add_persons, query);
             },
-            loadSuggestions(state, suggestions) {
-               state.add_persons.suggested = suggestions;
+            loadSuggestions(state, suggested) {
+               console.log('suggested', suggested);
+               // doublons si on ré-affiche des suggestions avec certains selected
+               //suggested.results.filter(selected => selected !== suggested.results);
+               state.add_persons.suggested = suggested;
             },
             updateSelected(state, value) {
                console.log('update value', value);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 2ce9108f6..6f17f32fc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -15,9 +15,6 @@
 
             <label style="float: right;">
                {{ $tc('add_persons.suggested_counter', suggestedCounter) }}
-               <span v-if="selectedCounter > 0">
-                  {{ $tc('add_persons.selected_counter', selectedCounter) }}
-               </span>
             </label>
             
             <input class="my-4" 
@@ -25,12 +22,15 @@
                ref="search" 
                v-model="query" 
                :placeholder="$t('add_persons.search_some_persons')" />
+               
+            <div v-if="selectedCounter > 0">
+               {{ $tc('add_persons.selected_counter', selectedCounter) }}
+            </div>
                   
          </template>
          <template v-slot:body>
                
             <!--span class="discret">Selection: {{ selected }}</span-->
-            
             <div class="results">
                <person-suggestion 
                   v-for="item in this.selectedAndSuggested"
@@ -106,6 +106,17 @@ export default {
       addPersons() {
          console.log('add persons');
          // code here
+         /*
+         addPerson() {
+            console.log('[wip] opening add persons modal');
+            this.$store.dispatch('addParticipation', {
+               id: SimpsonId++,
+               person: { firstName: "Lisa", lastName: "Simpson", id: SimpsonId },
+               startDate: { datetime: "1975-09-15T00:00:00+0100" }, 
+               endDate: { datetime: "1975-09-28T00:00:00+0100" }, 
+            })
+         },
+         */
          this.modal.showModal = false;
       }
    }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
index ec57921f4..34044441e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
@@ -4,7 +4,7 @@ const personMessages = {
          search_add_others_persons: "Rechercher et ajouter d'autres usagers",
          title: "Ajouter des usagers",
          suggested_counter: "Pas de résultats | 1 résultat | {count} résultats",
-         selected_counter: " / 1 sélectionné | / {count} sélectionnés",
+         selected_counter: " 1 sélectionné | {count} sélectionnés",
          search_some_persons: "Rechercher des personnes..",
       },
       item: {