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

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

26
website/client-old/js/app.js
View File

@@ -198,10 +198,28 @@ window.habitrpg = angular.module('habitrpg',
})
.then(function (response) {
var tasks = response.data.data;
tasks.forEach(function (element, index, array) {
if (!$scope.group[element.type + 's']) $scope.group[element.type + 's'] = [];
$scope.group[element.type + 's'].unshift(element);
});
// @TODO: This task ordering logic should be astracted and user everywhere group or user tasks are loaded
var groupedTasks = _(tasks)
.groupBy('type')
.forEach(function (tasksOfType, type) {
var order = $scope.group.tasksOrder[type + 's'];
var orderedTasks = new Array(tasksOfType.length);
var unorderedTasks = []; // what we want to add later
tasksOfType.forEach(function (task, index) {
var taskId = task._id;
var i = order[index] === taskId ? index : order.indexOf(taskId);
if (i === -1) {
unorderedTasks.unshift(task); // unshift because we want to display new on top
} else {
orderedTasks[i] = task;
}
});
// Remove empty values from the array and add any unordered task
$scope.group[type + 's'] = _.compact(orderedTasks).concat(unorderedTasks);
}).value();
$scope.group.approvals = [];
if (User.user._id === $scope.group.leader._id) {