krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Abstracted set next due logic, set offset, and mapped to ISO

Browse Source
This commit is contained in:
Keith Holliday
2017-05-12 07:39:32 -06:00
parent 1292f9a3d5
commit f192ca4c6f
4 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
website/common/script/cron.js
View File

@@ -122,7 +122,7 @@ export function shouldDo (day, dailyTask, options = {}) {
let schedule = moment(startDate).recur()
.every(dailyTask.everyX).days();
if (options.nextDue) return schedule.next(3, 'L');
if (options.nextDue) return schedule.fromDate(startOfDayWithCDSTime).next(3);
return schedule.matches(startOfDayWithCDSTime);
} else if (dailyTask.frequency === 'weekly') {
@@ -134,7 +134,7 @@ export function shouldDo (day, dailyTask, options = {}) {
schedule = schedule.every(daysOfTheWeek).daysOfWeek();
if (options.nextDue) return schedule.next(3, 'L');
if (options.nextDue) return schedule.fromDate(startOfDayWithCDSTime).next(3);
return schedule.matches(startOfDayWithCDSTime);
} else if (dailyTask.frequency === 'monthly') {
@@ -150,7 +150,7 @@ export function shouldDo (day, dailyTask, options = {}) {
schedule = schedule.every(dailyTask.daysOfMonth).daysOfMonth();
}
if (options.nextDue) return schedule.next(3, 'L');
if (options.nextDue) return schedule.fromDate(startOfDayWithCDSTime).next(3);
return schedule.matches(startOfDayWithCDSTime) && matchEveryX;
} else if (dailyTask.frequency === 'yearly') {
@@ -158,7 +158,7 @@ export function shouldDo (day, dailyTask, options = {}) {
schedule = schedule.every(dailyTask.everyX).years();
if (options.nextDue) return schedule.next(3, 'L');
if (options.nextDue) return schedule.fromDate(startOfDayWithCDSTime).next(3);
return schedule.matches(startOfDayWithCDSTime);
}