[open-ils-commits] r14623 - in trunk/Open-ILS/xul/staff_client/server: circ locale/en-US patron (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-10-27 02:35:52 -0400 (Tue, 27 Oct 2009)
New Revision: 14623

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/util.js
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
   trunk/Open-ILS/xul/staff_client/server/patron/holds.js
Log:
List columns for hold cancel reason, cancel note, and cancel time.  Display them by default if either of the two org unit settings that control display of cancelled holds are set.

Modified: trunk/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/util.js	2009-10-27 04:04:12 UTC (rev 14622)
+++ trunk/Open-ILS/xul/staff_client/server/circ/util.js	2009-10-27 06:35:52 UTC (rev 14623)
@@ -1537,6 +1537,33 @@
     var c = [
         {
             'persist' : 'hidden width ordinal',
+            'id' : 'cancel_time',
+            'label' : document.getElementById('circStrings').getString('staff.circ.utils.hold_cancel_time'),
+            'flex' : 1,
+            'primary' : false,
+            'hidden' : true,
+            'editable' : false, 'render' : function(my) { return my.ahr.cancel_time(); }
+        },
+        {
+            'persist' : 'hidden width ordinal',
+            'id' : 'cancel_cause',
+            'label' : document.getElementById('circStrings').getString('staff.circ.utils.hold_cancel_cause'),
+            'flex' : 1,
+            'primary' : false,
+            'hidden' : true,
+            'editable' : false, 'render' : function(my) { return typeof my.ahr.cancel_cause == 'object' ? my.ahr.cancel_cause().label() : data.hash.ahrcc[ my.ahr.cancel_cause() ].label(); }
+        },
+        {
+            'persist' : 'hidden width ordinal',
+            'id' : 'cancel_note',
+            'label' : document.getElementById('circStrings').getString('staff.circ.utils.hold_cancel_note'),
+            'flex' : 1,
+            'primary' : false,
+            'hidden' : true,
+            'editable' : false, 'render' : function(my) { return my.ahr.cancel_note(); }
+        },
+        {
+            'persist' : 'hidden width ordinal',
             'id' : 'request_lib',
             'label' : document.getElementById('circStrings').getString('staff.circ.utils.request_lib'),
             'flex' : 1,

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2009-10-27 04:04:12 UTC (rev 14622)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2009-10-27 06:35:52 UTC (rev 14623)
@@ -284,6 +284,12 @@
 staff.circ.utils.capture_timestamp=Capture Timestamp
 # Date the hold was captured
 staff.circ.utils.capture_time=Capture Date
+# Date the hold was cancelled
+staff.circ.utils.hold_cancel_time=Cancel Time
+# Controlled entry for why the hold was cancelled
+staff.circ.utils.hold_cancel_cause=Cancel Cause
+# Freetext note pertaining to the cancelled hold 
+staff.circ.utils.hold_cancel_note=Cancel Note
 staff.circ.utils.hold_status.1=Waiting for copy
 staff.circ.utils.hold_status.2=Waiting for capture
 staff.circ.utils.hold_status.3=In-Transit

Modified: trunk/Open-ILS/xul/staff_client/server/patron/holds.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/holds.js	2009-10-27 04:04:12 UTC (rev 14622)
+++ trunk/Open-ILS/xul/staff_client/server/patron/holds.js	2009-10-27 06:35:52 UTC (rev 14623)
@@ -52,7 +52,10 @@
                 'current_copy' : { 'hidden' : false },
                 'capture_time' : { 'hidden' : false },
                 'notify_time' : { 'hidden' : false },
-                'notify_count' : { 'hidden' : false }
+                'notify_count' : { 'hidden' : false },
+                'cancel_cause' : { 'hidden' : ! ( obj.data.hash.aous['circ.holds.canceled.display_count'] || obj.data.hash.aous['circ.holds.canceled.display_age'] ) },
+                'cancel_note' : { 'hidden' :  ! ( obj.data.hash.aous['circ.holds.canceled.display_count'] || obj.data.hash.aous['circ.holds.canceled.display_age'] ) },
+                'cancel_time' : { 'hidden' :  ! ( obj.data.hash.aous['circ.holds.canceled.display_count'] || obj.data.hash.aous['circ.holds.canceled.display_age'] ) }
             }
         );