some circ column tweaks, and checkin scan time for both columns and alternate item...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@14216 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
index bd2f498..8e0b397 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
+++ b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
@@ -1,5 +1,6 @@
 var error; 
 var network;
+var data;
 
 function my_init() {
     try {
@@ -11,6 +12,7 @@ function my_init() {
         error.sdump('D_TRACE','my_init() for alternate_copy_summary.xul');
 
         JSAN.use('util.network'); network = new util.network();
+        JSAN.use('OpenILS.data'); data = new OpenILS.data(); data.stash_retrieve();
 
         setTimeout( function() { load_item(); }, 1000 ); // timeout so xulG gets a chance to get pushed in
 
@@ -85,7 +87,7 @@ function load_item() {
         set("barcode", '');
         set("call_number", '');
         set("circ_as_type", '');
-        set("circ_lib" , '');
+        set("copy_circ_lib" , '');
         set("circ_modifier", '');
         set("circulate", '');
         set("copy_number", '');
@@ -120,7 +122,7 @@ function load_item() {
             set("barcode", details.copy.barcode()); 
             set("call_number", details.copy.call_number()); 
             set("circ_as_type", details.copy.circ_as_type()); 
-            set("circ_lib" , details.copy.circ_lib()); 
+            set("copy_circ_lib" , details.copy.circ_lib()); 
             set("circ_modifier", details.copy.circ_modifier()); 
             set("circulate", details.copy.circulate()); 
             set("copy_number", details.copy.copy_number()); 
@@ -207,7 +209,8 @@ function load_item() {
         set("checkin_workstation",""); 
         set("checkin_staff", '');
         set("checkin_time", '');
-        set("circ_lib" , '');
+        set("checkin_scan_time", '');
+        set("circ_circ_lib" , '');
         set("circ_staff", '');
         set("desk_renewal", '');
         set("due_date", '');
@@ -238,13 +241,14 @@ function load_item() {
         set("payment_total", '');
 
         if (details.circ) {
-            set("checkin_lib", details.circ.checkin_lib()); 
+            set("checkin_lib", typeof details.circ.checkin_lib() == 'object' ? details.circ.checkin_lib().shortname() : data.hash.aou[ details.circ.checkin_lib() ].shortname() ); 
             if (details.circ.checkin_workstation()) {
                 set("checkin_workstation", details.circ.checkin_workstation().name()); 
             }
             set("checkin_staff", details.circ.checkin_staff()); 
             set("checkin_time", details.circ.checkin_time()); 
-            set("circ_lib" , details.circ.circ_lib()); 
+            set("checkin_scan_time", details.circ.checkin_scan_time()); 
+            set("circ_circ_lib" , typeof details.circ.circ_lib() == 'object' ? details.circ.circ_lib().shortname() : data.hash.aou[ details.circ.circ_lib() ].shortname() ); 
             set("circ_staff", details.circ.circ_staff()); 
             set("desk_renewal", details.circ.desk_renewal()); 
             set("due_date", details.circ.due_date()); 
@@ -317,20 +321,20 @@ function load_item() {
             set("current_copy", details.hold.current_copy()); 
             set("email_notify", details.hold.email_notify()); 
             set("expire_time", details.hold.expire_time()); 
-            set("fulfillment_lib", details.hold.fulfillment_lib()); 
+            set("fulfillment_lib" , typeof details.hold.fulfillment_lib() == 'object' ? details.hold.fulfillment_lib().shortname() : data.hash.aou[ details.hold.fulfillment_lib() ].shortname() ); 
             set("fulfillment_staff", details.hold.fulfillment_staff()); 
             set("fulfillment_time", details.hold.fulfillment_time()); 
             set("hold_type", details.hold.hold_type()); 
             set("holdable_formats", details.hold.holdable_formats()); 
             set("hold_id", details.hold.id()); 
             set("phone_notify", details.hold.phone_notify()); 
-            set("pickup_lib", details.hold.pickup_lib()); 
+            set("pickup_lib" , typeof details.hold.pickup_lib() == 'object' ? details.hold.pickup_lib().shortname() : data.hash.aou[ details.hold.pickup_lib() ].shortname() ); 
             set("prev_check_time", details.hold.prev_check_time()); 
-            set("request_lib", details.hold.request_lib()); 
+            set("request_lib" , typeof details.hold.request_lib() == 'object' ? details.hold.request_lib().shortname() : data.hash.aou[ details.hold.request_lib() ].shortname() ); 
             set("request_time", details.hold.request_time()); 
             set("requestor", details.hold.requestor()); 
             set("selection_depth", details.hold.selection_depth()); 
-            set("selection_ou", details.hold.selection_ou()); 
+            set("selection_ou" , typeof details.hold.selection_ou() == 'object' ? details.hold.selection_ou().shortname() : data.hash.aou[ details.hold.selection_ou() ].shortname() ); 
             set("target", details.hold.target()); 
             set("usr", details.hold.usr()); 
             set("cancel_time", details.hold.cancel_time()); 

diff --git a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
index afeded8..9052f41 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
+++ b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
@@ -113,7 +113,7 @@
                                 <label value="Publisher" />
                                 <textbox name="publisher" readonly="true" context="clipboard"/>
                                 <label value="Checkout Date" />
-                                <textbox name="checkout_date" readonly="true" context="clipboard"/>
+                                <textbox name="xact_start" readonly="true" context="clipboard"/>
                             </row>
                             <row>
                                 <label value="Date Created" />
@@ -123,7 +123,7 @@
                                 <label value="Pub Date" />
                                 <textbox name="pubdate" readonly="true" context="clipboard"/>
                                 <label value="Checkout Library" />
-                                <textbox name="checkout_lib" readonly="true" context="clipboard"/>
+                                <textbox name="circ_circ_lib" readonly="true" context="clipboard"/>
                             </row>
                             <row>
                                 <label value="Copy ID" />
@@ -132,8 +132,8 @@
                                 <textbox name="opac_visible" readonly="true" context="clipboard"/>
                                 <label value="Edition" />
                                 <textbox name="edition" readonly="true" context="clipboard"/>
-                                <label value="Checkin Date" />
-                                <textbox name="checkin_date" readonly="true" context="clipboard"/>
+                                <label value="Checkin Time" />
+                                <textbox name="checkin_time" readonly="true" context="clipboard"/>
                             </row>
                             <row>
                                 <label value="TCN" />
@@ -142,8 +142,8 @@
                                 <textbox name="holdable" readonly="true" context="clipboard"/>
                                 <label value="Total Circs" />
                                 <textbox name="total_circs" readonly="true" context="clipboard"/>
-                                <label value="Checkin Library" />
-                                <textbox name="checkin_lib" readonly="true" context="clipboard"/>
+                                <label value="Checkin Scan Time" />
+                                <textbox name="checkin_scan_time" readonly="true" context="clipboard"/>
                             </row>
                             <row>
                                 <spacer />
@@ -152,18 +152,18 @@
                                 <textbox name="circ_mod" readonly="true" context="clipboard"/>
                                 <label value="Rolling Counter" />
                                 <textbox name="rolling_counter" readonly="true" context="clipboard"/>
-                                <label value="Checkin Workstation" />
-                                <textbox name="checkin_workstation" readonly="true" context="clipboard"/>
+                                <label value="Checkin Library" />
+                                <textbox name="checkin_lib" readonly="true" context="clipboard"/>
                             </row>
                             <row>
                                 <spacer />
                                 <spacer />
-                                <spacer />
-                                <spacer />
                                 <label value="Hold Shelf Location" />
                                 <textbox name="hold_shelf_loc" readonly="true" context="clipboard"/>
                                 <label value="Remaining Renewals" />
                                 <textbox name="remaining_renewals" readonly="true" context="clipboard"/>
+                                <label value="Checkin Workstation" />
+                                <textbox name="checkin_workstation" readonly="true" context="clipboard"/>
                             </row>
                         </rows>
                     </grid>

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 9a408e2..dc5c677 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -926,7 +926,7 @@ circ.util.columns = function(modify,params) {
                        'flex' : 1,
                        'primary' : false,
                        'hidden' : true,
-                       'render' : function(my) { return my.circ.xact_finish(); }
+                       'render' : function(my) { return my.circ ? my.circ.xact_finish() : ( my.acp.circulations() ? my.acp.circulations()[0].xact_finish() : ""); },
                },
                {
                        'persist' : 'hidden width ordinal',
@@ -1166,7 +1166,35 @@ circ.util.columns = function(modify,params) {
                        'primary' : false,
                        'hidden' : true,
                        'render' : function(my) { return my.acp.alert_message(); }
-               }
+               },
+        {
+            'persist' : 'hidden width ordinal',
+            'id' : 'checkin_workstation',
+            'label' : document.getElementById('circStrings').getString('staff.circ.utils.checkin_workstation'),
+            'flex' : 1,
+            'primary' : false,
+            'hidden' : true,
+                       'render' : function(my) { return my.circ ? ( typeof my.circ.checkin_workstation() == 'object' ? my.circ.checkin_workstation().name() : my.circ.checkin_workstation() ) : ( my.acp.circulations() ? ( typeof my.acp.circulations()[0].checkin_workstation() == 'object' ? my.acp.circulations().checkin_workstation().name() : my.acp.circulations().checkin_workstation() ) : ""); },
+        },
+        {
+            'persist' : 'hidden width ordinal',
+            'id' : 'checkin_scan_time',
+            'label' : document.getElementById('circStrings').getString('staff.circ.utils.checkin_scan_time'),
+            'flex' : 1,
+            'primary' : false,
+            'hidden' : true,
+                       'render' : function(my) { return my.circ ? my.circ.checkin_scan_time().substr(0,10) : ( my.acp.circulations() ? my.acp.circulations()[0].checkin_scan_time().substr(0,10) : ""); },
+        },
+        {
+            'persist' : 'hidden width ordinal',
+            'id' : 'checkin_scan_timestamp',
+            'label' : document.getElementById('circStrings').getString('staff.circ.utils.checkin_scan_timestamp'),
+            'flex' : 1,
+            'primary' : false,
+            'hidden' : true,
+                       'render' : function(my) { return my.circ ? my.circ.checkin_scan_time() : ( my.acp.circulations() ? my.acp.circulations()[0].checkin_scan_time() : ""); },
+        }
+
        ];
        for (var i = 0; i < c.length; i++) {
                if (modify[ c[i].id ]) {

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
index 390c99a..6532a03 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -237,6 +237,9 @@ staff.circ.utils.checkin_timestamp=Checkin Timestamp
 staff.circ.utils.xact_start=Checkout Date
 staff.circ.utils.checkin_time=Checkin Date
 staff.circ.utils.xact_finish=Transaction Finished
+staff.circ.utils.checkin_scan_timestamp=Checkin Scan Timestamp
+staff.circ.utils.checkin_scan_time=Checkin Scan Date
+staff.circ.utils.checkin_workstation=Checkin Workstation
 staff.circ.utils.create_date=Date Created
 staff.circ.utils.edit_date=Date Last Edited 
 staff.circ.utils.edition=Edition