From 7f2719a75c226e3894402db3b666a5e50a63adfd Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Thu, 18 May 2017 10:11:29 -0600 Subject: [PATCH] Fixed every x weekly --- website/common/script/cron.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/website/common/script/cron.js b/website/common/script/cron.js index 7195fc815c..042f89006f 100644 --- a/website/common/script/cron.js +++ b/website/common/script/cron.js @@ -128,15 +128,14 @@ export function shouldDo (day, dailyTask, options = {}) { } else if (dailyTask.frequency === 'weekly') { let schedule = moment(startDate).recur(); - if (dailyTask.everyX > 1) { - schedule = schedule.every(dailyTask.everyX).weeks(); - } + let differenceInWeeks = moment(day).week() - moment(startDate).week(); + let matchEveryX = differenceInWeeks % dailyTask.everyX === 0; schedule = schedule.every(daysOfTheWeek).daysOfWeek(); if (options.nextDue) return schedule.fromDate(startOfDayWithCDSTime).next(3); - return schedule.matches(startOfDayWithCDSTime); + return schedule.matches(startOfDayWithCDSTime) && matchEveryX; } else if (dailyTask.frequency === 'monthly') { let schedule = moment(startDate).recur();