diff --git a/website/client-old/js/services/taskServices.js b/website/client-old/js/services/taskServices.js index c5ecf31c27..17af74bbd5 100644 --- a/website/client-old/js/services/taskServices.js +++ b/website/client-old/js/services/taskServices.js @@ -393,10 +393,11 @@ angular.module('habitrpg') var options = angular.copy(user); options.nextDue = true; var nextDueDates = Shared.shouldDo(new Date, task, options); + if (!nextDueDates) return ''; let dateFormat = 'MM-DD-YYYY'; if (user.preferences.dateFormat) dateFormat = user.preferences.dateFormat.toUpperCase(); - console.log(dateFormat); + var nextDue = nextDueDates.map(function (date) { return date.format(dateFormat); }); diff --git a/website/common/script/cron.js b/website/common/script/cron.js index 124e0f0ce2..bd6532278d 100644 --- a/website/common/script/cron.js +++ b/website/common/script/cron.js @@ -131,6 +131,7 @@ export function shouldDo (day, dailyTask, options = {}) { let differenceInWeeks = moment(startOfDayWithCDSTime).week() - moment(startDate).week(); let matchEveryX = differenceInWeeks % dailyTask.everyX === 0; + if (daysOfTheWeek.length === 0) return false; schedule = schedule.every(daysOfTheWeek).daysOfWeek(); if (options.nextDue) {