From 01f9d03b14c32e9af76a2f9bc63c71611bce2abd Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Mon, 26 Apr 2021 17:13:40 +0200 Subject: [PATCH 01/62] init vuex store --- .../public/js/AccompanyingCourse/App_test.vue | 19 ++++++++++++++ .../api/accompanyingCourse.js | 25 +++++++++++++++++++ .../AccompanyingCourse/api/participations.js | 5 ++++ .../public/js/AccompanyingCourse/index.js | 20 ++++++++++----- .../public/js/AccompanyingCourse/store/.keep | 0 .../js/AccompanyingCourse/store/index.js | 21 ++++++++++++++++ 6 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App_test.vue create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/accompanyingCourse.js create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/participations.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/store/.keep create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/store/index.js diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App_test.vue b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App_test.vue new file mode 100644 index 000000000..5e8bd0d09 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App_test.vue @@ -0,0 +1,19 @@ + + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/accompanyingCourse.js b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/accompanyingCourse.js new file mode 100644 index 000000000..1da9261c4 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/accompanyingCourse.js @@ -0,0 +1,25 @@ +const + locale = 'fr', + format = 'json', + accompanying_period_id = () => window.accompanyingCourseId +; + +// 1. chill_person_accompanying_course_api_show +let getAccompanyingCourse = (accompanying_period_id) => { + const url = `/${locale}/person/api/1.0/accompanying-course/${accompanying_period_id}/show.${format}`; + return fetch(url).then(response => response.json()); +}; + +// 2. chill_person_accompanying_course_api_add_participation (POST) +let getParticipations = (accompanying_period_id) => { + const url = `/${locale}/person/api/1.0/accompanying-course/${accompanying_period_id}/participation.${format}` + return fetch(url).then(response => response.json()); +}; + +export { getAccompanyingCourse, getParticipations }; + + + +/// +// cfr. promise.all() pour plusieurs promesses +// catch throw sur le dernier then pour capturer l'erreur diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/participations.js b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/participations.js new file mode 100644 index 000000000..f0341ccd9 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/participations.js @@ -0,0 +1,5 @@ + +const _participations = [] + +export default { +} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/index.js b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/index.js index 4335113f7..6d738de33 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/index.js @@ -1,8 +1,16 @@ -import App from './App.vue'; import { createApp } from 'vue'; +import createStore from './store'; +import App from './App_test.vue'; -const app = createApp({ - template: `` -}) -.component('app', App) -.mount('#accompanying-course'); +createStore.then(store => { + + //console.log('store in create_store', store); + console.log('store course', store.state.course); + + const app = createApp({ + template: ``, + }) + .use(store) + .component('app', App) + .mount('#accompanying-course'); +}); diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/store/.keep b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/store/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/store/index.js new file mode 100644 index 000000000..e9bae629b --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/store/index.js @@ -0,0 +1,21 @@ +import 'es6-promise/auto'; +import { createStore } from 'vuex'; +import { getAccompanyingCourse, getParticipations } from '../api/accompanyingCourse'; + +const debug = process.env.NODE_ENV !== 'production'; + +let promise = getAccompanyingCourse(window.accompanyingCourseId) + .then(accompanying_course => new Promise((resolve, reject) => { + let store = createStore({ + state() { + return { + course: accompanying_course + } + }, + strict: debug + }); + //console.log('store', store); + resolve(store); + })); + +export default promise; From c2a4a95eba2675b7a9e78ecb8a6bc50568e29003 Mon Sep 17 00:00:00 2001 From: nobohan Date: Tue, 27 Apr 2021 18:52:37 +0200 Subject: [PATCH 02/62] add a fixture for accompanying period - wip --- .../ORM/LoadAccompanyingPeriod.php | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriod.php diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriod.php new file mode 100644 index 000000000..74fe55e3c --- /dev/null +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriod.php @@ -0,0 +1,85 @@ +, + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Chill\PersonBundle\DataFixtures\ORM; + + +//use Doctrine\Bundle\FixturesBundle\Fixture; +use Doctrine\Common\DataFixtures\AbstractFixture; +use Doctrine\Common\DataFixtures\OrderedFixtureInterface; +use Doctrine\Persistence\ObjectManager; +use Symfony\Component\DependencyInjection\ContainerAwareInterface; + +use Chill\PersonBundle\Entity\AccompanyingPeriod; +use Chill\PersonBundle\Entity\Person; + +/** + * Description of LoadAccompanyingPeriod + * + * @author Champs-Libres Coop + */ +class LoadAccompanyingPeriod extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface +{ + use \Symfony\Component\DependencyInjection\ContainerAwareTrait; + + + public const ACCOMPANYING_PERIOD = 'parcours 1'; + + public function getOrder() + { + return 10004; + } + + public static $references = array(); + + public function load(ObjectManager $manager) + { + + // $centerA = $this->getReference('centerA'); + // $centerAId = $centerA->getId(); + // dump($centerA); + // dump($centerAId); + + // $personIds = $this->container->get('doctrine.orm.entity_manager') + // ->createQuery("SELECT person.id FROM ChillPersonBundle:Person person WHERE person.center_id = ".$centerAId." ORDER BY person.id LIMIT 2;") + // ->getScalarResult(); + + // dump($personIds); + + $openingDate = new \DateTime('2020-04-01'); + + // $person1 = $manager->getRepository(Person::class)->find($personIds[0]); + + $a = new AccompanyingPeriod($openingDate); + $a->setClosingDate(new \DateTime('2021-05-01')); + + // $a->addPerson($person1); + + $manager->persist($a); + + $this->addReference(self::ACCOMPANYING_PERIOD, $a); + echo "Adding 1 AccompanyingPeriod\n"; + + + $manager->flush(); + } +} From 4cf77a9b0e7b38d9aa22a8c5327e614de47c8b3e Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 27 Apr 2021 17:27:06 +0200 Subject: [PATCH 03/62] adapt multi components to new store and new api endpoints * base of i18n (yarn add new deps) --- .../public/js/AccompanyingCourse/App.vue | 34 +++------- .../public/js/AccompanyingCourse/App_test.vue | 19 ------ .../api/accompanyingCourse.js | 12 ++-- .../AccompanyingCourse/api/participations.js | 5 -- .../components/AccompanyingCourse.vue | 22 ++++--- .../components/PersonItem.vue | 35 ++++++++--- .../components/PersonsAssociated.vue | 63 +++++++++---------- .../components/Requestor.vue | 8 ++- .../public/js/AccompanyingCourse/index.js | 19 ++++-- .../js/AccompanyingCourse/store/index.js | 18 ++++-- .../Resources/public/js/_components/i18n.js | 57 +++++++++++++++++ 11 files changed, 172 insertions(+), 120 deletions(-) delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App_test.vue delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/participations.js create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/js/_components/i18n.js diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App.vue index 971eca1c7..3357bffa9 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App.vue @@ -1,10 +1,12 @@ diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App_test.vue b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App_test.vue deleted file mode 100644 index 5e8bd0d09..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App_test.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/accompanyingCourse.js b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/accompanyingCourse.js index 1da9261c4..0448ba459 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/accompanyingCourse.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/accompanyingCourse.js @@ -7,19 +7,21 @@ const // 1. chill_person_accompanying_course_api_show let getAccompanyingCourse = (accompanying_period_id) => { const url = `/${locale}/person/api/1.0/accompanying-course/${accompanying_period_id}/show.${format}`; - return fetch(url).then(response => response.json()); + return fetch(url) + .then(response => response.json()); }; // 2. chill_person_accompanying_course_api_add_participation (POST) let getParticipations = (accompanying_period_id) => { const url = `/${locale}/person/api/1.0/accompanying-course/${accompanying_period_id}/participation.${format}` - return fetch(url).then(response => response.json()); + return fetch(url) + .then(response => response.json()); }; export { getAccompanyingCourse, getParticipations }; -/// -// cfr. promise.all() pour plusieurs promesses -// catch throw sur le dernier then pour capturer l'erreur +/// TODO +// * cfr. promise.all() pour plusieurs promesses +// * catch throw sur le dernier then pour capturer l'erreur diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/participations.js b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/participations.js deleted file mode 100644 index f0341ccd9..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/participations.js +++ /dev/null @@ -1,5 +0,0 @@ - -const _participations = [] - -export default { -} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/AccompanyingCourse.vue b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/AccompanyingCourse.vue index d08798c00..cecd12917 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/AccompanyingCourse.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/AccompanyingCourse.vue @@ -1,16 +1,16 @@ diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/ModalBootstrap.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/ModalBootstrap.vue deleted file mode 100644 index bb2e04491..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/ModalBootstrap.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - From d18922ed985bce9bda9a8816be3dcb59502138eb Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 29 Apr 2021 12:54:27 +0200 Subject: [PATCH 11/62] permit multiple modals in same component --- .../components/Requestor.vue | 40 +++++++++++++++---- .../public/vuejs/_components/Modal.vue | 2 +- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue index 89eb4525f..a7d017c04 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue @@ -5,11 +5,20 @@ {{ accompanying_course.remark }}

