[open-ils-commits] r20196 - in branches/rel_2_0/Open-ILS: src/perlmods/OpenILS/Application/Circ xul/staff_client/server/circ xul/staff_client/server/locale/en-US xul/staff_client/server/patron (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2011-04-19 10:16:48 -0400 (Tue, 19 Apr 2011)
New Revision: 20196

Modified:
   branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
   branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/util.js
   branches/rel_2_0/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
   branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/holds.js
Log:
Add xul support for displaying issuance holds (needs testing)


Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm	2011-04-19 02:57:23 UTC (rev 20195)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm	2011-04-19 14:16:48 UTC (rev 20196)
@@ -2597,6 +2597,18 @@
 			%$args 
 		}, {idlist=>1} );
 
+    my $subs = $e->search_serial_subscription(
+        { record_entry => $title_id }, {idlist=>1});
+    my $issuances = $e->search_serial_issuance(
+        { subscription => $subs }, {idlist=>1});
+
+    $resp->{issuance_holds} = $e->search_action_hold_request(
+        {
+			hold_type => OILS_HOLD_TYPE_ISSUANCE,
+            target => $issuances,
+            %$args
+        }, {idlist=>1} );
+
 	my $vols = $e->search_asset_call_number(
 		{ record => $title_id, deleted => 'f' }, {idlist=>1});
 

Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/util.js	2011-04-19 02:57:23 UTC (rev 20195)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/util.js	2011-04-19 14:16:48 UTC (rev 20196)
@@ -1860,6 +1860,15 @@
         },
         {
             'persist' : 'hidden width ordinal',
+            'id' : 'subscription_label',
+            'label' : document.getElementById('commonStrings').getString('staff.ahr_subscription_label_label'),
+            'flex' : 1,
+            'primary' : false,
+            'hidden' : true,
+            'editable' : false, 'render' : function(my) { return my.subscription.label(); }
+        },
+        {
+            'persist' : 'hidden width ordinal',
             'id' : 'ahr_id',
             'label' : document.getElementById('commonStrings').getString('staff.ahr_id_label'),
             'flex' : 1,

Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/locale/en-US/common.properties	2011-04-19 02:57:23 UTC (rev 20195)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/locale/en-US/common.properties	2011-04-19 14:16:48 UTC (rev 20196)
@@ -50,6 +50,7 @@
 staff.ahr_fulfillment_time_label=Fulfillment Time
 staff.ahr_hold_type_label=Type
 staff.ahr_holdable_formats_label=Holdable Formats
+staff.ahr_subscription_label_label=Subscription Label
 staff.ahr_id_label=Hold ID
 staff.ahr_phone_notify_label=Phone Notify
 staff.ahr_pickup_lib_label=Pickup Library

Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/holds.js
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/holds.js	2011-04-19 02:57:23 UTC (rev 20195)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/holds.js	2011-04-19 14:16:48 UTC (rev 20196)
@@ -21,6 +21,8 @@
 
     'filter_lib' : null,
 
+    'hold_subscription_map' : {},
+
     'expired' : false,
     'post_clear_shelf_hold_action_map' : {},
 
@@ -88,6 +90,11 @@
                                     row.my.acp = blob.copy;
                                     row.my.acn = blob.volume;
                                     row.my.mvr = blob.mvr;
+                                    row.my.issuance = blob.issuance;
+                                    if (blob.issuance) {
+                                        row.my.subscription = blob.issuance.subscription();
+                                        obj.hold_subscription_map[ row.my.hold_id ] = row.my.subscription;
+                                    }
                                     row.my.patron_family_name = blob.patron_last;
                                     row.my.patron_first_given_name = blob.patron_first;
                                     row.my.patron_barcode = blob.patron_barcode;
@@ -1143,6 +1150,10 @@
                                         case 'T' :
                                             opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + htarget;
                                         break;
+                                        case 'I' :
+                                            opac_url = xulG.url_prefix( urls.opac_rdetail )
+                                            + '?r=' + obj.hold_subscription_map[ obj.retrieve_ids[i].hold_id ].record_entry();
+                                        break;
                                         case 'V' :
                                             var my_acn = obj.network.simple_request( 'FM_ACN_RETRIEVE.authoritative', [ htarget ]);
                                             opac_url = xulG.url_prefix( urls.opac_rdetail) + '?r=' + my_acn.record();
@@ -1519,6 +1530,7 @@
                     holds = holds.concat( robj.copy_holds );
                     holds = holds.concat( robj.volume_holds );
                     holds = holds.concat( robj.title_holds );
+                    holds = holds.concat( robj.issuance_holds );
                     holds = holds.concat( robj.metarecord_holds );
                     holds = holds.sort();
                 }