diff --git a/website/client/src/components/notifications.vue b/website/client/src/components/notifications.vue index 2960b0889e..58640582cc 100644 --- a/website/client/src/components/notifications.vue +++ b/website/client/src/components/notifications.vue @@ -816,7 +816,7 @@ export default { const yesterUtcOffset = yesterDay.utcOffset(); dailys.forEach(task => { - if (task && task.group.approval && task.group.approval.requested) return; + if (task.group && task.group.id) return; if (task.completed) return; const due = shouldDo(yesterDay, task, { timezoneUtcOffset: yesterUtcOffset }); if (task.yesterDaily && due) this.yesterDailies.push(task); diff --git a/website/client/src/components/tasks/approvalFooter.vue b/website/client/src/components/tasks/approvalFooter.vue index 8dcc8736b3..8a489b4591 100644 --- a/website/client/src/components/tasks/approvalFooter.vue +++ b/website/client/src/components/tasks/approvalFooter.vue @@ -41,6 +41,7 @@
@@ -263,7 +265,6 @@ export default { if (userId !== this.user._id) { const index = findIndex(this.group.members, member => member._id === userId); const { completedDate } = this.task.group.assignedUsers[userId]; - if (!completedDate) return []; let completedDateString; if (moment().diff(completedDate, 'days') > 0) { completedDateString = `Completed ${moment(completedDate).format('M/D/YY')}`; diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index 2c1db2b5db..a73cd62a37 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -175,10 +175,10 @@ "onlyGroupLeaderCanEditTasks": "Not authorized to manage tasks!", "onlyGroupTasksCanBeAssigned": "Only group tasks can be assigned", "assignedTo": "Assign To", - "assignedToUser": "Assigned to @<%- userName %>", - "assignedToMembers": "Assigned to <%= userCount %> users", - "assignedToYouAndMembers": "Assigned to you and <%= userCount %> users", - "youAreAssigned": "Assigned to you", + "assignedToUser": "Assigned: @<%- userName %>", + "assignedToMembers": "Assigned: <%= userCount %> users", + "assignedToYouAndMembers": "Assigned: you + <%= userCount %> users", + "youAreAssigned": "Assigned: you", "taskIsUnassigned": "This task is unassigned", "unassigned": "Unassigned", "chooseTeamMember": "Search for a team member", @@ -365,6 +365,6 @@ "assignedDateAndUser": "Assigned by @<%- username %> on <%= date %>", "claimRewards": "Claim Rewards", "dayStart": "Day start: <%= startTime %>", - "viewStatus": "View Status", + "viewStatus": "Status", "lastCompleted": "Last completed" }