diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index ccdad5f62..f237db564 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -142,6 +142,33 @@ template(name="activity") +viewer = activity.comment.text + //- date activity ------------------------------------------------ + if($eq mode 'card') + if($eq activity.activityType 'a-receivedAt') + | {{{_ 'activity-receivedDate' (sanitize receivedDate) cardLink}}}. + + if($eq activity.activityType 'a-startAt') + | {{{_ 'activity-startDate' (sanitize startDate) cardLink}}}. + + if($eq activity.activityType 'a-dueAt') + | {{{_ 'activity-dueDate' (sanitize dueDate) cardLink}}}. + + if($eq activity.activityType 'a-endAt') + | {{{_ 'activity-endDate' (sanitize endDate) cardLink}}}. + + if($eq mode 'board') + if($eq activity.activityType 'a-receivedAt') + | {{{_ 'activity-receivedDate' (sanitize receivedDate) cardLink}}}. + + if($eq activity.activityType 'a-startAt') + | {{{_ 'activity-startDate' (sanitize startDate) cardLink}}}. + + if($eq activity.activityType 'a-dueAt') + | {{{_ 'activity-dueDate' (sanitize dueDate) cardLink}}}. + + if($eq activity.activityType 'a-endAt') + | {{{_ 'activity-endDate' (sanitize endDate) cardLink}}}. + //- customField activity ------------------------------------------------ if($eq mode 'board') if($eq activity.activityType 'createCustomField') diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index 83843d1d7..eb71c8d5c 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -81,6 +81,31 @@ BlazeComponent.extendComponent({ return createCardLink(this.currentData().activity.card()); }, + receivedDate() { + const receivedDate = this.currentData().activity.card(); + if (!receivedDate) return null; + return receivedDate.receivedAt; + }, + + startDate() { + const startDate = this.currentData().activity.card(); + if (!startDate) return null; + return startDate.startAt; + }, + + dueDate() { + const dueDate = this.currentData().activity.card(); + if (!dueDate) return null; + return dueDate.dueAt; + }, + + endDate() { + const endDate = this.currentData().activity.card(); + if (!endDate) return null; + // return endDate.getEnd(); + return endDate.getEnd().format('YYYY-MM-DD HH:mm'); + }, + lastLabel() { const lastLabelId = this.currentData().activity.labelId; if (!lastLabelId) return null; diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 9133211d8..7027613c8 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -75,6 +75,10 @@ "activity-checklist-uncompleted-card": "uncompleted the checklist %s", "activity-editComment": "edited comment %s", "activity-deleteComment": "deleted comment %s", + "activity-receivedDate": "edited received date to %s of %s", + "activity-startDate": "edited start date to %s of %s", + "activity-dueDate": "edited due date to %s of %s", + "activity-endDate": "edited end date to %s of %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card",