From: Jane Sandberg <sandbej@linnbenton.edu>
Date: Sun, 20 Jan 2019 04:06:32 +0000 (-0800)
Subject: Adding datePlusTime to timestamp columns
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8a3c29d7c7dac93058e6f6965134f85317dab21d;p=working%2FEvergreen.git

Adding datePlusTime to timestamp columns

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
---

diff --git a/Open-ILS/src/eg2/src/app/staff/booking/current-reservations.component.html b/Open-ILS/src/eg2/src/app/staff/booking/current-reservations.component.html
index 26f5d8591c..e9a663885c 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/current-reservations.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/current-reservations.component.html
@@ -11,13 +11,13 @@
   <eg-grid-column i18n-label [hidden]="true" path="usr.first_given_name"></eg-grid-column>
   <eg-grid-column i18n-label [hidden]="true" path="usr.second_given_name"></eg-grid-column>
   <eg-grid-column i18n-label [hidden]="true" path="usr.family_name"></eg-grid-column>
-  <eg-grid-column name="start_time" label="Start Time" i18n-label path="start_time" datatype="timestamp"></eg-grid-column>
-  <eg-grid-column name="end_time" label="End Time" i18n-label path="end_time" datatype="timestamp"></eg-grid-column>
-  <eg-grid-column name="request_time" label="Request Time" i18n-label path="request_time" datatype="timestamp"></eg-grid-column>
-  <eg-grid-column name="capture_time" label="Capture Time" i18n-label path="capture_time" datatype="timestamp"></eg-grid-column>
-  <eg-grid-column name="cancel_time" label="Cancel Time" i18n-label path="cancel_time" datatype="timestamp"></eg-grid-column>
-  <eg-grid-column name="pickup_time" label="Pickup Time" i18n-label path="pickup_time" datatype="timestamp"></eg-grid-column>
-  <eg-grid-column name="return_time" label="Return Time" i18n-label path="return_time" datatype="timestamp"></eg-grid-column>
+  <eg-grid-column name="start_time" label="Start Time" [datePlusTime]="true" i18n-label path="start_time" datatype="timestamp"></eg-grid-column>
+  <eg-grid-column name="end_time" label="End Time" [datePlusTime]="true" i18n-label path="end_time" datatype="timestamp"></eg-grid-column>
+  <eg-grid-column name="request_time" label="Request Time" [datePlusTime]="true" i18n-label path="request_time" datatype="timestamp"></eg-grid-column>
+  <eg-grid-column name="capture_time" label="Capture Time" [datePlusTime]="true" i18n-label path="capture_time" datatype="timestamp"></eg-grid-column>
+  <eg-grid-column name="cancel_time" label="Cancel Time" [datePlusTime]="true" i18n-label path="cancel_time" datatype="timestamp"></eg-grid-column>
+  <eg-grid-column name="pickup_time" label="Pickup Time" [datePlusTime]="true" i18n-label path="pickup_time" datatype="timestamp"></eg-grid-column>
+  <eg-grid-column name="return_time" label="Return Time" [datePlusTime]="true" i18n-label path="return_time" datatype="timestamp"></eg-grid-column>
   <eg-grid-column i18n-label path="email_notify" datatype="bool"></eg-grid-column>
   <eg-grid-column i18n-label path="unrecovered" datatype="bool"></eg-grid-column>
   <eg-grid-column i18n-label path="billing_total" datatype="money"></eg-grid-column>
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html b/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html
index ff10a81325..ae24452868 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html
@@ -17,9 +17,8 @@
   <eg-grid-column name="id" [hidden]="true" [index]="true" i18n-label label="ID" path="id"></eg-grid-column>
   <eg-grid-column name="barcode" label="Barcode" i18n-label path="current_resource.barcode"></eg-grid-column>
   <eg-grid-column name="title" label="Title or name" i18n-label path="target_resource_type.name"></eg-grid-column>
-  <eg-grid-column label="Reservation start time" path="reservations.0.start_time" i18n-label></eg-grid-column>
-  <eg-grid-column label="Reservation end time" path="reservations.0.end_time" i18n-label></eg-grid-column>
-  <eg-grid-column label="Reservation end time" path="reservations.0.end_time" i18n-label></eg-grid-column>
+  <eg-grid-column label="Reservation start time" [datePlusTime]="true" path="reservations.0.start_time" i18n-label></eg-grid-column>
+  <eg-grid-column label="Reservation end time" [datePlusTime]="true" path="reservations.0.end_time" i18n-label></eg-grid-column>
   <eg-grid-column label="Patron first name" path="reservations.0.usr.first_given_name" i18n-label></eg-grid-column>
   <eg-grid-column label="Patron last name" path="reservations.0.usr.family_name" i18n-label></eg-grid-column>