LP1904036 Use new due date display options

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html b/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html
index ae2d324..46d26c5 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html
@@ -214,6 +214,10 @@
       <eg-grid-column path="copy.status.name"
         label="Item Status" i18n-label></eg-grid-column>
 
+      <eg-grid-column path="circ.due_date" label="Due Date" i18n-label
+        timezoneContextOrg="circ.circ_lib" dateOnlyIntervalField="circ.duration"
+        datatype="timestamp"></eg-grid-column>
+
       <eg-grid-column path="copy.*" idlClass="acp" [hidden]="true"></eg-grid-column>
       <eg-grid-column path="circ.*" idlClass="circ" [hidden]="true"></eg-grid-column>
       <eg-grid-column path="mbts.*" idlClass="mbts" [hidden]="true"></eg-grid-column>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html
index 28cfbc3..df1d397 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html
@@ -108,10 +108,8 @@
         label="Row Index" i18n-label [hidden]="true"></eg-grid-column>
       <eg-grid-column path="circ.id" label="Circ ID" i18n-label></eg-grid-column>
 
-      <!-- TODO 
-        [datePlusTime]="true" when non-full-day circ 
-      -->
       <eg-grid-column path="dueDate" label="Due Date" i18n-label
+        timezoneContextOrg="circ.circ_lib" dateOnlyIntervalField="circ.duration"
         datatype="timestamp"></eg-grid-column>
 
       <eg-grid-column path="copy.barcode" label="Barcode" i18n-label></eg-grid-column>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.html
index 5edee57..de5f7fe 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.html
@@ -116,10 +116,8 @@
   <eg-grid-column path="circ.id" 
     label="Circ ID" i18n-label></eg-grid-column>
 
-  <!-- TODO 
-    [datePlusTime]="true" when non-full-day circ 
-  -->
   <eg-grid-column path="dueDate" label="Due Date" i18n-label
+    timezoneContextOrg="circ.circ_lib" dateOnlyIntervalField="circ.duration"
     datatype="timestamp"></eg-grid-column>
 
   <eg-grid-column path="copy.barcode" label="Barcode" i18n-label