[open-ils-commits] r16875 - trunk/Open-ILS/xul/staff_client/server/circ (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-07-08 09:24:17 -0400 (Thu, 08 Jul 2010)
New Revision: 16875

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
   trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
Log:
hold/transit data in Item Status->Alternate View->Holds/Transit


Modified: trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js	2010-07-08 13:24:13 UTC (rev 16874)
+++ trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js	2010-07-08 13:24:17 UTC (rev 16875)
@@ -284,6 +284,12 @@
         set("hold_transit_copy", '');
 
         if (details.transit) {
+            JSAN.use('circ.util'); var columns = circ.util.transit_columns({});
+
+            JSAN.use('util.list'); var list = new util.list('transit');
+            list.init( { 'columns' : columns, 'map_row_to_columns' : circ.util.std_map_row_to_columns(), });
+            list.append( { 'row' : { 'my' : { 'atc' : details.transit, } } });
+
             var transit_copy_status = typeof details.transit.copy_status() == 'object' ? details.transit.copy_status() : data.hash.ccs[ details.transit.copy_status() ];
                 set("transit_copy_status", transit_copy_status.name() );
                 set_tooltip("transit_copy_status", document.getElementById('circStrings').getFormattedString(
@@ -302,6 +308,8 @@
             set("source_send_time", util.date.formatted_date( details.transit.source_send_time(), '%{localized}' )); 
             set("target_copy", details.transit.target_copy()); 
             set("hold_transit_copy", details.transit.hold_transit_copy()); 
+        } else {
+            $('transit_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.not_transit'));
         }
 
         set("checkin_lib", '');
@@ -562,6 +570,29 @@
         set("notes", '');
 
         if (details.hold) {
+            var better_fleshed_hold_blob = network.simple_request('FM_AHR_BLOB_RETRIEVE.authoritative',[ ses(), details.hold.id() ]);
+            var status_robj = better_fleshed_hold_blob.status;
+            JSAN.use('circ.util');
+            var columns = circ.util.hold_columns( 
+                { 
+                    'request_time' : { 'hidden' : false },
+                    'pickup_lib_shortname' : { 'hidden' : false },
+                    'hold_type' : { 'hidden' : true },
+                    'current_copy' : { 'hidden' : true },
+                    'capture_time' : { 'hidden' : true },
+                    'email_notify' : { 'hidden' : false },
+                    'phone_notify' : { 'hidden' : false },
+                } 
+            );
+
+            JSAN.use('util.list'); var list = new util.list('hold');
+            list.init( { 'columns' : columns, 'map_row_to_columns' : circ.util.std_map_row_to_columns(), });
+            list.append( { 'row' : { 'my' : { 'ahr' : better_fleshed_hold_blob.hold, 'acp' : details.copy, 'status' : status_robj, } } });
+
+            JSAN.use('patron.util'); 
+            var au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), details.hold.usr() );
+            $('patron_name').setAttribute('value', $('circStrings').getFormattedString('staff.circ.copy_details.user_details', [au_obj.family_name(), au_obj.first_given_name(), au_obj.card().barcode()]) );
+
             set("hold_status", details.hold.status()); 
             set("transit", details.hold.transit()); 
             set("capture_time", util.date.formatted_date( details.hold.capture_time(), '%{localized}' )); 
@@ -600,7 +631,13 @@
             set("cancel_cause", details.hold.cancel_cause()); 
             set("cancel_note", details.hold.cancel_note()); 
             set("notes", details.hold.notes()); 
-        } 
+        } else {
+            if (details.copy.status() == 8 /* ON HOLDS SHELF */) {
+                $('hold_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.bad_hold_status'));
+            } else {
+                $('hold_caption').setAttribute('label', $('circStrings').getString('staff.circ.copy_details.no_hold'));
+            }
+        }
 
         var x = document.getElementById('cat_deck');
         if (x) {

Modified: trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul	2010-07-08 13:24:13 UTC (rev 16874)
+++ trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul	2010-07-08 13:24:17 UTC (rev 16875)
@@ -274,7 +274,18 @@
                         </rows>
                     </grid>
                 </tabpanel>
-                <tabpanel><!-- Hold/Transit -->
+                <tabpanel orient="vertical"><!-- Hold/Transit -->
+                    <groupbox flex="1" id="holds" style="overflow: none; min-height: 80;">
+                        <caption id="hold_caption" label="&staff.circ.copy_details.hold_caption;"/>
+                        <label id="patron_name" class="patronNameLarge"/>
+                        <tree id="hold" flex="1" enableColumnDrag="true"/>
+                        <spacer FIXME="label and tree get swapped without this"/>
+                    </groupbox>
+                    <splitter><grippy/></splitter>
+                    <groupbox flex="1" id="transits" style="overflow: none; min-height: 80;">
+                        <caption id="transit_caption" label="&staff.circ.copy_details.transit_caption;"/>
+                        <tree id="transit" flex="1" enableColumnDrag="true"/>
+                    </groupbox>
                 </tabpanel>
                 <tabpanel><!-- Cataloging Info -->
                     <deck id="cat_deck" flex="1"/>