diff --git a/website/client/src/components/tasks/approvalFooter.vue b/website/client/src/components/tasks/approvalFooter.vue
index 9b8132c098..9f6aad74d4 100644
--- a/website/client/src/components/tasks/approvalFooter.vue
+++ b/website/client/src/components/tasks/approvalFooter.vue
@@ -44,7 +44,7 @@
>
+
+ {{ formattedCompletionTime }}
+
@@ -264,7 +270,7 @@ export default {
);
const userName = this.group.members[index].auth.local.username;
- if (this.task.group.assignedUsers[userId].completed) { // completed
+ if (this.task.type === 'todo' && this.task.group.assignedUsers[userId].completed) { // completed
const { completedDate } = this.task.group.assignedUsers[userId];
if (this.userIsAssigned) {
if (moment().diff(completedDate, 'days') > 0) {
@@ -290,6 +296,14 @@ export default {
const completion = this.task.group.assignedUsers[userId];
return completion.completed && moment().diff(completion.completedDate, 'days') < 1;
},
+ formattedCompletionTime () {
+ const userId = this.assignedUsersKeys[0];
+ const completion = this.task.group.assignedUsers[userId];
+ if (!completion.completed) return '';
+ const { completedDate } = completion;
+ if (moment().diff(completedDate, 'days') < 1) return moment(completedDate).format('h:mm A');
+ return moment(completedDate).format('M/D/YY');
+ },
},
methods: {
iconClass (completion) {