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

Abstracted set next due logic, set offset, and mapped to ISO

Browse Source
This commit is contained in:
Keith Holliday
2017-05-12 07:39:32 -06:00
parent 1292f9a3d5
commit f192ca4c6f
4 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,11 +17,11 @@ import {
createTasks,
getTasks,
moveTask,
setNextDue,
} from '../../libs/taskManager';
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,15 +457,7 @@ api.updateTask = {
task.group.approval.required = true;
}
if (sanitizedObj.type === 'daily') {
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;
}
}
setNextDue(task, user);
let savedTask = await task.save();
@@ -596,15 +588,7 @@ api.scoreTask = {
}
}
if (task.type === 'daily') {
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;
}
}
setNextDue(task, user);
let results = await Bluebird.all([
user.save(),