From fda4e954eb7202b4c1ed0d30812e3b9156dfd5c9 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Thu, 16 Aug 2018 22:10:05 +0200 Subject: Completed activities log in card --- client/components/activities/activities.jade | 40 ++++++++++++++++++++-------- i18n/en.i18n.json | 9 ++++++- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index fae1a51a..f5ac2d0e 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -34,22 +34,20 @@ template(name="boardActivities") .activity-checklist(href="{{ card.absoluteUrl }}") +viewer = checklist.title - if($eq activityType 'removeChecklist') - | {{{_ 'activity-checklist-removed' cardLink}}} + if($eq activityType 'removedChecklist') + | {{{_ 'activity-checklist-removed' cardLink}}}. if($eq activityType 'checkedItem') - | {{{_ 'activity-checked-item' checkItem checklist.title cardLink}}} + | {{{_ 'activity-checked-item' checkItem checklist.title cardLink}}}. if($eq activityType 'uncheckedItem') - | {{{_ 'activity-unchecked-item' checkItem checklist.title cardLink}}} + | {{{_ 'activity-unchecked-item' checkItem checklist.title cardLink}}}. if($eq activityType 'checklistCompleted') - | {{{_ 'activity-checklist-completed' checklist.title cardLink}}} + | {{{_ 'activity-checklist-completed' checklist.title cardLink}}}. if($eq activityType 'checklistUncompleted') - | {{{_ 'activity-checklist-uncompleted' checklist.title cardLink}}} - - + | {{{_ 'activity-checklist-uncompleted' checklist.title cardLink}}}. if($eq activityType 'addChecklistItem') | {{{_ 'activity-checklist-item-added' checklist.title cardLink}}}. @@ -57,7 +55,7 @@ template(name="boardActivities") +viewer = checklistItem.title if($eq activityType 'removedChecklistItem') - | {{{_ 'activity-checklist-item-removed' checklist.title cardLink}}} + | {{{_ 'activity-checklist-item-removed' checklist.title cardLink}}}. if($eq activityType 'archivedCard') | {{{_ 'activity-archived' cardLink}}}. @@ -116,7 +114,6 @@ template(name="boardActivities") if($eq activityType 'removedLabel') | {{{_ 'activity-removed-label' lastLabel cardLink}}}. - if($eq activityType 'unjoinMember') if($eq user._id member._id) | {{{_ 'activity-unjoined' cardLink}}}. @@ -147,6 +144,25 @@ template(name="cardActivities") | {{{_ 'activity-removed' cardLabel memberLink}}}. if($eq activityType 'archivedCard') | {{_ 'activity-archived' cardLabel}}. + + if($eq activityType 'addedLabel') + | {{{_ 'activity-added-label-card' lastLabel }}}. + + if($eq activityType 'removedLabel') + | {{{_ 'activity-removed-label-card' lastLabel }}}. + + if($eq activityType 'checkedItem') + | {{{_ 'activity-checked-item-card' checkItem checklist.title }}}. + + if($eq activityType 'uncheckedItem') + | {{{_ 'activity-unchecked-item-card' checkItem checklist.title }}}. + + if($eq activityType 'checklistCompleted') + | {{{_ 'activity-checklist-completed-card' checklist.title }}}. + + if($eq activityType 'checklistUncompleted') + | {{{_ 'activity-checklist-uncompleted-card' checklist.title }}}. + if($eq activityType 'restoredCard') | {{_ 'activity-sent' cardLabel boardLabel}}. if($eq activityType 'moveCard') @@ -156,7 +172,9 @@ template(name="cardActivities") if attachment.isImage img.attachment-image-preview(src=attachment.url) if($eq activityType 'deleteAttachment') - | {{{_ 'activity-attached' attachmentLink cardLabel}}}. + | {{{_ 'activity-delete-attach' cardLabel}}}. + if($eq activityType 'removedChecklist') + | {{{_ 'activity-checklist-removed' cardLabel}}}. if($eq activityType 'addChecklist') | {{{_ 'activity-checklist-added' cardLabel}}}. .activity-checklist diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 2b3e6c4d..17cbb650 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -52,6 +52,10 @@ "activity-checklist-item-added": "added checklist item to '%s' in %s", "activity-checklist-item-removed": "removed a checklist item from '%s' in %s", "add": "Add", + "activity-checked-item-card": "checked %s in checklist %s", + "activity-unchecked-item-card": "unchecked %s in checklist %s", + "activity-checklist-completed-card": "completed the checklist %s", + "activity-checklist-uncompleted-card": "uncompleted the checklist %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", @@ -508,6 +512,9 @@ "no-parent": "Don't show parent", "activity-added-label": "added label '%s' to %s", "activity-removed-label": "removed label '%s' from %s", - "activity-delete-attach": "deleted an attachment from %s" + "activity-delete-attach": "deleted an attachment from %s", + "activity-added-label-card": "added label '%s'", + "activity-removed-label-card": "removed label '%s'", + "activity-delete-attach-card": "deleted an attachment" } -- cgit v1.2.3-1-g7c22