From 90faa27461ea2316888ced1550e3538638e8ee64 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 2 Sep 2021 19:15:40 +0200 Subject: [PATCH 1/4] vue Address: listen to adresssSelector to automatically fill street/number fields --- .../AddAddress/AddressSelection.vue | 41 ++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue index 97fd495ab..e8b856f57 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue @@ -4,6 +4,8 @@ -
+ +
s.trim()); + if (substr.length === 1) { + substr = address.split(' '); + } + let decimal = []; + substr.forEach((s, i) => { decimal[i] = /^\d+$/.test(s) }); + if (decimal[0] === true) { + return { number: substr.shift(), + street: substr.join(' ') } + } + else if (decimal[decimal.length - 1] === true) { + return { number: substr.pop(), + street: substr.join(' ') } + } + return { number: '', + street: substr.join(' ') } + }, addAddress() { this.entity.selected.writeNew.address = true; } From f6e65dddbee1c17b1690a448949c0a52f6358fcb Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 2 Sep 2021 21:06:11 +0200 Subject: [PATCH 2/4] vue Address: listen to citySelector to automatically fill city name and postcode fields --- .../AddAddress/AddressSelection.vue | 18 ++++--- .../components/AddAddress/CitySelection.vue | 51 ++++++++++++++++++- .../Address/components/EditAddressPane.vue | 4 +- 3 files changed, 64 insertions(+), 9 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue index e8b856f57..6f27b5fbf 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue @@ -119,15 +119,21 @@ export default { let decimal = []; substr.forEach((s, i) => { decimal[i] = /^\d+$/.test(s) }); if (decimal[0] === true) { - return { number: substr.shift(), - street: substr.join(' ') } + return { + number: substr.shift(), + street: substr.join(' ') + } } else if (decimal[decimal.length - 1] === true) { - return { number: substr.pop(), - street: substr.join(' ') } + return { + number: substr.pop(), + street: substr.join(' ') + } + } + return { + number: '', + street: substr.join(' ') } - return { number: '', - street: substr.join(' ') } }, addAddress() { this.entity.selected.writeNew.address = true; diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue index d0e196361..5bad8ed83 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue @@ -4,6 +4,8 @@
-
+
s.trim()); + if (substr.length === 1) { + substr = city.split(' '); + } + console.log('substr', substr); + let decimal = []; + substr.forEach((s, i) => { decimal[i] = /^\d+$/.test(s) }); + if (decimal[0] === true) { + return { + code: substr.shift(), + name: substr.join(' ') + } + } + else if (decimal[decimal.length - 1] === true) { + return { + code: substr.pop(), + name: substr.join(' ') + } + } + return { + code: '', + name: substr.join(' ') + } + }, addPostcode() { this.entity.selected.writeNew.postcode = true; } diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue index 017e6fd24..7bbad3db5 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue @@ -134,7 +134,9 @@ export default { methods: { focusOnAddress() { const addressSelector = document.getElementById('addressSelector'); - addressSelector.focus(); + if (addressSelector !== null) { + addressSelector.focus(); + } }, updateMapCenter(point) { //console.log('point', point); From d8b2d3cd901d81de8dc5de7a89e04acf7ea79ecb Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 2 Sep 2021 22:19:03 +0200 Subject: [PATCH 3/4] rename address-render-box component (cfr b9602aa72 - file had been moved and renamed, now we just rename component name into import and template ) --- .../public/vuejs/Address/components/ShowAddressPane.vue | 6 +++--- .../AccompanyingCourse/components/ButtonLocation.vue | 6 +++--- .../AccompanyingCourse/components/CourseLocation.vue | 8 ++++---- .../public/vuejs/AccompanyingCourseWorkEdit/App.vue | 8 ++++---- .../vuejs/HouseholdMembersEditor/components/Household.vue | 6 +++--- .../vuejs/_components/Entity/HouseholdRenderBox.vue | 6 +++--- .../public/vuejs/_components/Entity/PersonRenderBox.vue | 6 +++--- .../vuejs/_components/Entity/ThirdPartyRenderBox.vue | 6 +++--- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue index 738c1ab08..d3894f972 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue @@ -11,7 +11,7 @@ {{ $t(getSuccessText) }}
- +

{{ $t(getValidFromDateText) }}

@@ -48,12 +48,12 @@