diff --git a/scripts/team-cron.js b/scripts/team-cron.js index 71b882746c..fdb61673d0 100644 --- a/scripts/team-cron.js +++ b/scripts/team-cron.js @@ -55,8 +55,9 @@ async function updateTeamTasks (team) { for (const assignedUser in daily.group.assignedUsers) { if (Object.prototype.hasOwnProperty.call(daily.group.assignedUsers, assignedUser)) { assignments += 1; - if (assignedUser.completed) completions += 1; - assignedUser.completed = false; + if (daily.group.assignedUsers[assignedUser].completed) completions += 1; + daily.group.assignedUsers[assignedUser].completed = false; + daily.markModified('group.assignedUsers'); } } processChecklist = true; diff --git a/website/client/src/assets/svg/last-complete.svg b/website/client/src/assets/svg/last-complete.svg index ec05fc0483..bda38f7415 100644 --- a/website/client/src/assets/svg/last-complete.svg +++ b/website/client/src/assets/svg/last-complete.svg @@ -1,6 +1,3 @@ - - - - + diff --git a/website/client/src/components/tasks/approvalFooter.vue b/website/client/src/components/tasks/approvalFooter.vue index efcc458b35..8dcc8736b3 100644 --- a/website/client/src/components/tasks/approvalFooter.vue +++ b/website/client/src/components/tasks/approvalFooter.vue @@ -32,7 +32,7 @@
{{ completion.completedDateString }}
@@ -44,7 +44,7 @@ >
{{ formattedCompletionTime }} @@ -142,6 +143,7 @@ padding-bottom: 0.25rem; padding-top: 0.25rem; z-index: 9; + height: 24px; .blue-10 { color: $blue-10; @@ -206,10 +208,7 @@ .last-completed { width: 16px; height: 14px; - - + .green-10 { - margin-top: 1px; - } + margin-bottom: 4px; } @@ -277,7 +276,6 @@ export default { completed: this.task.group.assignedUsers[userId].completed, completedDate, completedDateString, - completedToday: moment().diff(completedDate, 'days') === 0, }); } } @@ -297,7 +295,7 @@ export default { ); const userName = this.group.members[index].auth.local.username; - if (this.task.type === 'todo' && this.task.group.assignedUsers[userId].completed) { // completed + if (this.task.group.assignedUsers[userId].completed) { // completed const { completedDate } = this.task.group.assignedUsers[userId]; if (this.userIsAssigned) { if (moment().diff(completedDate, 'days') > 0) { @@ -320,7 +318,6 @@ export default { singleAssignLastDone () { const userId = this.assignedUsersKeys[0]; const completion = this.task.group.assignedUsers[userId]; - if (!completion.completed) return null; return completion.completedDate; }, showGreen () { diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index f0da5d399b..2c1db2b5db 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -365,5 +365,6 @@ "assignedDateAndUser": "Assigned by @<%- username %> on <%= date %>", "claimRewards": "Claim Rewards", "dayStart": "Day start: <%= startTime %>", - "viewStatus": "View Status" + "viewStatus": "View Status", + "lastCompleted": "Last completed" }