marketing-shibata50/tududi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix recurrence occurences (#750)

Browse source
This commit is contained in:
Chris 2025-12-29 12:13:08 +02:00 • committed by GitHub
parent 703f6fe506
commit b4de9c23eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 63 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/services/recurringTaskService.js
View file

@ -52,7 +52,7 @@ const calculateNextDueDate = (task, fromDate) => {
const calculateDailyRecurrence = (fromDate, interval) => {
const nextDate = new Date(fromDate);
nextDate.setDate(nextDate.getDate() + interval);
nextDate.setUTCDate(nextDate.getUTCDate() + interval);
return nextDate;
};
@ -60,22 +60,22 @@ const calculateWeeklyRecurrence = (fromDate, interval, weekday) => {
const nextDate = new Date(fromDate);
if (weekday !== null && weekday !== undefined) {
const currentWeekday = nextDate.getDay();
const currentWeekday = nextDate.getUTCDay();
const daysUntilTarget = (weekday - currentWeekday + 7) % 7;
if (
daysUntilTarget === 0 &&
nextDate.getTime() === fromDate.getTime()
) {
nextDate.setDate(nextDate.getDate() + interval * 7);
nextDate.setUTCDate(nextDate.getUTCDate() + interval * 7);
} else {
nextDate.setDate(nextDate.getDate() + daysUntilTarget);
nextDate.setUTCDate(nextDate.getUTCDate() + daysUntilTarget);
if (nextDate <= fromDate) {
nextDate.setDate(nextDate.getDate() + interval * 7);
nextDate.setUTCDate(nextDate.getUTCDate() + interval * 7);
}
}
} else {
nextDate.setDate(nextDate.getDate() + interval * 7);
nextDate.setUTCDate(nextDate.getUTCDate() + interval * 7);
}
return nextDate;