From 75be8aa5571f68a3555ead0e48869c213fe2433d Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Sat, 7 Aug 2021 11:59:11 +0200 Subject: [PATCH] enable vue CourseLocation and mark place where it must connect to Address component --- .../AccompanyingCourse/components/CourseLocation.vue | 3 ++- .../Resources/public/vuejs/HouseholdAddress/js/i18n.js | 2 +- src/Bundle/ChillPersonBundle/chill.webpack.config.js | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue index 0fa2ec8ec..2573dccf1 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue @@ -5,6 +5,7 @@
+ @@ -47,7 +48,7 @@ export default { methods: { addTemporaryAddress({ address, modal }) { console.log('@@@ CLICK button addTemporaryAdress', address); - + /* let newAddress = { 'isNoAddress': address.isNoAddress, diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js index f7ee56e02..d62e9add9 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js @@ -1,4 +1,4 @@ -import { addressMessages } from 'ChillMainAssets/vuejs/Address/js/i18n' +import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n' const appMessages = { fr: { diff --git a/src/Bundle/ChillPersonBundle/chill.webpack.config.js b/src/Bundle/ChillPersonBundle/chill.webpack.config.js index 1b779cb79..a08040ccc 100644 --- a/src/Bundle/ChillPersonBundle/chill.webpack.config.js +++ b/src/Bundle/ChillPersonBundle/chill.webpack.config.js @@ -8,11 +8,12 @@ module.exports = function(encore, entries) ChillPersonAssets: __dirname + '/Resources/public' }); - //encore.addEntry('vue_household_address', __dirname + '/Resources/public/vuejs/HouseholdAddress/index.js'); - //encore.addEntry('vue_household_members_editor', __dirname + '/Resources/public/vuejs/HouseholdMembersEditor/index.js'); + encore.addEntry('vue_household_address', __dirname + '/Resources/public/vuejs/HouseholdAddress/index.js'); + + encore.addEntry('vue_household_members_editor', __dirname + '/Resources/public/vuejs/HouseholdMembersEditor/index.js'); encore.addEntry('vue_accourse', __dirname + '/Resources/public/vuejs/AccompanyingCourse/index.js'); - //encore.addEntry('vue_accourse_work_create', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkCreate/index.js'); - //encore.addEntry('vue_accourse_work_edit', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkEdit/index.js'); + encore.addEntry('vue_accourse_work_create', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkCreate/index.js'); + encore.addEntry('vue_accourse_work_edit', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkEdit/index.js'); encore.addEntry('page_household_edit_metadata', __dirname + '/Resources/public/page/household_edit_metadata/index.js'); encore.addEntry('page_person', __dirname + '/Resources/public/page/person/index.js');