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

Fixed strings, yesterdaily filtering and cron check

Browse Source
This commit is contained in:
Keith Holliday
2017-06-15 10:13:33 -06:00
parent f738f550e7
commit a52bd66871
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
website/client-old/js/controllers/notificationCtrl.js
View File

@@ -14,15 +14,20 @@ habitrpg.controller('NotificationCtrl',
function runYesterDailies() {
var userLastCron = moment(User.user.lastCron).local();
var userDayStart = moment().startOf('day').add({ hours: User.user.preferences.dayStart });
if (!userLastCron.isBefore(userDayStart)) return;
if (userLastCron.date() == userDayStart.date()) return;
var dailys = User.user.dailys;
if (!Boolean(dailys) || dailys.length === 0) return;
var yesterDay = moment().subtract('1', 'day').startOf('day').add({ hours: User.user.preferences.dayStart });
var yesterDailies = [];
dailys.forEach(function (task) {
if (task && task.group.approval && task.group.approval.requested) return;
if (task) yesterDailies.push(task);
var shouldDo = Shared.shouldDo(yesterDay, task);
if (task.yesterDaily && shouldDo) yesterDailies.push(task);
});
if (yesterDailies.length === 0) return;