All datetime values are stored in UTC but were displaying raw UTC times to users, causing confusion (e.g., 10:00 Bucharest showing as 08:00). This implements proper timezone conversion throughout the app using each user's profile timezone setting. Changes: - Frontend: Replace local formatters with timezone-aware utilities - Backend: Add timezone conversion to PUT /bookings endpoint - FullCalendar: Configure to display events in user timezone - Fix edit modal to preserve times when editing bookings Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
497 lines
11 KiB
Vue
497 lines
11 KiB
Vue
<template>
|
|
<div class="space-calendar">
|
|
<div v-if="isEditable" class="admin-notice">
|
|
Admin Mode: Drag approved bookings to reschedule
|
|
</div>
|
|
<div v-if="error" class="error">{{ error }}</div>
|
|
<div v-if="loading && !confirmModal.show" class="loading">Loading calendar...</div>
|
|
<FullCalendar v-show="!loading" :options="calendarOptions" />
|
|
|
|
<!-- Confirmation Modal -->
|
|
<div v-if="confirmModal.show" class="modal-overlay" @click.self="cancelReschedule">
|
|
<div class="modal-content">
|
|
<h3>Confirm Reschedule</h3>
|
|
<p>Reschedule this booking?</p>
|
|
|
|
<div class="time-comparison">
|
|
<div class="old-time">
|
|
<strong>Old Time:</strong><br />
|
|
{{ formatDateTime(confirmModal.oldStart) }} - {{ formatDateTime(confirmModal.oldEnd) }}
|
|
</div>
|
|
<div class="arrow">→</div>
|
|
<div class="new-time">
|
|
<strong>New Time:</strong><br />
|
|
{{ formatDateTime(confirmModal.newStart) }} - {{ formatDateTime(confirmModal.newEnd) }}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="modal-actions">
|
|
<button @click="confirmReschedule" :disabled="modalLoading" class="btn-primary">
|
|
{{ modalLoading ? 'Saving...' : 'Confirm' }}
|
|
</button>
|
|
<button @click="cancelReschedule" :disabled="modalLoading" class="btn-secondary">
|
|
Cancel
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import { ref, computed } from 'vue'
|
|
import FullCalendar from '@fullcalendar/vue3'
|
|
import dayGridPlugin from '@fullcalendar/daygrid'
|
|
import timeGridPlugin from '@fullcalendar/timegrid'
|
|
import interactionPlugin from '@fullcalendar/interaction'
|
|
import type { CalendarOptions, EventInput, DatesSetArg, EventDropArg, EventResizeDoneArg } from '@fullcalendar/core'
|
|
import { bookingsApi, adminBookingsApi, handleApiError } from '@/services/api'
|
|
import { useAuthStore } from '@/stores/auth'
|
|
import { formatDateTime as formatDateTimeUtil } from '@/utils/datetime'
|
|
import type { Booking } from '@/types'
|
|
|
|
interface Props {
|
|
spaceId: number
|
|
}
|
|
|
|
const props = defineProps<Props>()
|
|
|
|
const authStore = useAuthStore()
|
|
const userTimezone = computed(() => authStore.user?.timezone || 'UTC')
|
|
const bookings = ref<Booking[]>([])
|
|
const loading = ref(true)
|
|
const initialLoad = ref(true)
|
|
const modalLoading = ref(false)
|
|
const error = ref('')
|
|
|
|
interface ConfirmModal {
|
|
show: boolean
|
|
booking: any
|
|
oldStart: Date | null
|
|
oldEnd: Date | null
|
|
newStart: Date | null
|
|
newEnd: Date | null
|
|
revertFunc: (() => void) | null
|
|
}
|
|
|
|
const confirmModal = ref<ConfirmModal>({
|
|
show: false,
|
|
booking: null,
|
|
oldStart: null,
|
|
oldEnd: null,
|
|
newStart: null,
|
|
newEnd: null,
|
|
revertFunc: null
|
|
})
|
|
|
|
// Admin can edit, users see read-only
|
|
const isEditable = computed(() => authStore.user?.role === 'admin')
|
|
|
|
// Status to color mapping
|
|
const STATUS_COLORS: Record<string, string> = {
|
|
pending: '#FFA500',
|
|
approved: '#4CAF50',
|
|
rejected: '#F44336',
|
|
canceled: '#9E9E9E'
|
|
}
|
|
|
|
// Convert bookings to FullCalendar events
|
|
const events = computed<EventInput[]>(() => {
|
|
return bookings.value.map((booking) => ({
|
|
id: String(booking.id),
|
|
title: booking.title,
|
|
start: booking.start_datetime,
|
|
end: booking.end_datetime,
|
|
backgroundColor: STATUS_COLORS[booking.status] || '#9E9E9E',
|
|
borderColor: STATUS_COLORS[booking.status] || '#9E9E9E',
|
|
extendedProps: {
|
|
status: booking.status,
|
|
description: booking.description
|
|
}
|
|
}))
|
|
})
|
|
|
|
// Handle event drop (drag)
|
|
const handleEventDrop = (info: EventDropArg) => {
|
|
const booking = info.event
|
|
const oldStart = info.oldEvent.start
|
|
const oldEnd = info.oldEvent.end
|
|
const newStart = info.event.start
|
|
const newEnd = info.event.end
|
|
|
|
// Show confirmation modal
|
|
confirmModal.value = {
|
|
show: true,
|
|
booking: booking,
|
|
oldStart: oldStart,
|
|
oldEnd: oldEnd,
|
|
newStart: newStart,
|
|
newEnd: newEnd,
|
|
revertFunc: info.revert
|
|
}
|
|
}
|
|
|
|
// Handle event resize
|
|
const handleEventResize = (info: EventResizeDoneArg) => {
|
|
const booking = info.event
|
|
const oldStart = info.oldEvent.start
|
|
const oldEnd = info.oldEvent.end
|
|
const newStart = info.event.start
|
|
const newEnd = info.event.end
|
|
|
|
// Show confirmation modal
|
|
confirmModal.value = {
|
|
show: true,
|
|
booking: booking,
|
|
oldStart: oldStart,
|
|
oldEnd: oldEnd,
|
|
newStart: newStart,
|
|
newEnd: newEnd,
|
|
revertFunc: info.revert
|
|
}
|
|
}
|
|
|
|
// Confirm reschedule
|
|
const confirmReschedule = async () => {
|
|
if (!confirmModal.value.newStart || !confirmModal.value.newEnd) {
|
|
return
|
|
}
|
|
|
|
try {
|
|
modalLoading.value = true
|
|
|
|
// Call reschedule API
|
|
await adminBookingsApi.reschedule(parseInt(confirmModal.value.booking.id), {
|
|
start_datetime: confirmModal.value.newStart.toISOString(),
|
|
end_datetime: confirmModal.value.newEnd.toISOString()
|
|
})
|
|
|
|
// Success - reload events
|
|
await loadBookings(
|
|
confirmModal.value.newStart < confirmModal.value.oldStart!
|
|
? confirmModal.value.newStart
|
|
: confirmModal.value.oldStart!,
|
|
confirmModal.value.newEnd > confirmModal.value.oldEnd!
|
|
? confirmModal.value.newEnd
|
|
: confirmModal.value.oldEnd!
|
|
)
|
|
|
|
confirmModal.value.show = false
|
|
} catch (err: any) {
|
|
// Error - revert the change
|
|
if (confirmModal.value.revertFunc) {
|
|
confirmModal.value.revertFunc()
|
|
}
|
|
|
|
const errorMsg = err.response?.data?.detail || 'Failed to reschedule booking'
|
|
error.value = errorMsg
|
|
|
|
// Clear error after 5 seconds
|
|
setTimeout(() => {
|
|
error.value = ''
|
|
}, 5000)
|
|
|
|
confirmModal.value.show = false
|
|
} finally {
|
|
modalLoading.value = false
|
|
}
|
|
}
|
|
|
|
// Cancel reschedule
|
|
const cancelReschedule = () => {
|
|
// Revert the visual change
|
|
if (confirmModal.value.revertFunc) {
|
|
confirmModal.value.revertFunc()
|
|
}
|
|
confirmModal.value.show = false
|
|
}
|
|
|
|
// Format datetime for display
|
|
const formatDateTime = (date: Date | null) => {
|
|
if (!date) return ''
|
|
return formatDateTimeUtil(date.toISOString(), userTimezone.value)
|
|
}
|
|
|
|
// Track current date range for refresh
|
|
let currentStart: Date | null = null
|
|
let currentEnd: Date | null = null
|
|
|
|
// Load bookings for a date range
|
|
const loadBookings = async (start: Date, end: Date) => {
|
|
currentStart = start
|
|
currentEnd = end
|
|
error.value = ''
|
|
|
|
try {
|
|
const startStr = start.toISOString()
|
|
const endStr = end.toISOString()
|
|
bookings.value = await bookingsApi.getForSpace(props.spaceId, startStr, endStr)
|
|
} catch (err) {
|
|
error.value = handleApiError(err)
|
|
} finally {
|
|
if (initialLoad.value) {
|
|
loading.value = false
|
|
initialLoad.value = false
|
|
}
|
|
}
|
|
}
|
|
|
|
// Handle date range changes
|
|
const handleDatesSet = (arg: DatesSetArg) => {
|
|
loadBookings(arg.start, arg.end)
|
|
}
|
|
|
|
// FullCalendar options
|
|
const calendarOptions = computed<CalendarOptions>(() => ({
|
|
plugins: [dayGridPlugin, timeGridPlugin, interactionPlugin],
|
|
initialView: 'dayGridMonth',
|
|
headerToolbar: {
|
|
left: 'prev,next today',
|
|
center: 'title',
|
|
right: 'dayGridMonth,timeGridWeek,timeGridDay'
|
|
},
|
|
timeZone: userTimezone.value,
|
|
events: events.value,
|
|
datesSet: handleDatesSet,
|
|
editable: isEditable.value, // Enable drag/resize for admins
|
|
eventStartEditable: isEditable.value,
|
|
eventDurationEditable: isEditable.value,
|
|
selectable: false,
|
|
selectMirror: true,
|
|
dayMaxEvents: true,
|
|
weekends: true,
|
|
height: 'auto',
|
|
eventTimeFormat: {
|
|
hour: '2-digit',
|
|
minute: '2-digit',
|
|
hour12: false
|
|
},
|
|
slotLabelFormat: {
|
|
hour: '2-digit',
|
|
minute: '2-digit',
|
|
hour12: false
|
|
},
|
|
// Drag callback
|
|
eventDrop: handleEventDrop,
|
|
// Resize callback
|
|
eventResize: handleEventResize,
|
|
// Event rendering
|
|
eventDidMount: (info) => {
|
|
// Only approved bookings are draggable
|
|
if (info.event.extendedProps.status !== 'approved') {
|
|
info.el.style.cursor = 'default'
|
|
}
|
|
},
|
|
// Event allow callback
|
|
eventAllow: (dropInfo, draggedEvent) => {
|
|
// Only allow dragging approved bookings
|
|
return draggedEvent.extendedProps.status === 'approved'
|
|
}
|
|
}))
|
|
|
|
// Public refresh method for parent components
|
|
const refresh = () => {
|
|
if (currentStart && currentEnd) {
|
|
loadBookings(currentStart, currentEnd)
|
|
} else {
|
|
const now = new Date()
|
|
const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1)
|
|
const endOfMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0)
|
|
loadBookings(startOfMonth, endOfMonth)
|
|
}
|
|
}
|
|
|
|
defineExpose({ refresh })
|
|
</script>
|
|
|
|
<style scoped>
|
|
.space-calendar {
|
|
background: white;
|
|
border-radius: 8px;
|
|
padding: 24px;
|
|
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
|
}
|
|
|
|
.admin-notice {
|
|
background: #e3f2fd;
|
|
padding: 8px 16px;
|
|
margin-bottom: 16px;
|
|
border-radius: 4px;
|
|
color: #1976d2;
|
|
font-size: 14px;
|
|
}
|
|
|
|
.error {
|
|
padding: 12px;
|
|
background: #fee2e2;
|
|
color: #991b1b;
|
|
border-radius: 4px;
|
|
margin-bottom: 16px;
|
|
}
|
|
|
|
.loading {
|
|
text-align: center;
|
|
color: #6b7280;
|
|
padding: 24px;
|
|
}
|
|
|
|
/* Modal styles */
|
|
.modal-overlay {
|
|
position: fixed;
|
|
top: 0;
|
|
left: 0;
|
|
right: 0;
|
|
bottom: 0;
|
|
background: rgba(0, 0, 0, 0.5);
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: center;
|
|
z-index: 1000;
|
|
}
|
|
|
|
.modal-content {
|
|
background: white;
|
|
padding: 24px;
|
|
border-radius: 8px;
|
|
max-width: 500px;
|
|
width: 90%;
|
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
|
|
}
|
|
|
|
.modal-content h3 {
|
|
margin-top: 0;
|
|
margin-bottom: 16px;
|
|
color: #1f2937;
|
|
}
|
|
|
|
.modal-content p {
|
|
margin-bottom: 20px;
|
|
color: #6b7280;
|
|
}
|
|
|
|
.time-comparison {
|
|
display: flex;
|
|
align-items: center;
|
|
gap: 16px;
|
|
margin: 20px 0;
|
|
padding: 16px;
|
|
background: #f9fafb;
|
|
border-radius: 4px;
|
|
}
|
|
|
|
.old-time,
|
|
.new-time {
|
|
flex: 1;
|
|
font-size: 14px;
|
|
}
|
|
|
|
.old-time strong,
|
|
.new-time strong {
|
|
color: #374151;
|
|
display: block;
|
|
margin-bottom: 4px;
|
|
}
|
|
|
|
.arrow {
|
|
font-size: 24px;
|
|
color: #9ca3af;
|
|
}
|
|
|
|
.modal-actions {
|
|
display: flex;
|
|
gap: 12px;
|
|
justify-content: flex-end;
|
|
margin-top: 24px;
|
|
}
|
|
|
|
.btn-primary {
|
|
background: #3b82f6;
|
|
color: white;
|
|
border: none;
|
|
padding: 10px 20px;
|
|
border-radius: 4px;
|
|
cursor: pointer;
|
|
font-size: 14px;
|
|
font-weight: 500;
|
|
transition: background 0.2s;
|
|
}
|
|
|
|
.btn-primary:hover:not(:disabled) {
|
|
background: #2563eb;
|
|
}
|
|
|
|
.btn-primary:disabled {
|
|
background: #93c5fd;
|
|
cursor: not-allowed;
|
|
}
|
|
|
|
.btn-secondary {
|
|
background: #f3f4f6;
|
|
color: #374151;
|
|
border: 1px solid #d1d5db;
|
|
padding: 10px 20px;
|
|
border-radius: 4px;
|
|
cursor: pointer;
|
|
font-size: 14px;
|
|
font-weight: 500;
|
|
transition: background 0.2s;
|
|
}
|
|
|
|
.btn-secondary:hover:not(:disabled) {
|
|
background: #e5e7eb;
|
|
}
|
|
|
|
.btn-secondary:disabled {
|
|
opacity: 0.5;
|
|
cursor: not-allowed;
|
|
}
|
|
|
|
/* FullCalendar custom styles */
|
|
:deep(.fc) {
|
|
font-family: inherit;
|
|
}
|
|
|
|
:deep(.fc-button) {
|
|
background: #3b82f6;
|
|
border-color: #3b82f6;
|
|
text-transform: capitalize;
|
|
}
|
|
|
|
:deep(.fc-button:hover) {
|
|
background: #2563eb;
|
|
border-color: #2563eb;
|
|
}
|
|
|
|
:deep(.fc-button-active) {
|
|
background: #1d4ed8 !important;
|
|
border-color: #1d4ed8 !important;
|
|
}
|
|
|
|
:deep(.fc-daygrid-day-number) {
|
|
color: #374151;
|
|
font-weight: 500;
|
|
}
|
|
|
|
:deep(.fc-col-header-cell-cushion) {
|
|
color: #374151;
|
|
font-weight: 600;
|
|
}
|
|
|
|
:deep(.fc-event) {
|
|
cursor: pointer;
|
|
}
|
|
|
|
:deep(.fc-event-title) {
|
|
font-weight: 500;
|
|
}
|
|
|
|
/* Draggable events styling */
|
|
:deep(.fc-event.fc-draggable) {
|
|
cursor: move;
|
|
}
|
|
|
|
:deep(.fc-event:not(.fc-draggable)) {
|
|
cursor: default;
|
|
}
|
|
</style>
|