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

Added option for getting isDue field for specified date

Browse Source
This commit is contained in:
Keith Holliday
2017-06-27 22:22:20 -06:00
parent 8299982484
commit acb4b79078
3 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
website/server/libs/taskManager.js
View File

@@ -1,3 +1,4 @@
import moment from 'moment';
import * as Tasks from '../models/task';
import {
BadRequest,
@@ -22,13 +23,16 @@ async function _validateTaskAlias (tasks, res) {
});
}
export function setNextDue (task, user) {
export function setNextDue (task, user, dueDateOption) {
if (task.type !== 'daily') return;
let dateTaskIsDue = Date.now();
if (dueDateOption) dateTaskIsDue = moment(dueDateOption);
console.log(dueDateOption)
let optionsForShouldDo = user.preferences.toObject();
task.isDue = shared.shouldDo(Date.now(), task, optionsForShouldDo);
task.isDue = shared.shouldDo(dateTaskIsDue, task, optionsForShouldDo);
optionsForShouldDo.nextDue = true;
let nextDue = shared.shouldDo(Date.now(), task, optionsForShouldDo);
let nextDue = shared.shouldDo(dateTaskIsDue, task, optionsForShouldDo);
if (nextDue && nextDue.length > 0) {
task.nextDue = nextDue.map((dueDate) => {
return dueDate.toISOString();
@@ -120,6 +124,7 @@ export async function getTasks (req, res, options = {}) {
user,
challenge,
group,
dueDate,
} = options;
let query = {userId: user._id};
@@ -185,6 +190,8 @@ export async function getTasks (req, res, options = {}) {
} else {
orderedTasks[i] = task;
}
if (dueDate) setNextDue(task, user, dueDate);
});
// Remove empty values from the array and add any unordered task