From af2f28090b9242fb7ab263fa5bbb95a5bcc1b27f Mon Sep 17 00:00:00 2001
From: Sean Morley <mail@seanmorley.com>
Date: Sun, 7 Sep 2025 23:00:33 -0400
Subject: [PATCH] [BUG] Location Visit End Date not affected by Location
 Timezone Fixes #843

---
 backend/server/.env.example                     |  8 ++++++--
 .../components/locations/LocationVisits.svelte  | 17 ++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/backend/server/.env.example b/backend/server/.env.example
index 95a489ef..18e05d0a 100644
--- a/backend/server/.env.example
+++ b/backend/server/.env.example
@@ -37,7 +37,11 @@ EMAIL_BACKEND='console'
 # PGUSER='admin'
 # PGPASSWORD='admin'
 
-# For Sean's use:
-# re-sync the development branch with main after doing squash merges
+# ------ For Sean's use: ----- #
+# 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
+
+# Pull and merge weblate changes
+# git remote update weblate;
+# git merge weblate/development;
 # ------------------- #
\ No newline at end of file
diff --git a/frontend/src/lib/components/locations/LocationVisits.svelte b/frontend/src/lib/components/locations/LocationVisits.svelte
index 5248c450..21e296bb 100644
--- a/frontend/src/lib/components/locations/LocationVisits.svelte
+++ b/frontend/src/lib/components/locations/LocationVisits.svelte
@@ -38,7 +38,6 @@
 	// Props
 	export let collection: Collection | null = null;
 	export let selectedStartTimezone: string = Intl.DateTimeFormat().resolvedOptions().timeZone;
-	export let selectedEndTimezone: string = Intl.DateTimeFormat().resolvedOptions().timeZone;
 	export let utcStartDate: string | null = null;
 	export let utcEndDate: string | null = null;
 	export let note: string | null = null;
@@ -136,7 +135,7 @@
 
 			const end = updateLocalDate({
 				utcDate: utcEndDate,
-				timezone: selectedEndTimezone
+				timezone: selectedStartTimezone
 			}).localDate;
 
 			localStartDate = start;
@@ -192,7 +191,7 @@
 
 		utcEndDate = updateUTCDate({
 			localDate: localEndDate,
-			timezone: selectedEndTimezone,
+			timezone: selectedStartTimezone,
 			allDay
 		}).utcDate;
 	}
@@ -214,7 +213,7 @@
 
 		utcEndDate = updateUTCDate({
 			localDate: localEndDate,
-			timezone: selectedEndTimezone,
+			timezone: selectedStartTimezone,
 			allDay
 		}).utcDate;
 
@@ -225,7 +224,7 @@
 
 		localEndDate = updateLocalDate({
 			utcDate: utcEndDate,
-			timezone: selectedEndTimezone
+			timezone: selectedStartTimezone
 		}).localDate;
 	}
 
@@ -587,7 +586,7 @@
 		if ('start_timezone' in visit && typeof visit.start_timezone === 'string') {
 			selectedStartTimezone = visit.start_timezone;
 			if ('end_timezone' in visit && typeof visit.end_timezone === 'string') {
-				selectedEndTimezone = visit.end_timezone;
+				selectedStartTimezone = visit.end_timezone;
 			}
 		} else if (visit.timezone) {
 			selectedStartTimezone = visit.timezone;
@@ -673,14 +672,14 @@
 
 		localEndDate = updateLocalDate({
 			utcDate: utcEndDate,
-			timezone: selectedEndTimezone
+			timezone: selectedStartTimezone
 		}).localDate;
 
 		if (!selectedStartTimezone) {
 			selectedStartTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 		}
-		if (!selectedEndTimezone) {
-			selectedEndTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+		if (!selectedStartTimezone) {
+			selectedStartTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 		}
 
 		// Check if Strava is enabled by making a simple API call