Skip to content

fix(agenda): handle calendar view events that spread across multiple days #8685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 1 commit into from
Mar 19, 2025
+6 −2
Merged

fix(agenda): handle calendar view events that spread across multiple days #8685

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions client/agenda/AgendaScheduleCalendar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ function refreshData () {
let earliestDate = DateTime.fromISO('2200-01-01')
let latestDate = DateTime.fromISO('1990-01-01')
let nowDate = DateTime.now()
let hasCrossDayEvents = false

calendarOptions.events = agendaStore.scheduleAdjusted.map(ev => {
// -> Determine boundaries
Expand All @@ -202,6 +203,9 @@ function refreshData () {
if (ev.adjustedEnd < latestDate) {
latestDate = ev.adjustedEnd
}
if (ev.adjustedStart.day !== ev.adjustedEnd.day) {
hasCrossDayEvents = true
}
// -> Build event object
return {
id: ev.id,
Expand All @@ -214,8 +218,8 @@ function refreshData () {
})

// -> Display settings
calendarOptions.slotMinTime = `${earliestHour.toString().padStart(2, '0')}:00:00`
calendarOptions.slotMaxTime = `${latestHour.toString().padStart(2, '0')}:00:00`
calendarOptions.slotMinTime = hasCrossDayEvents ? '00:00:00' : `${earliestHour.toString().padStart(2, '0')}:00:00`
calendarOptions.slotMaxTime = hasCrossDayEvents ? '23:59:59' : `${latestHour.toString().padStart(2, '0')}:00:00`
calendarOptions.validRange.start = earliestDate.minus({ days: 1 }).toISODate()
calendarOptions.validRange.end = latestDate.plus({ days: 1 }).toISODate()
// calendarOptions.scrollTime = `${earliestHour.toString().padStart(2, '0')}:00:00`
Expand Down
Loading