- {$t(`lodging.${lodging.type}`) + ' ' + getLodgingIcon(lodging.type)}
-
@@ -124,21 +136,11 @@
{$t('adventures.dates')}:
- {new Date(lodging.check_in).toLocaleString('en-US', {
- month: 'short',
- day: 'numeric',
- year: 'numeric',
- hour: 'numeric',
- minute: 'numeric'
- })}
- -
- {new Date(lodging.check_out).toLocaleString('en-US', {
- month: 'short',
- day: 'numeric',
- year: 'numeric',
- hour: 'numeric',
- minute: 'numeric'
- })}
+ {formatDateInTimezone(lodging.check_in ?? '', lodging.timezone ?? undefined)} –
+ {formatDateInTimezone(lodging.check_out ?? '', lodging.timezone ?? undefined)}
+ {#if lodging.timezone}
+ ({lodging.timezone})
+ {/if}
{/if}
diff --git a/frontend/src/lib/components/LodgingModal.svelte b/frontend/src/lib/components/LodgingModal.svelte
index d91155c..239211b 100644
--- a/frontend/src/lib/components/LodgingModal.svelte
+++ b/frontend/src/lib/components/LodgingModal.svelte
@@ -5,6 +5,7 @@
import MarkdownEditor from './MarkdownEditor.svelte';
import type { Collection, Lodging } from '$lib/types';
import LocationDropdown from './LocationDropdown.svelte';
+ import DateRangeCollapse from './DateRangeCollapse.svelte';
const dispatch = createEventDispatcher();
@@ -12,22 +13,10 @@
export let lodgingToEdit: Lodging | null = null;
let modal: HTMLDialogElement;
- let constrainDates: boolean = false;
let lodging: Lodging = { ...initializeLodging(lodgingToEdit) };
let fullStartDate: string = '';
let fullEndDate: string = '';
- // Format date as local datetime
- // Convert an ISO date to a datetime-local value in local time.
- function toLocalDatetime(value: string | null): string {
- if (!value) return '';
- const date = new Date(value);
- // Adjust the time by subtracting the timezone offset.
- date.setMinutes(date.getMinutes() - date.getTimezoneOffset());
- // Return format YYYY-MM-DDTHH:mm
- return date.toISOString().slice(0, 16);
- }
-
type LodgingType = {
value: string;
label: string;
@@ -47,27 +36,28 @@
{ value: 'other', label: 'Other' }
];
- // Initialize hotel with values from hotelToEdit or default values
- function initializeLodging(hotelToEdit: Lodging | null): Lodging {
+ // Initialize hotel with values from lodgingToEdit or default values
+ function initializeLodging(lodgingToEdit: Lodging | null): Lodging {
return {
- id: hotelToEdit?.id || '',
- user_id: hotelToEdit?.user_id || '',
- name: hotelToEdit?.name || '',
- type: hotelToEdit?.type || 'other',
- description: hotelToEdit?.description || '',
- rating: hotelToEdit?.rating || NaN,
- link: hotelToEdit?.link || '',
- check_in: hotelToEdit?.check_in ? toLocalDatetime(hotelToEdit.check_in) : null,
- check_out: hotelToEdit?.check_out ? toLocalDatetime(hotelToEdit.check_out) : null,
- reservation_number: hotelToEdit?.reservation_number || '',
- price: hotelToEdit?.price || null,
- latitude: hotelToEdit?.latitude || null,
- longitude: hotelToEdit?.longitude || null,
- location: hotelToEdit?.location || '',
- is_public: hotelToEdit?.is_public || false,
- collection: hotelToEdit?.collection || collection.id,
- created_at: hotelToEdit?.created_at || '',
- updated_at: hotelToEdit?.updated_at || ''
+ id: lodgingToEdit?.id || '',
+ user_id: lodgingToEdit?.user_id || '',
+ name: lodgingToEdit?.name || '',
+ type: lodgingToEdit?.type || 'other',
+ description: lodgingToEdit?.description || '',
+ rating: lodgingToEdit?.rating || NaN,
+ link: lodgingToEdit?.link || '',
+ check_in: lodgingToEdit?.check_in || null,
+ check_out: lodgingToEdit?.check_out || null,
+ reservation_number: lodgingToEdit?.reservation_number || '',
+ price: lodgingToEdit?.price || null,
+ latitude: lodgingToEdit?.latitude || null,
+ longitude: lodgingToEdit?.longitude || null,
+ location: lodgingToEdit?.location || '',
+ is_public: lodgingToEdit?.is_public || false,
+ collection: lodgingToEdit?.collection || collection.id,
+ created_at: lodgingToEdit?.created_at || '',
+ updated_at: lodgingToEdit?.updated_at || '',
+ timezone: lodgingToEdit?.timezone || ''
};
}
@@ -104,27 +94,6 @@
async function handleSubmit(event: Event) {
event.preventDefault();
- if (lodging.check_in && !lodging.check_out) {
- const checkInDate = new Date(lodging.check_in);
- checkInDate.setDate(checkInDate.getDate() + 1);
- lodging.check_out = checkInDate.toISOString();
- }
-
- if (lodging.check_in && lodging.check_out && lodging.check_in > lodging.check_out) {
- addToast('error', $t('adventures.start_before_end_error'));
- return;
- }
-
- // Only convert to UTC if the time is still in local format.
- if (lodging.check_in && !lodging.check_in.includes('Z')) {
- // new Date(lodging.check_in) interprets the input as local time.
- lodging.check_in = new Date(lodging.check_in).toISOString();
- }
- if (lodging.check_out && !lodging.check_out.includes('Z')) {
- lodging.check_out = new Date(lodging.check_out).toISOString();
- }
- console.log(lodging.check_in, lodging.check_out);
-
// Create or update lodging...
const url = lodging.id === '' ? '/api/lodging' : `/api/lodging/${lodging.id}`;
const method = lodging.id === '' ? 'POST' : 'PATCH';
@@ -323,6 +292,7 @@
id="price"
name="price"
bind:value={lodging.price}
+ step="0.01"
class="input input-bordered w-full max-w-xs mt-1"
/>