Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

address: sort cities by code and then by name + improve city display

Browse Source
This commit is contained in:
nobohan 2021-10-11 16:16:49 +02:00
parent f7954d5159
commit 62c0410bf5
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
View File

@ -72,7 +72,7 @@ export default {
addresses() { addresses() {
return this.entity.loaded.addresses.sort( return this.entity.loaded.addresses.sort(
(a, b) => a.street > b.street || Number(a.streetNumber) - Number(b.streetNumber) (a, b) => a.street > b.street || Number(a.streetNumber) - Number(b.streetNumber)
) )
}, },
street: { street: {
set(value) { set(value) {

6
src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
View File

@ -68,7 +68,9 @@ export default {
return this.$data.value !== null && typeof this.$data.value.text !== 'undefined'; return this.$data.value !== null && typeof this.$data.value.text !== 'undefined';
}, },
cities() { cities() {
return this.entity.loaded.cities; return this.entity.loaded.cities.sort(
(a, b) => Number(a.code) - Number(b.code) || a.name > b.name
)
}, },
name: { name: {
set(value) { set(value) {
@ -92,7 +94,7 @@ export default {
}, },
methods: { methods: {
transName(value) { transName(value) {
return (value.code && value.name) ? `${value.code}-${value.name}` : ''; return (value.code && value.name) ? `${value.name} (${value.code})` : '';
}, },
selectCity(value) { selectCity(value) {
this.entity.selected.city = value; this.entity.selected.city = value;