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

Group plans reorder tasks (#8358)

Browse Source 
* Added move route for group tasks

* Added group task reorder to front end

* Added syncing with group task order

* Fixed linting issues

* Added missing exec and abstracted move code

* Added unit test for moveTask
This commit is contained in:
Keith Holliday
2017-01-11 11:16:20 -07:00
committed by Matteo Pagliazzi
parent 2690caed35
commit 1590d955cd
9 changed files with 191 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ import {
import {
createTasks,
getTasks,
moveTask,
} from '../../libs/taskManager';
import common from '../../../common';
import Bluebird from 'bluebird';
@@ -460,22 +461,8 @@ api.moveTask = {
if (!task) throw new NotFound(res.t('taskNotFound'));
if (task.type === 'todo' && task.completed) throw new BadRequest(res.t('cantMoveCompletedTodo'));
let order = user.tasksOrder[`${task.type}s`];
let currentIndex = order.indexOf(task._id);
// If for some reason the task isn't ordered (should never happen), push it in the new position
// if the task is moved to a non existing position
// or if the task is moved to position -1 (push to bottom)
// -> push task at end of list
if (!order[to] && to !== -1) {
order.push(task._id);
} else {
if (currentIndex !== -1) order.splice(currentIndex, 1);
if (to === -1) {
order.push(task._id);
} else {
order.splice(to, 0, task._id);
}
}
moveTask(order, task._id, to);
await user.save();
res.respond(200, order);

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

@@ -4,12 +4,14 @@ import * as Tasks from '../../../models/task';
import { model as Group } from '../../../models/group';
import { model as User } from '../../../models/user';
import {
BadRequest,
NotFound,
NotAuthorized,
} from '../../../libs/errors';
import {
createTasks,
getTasks,
moveTask,
} from '../../../libs/taskManager';
let requiredGroupFields = '_id leader tasksOrder name';
@@ -80,6 +82,58 @@ api.getGroupTasks = {
},
};
/**
* @api {post} /api/v3/group/:groupId/tasks/:taskId/move/to/:position Move a group task to a specified position
* @apiDescription Moves a group task to a specified position
* @apiVersion 3.0.0
* @apiName GroupMoveTask
* @apiGroup Task
*
* @apiParam {String} taskId The task _id
* @apiParam {Number} position Query parameter - Where to move the task (-1 means push to bottom). First position is 0
*
* @apiSuccess {Array} data The new tasks order (group.tasksOrder.{task.type}s)
*/
api.groupMoveTask = {
method: 'POST',
url: '/group-tasks/:taskId/move/to/:position',
middlewares: [authWithHeaders()],
async handler (req, res) {
req.checkParams('taskId', res.t('taskIdRequired')).notEmpty();
req.checkParams('position', res.t('positionRequired')).notEmpty().isNumeric();
let reqValidationErrors = req.validationErrors();
if (reqValidationErrors) throw reqValidationErrors;
let user = res.locals.user;
let taskId = req.params.taskId;
let task = await Tasks.Task.findOne({
_id: taskId,
}).exec();
let to = Number(req.params.position);
if (!task) {
throw new NotFound(res.t('taskNotFound'));
}
if (task.type === 'todo' && task.completed) throw new BadRequest(res.t('cantMoveCompletedTodo'));
let group = await Group.getGroup({user, groupId: task.group.id, fields: requiredGroupFields});
if (!group) throw new NotFound(res.t('groupNotFound'));
if (group.leader !== user._id) throw new NotAuthorized(res.t('onlyGroupLeaderCanEditTasks'));
let order = group.tasksOrder[`${task.type}s`];
moveTask(order, task._id, to);
await group.save();
res.respond(200, order);
},
};
/**
* @api {post} /api/v3/tasks/:taskId/assign/:assignedUserId Assign a group task to a user
* @apiDescription Assigns a user to a group task