From 6cf4eae61e5e5b6713a4e1c019c336f8819470d7 Mon Sep 17 00:00:00 2001
From: Paul Falgout <paul@otterball.com>
Date: Fri, 9 Aug 2019 07:26:41 +0900
Subject: [PATCH] Have action activity display date and time

---
 .../action/action-sidebar-activity-views.js      | 16 ++++++++--------
 .../patients/sidebar/action-sidebar.js           |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/js/views/patients/sidebar/action/action-sidebar-activity-views.js b/src/js/views/patients/sidebar/action/action-sidebar-activity-views.js
index 0e881b499..9039e7058 100644
--- a/src/js/views/patients/sidebar/action/action-sidebar-activity-views.js
+++ b/src/js/views/patients/sidebar/action/action-sidebar-activity-views.js
@@ -7,56 +7,56 @@ const CreatedTemplate = hbs`
   {{#with metadata.editor}}
   {{formatHTMLMessage (intlGet "patients.sidebar.action.activityViews.created") name = name role = role.name}}
   {{/with}}
-  <div>{{formatMoment date "LONG"}}</div>
+  <div>{{formatMoment date "AT_TIME"}}</div>
 `;
 
 const ClinicianAssignedTemplate = hbs`
   {{#with metadata}}
   {{formatHTMLMessage (intlGet "patients.sidebar.action.activityViews.clinicianAssigned") name = editor.name role = editor.role.name to_name = value.to.name}}
   {{/with}}
-  <div>{{formatMoment date "LONG"}}</div>
+  <div>{{formatMoment date "AT_TIME"}}</div>
 `;
 
 const DetailsUpdatedTemplate = hbs`
   {{#with metadata.editor}}
   {{formatHTMLMessage (intlGet "patients.sidebar.action.activityViews.detailsUpdated") name = name role = role.name}}
   {{/with}}
-  <div>{{formatMoment date "LONG"}}</div>
+  <div>{{formatMoment date "AT_TIME"}}</div>
 `;
 
 const DueDateUpdatedTemplate = hbs`
   {{#with metadata}}
   {{formatHTMLMessage (intlGet "patients.sidebar.action.activityViews.dueDateUpdated") name = editor.name role = editor.role.name date = (formatMoment value.to "LONG")}}
   {{/with}}
-  <div>{{formatMoment date "LONG"}}</div>
+  <div>{{formatMoment date "AT_TIME"}}</div>
 `;
 
 const DurationUpdatedTemplate = hbs`
   {{#with metadata}}
   {{formatHTMLMessage (intlGet "patients.sidebar.action.activityViews.durationUpdated") name = editor.name role = editor.role.name duration = (formatDuration value.to "minutes")}}
   {{/with}}
-  <div>{{formatMoment date "LONG"}}</div>
+  <div>{{formatMoment date "AT_TIME"}}</div>
 `;
 
 const NameUpdatedTemplate = hbs`
   {{#with metadata}}
   {{formatHTMLMessage (intlGet "patients.sidebar.action.activityViews.nameUpdated") name = editor.name role = editor.role.name to_name = value.to from_name = value.from}}
   {{/with}}
-  <div>{{formatMoment date "LONG"}}</div>
+  <div>{{formatMoment date "AT_TIME"}}</div>
 `;
 
 const RoleAssignedTemplate = hbs`
   {{#with metadata}}
   {{formatHTMLMessage (intlGet "patients.sidebar.action.activityViews.roleAssigned") name = editor.name role = editor.role.name to_role = value.to.name}}
   {{/with}}
-  <div>{{formatMoment date "LONG"}}</div>
+  <div>{{formatMoment date "AT_TIME"}}</div>
 `;
 
 const StateUpdatedTemplate = hbs`
   {{#with metadata}}
   {{formatHTMLMessage (intlGet "patients.sidebar.action.activityViews.stateUpdated") name = editor.name role = editor.role.name to_state = value.to}}
   {{/with}}
-  <div>{{formatMoment date "LONG"}}</div>
+  <div>{{formatMoment date "AT_TIME"}}</div>
 `;
 
 const ActivityView = View.extend({
diff --git a/test/integration/patients/sidebar/action-sidebar.js b/test/integration/patients/sidebar/action-sidebar.js
index a0b83e4be..1469e188b 100644
--- a/test/integration/patients/sidebar/action-sidebar.js
+++ b/test/integration/patients/sidebar/action-sidebar.js
@@ -195,7 +195,7 @@ context('action sidebar', function() {
           name: 'Name',
           details: 'Details',
           duration: 5,
-          due_date: moment(now).subtract(1, 'days').format(),
+          due_date: moment(local).subtract(2, 'days').format('YYYY-MM-DD'),
           updated_at: now.format(),
         };
         fx.data[0].relationships.clinician.data = { id: currentClinicianId };