Adding 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 8c61c50..2c4c527 100644 (file)
--- 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
@@ -5,10 +5,28 @@
 <eg-grid [dataSource]="gridSource"
   [sortable]="true" persistKey="booking.current_reservations" >
   <eg-grid-column name="id" [hidden]="true" [index]="true" i18n-label label="ID" path="id"></eg-grid-column>
-  <eg-grid-column i18n-label path="usr"></eg-grid-column>
-  <eg-grid-column name="start_time" label="Start Time" i18n-label path="start_time"></eg-grid-column>
-  <eg-grid-column name="end_time" label="End Time" i18n-label path="end_time"></eg-grid-column>
-  <eg-grid-column name="capture_time" label="Capture Time" i18n-label path="capture_time"></eg-grid-column>
+  <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 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>
+  <eg-grid-column i18n-label path="payment_total" datatype="money"></eg-grid-column>
+  <eg-grid-column i18n-label path="booking_interval" [hidden]="true"></eg-grid-column>
+  <eg-grid-column i18n-label path="fine_interval" [hidden]="true"></eg-grid-column>
+  <eg-grid-column i18n-label path="fine_amount" datatype="money"></eg-grid-column>
+  <eg-grid-column i18n-label path="max_fine" datatype="money"></eg-grid-column>
+  <eg-grid-column i18n-label path="current_resource.barcode"></eg-grid-column>
+  <eg-grid-column i18n-label path="target_resource_type.name"></eg-grid-column>
+  <eg-grid-column i18n-label path="request_lib.name"></eg-grid-column>
+  <eg-grid-column i18n-label path="pickup_lib.name"></eg-grid-column>
 
 </eg-grid>
 

diff --git a/Open-ILS/src/eg2/src/app/staff/booking/current-reservations.component.ts b/Open-ILS/src/eg2/src/app/staff/booking/current-reservations.component.ts
index 563125d..b2095d8 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/booking/current-reservations.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/booking/current-reservations.component.ts
@@ -27,8 +27,9 @@ export class CurrentReservationsComponent implements OnInit {
       return this.pcrud.search('bresv', {"usr" : (this.patronId ? this.patronId : {">" : 1})}, {   
         order_by: orderBy,
         limit: pager.limit,
-        offset: pager.offset
-      });
+        offset: pager.offset,
+        flesh: 1,
+        flesh_fields: {'bresv' : ['usr', 'capture_staff', 'target_resource', 'target_resource_type', 'current_resource', 'request_lib', 'pickup_lib']}});
     }
   }