From 0d55a10ec2918e37f13c6a29c2057d845bc2ad32 Mon Sep 17 00:00:00 2001 From: Spythere Date: Fri, 19 Dec 2025 13:44:56 +0100 Subject: [PATCH] fix(journal): including timezone in date filters --- src/views/JournalDispatchers.vue | 22 +++++++++++++++++++--- src/views/JournalTimetables.vue | 2 -- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/views/JournalDispatchers.vue b/src/views/JournalDispatchers.vue index 957d2f0..8123de6 100644 --- a/src/views/JournalDispatchers.vue +++ b/src/views/JournalDispatchers.vue @@ -272,7 +272,7 @@ export default defineComponent({ this.scrollDataLoaded = true; }, - async fetchHistoryData() { + async fetchHistoryData() { const queryParams: DispatchersQueryParams = {}; const dispatcherName = this.searchersValues['search-dispatcher'].trim() || undefined; @@ -280,9 +280,25 @@ export default defineComponent({ const dateFromString = this.searchersValues['search-date-from'].trim() || undefined; const dateToString = this.searchersValues['search-date-to'].trim() || undefined; + let dateFromISO: string | undefined = undefined; + let dateToISO: string | undefined = undefined; + + if (dateFromString) { + let dateFrom = new Date(dateFromString); + dateFrom.setMinutes(dateFrom.getMinutes() + dateFrom.getTimezoneOffset()); + dateFromISO = dateFrom.toISOString(); + } + + if (dateToString) { + let dateTo = new Date(dateToString); + dateTo.setMinutes(dateTo.getMinutes() + dateTo.getTimezoneOffset()); + dateToISO = dateTo.toISOString(); + } + queryParams['dispatcherName'] = dispatcherName; - queryParams['dateFrom'] = dateFromString; - queryParams['dateTo'] = dateToString ? `${dateToString}T23:00:00` : undefined; + + queryParams['dateFrom'] = dateFromISO; + queryParams['dateTo'] = dateToISO; queryParams['countLimit'] = 30; diff --git a/src/views/JournalTimetables.vue b/src/views/JournalTimetables.vue index 1ee6a83..978d0bd 100644 --- a/src/views/JournalTimetables.vue +++ b/src/views/JournalTimetables.vue @@ -376,8 +376,6 @@ export default defineComponent({ dateFromISO = dateFrom.toISOString(); dateToISO = dateTo.toISOString(); - - console.log(dateFromISO, dateToISO); } const queryParams: TimetablesQueryParams = {};