From 46de825d7013f41f4df66e7e2ed0de11b487df72 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 15 Nov 2021 14:13:08 -0500
Subject: [PATCH] LP1904036 Checkin grid columns match xul

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../app/staff/circ/checkin/checkin.component.html  | 43 +++++++++++++---------
 1 file changed, 25 insertions(+), 18 deletions(-)

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 b756aeba25..0bd4165aa0 100644
--- 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
@@ -175,50 +175,57 @@
       <eg-grid-column path="index" [index]="true" 
         label="Row Index" i18n-label [hidden]="true"></eg-grid-column>
 
+      <eg-grid-column path="copy.alert_message" label="Alert Message"
+        i18n-label></eg-grid-column>
+
       <eg-grid-column path="mbts.balance_owed" label="Balance Owed" 
         datatype="money" i18n-label></eg-grid-column>
 
       <eg-grid-column path="copy.barcode" label="Barcode" 
         i18n-label [cellTemplate]="barcodeTemplate"></eg-grid-column>
 
-      <eg-grid-column path="circ.id" label="Bill #" i18n-label>
+      <eg-grid-column i18n-label label="Call Number" path="volume.label">
       </eg-grid-column>
 
-      <eg-grid-column path="circ.checkin_time" label="Checkin Date" i18n-label
-        datatype="timestamp" [datePlusTime]="true"></eg-grid-column>
+      <eg-grid-column path="copy.circ_lib.shortname"
+        label="Circulation Library" i18n-label></eg-grid-column>
 
-      <eg-grid-column path="circ.xact_finish" label="Finish" i18n-label
-        datatype="timestamp" [datePlusTime]="true"></eg-grid-column>
-      <eg-grid-column path="circ_patron.family_name" label="Last Name" i18n-label>
+      <eg-grid-column path="title" label="Title" i18n-label 
+        [cellTemplate]="titleTemplate"></eg-grid-column>
+
+      <eg-grid-column path="patron.family_name" label="Last Name" i18n-label>
       </eg-grid-column>
 
-      <eg-grid-column path="circ_patron.first_given_name" label="First Name" i18n-label>
+      <eg-grid-column path="patron.first_given_name" label="First Name" i18n-label>
       </eg-grid-column>
 
       <eg-grid-column path="copy.location.name" label="Location" i18n-label [hidden]="true">
       </eg-grid-column>
 
-      <eg-grid-column name="routeTo" label="Route To" i18n-label>
+      <eg-grid-column path="circ.id" label="Bill #" i18n-label [hidden]="true">
       </eg-grid-column>
 
-      <eg-grid-column path="circ.xact_start" label="Start" i18n-label
-        datatype="timestamp" [datePlusTime]="true"></eg-grid-column>
+      <eg-grid-column path="circ.checkin_time" label="Checkin Date" i18n-label
+        datatype="timestamp" [datePlusTime]="true" [hidden]="true"></eg-grid-column>
 
-      <eg-grid-column path="title" label="Title" i18n-label 
-        [cellTemplate]="titleTemplate"></eg-grid-column>
+      <eg-grid-column path="circ.xact_finish" label="Finish" i18n-label
+        [hidden]="true" datatype="timestamp" [datePlusTime]="true"></eg-grid-column>
 
-      <eg-grid-column path="copy.circ_modifier" 
-        label="Circulation Modifier" i18n-label></eg-grid-column>
+      <eg-grid-column name="routeTo" label="Route To" i18n-label [hidden]="true">
+      </eg-grid-column>
 
-      <eg-grid-column path="copy.circ_lib.shortname"
-        label="Circulation Library" i18n-label></eg-grid-column>
+      <eg-grid-column path="circ.xact_start" label="Start" i18n-label [hidden]="true" 
+        datatype="timestamp" [datePlusTime]="true"></eg-grid-column>
+
+      <eg-grid-column path="copy.circ_modifier" [hidden]="true" 
+        label="Circulation Modifier" i18n-label></eg-grid-column>
 
-      <eg-grid-column path="copy.status.name"
+      <eg-grid-column path="copy.status.name" [hidden]="true"
         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>
+        [hidden]="true" datatype="timestamp"></eg-grid-column>
 
       <eg-grid-column path="copy.*" idlClass="acp" [hidden]="true"></eg-grid-column>
       <eg-grid-column path="volume.*" idlClass="acn" [hidden]="true"></eg-grid-column>
-- 
2.11.0