LP1182519 Per-Hold Behind Desk UI

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index d52ae78..bdb332d 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1507,6 +1507,7 @@
 <!ENTITY staff.patron_display.first_given_name.label 'First Name:'>
 <!ENTITY staff.patron_display.holds.label 'Holds:'>
 <!ENTITY staff.patron_display.holds_available.label 'Available:'>
+<!ENTITY staff.patron_display.holds_available_behind_desk.label 'Behind Desk:'>
 <!ENTITY staff.patron_display.home_ou.label 'Home Library:'>
 <!ENTITY staff.patron_display.ident1.label 'ID 1:'>
 <!ENTITY staff.patron_display.ident2.label 'ID 2:'>

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 1fae2ae..b783ea3 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -2717,8 +2717,8 @@ circ.util.hold_columns = function(modify,params) {
         },
         {
             'persist' : 'hidden width ordinal',
-            'id' : 'behind_shelf',
-            'label' : document.getElementById('circStrings').getString('staff.circ.utils.hold.staff_hold'),
+            'id' : 'behind_desk',
+            'label' : document.getElementById('circStrings').getString('staff.circ.utils.hold.behind_desk'),
             'flex' : 1,
             'primary' : false,
             'hidden' : true,

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 3e2932f..c4644b8 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
@@ -316,7 +316,7 @@ staff.circ.utils.available_time=Available On
 staff.circ.utils.capture_time=Capture Date
 # Date the hold was cancelled
 staff.circ.utils.hold_cancel_time=Cancel Time
-staff.circ.utils.hold.staff_hold=Behind Desk
+staff.circ.utils.hold.behind_desk=Behind Desk
 # Controlled entry for why the hold was cancelled
 staff.circ.utils.hold_cancel_cause=Cancel Cause
 # Freetext note pertaining to the cancelled hold 

diff --git a/Open-ILS/xul/staff_client/server/patron/summary.js b/Open-ILS/xul/staff_client/server/patron/summary.js
index e560b64..35473e2 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/summary.js
+++ b/Open-ILS/xul/staff_client/server/patron/summary.js
@@ -435,7 +435,9 @@ patron.summary.prototype = {
                             return function() { 
                                 util.widgets.set_text(e,'...');
                                 var e2 = document.getElementById('patron_holds_available');
+                                var e3 = document.getElementById('patron_holds_available_behind_desk');
                                 if (e2) util.widgets.set_text(e2,'...');
+                                if (e3) util.widgets.set_text(e2,'...');
                                 var under_btn; 
                                 if (xulG) {
                                     if (xulG.display_window) {
@@ -451,9 +453,13 @@ patron.summary.prototype = {
                                         util.widgets.set_text(e,
                                             robj.total
                                         );
-                                        if (e2) util.widgets.set_text(e2,
-                                            robj.ready
-                                        );
+                                        if (e2) {
+                                            util.widgets.set_text(e2, robj.ready);
+                                            if (true /* behind-shelf supported */) { // TODO
+                                                // TODO: un-hide e3
+                                                util.widgets.set_text(e3, robj.behind_desk);
+                                            } 
+                                        }
                                         if (under_btn) util.widgets.set_text(under_btn, req.getResultObject().ready + '/' + req.getResultObject().total );
                                         obj.holds_summary = robj;
                                         if (obj.holds_summary && obj.bills_summary) 

diff --git a/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul b/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
index 4a39089..5ca8bfb 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
@@ -77,6 +77,10 @@
             <label id="PatronSummaryStatus_holds_available_label" class="copyable text_right holds_ready label subgroup"
                 value="&staff.patron_display.holds_available.label;"  />
             <description id="patron_holds_available" class="copyable holds_ready value subgroup" />
+        </row><row>
+            <label id="PatronSummaryStatus_holds_available_behind_desk_label" class="copyable text_right holds_ready label subgroup"
+                value="&staff.patron_display.holds_available_behind_desk.label;"  />
+            <description id="patron_holds_available_behind_desk" class="copyable holds_ready value subgroup" />
         </row>
         <row id="pdsgr2" class="hide_patron_credit" hidden="true">
             <label id="PatronSummaryStatus_credit_label" class="copyable text_left credit label"