From ad690db886b8a5dc53ebd6d6cb37757bca42b782 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Fri, 7 May 2021 10:26:04 +0200 Subject: [PATCH] display reset link + minor changes --- .../ChillMainBundle/Resources/public/vuejs/_js/i18n.js | 3 ++- .../public/vuejs/AccompanyingCourse/store/index.js | 2 +- .../Resources/public/vuejs/_components/AddPersons.vue | 4 ++++ .../Resources/public/vuejs/_components/PersonSuggestion.vue | 6 +++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js index b6f80daf4..4f5c64e30 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js @@ -36,7 +36,8 @@ const messages = { next: "Suivant", previous: "Précédent", back: "Retour", - check_all: "cocher tout" + check_all: "cocher tout", + reset: "réinitialiser" }, } }; 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 4add9bf43..42c0a6b29 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -23,7 +23,7 @@ let getDataPromise = getAccompanyingCourse(id) }, getters: { selectedAndSuggested: state => { - let uniqBy = (a, key) => [ + const uniqBy = (a, key) => [ ...new Map( a.map(x => [key(x), x]) ).values() diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue index 3f4be3297..ae5396ddf 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue @@ -34,16 +34,20 @@ {{ $t('action.check_all')}} + + {{ $t('action.reset')}} {{ $tc('add_persons.selected_counter', selectedCounter) }} + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue index 943ee731a..a3dc98b4c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue @@ -45,9 +45,9 @@ export default { return this.$store.state.add_persons.selected; } }, - selectedAndSuggested() { - return this.$store.getters.selectedAndSuggested; - }, + //selectedAndSuggested() { + // return this.$store.getters.selectedAndSuggested; + //}, isChecked() { return (this.selected.indexOf(this.item) === -1) ? false : true; }