- +
    +
  • + +
    • +
  • + +
    • +
- + @@ -22,7 +31,18 @@

Quisque non erat tincidunt, lacinia justo ut, pulvinar nisl. Nunc id enim ut sem pretium interdum consectetur eu quam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Etiam posuere erat eget augue finibus luctus. Maecenas auctor, tortor non luctus ultrices, neque neque porttitor ex, nec lacinia lorem ligula et elit. Sed tempor nulla vitae lorem sollicitudin dictum. Vestibulum nec arcu eget elit pulvinar pretium. Phasellus facilisis metus sed diam luctus, feugiat scelerisque velit dignissim.

+ + + + + + @@ -40,8 +60,14 @@ export default { }, data() { return { - showModal: false, - modalDialogClass: "modal-dialog modal-dialog-scrollable modal-xl" // modal-lg modal-md modal-sm + modal1: { + showModal: false, + modalDialogClass: "modal-dialog modal-dialog-scrollable modal-xl" // modal-lg modal-md modal-sm + }, + modal2: { + showModal: false, + modalDialogClass: "modal-dialog modal-dialog-centered modal-sm" // modal-lg modal-md modal-sm + } } }, computed: { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Modal.vue index 04afcd398..2945f9f78 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Modal.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Modal.vue @@ -35,7 +35,7 @@ */ export default { name: 'Modal', - props: ['showModal', 'modalDialogClass'], + props: ['modalDialogClass'], emits: ['close'] } From 25bd170f6b0aaef0674a3a6fb8c4349cd35d591a Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 29 Apr 2021 15:42:31 +0200 Subject: [PATCH 12/62] improve modal system, test when a modal call next modal --- .../ChillMainBundle/Resources/public/scss/chillmain.scss | 3 +++ .../vuejs/AccompanyingCourse/components/Requestor.vue | 9 ++++++--- .../Resources/public/vuejs/AccompanyingCourse/js/i18n.js | 5 ++++- .../Resources/public/vuejs/_components/Modal.vue | 7 ++++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss index 25638ec78..033e55dbb 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss @@ -70,6 +70,9 @@ div.vue-component { display: table; transition: opacity 0.3s ease; } +.modal-header .close { // bootstrap classes, override sc-button 0 radius + border-top-right-radius: 0.3rem; +} /* * The following styles are auto-applied to elements with diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue index a7d017c04..7e082d5b1 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue @@ -31,7 +31,8 @@

Quisque non erat tincidunt, lacinia justo ut, pulvinar nisl. Nunc id enim ut sem pretium interdum consectetur eu quam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Etiam posuere erat eget augue finibus luctus. Maecenas auctor, tortor non luctus ultrices, neque neque porttitor ex, nec lacinia lorem ligula et elit. Sed tempor nulla vitae lorem sollicitudin dictum. Vestibulum nec arcu eget elit pulvinar pretium. Phasellus facilisis metus sed diam luctus, feugiat scelerisque velit dignissim.

 @@ -43,6 +44,8 @@

modal 2

@@ -62,11 +65,11 @@ export default { return { modal1: { showModal: false, - modalDialogClass: "modal-dialog modal-dialog-scrollable modal-xl" // modal-lg modal-md modal-sm + modalDialogClass: "modal-dialog-scrollable modal-xl" // modal-lg modal-md modal-sm }, modal2: { showModal: false, - modalDialogClass: "modal-dialog modal-dialog-centered modal-sm" // modal-lg modal-md modal-sm + modalDialogClass: "modal-dialog-centered modal-sm" // modal-lg modal-md modal-sm } } }, diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index 440bd9ff8..9cfa8f10d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -34,7 +34,10 @@ const messages = { showModal: "Ouvrir une modale", ok: "OK", cancel: "Annuler", - close: "Fermer" + close: "Fermer", + next: "Suivant", + previous: "Précédent", + back: "Retour" } } }; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Modal.vue index 2945f9f78..494735e5c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Modal.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Modal.vue @@ -2,11 +2,12 @@
-
+
- +
@@ -29,7 +30,7 @@ * => with 'v-if:showModal' directive:parameter, html scope is added/removed not just shown/hidden * => with slot we can pass content from parent component * => some classes are passed from parent component - * - Bootstrap 4.4 _modal.scss module + * - Bootstrap 4.6 _modal.scss module * => using bootstrap css classes, the modal have a responsive behaviour, * => modal design can be configured using css classes (size, scroll) */ From ec68e6f761ac0fbb64f18d267baa391c5caf2fc2 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 29 Apr 2021 17:14:13 +0200 Subject: [PATCH 13/62] make inheritance for vue translations i18n.js files By importing only the app i18n file, we benefit from the whole inherited chain: app i18n < chill bundle i18n < chill main bundle i18n --- .../public/vuejs/AccompanyingCourse/App.vue | 2 -- .../vuejs/AccompanyingCourse/js/i18n.js | 21 +++-------------- .../Resources/public/vuejs/_js/i18n.js | 23 +++++++++++++++++-- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue index 3357bffa9..fba5a2781 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue @@ -23,5 +23,3 @@ export default { ]) }; - - diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index 9cfa8f10d..89ae2607f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -1,6 +1,5 @@ -import { datetimeFormats } from 'ChillPersonAssets/vuejs/_js/i18n' +import { datetimeFormats, personMessages } from 'ChillPersonAssets/vuejs/_js/i18n' -// TODO howto merge message object from import ?? const messages = { fr: { title: { @@ -22,26 +21,12 @@ const messages = { startdate: "Date d'entrée", enddate: "Date de sortie", addPerson: "Ajouter un usager", - }, - action: { - actions: "Actions", - show: "Voir", - edit: "Modifier", - create: "Créer", - remove: "Enlever", - delete: "Supprimer", - save: "Enregistrer", - showModal: "Ouvrir une modale", - ok: "OK", - cancel: "Annuler", - close: "Fermer", - next: "Suivant", - previous: "Précédent", - back: "Retour" } } }; +Object.assign(messages.fr, personMessages.fr); + export { datetimeFormats, messages diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js index 5a675159e..a2f112e97 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js @@ -16,9 +16,28 @@ const datetimeFormats = { } } }; -// const messages = {} ... +const personMessages = { + fr: { + action: { + actions: "Actions", + show: "Voir", + edit: "Modifier", + create: "Créer", + remove: "Enlever", + delete: "Supprimer", + save: "Enregistrer", + showModal: "Ouvrir une modale", + ok: "OK", + cancel: "Annuler", + close: "Fermer", + next: "Suivant", + previous: "Précédent", + back: "Retour" + } + } +} export { datetimeFormats, - // messages + personMessages }; From 4900c81c11f567d7913abf2d39fdaa0ee6ab5606 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Fri, 30 Apr 2021 14:59:14 +0200 Subject: [PATCH 14/62] improve inheritance with translations i18n.js files vue-i18n --> chill main i18n ---( )---> app index chill bundle i18n --> app i18n --^ --- .../Resources/public/vuejs/_js/i18n.js | 52 +++++++++++++++++++ .../components/AccompanyingCourse.vue | 2 +- .../components/PersonsAssociated.vue | 2 +- .../components/Requestor.vue | 4 +- .../public/vuejs/AccompanyingCourse/index.js | 13 ++--- .../vuejs/AccompanyingCourse/js/i18n.js | 21 ++++---- .../Resources/public/vuejs/_js/i18n.js | 39 ++------------ 7 files changed, 74 insertions(+), 59 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js new file mode 100644 index 000000000..2c2501d69 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js @@ -0,0 +1,52 @@ +import { createI18n } from 'vue-i18n' + +const datetimeFormats = { + fr: { + short: { + year: "numeric", + month: "numeric", + day: "numeric" + }, + long: { + year: "numeric", + month: "short", + day: "numeric", + weekday: "short", + hour: "numeric", + minute: "numeric", + hour12: false + } + } +}; +const messages = { + fr: { + action: { + actions: "Actions", + show: "Voir", + edit: "Modifier", + create: "Créer", + remove: "Enlever", + delete: "Supprimer", + save: "Enregistrer", + show_modal: "Ouvrir une modale", + ok: "OK", + cancel: "Annuler", + close: "Fermer", + next: "Suivant", + previous: "Précédent", + back: "Retour" + }, + } +}; + +const _createI18n = (appMessages) => { + Object.assign(messages.fr, appMessages.fr); + return createI18n({ + datetimeFormats, + messages, + locale: 'fr', + fallbackLocale: 'fr' + }) +}; + +export { _createI18n } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue index cecd12917..4a5ad0ab1 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue @@ -1,6 +1,6 @@ From a536d2780e7be8951200828a0b7c518cfa2d2e64 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 6 May 2021 12:57:53 +0200 Subject: [PATCH 32/62] fix state mutation for closeParticipation --- .../components/PersonsAssociated.vue | 2 +- .../vuejs/AccompanyingCourse/store/index.js | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) 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 586ad3993..f330acde6 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue @@ -60,7 +60,7 @@ export default { savePersons() { console.log('[wip] saving persons'); } -*/ + */ } } 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 88b3d571b..9bf4d4014 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -31,16 +31,21 @@ let getDataPromise = getAccompanyingCourse(id) //console.log('mutation: remove item', item.id); state.accompanying_course.participations = state.accompanying_course.participations.filter(participation => participation !== item); }, - closeParticipation(state, { participation, item }) { - console.log('mutation: close item', item.id); - state.accompanying_course.participations.filter(participation => participation !== item); + closeParticipation(state, { participation, payload }) { + console.log('### mutation: close item', { participation, payload }); + // temporaire, le temps que le backend ajoute la enddate + participation.endDate = { datetime: "2021-05-06T10:49:00+0200" }; + // trouve dans le state le payload et le supprime du state + state.accompanying_course.participations = state.accompanying_course.participations.filter(participation => participation !== payload); + // pousse la participation + state.accompanying_course.participations.push(participation); }, - addParticipation(state, { participation, item }) { + addParticipation(state, { participation, payload }) { //console.log('### mutation: add participation', participation); state.accompanying_course.participations.push(participation); //console.log('count participations from state', state.accompanying_course.participations.length); //console.log('avant', state.add_persons.selected); - state.add_persons.selected = state.add_persons.selected.filter(value => value !== item); + state.add_persons.selected = state.add_persons.selected.filter(value => value !== payload); //console.log('après', state.add_persons.selected); state.add_persons.query = ""; state.add_persons.suggested = []; @@ -92,6 +97,7 @@ let getDataPromise = getAccompanyingCourse(id) console.log('## action: fetch delete participation: payload', payload.person.id); postParticipation(id, payload.person.id, 'DELETE') .then(participation => new Promise((resolve, reject) => { + //console.log('payload', payload); commit('closeParticipation', { participation, payload }); resolve(); })) From e1fcc41ace04a261737b7840a439c2b6bd50816e Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 6 May 2021 13:16:26 +0200 Subject: [PATCH 33/62] avoiding duplicates between selected and suggested (wip) see comments in store/index.js --- .../vuejs/AccompanyingCourse/store/index.js | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) 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 9bf4d4014..e6afa6374 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -56,31 +56,43 @@ let getDataPromise = getAccompanyingCourse(id) }, loadSuggestions(state, suggested) { + // les résultats combinent les valeurs suggérées et les valeurs sélectionnées + // si on change de recherche les valeurs sélectionnées doivent restées affichées ! + // c'est pq on affiche indépendamment les 2 tableaux, + // mais on veut s'assurer d'enlever les doublons dans le tableau des suggestions + + // problème: certaines fonctions javascript ne supportent pas de manipuler les 2 tableaux + // si l'un est un objet virtuel de vue (Proxy) + // [{},{},{}] et [Proxy,Proxy,Proxy] + + // a. remplace par les nouvelles valeurs + //state.add_persons.suggested = suggested; + + // b.1 réinitialise avec un tableau vide //state.add_persons.suggested = []; // <== empêche la création du proxy, réinitialiser autrement + + // b.2 vide le tableau avec splice state.add_persons.suggested.splice(0, state.add_persons.suggested.length ); - //console.log('suggestions', state.add_persons.suggested); + + console.log('suggestions', state.add_persons.suggested); + + // b. pousse les nouvelles valeurs dans le tableau suggested.forEach(function(item) { state.add_persons.suggested.push(item); }); - //state.add_persons.suggested = suggested; console.log('selections', state.add_persons.selected); console.log('suggestions', state.add_persons.suggested); - // doublons qd on ré-affiche des suggestions avec certains selected + // calcule l'intersection des 2 tableaux let intersection = state.add_persons.suggested.filter( item => state.add_persons.selected.indexOf(item) !== -1 - /* - function(item) { - let x = state.add_persons.selected.indexOf(item); - console.log('indexof', x); - return x !== -1 - } -*/ + //function(item) {let x = state.add_persons.selected.indexOf(item); console.log('indexof', x); return x !== -1; } ); console.log('intersection', intersection); + // enlève l'intersection des 2 tableaux state.add_persons.suggested = state.add_persons.suggested.filter(item => item !== intersection); }, @@ -119,6 +131,7 @@ let getDataPromise = getAccompanyingCourse(id) }, setQuery({ commit }, payload) { commit('setQuery', payload); + console.log('## action: setquery: payload', payload); if (payload.query.length >= 3) { searchPersons(payload.query) .then(suggested => new Promise((resolve, reject) => { From b4ad0128e4abe0f956596ad6cd14bdd66a9aa94e Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 6 May 2021 17:43:32 +0200 Subject: [PATCH 34/62] manage selected and suggested arrays: fix duplicate --- .../vuejs/AccompanyingCourse/store/index.js | 60 +++++-------------- .../public/vuejs/_components/AddPersons.vue | 7 +-- .../vuejs/_components/PersonSuggestion.vue | 3 + 3 files changed, 20 insertions(+), 50 deletions(-) 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 e6afa6374..2247e078d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -22,9 +22,18 @@ let getDataPromise = getAccompanyingCourse(id) errorMsg: [] }, getters: { - //getSelectedByid: (state) => (id) => { - // return state.add_persons.selected.find(item => item.id === id) - //} + selectedAndSuggested: state => { + let uniqBy = (a, key) => [ + ...new Map( + a.map(x => [key(x), x]) + ).values() + ]; + let union = [...new Set([ + ...state.add_persons.selected, + ...state.add_persons.suggested, + ])]; + return uniqBy(union, k => k.id); + } }, mutations: { removeParticipation(state, item) { @@ -55,49 +64,9 @@ let getDataPromise = getAccompanyingCourse(id) state.add_persons = Object.assign({}, state.add_persons, query); }, loadSuggestions(state, suggested) { - - // les résultats combinent les valeurs suggérées et les valeurs sélectionnées - // si on change de recherche les valeurs sélectionnées doivent restées affichées ! - // c'est pq on affiche indépendamment les 2 tableaux, - // mais on veut s'assurer d'enlever les doublons dans le tableau des suggestions - - // problème: certaines fonctions javascript ne supportent pas de manipuler les 2 tableaux - // si l'un est un objet virtuel de vue (Proxy) - // [{},{},{}] et [Proxy,Proxy,Proxy] - - // a. remplace par les nouvelles valeurs - //state.add_persons.suggested = suggested; - - // b.1 réinitialise avec un tableau vide - //state.add_persons.suggested = []; // <== empêche la création du proxy, réinitialiser autrement - - // b.2 vide le tableau avec splice - state.add_persons.suggested.splice(0, - state.add_persons.suggested.length - ); - - console.log('suggestions', state.add_persons.suggested); - - // b. pousse les nouvelles valeurs dans le tableau - suggested.forEach(function(item) { - state.add_persons.suggested.push(item); - }); - - console.log('selections', state.add_persons.selected); - console.log('suggestions', state.add_persons.suggested); - - // calcule l'intersection des 2 tableaux - let intersection = state.add_persons.suggested.filter( - item => state.add_persons.selected.indexOf(item) !== -1 - //function(item) {let x = state.add_persons.selected.indexOf(item); console.log('indexof', x); return x !== -1; } - ); - console.log('intersection', intersection); - // enlève l'intersection des 2 tableaux - state.add_persons.suggested = state.add_persons.suggested.filter(item => item !== intersection); - + state.add_persons.suggested = suggested; }, updateSelected(state, value) { - console.log('update selected values', value); state.add_persons.selected = value; } }, @@ -131,7 +100,7 @@ let getDataPromise = getAccompanyingCourse(id) }, setQuery({ commit }, payload) { commit('setQuery', payload); - console.log('## action: setquery: payload', payload); + //console.log('## action: setquery: payload', payload); if (payload.query.length >= 3) { searchPersons(payload.query) .then(suggested => new Promise((resolve, reject) => { @@ -143,6 +112,7 @@ let getDataPromise = getAccompanyingCourse(id) } }, updateSelected({ commit }, payload) { + //console.log('## action: update selected values: payload', payload); commit('updateSelected', payload); } } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue index 54e00c63a..efb5ce832 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue @@ -65,8 +65,6 @@ import { mapState } from 'vuex'; import Modal from 'ChillPersonAssets/vuejs/_components/Modal'; import PersonSuggestion from 'ChillPersonAssets/vuejs/_components/PersonSuggestion'; -const SimpsonId = 10000; - export default { name: 'AddPersons', components: { @@ -101,12 +99,11 @@ export default { return this.add_persons.selected; }, selectedCounter() { - if (! this.add_persons.selected) { return 0; } return this.add_persons.selected.length; }, selectedAndSuggested() { - return [...new Set([...this.selected, ...this.suggested])]; - }, + return this.$store.getters.selectedAndSuggested; + } }, methods: { openModal() { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue index 86071ae22..943ee731a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue @@ -45,6 +45,9 @@ export default { return this.$store.state.add_persons.selected; } }, + selectedAndSuggested() { + return this.$store.getters.selectedAndSuggested; + }, isChecked() { return (this.selected.indexOf(this.item) === -1) ? false : true; } From f3260f57a4cdee8421ddc814e703ddc18fe526ca Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 6 May 2021 19:16:07 +0200 Subject: [PATCH 35/62] fix display elements order selectAndSuggested method in store getter, is callable in all components, and make union of two arrays: suggested and selected * we need to have selected in last position (required for isChecked method to work well) * but we want to display selected in first position (for better ux) then, we use double inversion to obtain good behaviour --- .../Resources/public/vuejs/AccompanyingCourse/store/index.js | 4 ++-- .../Resources/public/vuejs/_components/AddPersons.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 2247e078d..4add9bf43 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -29,8 +29,8 @@ let getDataPromise = getAccompanyingCourse(id) ).values() ]; let union = [...new Set([ - ...state.add_persons.selected, - ...state.add_persons.suggested, + ...state.add_persons.suggested.slice().reverse(), + ...state.add_persons.selected.slice().reverse(), ])]; return uniqBy(union, k => k.id); } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue index efb5ce832..3f4be3297 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue @@ -40,7 +40,7 @@
From ad690db886b8a5dc53ebd6d6cb37757bca42b782 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Fri, 7 May 2021 10:26:04 +0200 Subject: [PATCH 36/62] 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; } From b4274264a7874714b43b9a654610bd73a819904a Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Fri, 7 May 2021 12:03:36 +0200 Subject: [PATCH 37/62] create addPersons store module, move state/getters/mutations/actions in module --- .../public/vuejs/AccompanyingCourse/api.js | 5 +- .../public/vuejs/AccompanyingCourse/index.js | 6 +- .../vuejs/AccompanyingCourse/store/index.js | 74 ++++-------------- .../store/modules/addPersons.js | 76 +++++++++++++++++++ .../public/vuejs/_components/AddPersons.vue | 18 +++-- .../vuejs/_components/PersonSuggestion.vue | 5 +- 6 files changed, 107 insertions(+), 77 deletions(-) create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/modules/addPersons.js diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js index dc94159cf..0f71f7170 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js @@ -22,10 +22,11 @@ let getAccompanyingCourse = (accompanying_period_id___) => { //tmp /* * Endpoint chill_person_accompanying_course_api_add_participation, -* method POST, add a participation to the accompanyingCourse +* method POST/DELETE, add/close a participation to the accompanyingCourse * * @accompanying_period_id integer - id of accompanyingCourse -* @person_id integer - id of person +* @person_id integer - id of person +* @method string - POST or DELETE */ let postParticipation = (accompanying_period_id, person_id, method) => { const url = `/${locale}/person/api/1.0/accompanying-course/${accompanying_period_id}/participation.${format}` diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js index b1f6dee0e..3cd93b08e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js @@ -1,14 +1,14 @@ import { createApp } from 'vue' import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n' import { appMessages } from './js/i18n' -import { getDataPromise } from './store' +import { initPromise } from './store' import App from './App.vue'; -getDataPromise.then(store => { +initPromise.then(store => { //console.log('store in create_store', store); - console.log('store accompanyingCourse', store.state.accompanying_course); + //console.log('store accompanyingCourse', store.state.accompanying_course); const i18n = _createI18n(appMessages); 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 42c0a6b29..77a27370a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -1,39 +1,25 @@ import 'es6-promise/auto'; import { createStore } from 'vuex'; +import addPersons from './modules/addPersons' import { getAccompanyingCourse, postParticipation } from '../api'; -import { searchPersons } from 'ChillPersonAssets/vuejs/_api/AddPersons' const debug = process.env.NODE_ENV !== 'production'; const id = window.accompanyingCourseId; //tmp -let getDataPromise = getAccompanyingCourse(id) +let initPromise = getAccompanyingCourse(id) .then(accompanying_course => new Promise((resolve, reject) => { const store = createStore({ strict: debug, + modules: { + addPersons: addPersons + }, state: { accompanying_course: accompanying_course, - add_persons: { - query: "", - suggested: [], - selected: [] - }, errorMsg: [] }, getters: { - selectedAndSuggested: state => { - const uniqBy = (a, key) => [ - ...new Map( - a.map(x => [key(x), x]) - ).values() - ]; - let union = [...new Set([ - ...state.add_persons.suggested.slice().reverse(), - ...state.add_persons.selected.slice().reverse(), - ])]; - return uniqBy(union, k => k.id); - } }, mutations: { removeParticipation(state, item) { @@ -49,33 +35,17 @@ let getDataPromise = getAccompanyingCourse(id) // pousse la participation state.accompanying_course.participations.push(participation); }, - addParticipation(state, { participation, payload }) { + addParticipation(state, participation) { //console.log('### mutation: add participation', participation); state.accompanying_course.participations.push(participation); - //console.log('count participations from state', state.accompanying_course.participations.length); - //console.log('avant', state.add_persons.selected); - state.add_persons.selected = state.add_persons.selected.filter(value => value !== payload); - //console.log('après', state.add_persons.selected); - state.add_persons.query = ""; - state.add_persons.suggested = []; }, - setQuery(state, query) { - //console.log('q=', query); - state.add_persons = Object.assign({}, state.add_persons, query); - }, - loadSuggestions(state, suggested) { - state.add_persons.suggested = suggested; - }, - updateSelected(state, value) { - state.add_persons.selected = value; - } }, actions: { removeParticipation({ commit }, payload) { commit('removeParticipation', payload); }, closeParticipation({ commit }, payload) { - console.log('## action: fetch delete participation: payload', payload.person.id); + //console.log('## action: fetch delete participation: payload', payload.person.id); postParticipation(id, payload.person.id, 'DELETE') .then(participation => new Promise((resolve, reject) => { //console.log('payload', payload); @@ -83,42 +53,26 @@ let getDataPromise = getAccompanyingCourse(id) resolve(); })) .catch((error) => { - console.log('error', error); state.errorMsg.push(error.message); }); }, - addParticipation({ commit }, payload) { - console.log('## action: fetch post participation: payload', payload.id); + addParticipation(addPersons, payload) { + //console.log('## action: fetch post participation: payload', payload.id); postParticipation(id, payload.id, 'POST') .then(participation => new Promise((resolve, reject) => { - commit('addParticipation', { participation, payload }); + //console.log(participation, payload); + addPersons.commit('addParticipation', participation); + addPersons.commit('resetState', payload); resolve(); })) .catch((error) => { state.errorMsg.push(error.message); }); }, - setQuery({ commit }, payload) { - commit('setQuery', payload); - //console.log('## action: setquery: payload', payload); - if (payload.query.length >= 3) { - searchPersons(payload.query) - .then(suggested => new Promise((resolve, reject) => { - commit('loadSuggestions', suggested.results); - resolve(); - })); - } else { - commit('loadSuggestions', []); - } - }, - updateSelected({ commit }, payload) { - //console.log('## action: update selected values: payload', payload); - commit('updateSelected', payload); - } } }); - console.log('store object', store.state.accompanying_course.id); + //console.log('store object', store.state.accompanying_course.id); resolve(store); })); -export { getDataPromise }; +export { initPromise }; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/modules/addPersons.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/modules/addPersons.js new file mode 100644 index 000000000..e65f94fa9 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/modules/addPersons.js @@ -0,0 +1,76 @@ +import { searchPersons } from 'ChillPersonAssets/vuejs/_api/AddPersons' +import { postParticipation } from '../../api'; + + +// initial state +const state = { + query: "", + suggested: [], + selected: [] +} + +// getters +const getters = { + selectedAndSuggested: state => { + const uniqBy = (a, key) => [ + ...new Map( + a.map(x => [key(x), x]) + ).values() + ]; + let union = [...new Set([ + ...state.suggested.slice().reverse(), + ...state.selected.slice().reverse(), + ])]; + return uniqBy(union, k => k.id); + } +} + +// mutations +const mutations = { + setQuery(state, query) { + //console.log('q=', query); + state.query = query; + }, + loadSuggestions(state, suggested) { + state.suggested = suggested; + }, + updateSelected(state, value) { + state.selected = value; + }, + resetState(state, selected) { + //console.log('avant', state.selected); + state.selected = state.selected.filter(value => value !== selected); + //console.log('après', state.selected); + state.query = ""; + state.suggested = []; + } +} + +// actions +const actions = { + setQuery({ commit }, payload) { + //console.log('## action: setquery: payload', payload); + commit('setQuery', payload.query); + if (payload.query.length >= 3) { + searchPersons(payload.query) + .then(suggested => new Promise((resolve, reject) => { + commit('loadSuggestions', suggested.results); + resolve(); + })); + } else { + commit('loadSuggestions', []); + } + }, + updateSelected({ commit }, payload) { + //console.log('## action: update selected values: payload', payload); + commit('updateSelected', payload); + } +} + +export default { + //namespaced: true, + state, + getters, + actions, + mutations +} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue index ae5396ddf..74df3c575 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue @@ -55,7 +55,7 @@ @@ -84,26 +84,28 @@ export default { } }, computed: { - ...mapState(['add_persons']), + ...mapState({ + addPersons: state => state.addPersons + }), query: { set(query) { this.$store.dispatch('setQuery', { query }); }, get() { - return this.add_persons.query; + return this.addPersons.query; } }, suggested() { - return this.add_persons.suggested; + return this.addPersons.suggested; }, suggestedCounter() { - return this.add_persons.suggested.length; + return this.addPersons.suggested.length; }, selected() { - return this.add_persons.selected; + return this.addPersons.selected; }, selectedCounter() { - return this.add_persons.selected.length; + return this.addPersons.selected.length; }, selectedAndSuggested() { return this.$store.getters.selectedAndSuggested; @@ -116,7 +118,7 @@ export default { this.$refs.search.focus(); }) }, - addPersons() { + addNewPersons() { console.log('@@@ CLICK button addPersons') this.selected.forEach(function(item) { //console.log('# dispatch action for each item', item); diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue index a3dc98b4c..f2561b0af 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/PersonSuggestion.vue @@ -42,12 +42,9 @@ export default { this.$store.dispatch('updateSelected', value); }, get() { - return this.$store.state.add_persons.selected; + return this.$store.state.addPersons.selected; } }, - //selectedAndSuggested() { - // return this.$store.getters.selectedAndSuggested; - //}, isChecked() { return (this.selected.indexOf(this.item) === -1) ? false : true; } From 6f5d45712216fef98012075d6a47018668afcbbe Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Fri, 7 May 2021 15:15:41 +0200 Subject: [PATCH 38/62] renaming store state dict name --- .../public/vuejs/AccompanyingCourse/App.vue | 2 +- .../components/AccompanyingCourse.vue | 14 +++++++------- .../components/PersonsAssociated.vue | 4 ++-- .../AccompanyingCourse/components/Requestor.vue | 8 ++++---- .../public/vuejs/AccompanyingCourse/index.js | 2 +- .../public/vuejs/AccompanyingCourse/store/index.js | 14 +++++++------- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue index fba5a2781..480b882dc 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue @@ -19,7 +19,7 @@ export default { Requestor }, computed: mapState([ - 'accompanying_course' + 'accompanyingCourse' ]) }; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue index 4a5ad0ab1..be3014ddb 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue @@ -3,15 +3,15 @@

{{ $t('course.title') }}

{{ $t('course.id') }}
-
{{ accompanying_course.id }}
+
{{ accompanyingCourse.id }}
{{ $t('course.opening_date') }}
-
{{ $d(accompanying_course.openingDate.datetime, 'short') }}
+
{{ $d(accompanyingCourse.openingDate.datetime, 'short') }}
{{ $t('course.closing_date') }}
-
{{ $d(accompanying_course.closingDate.datetime, 'short') }}
+
{{ $d(accompanyingCourse.closingDate.datetime, 'short') }}
{{ $t('course.remark') }}
-
{{ accompanying_course.remark }}
+
{{ accompanyingCourse.remark }}
{{ $t('course.closing_motive') }}
-
{{ accompanying_course.closing_motive }}
+
{{ accompanyingCourse.closing_motive }}
@@ -20,8 +20,8 @@ export default { name: 'AccompanyingCourse', computed: { - accompanying_course() { - return this.$store.state.accompanying_course + accompanyingCourse() { + return this.$store.state.accompanyingCourse } } } 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 f330acde6..631534fcb 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue @@ -45,8 +45,8 @@ export default { AddPersons }, computed: mapState({ - participations: state => state.accompanying_course.participations, - counter: state => state.accompanying_course.participations.length + participations: state => state.accompanyingCourse.participations, + counter: state => state.accompanyingCourse.participations.length }), methods: { removeParticipation(item) { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue index 58a7c8ffd..e481fa91d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue @@ -1,8 +1,8 @@