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

Fixed broken tests

Browse Source
This commit is contained in:
Keith Holliday
2017-05-20 17:19:35 -06:00
parent 99a2013767
commit c08c0685f3
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,7 +128,7 @@ export function shouldDo (day, dailyTask, options = {}) {
} else if (dailyTask.frequency === 'weekly') {
let schedule = moment(startDate).recur();
let differenceInWeeks = moment(day).week() - moment(startDate).week();
let differenceInWeeks = moment(startOfDayWithCDSTime).week() - moment(startDate).week();
let matchEveryX = differenceInWeeks % dailyTask.everyX === 0;
schedule = schedule.every(daysOfTheWeek).daysOfWeek();
@@ -147,7 +147,7 @@ export function shouldDo (day, dailyTask, options = {}) {
} else if (dailyTask.frequency === 'monthly') {
let schedule = moment(startDate).recur();
let differenceInMonths = moment(day).month() - moment(startDate).month();
let differenceInMonths = moment(startOfDayWithCDSTime).month() - moment(startDate).month();
let matchEveryX = differenceInMonths % dailyTask.everyX === 0;
if (dailyTask.weeksOfMonth && dailyTask.weeksOfMonth.length > 0) {