mirror/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-12-23 22:58:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

[BUG] Location Visit End Date not affected by Location Timezone

Browse Source 
Fixes #843
This commit is contained in:
Sean Morley
2025-09-07 23:00:33 -04:00
parent 3fafd1c412
commit af2f28090b
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/server/.env.example
View File

@@ -37,7 +37,11 @@ EMAIL_BACKEND='console'
# PGUSER='admin' # PGUSER='admin'
# PGPASSWORD='admin' # PGPASSWORD='admin'
# For Sean's use: # ------ For Sean's use: ----- #
# re-sync the development branch with main after doing squash merges # Re-sync the development branch with main after doing squash merges
# git fetch origin && git checkout development && git reset --hard origin/main && git push origin development --force # git fetch origin && git checkout development && git reset --hard origin/main && git push origin development --force
# Pull and merge weblate changes
# git remote update weblate;
# git merge weblate/development;
# ------------------- # # ------------------- #

17
frontend/src/lib/components/locations/LocationVisits.svelte
View File

@@ -38,7 +38,6 @@
// Props // Props
export let collection: Collection | null = null; export let collection: Collection | null = null;
export let selectedStartTimezone: string = Intl.DateTimeFormat().resolvedOptions().timeZone; export let selectedStartTimezone: string = Intl.DateTimeFormat().resolvedOptions().timeZone;
export let selectedEndTimezone: string = Intl.DateTimeFormat().resolvedOptions().timeZone;
export let utcStartDate: string | null = null; export let utcStartDate: string | null = null;
export let utcEndDate: string | null = null; export let utcEndDate: string | null = null;
export let note: string | null = null; export let note: string | null = null;
@@ -136,7 +135,7 @@
const end = updateLocalDate({ const end = updateLocalDate({
utcDate: utcEndDate, utcDate: utcEndDate,
timezone: selectedEndTimezone timezone: selectedStartTimezone
}).localDate; }).localDate;
localStartDate = start; localStartDate = start;
@@ -192,7 +191,7 @@
utcEndDate = updateUTCDate({ utcEndDate = updateUTCDate({
localDate: localEndDate, localDate: localEndDate,
timezone: selectedEndTimezone, timezone: selectedStartTimezone,
allDay allDay
}).utcDate; }).utcDate;
} }
@@ -214,7 +213,7 @@
utcEndDate = updateUTCDate({ utcEndDate = updateUTCDate({
localDate: localEndDate, localDate: localEndDate,
timezone: selectedEndTimezone, timezone: selectedStartTimezone,
allDay allDay
}).utcDate; }).utcDate;
@@ -225,7 +224,7 @@
localEndDate = updateLocalDate({ localEndDate = updateLocalDate({
utcDate: utcEndDate, utcDate: utcEndDate,
timezone: selectedEndTimezone timezone: selectedStartTimezone
}).localDate; }).localDate;
} }
@@ -587,7 +586,7 @@
if ('start_timezone' in visit && typeof visit.start_timezone === 'string') { if ('start_timezone' in visit && typeof visit.start_timezone === 'string') {
selectedStartTimezone = visit.start_timezone; selectedStartTimezone = visit.start_timezone;
if ('end_timezone' in visit && typeof visit.end_timezone === 'string') { if ('end_timezone' in visit && typeof visit.end_timezone === 'string') {
selectedEndTimezone = visit.end_timezone; selectedStartTimezone = visit.end_timezone;
} }
} else if (visit.timezone) { } else if (visit.timezone) {
selectedStartTimezone = visit.timezone; selectedStartTimezone = visit.timezone;
@@ -673,14 +672,14 @@
localEndDate = updateLocalDate({ localEndDate = updateLocalDate({
utcDate: utcEndDate, utcDate: utcEndDate,
timezone: selectedEndTimezone timezone: selectedStartTimezone
}).localDate; }).localDate;
if (!selectedStartTimezone) { if (!selectedStartTimezone) {
selectedStartTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone; selectedStartTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
} }
if (!selectedEndTimezone) { if (!selectedStartTimezone) {
selectedEndTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone; selectedStartTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
} }
// Check if Strava is enabled by making a simple API call // Check if Strava is enabled by making a simple API call