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

WIP(teams): fix initially unassigned task, add completedBy data

Browse Source
This commit is contained in:
Sabe Jones
2021-04-14 16:42:56 -05:00
committed by SabreCat
parent 74345adf6b
commit ae0528e5cd
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/src/components/tasks/taskModal.vue
View File

@@ -1458,11 +1458,13 @@ export default {
tasks: [this.task], tasks: [this.task],
}); });
Object.assign(this.task, response); Object.assign(this.task, response);
if (this.assignedMember) {
await this.$store.dispatch('tasks:assignTask', { await this.$store.dispatch('tasks:assignTask', {
taskId: this.task._id, taskId: this.task._id,
userId: this.assignedMember, userId: this.assignedMember,
}); });
this.task.group.assignedUsers = [this.assignedMember]; this.task.group.assignedUsers = [this.assignedMember];
}
this.$emit('taskCreated', this.task); this.$emit('taskCreated', this.task);
} else { } else {
this.createTask(this.task); this.createTask(this.task);

1
website/server/libs/groupTasks.js
View File

@@ -20,6 +20,7 @@ async function handleSharedCompletion (masterTask, groupMemberTask) {
if (masterTask.type === 'reward') return; if (masterTask.type === 'reward') return;
if (masterTask.type === 'todo') await _deleteUnfinishedTasks(groupMemberTask); if (masterTask.type === 'todo') await _deleteUnfinishedTasks(groupMemberTask);
masterTask.completed = groupMemberTask.completed; masterTask.completed = groupMemberTask.completed;
masterTask.group.completedBy = groupMemberTask.userId;
await masterTask.save(); await masterTask.save();
} }

4
website/server/libs/tasks/index.js
View File

@@ -375,6 +375,10 @@ async function scoreTask (user, task, direction, req, res) {
} }
} }
if (task.completed && task.group.id && !task.userId) {
task.group.completedBy = user._id;
}
setNextDue(task, user); setNextDue(task, user);
if (localTask) { if (localTask) {

1
website/server/models/task.js
View File

@@ -147,6 +147,7 @@ export const TaskSchema = new Schema({
default: SHARED_COMPLETION.single, default: SHARED_COMPLETION.single,
}, },
managerNotes: { $type: String }, managerNotes: { $type: String },
completedBy: { $type: String, ref: 'User', validate: [v => validator.isUUID(v), 'Invalid uuid for group completing user.'] },
}, },
reminders: [reminderSchema], reminders: [reminderSchema],