alex/voyage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(lodging): add check-in and check-out labels and enhance date handling for lodging events

Browse Source
This commit is contained in:
Sean Morley
2025-06-18 22:21:34 -04:00
parent df24316837
commit 9964398e25
15 changed files with 93 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/lib/components/DateRangeCollapse.svelte
View File

@@ -263,7 +263,9 @@
<label for="date" class="text-sm font-medium">
{type === 'transportation'
? $t('adventures.departure_date')
: $t('adventures.start_date')}
: type === 'lodging'
? $t('adventures.check_in')
: $t('adventures.start_date')}
</label>
{#if allDay}
@@ -295,7 +297,11 @@
{#if localStartDate}
<div class="space-y-2">
<label for="end_date" class="text-sm font-medium">
{type === 'transportation' ? $t('adventures.arrival_date') : $t('adventures.end_date')}
{type === 'transportation'
? $t('adventures.arrival_date')
: type === 'lodging'
? $t('adventures.check_out')
: $t('adventures.end_date')}
</label>
{#if allDay}

22
frontend/src/lib/components/LodgingModal.svelte
View File

@@ -7,6 +7,8 @@
import LocationDropdown from './LocationDropdown.svelte';
import DateRangeCollapse from './DateRangeCollapse.svelte';
import { isAllDay } from '$lib';
// @ts-ignore
import { DateTime } from 'luxon';
const dispatch = createEventDispatcher();
@@ -85,19 +87,21 @@
lodging.timezone = lodgingTimezone || null;
console.log(lodgingTimezone);
// Auto-set end date if missing but start date exists
if (lodging.check_in && !lodging.check_out) {
const startDate = new Date(lodging.check_in);
const nextDay = new Date(startDate);
nextDay.setDate(nextDay.getDate() + 1);
if (isAllDay(lodging.check_in)) {
// For all-day, set to next day at 00:00:00
lodging.check_out = nextDay.toISOString().split('T')[0] + 'T00:00:00';
// For all-day, just add one day and keep at UTC 00:00:00
const start = DateTime.fromISO(lodging.check_in, { zone: 'utc' });
const nextDay = start.plus({ days: 1 });
lodging.check_out = nextDay.toISO();
} else {
// For timed events, set to next day at 9:00 AM
nextDay.setHours(9, 0, 0, 0);
lodging.check_out = nextDay.toISOString();
// For timed events, set to next day at 9:00 AM in lodging's timezone, then convert to UTC
const start = DateTime.fromISO(lodging.check_in, { zone: lodging.timezone || 'utc' });
const nextDay = start.plus({ days: 1 });
const end = nextDay.set({ hour: 9, minute: 0, second: 0, millisecond: 0 });
lodging.check_out = end.toUTC().toISO();
}
}

83
frontend/src/lib/index.ts
View File

@@ -70,66 +70,57 @@ export function groupAdventuresByDate(
): Record<string, Adventure[]> {
const groupedAdventures: Record<string, Adventure[]> = {};
// Initialize all days in the range
// Initialize all days in the range using DateTime
for (let i = 0; i < numberOfDays; i++) {
const currentDate = new Date(startDate);
currentDate.setDate(startDate.getDate() + i);
const dateString = getLocalDateString(currentDate);
const currentDate = DateTime.fromJSDate(startDate).plus({ days: i });
const dateString = currentDate.toISODate(); // 'YYYY-MM-DD'
groupedAdventures[dateString] = [];
}
adventures.forEach((adventure) => {
adventure.visits.forEach((visit) => {
if (visit.start_date) {
// Check if this is an all-day event (both start and end at midnight)
const isAllDayEvent =
isAllDay(visit.start_date) && (visit.end_date ? isAllDay(visit.end_date) : false);
// Check if it's all-day: start has 00:00:00 AND (no end OR end also has 00:00:00)
const startHasZeros = visit.start_date.includes('T00:00:00');
const endHasZeros = visit.end_date ? visit.end_date.includes('T00:00:00') : true;
const isAllDayEvent = startHasZeros && endHasZeros;
// For all-day events, we need to handle dates differently
if (isAllDayEvent && visit.end_date) {
// Extract just the date parts without time
const startDateStr = visit.start_date.split('T')[0];
const endDateStr = visit.end_date.split('T')[0];
let startDT: DateTime;
let endDT: DateTime;
// Loop through all days in the range
for (let i = 0; i < numberOfDays; i++) {
const currentDate = new Date(startDate);
currentDate.setDate(startDate.getDate() + i);
const currentDateStr = getLocalDateString(currentDate);
if (isAllDayEvent) {
// For all-day events, extract just the date part and ignore timezone
const dateOnly = visit.start_date.split('T')[0]; // Get 'YYYY-MM-DD'
startDT = DateTime.fromISO(dateOnly); // This creates a date without time/timezone
// Include the current day if it falls within the adventure date range
if (currentDateStr >= startDateStr && currentDateStr <= endDateStr) {
if (groupedAdventures[currentDateStr]) {
groupedAdventures[currentDateStr].push(adventure);
}
}
}
endDT = visit.end_date
? DateTime.fromISO(visit.end_date.split('T')[0])
: startDT;
} else {
// Handle regular events with time components
const adventureStartDate = new Date(visit.start_date);
const adventureDateStr = getLocalDateString(adventureStartDate);
// For timed events, use timezone conversion
startDT = DateTime.fromISO(visit.start_date, {
zone: visit.timezone ?? 'UTC'
});
if (visit.end_date) {
const adventureEndDate = new Date(visit.end_date);
const endDateStr = getLocalDateString(adventureEndDate);
endDT = visit.end_date
? DateTime.fromISO(visit.end_date, {
zone: visit.timezone ?? 'UTC'
})
: startDT;
}
// Loop through all days and include adventure if it falls within the range
for (let i = 0; i < numberOfDays; i++) {
const currentDate = new Date(startDate);
currentDate.setDate(startDate.getDate() + i);
const dateString = getLocalDateString(currentDate);
const startDateStr = startDT.toISODate();
const endDateStr = endDT.toISODate();
// Include the current day if it falls within the adventure date range
if (dateString >= adventureDateStr && dateString <= endDateStr) {
if (groupedAdventures[dateString]) {
groupedAdventures[dateString].push(adventure);
}
}
}
} else {
// If there's no end date, add adventure to the start date only
if (groupedAdventures[adventureDateStr]) {
groupedAdventures[adventureDateStr].push(adventure);
// Loop through all days in range
for (let i = 0; i < numberOfDays; i++) {
const currentDate = DateTime.fromJSDate(startDate).plus({ days: i });
const currentDateStr = currentDate.toISODate();
// Include the current day if it falls within the adventure date range
if (currentDateStr >= startDateStr && currentDateStr <= endDateStr) {
if (groupedAdventures[currentDateStr]) {
groupedAdventures[currentDateStr].push(adventure);
}
}
}