Skip to content

fix: correctly set allday and keep timezone #2636

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
raimund-schluessler merged 1 commit into from
Aug 5, 2024
Merged

fix: correctly set allday and keep timezone #2636

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: 6 additions & 10 deletions src/models/task.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,9 +483,9 @@ export default class Task {
} else {
this.vtodo.removeProperty('dtstart')
}
this._start = start
this._startMoment = moment(start, 'YYYYMMDDTHHmmssZ')
this.updateLastModified()
this._start = this.vtodo.getFirstPropertyValue('dtstart')
this._startMoment = moment(this._start, 'YYYYMMDDTHHmmssZ')
// Check all day setting
const d = this._due || this._start
this._allDay = d !== null && d.isDate
Expand All @@ -509,9 +509,9 @@ export default class Task {
} else {
this.vtodo.removeProperty('due')
}
this._due = due
this._dueMoment = moment(due, 'YYYYMMDDTHHmmssZ')
this.updateLastModified()
this._due = this.vtodo.getFirstPropertyValue('due')
this._dueMoment = moment(this._due, 'YYYYMMDDTHHmmssZ')
// Check all day setting
const d = this._due || this._start
this._allDay = d !== null && d.isDate
Expand All @@ -531,9 +531,7 @@ export default class Task {
start.isDate = allDay
if (!allDay) {
// If we converted to datetime, we set the hour to zero in the current timezone.
const startJs = start.toJSDate()
startJs.setHours(0)
this.setStart(ICAL.Time.fromJSDate(startJs, true))
this.setStart(ICAL.Time.fromJSDate(moment(start, 'YYYYMMDDTHHmmssZ').toDate(), true))
} else {
this.setStart(ICAL.Time.fromDateString(this._startMoment.format('YYYY-MM-DD')))
}
Expand All @@ -543,9 +541,7 @@ export default class Task {
due.isDate = allDay
if (!allDay) {
// If we converted to datetime, we set the hour to zero in the current timezone.
const dueJs = due.toJSDate()
dueJs.setHours(0)
this.setDue(ICAL.Time.fromJSDate(dueJs, true))
this.setDue(ICAL.Time.fromJSDate(moment(due, 'YYYYMMDDTHHmmssZ').toDate(), true))
} else {
this.setDue(ICAL.Time.fromDateString(this._dueMoment.format('YYYY-MM-DD')))
}
Expand Down