moving selected counter + cleaning code

This commit is contained in:
Mathieu Jaumotte 2021-05-04 10:48:58 +02:00
parent 4495a5d33b
commit cc8de353d4
5 changed files with 21 additions and 32 deletions

View File

@ -18,14 +18,6 @@ const datetimeFormats = {
} }
} }
}; };
//const pluralizationRules = {
// 'fr': (choice, choicesLength) => {
// if (choice === 0) {
// return 0;
// }
// return (choicesLength < 4) ? 2 : 3;
// }
//};
const messages = { const messages = {
fr: { fr: {
action: { action: {
@ -55,7 +47,6 @@ const _createI18n = (appMessages) => {
fallbackLocale: 'fr', fallbackLocale: 'fr',
datetimeFormats, datetimeFormats,
messages, messages,
//pluralizationRules
}) })
}; };

View File

@ -23,11 +23,6 @@
</table> </table>
<add-persons></add-persons> <add-persons></add-persons>
<ul class="record_actions"> <ul class="record_actions">
<li>
<!--button class="sc-button bt-create" @click="addPerson">
{{ $t('persons_associated.addPerson') }}
</button-->
</li>
<li> <li>
<button class="sc-button orange" @click="savePersons"> <button class="sc-button orange" @click="savePersons">
{{ $t('action.save') }} {{ $t('action.save') }}
@ -42,8 +37,6 @@ import { mapState } from 'vuex';
import PersonItem from "./PersonItem.vue" import PersonItem from "./PersonItem.vue"
import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue' import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'
//let SimpsonId = 10000
export default { export default {
name: 'PersonsAssociated', name: 'PersonsAssociated',
components: { components: {
@ -55,15 +48,6 @@ export default {
counter: state => state.accompanying_course.participations.length counter: state => state.accompanying_course.participations.length
}), }),
methods: { 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) { removePerson(item) {
this.$store.dispatch('removeParticipation', item) this.$store.dispatch('removeParticipation', item)
}, },

View File

@ -38,8 +38,11 @@ let getDataPromise = getAccompanyingCourse(id)
//console.log('q=', query); //console.log('q=', query);
state.add_persons = Object.assign({}, state.add_persons, query); state.add_persons = Object.assign({}, state.add_persons, query);
}, },
loadSuggestions(state, suggestions) { loadSuggestions(state, suggested) {
state.add_persons.suggested = suggestions; 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) { updateSelected(state, value) {
console.log('update value', value); console.log('update value', value);

View File

@ -15,9 +15,6 @@
<label style="float: right;"> <label style="float: right;">
{{ $tc('add_persons.suggested_counter', suggestedCounter) }} {{ $tc('add_persons.suggested_counter', suggestedCounter) }}
<span v-if="selectedCounter > 0">
{{ $tc('add_persons.selected_counter', selectedCounter) }}
</span>
</label> </label>
<input class="my-4" <input class="my-4"
@ -25,12 +22,15 @@
ref="search" ref="search"
v-model="query" v-model="query"
:placeholder="$t('add_persons.search_some_persons')" /> :placeholder="$t('add_persons.search_some_persons')" />
<div v-if="selectedCounter > 0">
{{ $tc('add_persons.selected_counter', selectedCounter) }}
</div>
</template> </template>
<template v-slot:body> <template v-slot:body>
<!--span class="discret">Selection: {{ selected }}</span--> <!--span class="discret">Selection: {{ selected }}</span-->
<div class="results"> <div class="results">
<person-suggestion <person-suggestion
v-for="item in this.selectedAndSuggested" v-for="item in this.selectedAndSuggested"
@ -106,6 +106,17 @@ export default {
addPersons() { addPersons() {
console.log('add persons'); console.log('add persons');
// code here // 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; this.modal.showModal = false;
} }
} }

View File

@ -4,7 +4,7 @@ const personMessages = {
search_add_others_persons: "Rechercher et ajouter d'autres usagers", search_add_others_persons: "Rechercher et ajouter d'autres usagers",
title: "Ajouter des usagers", title: "Ajouter des usagers",
suggested_counter: "Pas de résultats | 1 résultat | {count} résultats", 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..", search_some_persons: "Rechercher des personnes..",
}, },
item: { item: {