Skip to content

[stable6.6] Set task start to allow visualization as regular event (take 2) #8869

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
SebastianKrupinski merged 1 commit into from
Sep 5, 2026
+114 −48
Merged

[stable6.6] Set task start to allow visualization as regular event (take 2) #8869

Show file tree
Hide file tree
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
16 changes: 0 additions & 16 deletions src/components/CalendarGrid.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,22 +420,6 @@ export default {
</script>

<style scoped lang="scss">
.calendar-grid-checkbox {
border-style: solid;
border-width: 2px;
border-radius: 4px;
height: 16px;
width: 16px;
}

.calendar-grid-checkbox-checked {
border-style: solid;
border-width: 8px;
border-radius: 4px;
height: 16px;
width: 16px;
}

.fullcalendar-widget{
min-height: 500px;
:deep(.fc-col-header-cell-cushion){
Expand Down
33 changes: 27 additions & 6 deletions src/fullcalendar/eventSources/eventSourceFunction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,34 @@ export function eventSourceFunction(calendarObjects, calendar, start, end, timez
// if there is no due date, we store the task in the
// tasksstore, so user can add it to the calendar if
// he wants
if (object.endDate === null) {
jsStart = null
jsEnd = null
} else {
jsStart = object.endDate.getInTimezone(timezone).jsDate
jsStart = null
jsEnd = null
// Pick up the start and end dates if available.
if (object.startDate) {
jsStart = object.startDate.getInTimezone(timezone).jsDate
}
if (object.endDate) {
jsEnd = object.endDate.getInTimezone(timezone).jsDate
}
let hasOnlyOneDate = false
if (jsStart === null && jsEnd !== null) {
// Task has no start date. Display the start
// of the task as its due date.
jsStart = new Date(jsEnd)
hasOnlyOneDate = true
} else if (jsStart !== null && jsEnd === null) {
// Task has no due date. Display the end of
// the task as its start date.
jsEnd = new Date(jsStart)
hasOnlyOneDate = true
}
if (hasOnlyOneDate && !object.isAllDay()) {
// A timed task with only one date would otherwise render as
// a zero-length slot in the time grid, too short for its
// checkbox and title to be legible. Give it a visible
// minimum span instead.
jsEnd = new Date(jsEnd.getTime() + 30 * 60 * 1000)
}
} else {
// We do not want to display anything that's neither
// an event nor a task
Expand Down Expand Up @@ -198,7 +219,7 @@ export function eventSourceFunction(calendarObjects, calendar, start, end, timez
}
}

if (object.name === 'VTODO' && object.endDate === null && object.percent !== 100 && object.status !== 'COMPLETED') {
if (object.name === 'VTODO' && object.startDate === null && object.endDate === null && object.percent !== 100 && object.status !== 'COMPLETED') {
fcEvent.create = true
tasksStore.appendTask(calendar.id, fcEvent)
} else {
Expand Down
12 changes: 6 additions & 6 deletions src/fullcalendar/rendering/eventDidMount.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ export default errorCatch(function({ event, el }) {
dotElement.style.color = 'var(--color-main-text)'

if (event.extendedProps.percent === 100) {
dotElement.classList.add('calendar-grid-checkbox-checked')
dotElement.classList.add('fc-task-checkbox--checked')
} else {
dotElement.classList.add('calendar-grid-checkbox')
dotElement.classList.add('fc-task-checkbox')
}
} else if (el.classList.contains('fc-daygrid-dot-event')) {
// Dot event in day grid view
Expand All @@ -164,19 +164,19 @@ export default errorCatch(function({ event, el }) {
dotElement.style.color = 'var(--color-main-text)'

if (event.extendedProps.percent === 100) {
dotElement.classList.add('calendar-grid-checkbox-checked')
dotElement.classList.add('fc-task-checkbox--checked')
} else {
dotElement.classList.add('calendar-grid-checkbox')
dotElement.classList.add('fc-task-checkbox')
}
} else {
// AgendaView and all-day grid view
const titleContainer = el.querySelector('.fc-event-title-container')
const checkboxElement = document.createElement('div')
checkboxElement.classList.add('fc-event-title-checkbox')
if (event.extendedProps.percent === 100) {
checkboxElement.classList.add('calendar-grid-checkbox-checked')
checkboxElement.classList.add('fc-task-checkbox--checked')
} else {
checkboxElement.classList.add('calendar-grid-checkbox')
checkboxElement.classList.add('fc-task-checkbox')
}

titleContainer.prepend(checkboxElement)
Expand Down
16 changes: 16 additions & 0 deletions src/styles/fullcalendar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,22 @@
}
}

.fc-task-checkbox {
border-style: solid;
border-width: 2px;
border-radius: 4px;
height: 16px;
width: 16px;
}

.fc-task-checkbox--checked {
border-style: solid;
border-width: 8px;
border-radius: 4px;
height: 16px;
width: 16px;
}

.fc-list-event-checkbox {
margin: 2px 4px 0 -2px;
line-height: 1;
Expand Down
85 changes: 65 additions & 20 deletions tests/javascript/unit/fullcalendar/eventSources/freeBusyResourceEventSourceFunction.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
const event4End = new Date(2020, 5, 6, 0, 0, 0, 0)
const event5Start = new Date(2020, 6, 10, 10, 0, 0, 0)
const event5End = new Date(2020, 6, 10, 10, 0, 0, 0)
const event6Start = new Date(2020, 7, 1, 9, 0, 0, 0)

const eventComponentSet = [{
name: 'VTODO',
Expand Down Expand Up @@ -563,6 +564,23 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
percent: null,
getFirstPropertyFirstValue: vi.fn().mockReturnValue(null),
getPropertyIterator: vi.fn().mockReturnValue([]),
}, {
name: 'VTODO',
id: '7',
isAllDay: vi.fn().mockReturnValue(false),
getReferenceRecurrenceId: vi.fn().mockReturnValue({ unixTime: 123 }),
canModifyAllDay: vi.fn().mockReturnValue(false),
startDate: {
getInTimezone: vi.fn().mockReturnValue({
jsDate: event6Start,
}),
},
endDate: null,
hasComponent: vi.fn().mockReturnValue(false),
title: 'Task without Due but with a start date',
percent: null,
getFirstPropertyFirstValue: vi.fn().mockReturnValue(null),
getPropertyIterator: vi.fn().mockReturnValue([]),
}]

getAllObjectsInTimeRange
Expand Down Expand Up @@ -606,7 +624,7 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
attendeeCount: 0,
},
id: '1###1',
start: event1End,
start: event1Start,
title: 'Untitled task',
}, {
allDay: false,
Expand All @@ -630,7 +648,7 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
attendeeCount: 0,
},
id: '1###2',
start: event2End,
start: event2Start,
title: 'Untitled task',
}, {
allDay: false,
Expand All @@ -654,7 +672,7 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
attendeeCount: 0,
},
id: '1###3',
start: event3End,
start: event3Start,
title: 'Untitled task (99%)',
}, {
allDay: false,
Expand All @@ -678,7 +696,7 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
attendeeCount: 0,
},
id: '1###4',
start: event4End,
start: event4Start,
title: 'This task has a title',
}, {
allDay: false,
Expand All @@ -702,30 +720,57 @@ describe('fullcalendar/freeBusyResourceEventSourceFunction test suite', () => {
attendeeCount: 0,
},
id: '1###5',
start: event5End,
start: event5Start,
title: 'This task has a title and percent (99%)',
}, {
allDay: false,
classNames: [
'fc-event-nc-task',
],
end: new Date(event6Start.getTime() + 30 * 60 * 1000),
extendedProps: {
calendarId: 'Calendar id 456',
calendarName: 'Calendar displayname',
calendarOrder: 1337,
canModifyAllDay: false,
davUrl: 'url1',
objectId: '1',
vobjectId: '7',
objectType: 'VTODO',
percent: null,
recurrenceId: 123,
description: undefined,
location: undefined,
attendeeCount: 0,
},
id: '1###7',
start: event6Start,
title: 'Task without Due but with a start date',
}])

expect(eventComponentSet[0].startDate.getInTimezone).toHaveBeenCalledTimes(0)
expect(eventComponentSet[0].endDate.getInTimezone).toHaveBeenCalledTimes(2)
expect(eventComponentSet[6].startDate.getInTimezone).toHaveBeenCalledTimes(1)
expect(eventComponentSet[6].startDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)

expect(eventComponentSet[0].startDate.getInTimezone).toHaveBeenCalledTimes(1)
expect(eventComponentSet[0].startDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
expect(eventComponentSet[0].endDate.getInTimezone).toHaveBeenCalledTimes(1)
expect(eventComponentSet[0].endDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
expect(eventComponentSet[0].endDate.getInTimezone).toHaveBeenNthCalledWith(2, timezone)
expect(eventComponentSet[1].startDate.getInTimezone).toHaveBeenCalledTimes(0)
expect(eventComponentSet[1].endDate.getInTimezone).toHaveBeenCalledTimes(2)
expect(eventComponentSet[1].startDate.getInTimezone).toHaveBeenCalledTimes(1)
expect(eventComponentSet[1].startDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
expect(eventComponentSet[1].endDate.getInTimezone).toHaveBeenCalledTimes(1)
expect(eventComponentSet[1].endDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
expect(eventComponentSet[1].endDate.getInTimezone).toHaveBeenNthCalledWith(2, timezone)
expect(eventComponentSet[2].startDate.getInTimezone).toHaveBeenCalledTimes(0)
expect(eventComponentSet[2].endDate.getInTimezone).toHaveBeenCalledTimes(2)
expect(eventComponentSet[2].startDate.getInTimezone).toHaveBeenCalledTimes(1)
expect(eventComponentSet[2].startDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
expect(eventComponentSet[2].endDate.getInTimezone).toHaveBeenCalledTimes(1)
expect(eventComponentSet[2].endDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
expect(eventComponentSet[2].endDate.getInTimezone).toHaveBeenNthCalledWith(2, timezone)
expect(eventComponentSet[3].startDate.getInTimezone).toHaveBeenCalledTimes(0)
expect(eventComponentSet[3].endDate.getInTimezone).toHaveBeenCalledTimes(2)
expect(eventComponentSet[3].startDate.getInTimezone).toHaveBeenCalledTimes(1)
expect(eventComponentSet[3].startDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
expect(eventComponentSet[3].endDate.getInTimezone).toHaveBeenCalledTimes(1)
expect(eventComponentSet[3].endDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
expect(eventComponentSet[3].endDate.getInTimezone).toHaveBeenNthCalledWith(2, timezone)
expect(eventComponentSet[4].startDate.getInTimezone).toHaveBeenCalledTimes(0)
expect(eventComponentSet[4].endDate.getInTimezone).toHaveBeenCalledTimes(2)
expect(eventComponentSet[4].startDate.getInTimezone).toHaveBeenCalledTimes(1)
expect(eventComponentSet[4].startDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
expect(eventComponentSet[4].endDate.getInTimezone).toHaveBeenCalledTimes(1)
expect(eventComponentSet[4].endDate.getInTimezone).toHaveBeenNthCalledWith(1, timezone)
expect(eventComponentSet[4].endDate.getInTimezone).toHaveBeenNthCalledWith(2, timezone)

expect(translate).toHaveBeenCalledTimes(3)
expect(translate).toHaveBeenNthCalledWith(1, 'calendar', 'Untitled task')
Expand Down
Loading