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

Fix project view due date timezone bug and recurring multi-weekday bug (#836)

Browse source
This commit is contained in:
Chris 2026-02-12 12:12:24 +02:00 • committed by GitHub
parent 5a1f0650ae
commit 45aec304a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 144 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
backend/modules/tasks/recurringTaskService.js
View file

@ -21,7 +21,8 @@ const calculateNextDueDate = (task, fromDate) => {
return calculateWeeklyRecurrence(
startDate,
task.recurrence_interval || 1,
task.recurrence_weekday
task.recurrence_weekday,
task.recurrence_weekdays
);
case 'monthly':
@ -56,10 +57,28 @@ const calculateDailyRecurrence = (fromDate, interval) => {
return nextDate;
};
const calculateWeeklyRecurrence = (fromDate, interval, weekday) => {
const calculateWeeklyRecurrence = (fromDate, interval, weekday, weekdays) => {
const nextDate = new Date(fromDate);
if (weekday !== null && weekday !== undefined) {
// Handle multiple weekdays (e.g. Tuesday AND Thursday)
const parsedWeekdays = weekdays
? Array.isArray(weekdays)
? weekdays
: JSON.parse(weekdays)
: null;
if (parsedWeekdays && parsedWeekdays.length > 0) {
// Find the next matching weekday from tomorrow onward
for (let daysAhead = 1; daysAhead <= 7; daysAhead++) {
const testDate = new Date(nextDate);
testDate.setUTCDate(testDate.getUTCDate() + daysAhead);
if (parsedWeekdays.includes(testDate.getUTCDay())) {
return testDate;
}
}
// Fallback: advance by interval weeks
nextDate.setUTCDate(nextDate.getUTCDate() + interval * 7);
} else if (weekday !== null && weekday !== undefined) {
const currentWeekday = nextDate.getUTCDay();
const daysUntilTarget = (weekday - currentWeekday + 7) % 7;