krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 23:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP(teams): can do To Do's

Browse Source
This commit is contained in:
SabreCat
2022-01-28 17:14:33 -06:00
parent eaa5f821a4
commit 9e527f4f35
8 changed files with 125 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
website/client/src/components/tasks/task.vue
View File

@@ -58,8 +58,8 @@
class="task-control daily-todo-control"
:class="controlClass.inner"
tabindex="0"
@click="score(task.completed ? 'down' : 'up' )"
@keypress.enter="score(task.completed ? 'down' : 'up' )"
@click="score(showCheckIcon ? 'down' : 'up' )"
@keypress.enter="score(showCheckIcon ? 'down' : 'up' )"
>
<div
v-if="showTaskLockIcon"
@@ -71,7 +71,7 @@
v-else
class="svg-icon check"
:class="{
'display-check-icon': task.completed,
'display-check-icon': showCheckIcon,
[controlClass.checkbox]: true,
}"
v-html="icons.check"
@@ -1043,12 +1043,22 @@ export default {
if (this.task.group.assignedUsers) return false;
return true;
},
showCheckIcon () {
if (this.isGroupTask && this.task.group.assignedUsers
&& this.task.group.assignedUsers[this.user._id]) {
return this.task.group.assignedUsers[this.user._id].completed;
}
return this.task.completed;
},
showTaskLockIcon () {
if (this.isUser) return false;
if (this.isGroupTask) {
if (this.task.completed) {
if (this.task.group.completedBy === this.user._id) return false;
if (this.teamManagerAccess) return false;
if (this.task.group.assignedUsers && this.task.group.assignedUsers[this.user._id]) {
return false;
}
if (this.task.group.completedBy.userId === this.user._id) return false;
if (this.teamManagerAccess && !this.task.group.assignedUsers) return false;
return true;
}
if (this.isOpenTask) return false;