From 13c2e627ee4ec11204ca9f01e276ad265f15033e Mon Sep 17 00:00:00 2001 From: Anja Guenther Date: Sun, 28 Sep 2025 20:48:01 +0200 Subject: [PATCH] =?UTF-8?q?fix=20for=20the=20datums=20h=C3=B6lle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/components/UI/Dropdown.vue | 4 ++-- .../src/components/layout/bulkoperation/BulkOperation.vue | 4 +++- .../src/components/layout/config/BulkOperations.vue | 6 ++++-- .../src/components/layout/config/CountryProperties.vue | 4 +++- src/frontend/src/components/layout/config/Properties.vue | 4 +++- src/frontend/src/components/layout/config/Rates.vue | 4 +++- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/frontend/src/components/UI/Dropdown.vue b/src/frontend/src/components/UI/Dropdown.vue index 7d3d777..b3aac56 100644 --- a/src/frontend/src/components/UI/Dropdown.vue +++ b/src/frontend/src/components/UI/Dropdown.vue @@ -101,9 +101,9 @@ export default { computed: { selectedOption() { if (!this.modelValue) return null - return this.options.find(option => + return this.options?.find(option => option[this.valueKey] === this.modelValue - ) + ) ?? null; } }, mounted() { diff --git a/src/frontend/src/components/layout/bulkoperation/BulkOperation.vue b/src/frontend/src/components/layout/bulkoperation/BulkOperation.vue index 3a9f0e5..e92193f 100644 --- a/src/frontend/src/components/layout/bulkoperation/BulkOperation.vue +++ b/src/frontend/src/components/layout/bulkoperation/BulkOperation.vue @@ -59,7 +59,9 @@ export default { return string.substring(0,350) + "..." }, buildDate(date) { - return `${date[0]}-${date[1].toString().padStart(2, '0')}-${date[2].toString().padStart(2, '0')} ${date[3].toString().padStart(2, '0')}:${date[4]?.toString().padStart(2, '0') || '00'}:${date[5]?.toString().padStart(2, '0') || '00'}` + if(date === null) return "not set"; + + return `${date[0]}-${date[1].toString().padStart(2, '0')}-${date[2].toString().padStart(2, '0')} ${date[3]?.toString().padStart(2, '0') ?? '00'}:${date[4]?.toString().padStart(2, '0') ?? '00'}:${date[5]?.toString().padStart(2, '0') ?? '00'}` }, }, data() { diff --git a/src/frontend/src/components/layout/config/BulkOperations.vue b/src/frontend/src/components/layout/config/BulkOperations.vue index a2bb5f0..210286d 100644 --- a/src/frontend/src/components/layout/config/BulkOperations.vue +++ b/src/frontend/src/components/layout/config/BulkOperations.vue @@ -166,8 +166,10 @@ export default { } }, methods: { - buildDate(date) { - return `${date[0]}-${date[1].toString().padStart(2, '0')}-${date[2].toString().padStart(2, '0')} ${date[3].toString().padStart(2, '0')}:${date[4].toString().padStart(2, '0')}:${date[5].toString().padStart(2, '0')}` + buildDate(date) { + if(date === null) return "not set"; + + return `${date[0]}-${date[1].toString().padStart(2, '0')}-${date[2].toString().padStart(2, '0')} ${date[3]?.toString().padStart(2, '0') ?? '00'}:${date[4]?.toString().padStart(2, '0') ?? '00'}:${date[5]?.toString().padStart(2, '0') ?? '00'}` }, async fetchFile(id) { logger.info(`Fetching file ${id}`); diff --git a/src/frontend/src/components/layout/config/CountryProperties.vue b/src/frontend/src/components/layout/config/CountryProperties.vue index cf0ae42..ebcd611 100644 --- a/src/frontend/src/components/layout/config/CountryProperties.vue +++ b/src/frontend/src/components/layout/config/CountryProperties.vue @@ -131,7 +131,9 @@ export default { }, methods: { buildDate(date) { - return `${date[0]}-${date[1].toString().padStart(2, '0')}-${date[2].toString().padStart(2, '0')} ${date[3].toString().padStart(2, '0')}:${date[4].toString().padStart(2, '0')}:${date[5].toString().padStart(2, '0')}` + if(date === null) return "not set"; + + return `${date[0]}-${date[1].toString().padStart(2, '0')}-${date[2].toString().padStart(2, '0')} ${date[3]?.toString().padStart(2, '0') ?? '00'}:${date[4]?.toString().padStart(2, '0') ?? '00'}:${date[5]?.toString().padStart(2, '0') ?? '00'}` }, async saveProperty(property) { this.countryStore.setProperty(property); diff --git a/src/frontend/src/components/layout/config/Properties.vue b/src/frontend/src/components/layout/config/Properties.vue index a50b86e..89a30e2 100644 --- a/src/frontend/src/components/layout/config/Properties.vue +++ b/src/frontend/src/components/layout/config/Properties.vue @@ -124,7 +124,9 @@ export default { this.propertiesStore.setProperty(property); }, buildDate(date) { - return `${date[0]}-${date[1].toString().padStart(2, '0')}-${date[2].toString().padStart(2, '0')} ${date[3].toString().padStart(2, '0')}:${date[4].toString().padStart(2, '0')}:${date[5].toString().padStart(2, '0')}` + if(date === null) return "not set"; + + return `${date[0]}-${date[1].toString().padStart(2, '0')}-${date[2].toString().padStart(2, '0')} ${date[3]?.toString().padStart(2, '0') ?? '00'}:${date[4]?.toString().padStart(2, '0') ?? '00'}:${date[5]?.toString().padStart(2, '0') ?? '00'}` }, deletePeriod() { if (!this.disableDeleteButton) { diff --git a/src/frontend/src/components/layout/config/Rates.vue b/src/frontend/src/components/layout/config/Rates.vue index 06bc833..63d22f6 100644 --- a/src/frontend/src/components/layout/config/Rates.vue +++ b/src/frontend/src/components/layout/config/Rates.vue @@ -184,7 +184,9 @@ export default { }, methods: { buildDate(date) { - return `${date[0]}-${date[1].toString().padStart(2, '0')}-${date[2].toString().padStart(2, '0')} ${date[3].toString().padStart(2, '0')}:${date[4].toString().padStart(2, '0')}:${date[5].toString().padStart(2, '0')}` + if(date === null) return "not set"; + + return `${date[0]}-${date[1].toString().padStart(2, '0')}-${date[2].toString().padStart(2, '0')} ${date[3]?.toString().padStart(2, '0') ?? '00'}:${date[4]?.toString().padStart(2, '0') ?? '00'}:${date[5]?.toString().padStart(2, '0') ?? '00'}` }, async fetch(query) {