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

Added nextDue field

Browse Source
This commit is contained in:
Keith Holliday
2017-05-11 13:11:16 -06:00
parent e7418472f6
commit 1292f9a3d5
9 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
website/server/controllers/api-v3/tasks.js
View File

@@ -21,6 +21,7 @@ import {
import common from '../../../common';
import Bluebird from 'bluebird';
import _ from 'lodash';
import cloneDeep from 'lodash/cloneDeep';
import logger from '../../libs/logger';
const MAX_SCORE_NOTES_LENGTH = 256;
@@ -457,7 +458,13 @@ api.updateTask = {
}
if (sanitizedObj.type === 'daily') {
task.isDue = common.shouldDo(Date.now(), sanitizedObj, user.preferences);
let optionsForShouldDo = cloneDeep(user.preferences.toObject());
task.isDue = common.shouldDo(Date.now(), sanitizedObj, optionsForShouldDo);
optionsForShouldDo.nextDue = true;
let nextDue = common.shouldDo(Date.now(), sanitizedObj, optionsForShouldDo);
if (nextDue && nextDue.length > 0) {
task.nextDue = nextDue;
}
}
let savedTask = await task.save();
@@ -590,7 +597,13 @@ api.scoreTask = {
}
if (task.type === 'daily') {
task.isDue = common.shouldDo(Date.now(), task, user.preferences);
let optionsForShouldDo = cloneDeep(user.preferences.toObject());
task.isDue = common.shouldDo(Date.now(), task, optionsForShouldDo);
optionsForShouldDo.nextDue = true;
let nextDue = common.shouldDo(Date.now(), task, optionsForShouldDo);
if (nextDue && nextDue.length > 0) {
task.nextDue = nextDue;
}
}
let results = await Bluebird.all([