From 3d78e822af3a6337430825dcf328889ea254c6b6 Mon Sep 17 00:00:00 2001
From: Michele Morgan <mmorgan@noblenet.org>
Date: Tue, 16 Aug 2016 14:47:43 -0400
Subject: [PATCH] LP#1583729 Item status screen column options do not include
 age protection

Adds the age_protect field to several missing copy interfaces:

XUL client:

- Item status list view column picker
- Item status alternate view
- Holdings Maintenance column picker

Web client:

- Item status alternate view
- Holdings view column picker

Also addresses an issue with displaying the circ modifier in some item
interfaces.

Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
---
 .../templates/staff/cat/catalog/t_holdings.tt2    |  1 +
 .../templates/staff/cat/item/t_summary_pane.tt2   |  2 ++
 Open-ILS/web/js/ui/default/staff/cat/item/app.js  |  2 +-
 .../js/ui/default/staff/cat/services/holdings.js  |  2 +-
 Open-ILS/web/opac/locale/en-US/lang.dtd           |  1 +
 .../xul/staff_client/server/cat/copy_browser.js   |  1 +
 .../server/circ/alternate_copy_summary.js         |  7 ++++++-
 .../server/circ/alternate_copy_summary.xul        |  3 ++-
 Open-ILS/xul/staff_client/server/circ/util.js     | 15 +++++++++++++++
 .../server/locale/en-US/circ.properties           |  1 +
 .../server/locale/en-US/common.properties         |  1 +
 11 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
index 8bbfb4572a..bd618ace26 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
@@ -109,6 +109,7 @@
     <eg-grid-field label="[% l('Circulate As MARC Type') %]" path="circ_as_type"></eg-grid-field>
     <eg-grid-field label="[% l('Circulate') %]"              datatype="bool" path="circulate"></eg-grid-field>
     <eg-grid-field label="[% l('Holdable') %]"               datatype="bool" path="holdable"></eg-grid-field>
+    <eg-grid-field label="[% l('Age-based Hold Protection') %]" path="age_protect.name"></eg-grid-field>
     <eg-grid-field label="[% l('Reference') %]"              datatype="bool" path="ref"></eg-grid-field>
   
   </eg-grid>
diff --git a/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2 b/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2
index c21c9cdf4b..1ab16a571b 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2
@@ -161,6 +161,8 @@
     <div class="flex-cell">[% l('Circ Modifier') %]</div>
     <div class="flex-cell well">{{copy.circ_modifier().name()}}</div>
 
+    <div class="flex-cell">[% l('Age-based Hold Protection') %]</div>
+    <div class="flex-cell well">{{copy.age_protect().name()}}</div>
     <!-- empty -->
     <div class="flex-cell"></div>
     <div class="flex-cell"></div>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
index a8781dc9be..922a531f8e 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
@@ -59,7 +59,7 @@ function(egCore) {
     service.flesh = {   
         flesh : 3, 
         flesh_fields : {
-            acp : ['call_number','location','status','location','floating'],
+            acp : ['call_number','location','status','location','floating','circ_modifier','age_protect'],
             acn : ['record','prefix','suffix'],
             bre : ['simple_record','creator','editor']
         },
diff --git a/Open-ILS/web/js/ui/default/staff/cat/services/holdings.js b/Open-ILS/web/js/ui/default/staff/cat/services/holdings.js
index 2742915010..71255a4551 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/services/holdings.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/services/holdings.js
@@ -15,7 +15,7 @@ function(egCore , $q) {
     service.prototype.flesh = {   
         flesh : 2, 
         flesh_fields : {
-            acp : ['status','location','circ_lib','parts'],
+            acp : ['status','location','circ_lib','parts','age_protect'],
             acn : ['prefix','suffix','copies']
         }
     }
diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index bbdf8ac7d2..3dd1b4ab66 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -3753,6 +3753,7 @@
 <!ENTITY staff.circ.alternate_copy_summary.Edition.label "Edition">
 <!ENTITY staff.circ.alternate_copy_summary.Floating.label "Floating">
 <!ENTITY staff.circ.alternate_copy_summary.Holdable.label "Holdable">
+<!ENTITY staff.circ.alternate_copy_summary.Age_Protect.label "Age-based Hold Protection">
 <!ENTITY staff.circ.alternate_copy_summary.Hold_Shelf_Location.label "Hold Shelf Location">
 <!ENTITY staff.circ.alternate_copy_summary.Holds_Transit.label "Holds/Transit">
 <!ENTITY staff.circ.alternate_copy_summary.Holds_Transit.accesskey "">
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_browser.js b/Open-ILS/xul/staff_client/server/cat/copy_browser.js
index 532ec1b4f6..327b45b70b 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_browser.js
+++ b/Open-ILS/xul/staff_client/server/cat/copy_browser.js
@@ -1758,6 +1758,7 @@ cat.copy_browser.prototype = {
                             'fine_level',
                             'circulate',
                             'holdable',
+                            'age_protect',
                             'opac_visible',
                             'ref',
                             'deposit',
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 74b7ae3d14..43c52ff8a5 100644
--- a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
+++ b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
@@ -191,7 +191,12 @@ function load_item() {
 
         if (details.copy) {
             set("stat_cat_entries", details.copy.stat_cat_entries()); 
-            set("age_protect", details.copy.age_protect()); 
+            var ap = details.copy.age_protect();
+            if (typeof data.hash.crahp[ap] != 'undefined') {
+                set("age_protect", data.lookup('crahp',details.copy.age_protect()).name());
+            } else {
+                set("age_protect","");
+            }
             set("alert_message", details.copy.alert_message()); 
             set("barcode", details.copy.barcode()); 
             if (typeof details.copy.call_number() == 'object') {
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 3c4ba95b83..a06ea95cde 100644
--- a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
+++ b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
@@ -158,7 +158,8 @@
                                 <textbox name="copy_id" readonly="true" context="clipboard"/>
                                 <label value="&staff.circ.alternate_copy_summary.Holdable.label;" />
                                 <textbox name="holdable" readonly="true" context="clipboard"/>
-                                <spacer /><spacer />
+                                <label value="&staff.circ.alternate_copy_summary.Age_Protect.label;" />
+                                <textbox name="age_protect" readonly="true" context="clipboard"/>
                                 <label value="&staff.circ.alternate_copy_summary.Checkin_Time.label;" />
                                 <textbox name="checkin_time" readonly="true" context="clipboard"/>
                             </row>
diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 3f473e821c..9d372d84b9 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -921,6 +921,21 @@ circ.util.columns = function(modify,params) {
                 }
             }
         },
+        {
+            'id' : 'age_protect',
+            'fm_class' : 'acp',
+            'label' : document.getElementById('circStrings').getString('staff.circ.utils.age_protect'),
+            'flex' : 1,
+            'primary' : false,
+            'hidden' : true,
+            'editable' : false, 'render' : function(my) {
+                if (Number(my.acp.age_protect())>=0) {
+                    return data.lookup("crahp", my.acp.age_protect() ).name();
+                } else {
+                    return my.acp.age_protect().name();
+                }
+            }
+        },
         {
             'id' : 'floating',
             'fm_class' : 'acp',
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 d5bb8d1fbd..0e6cd05492 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -256,6 +256,7 @@ staff.circ.utils.fine_level.high=High
 staff.circ.utils.circulate=Circulate?
 staff.circ.utils.deleted=Deleted?
 staff.circ.utils.holdable=Holdable?
+staff.circ.utils.age_protect=Age-based Hold Protection
 staff.circ.utils.floating=Floating?
 staff.circ.utils.hold_note=Hold Note(s) Count
 staff.circ.utils.hold_note_text=Hold Note(s) Text
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
index 47176836a5..78ce7241aa 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
@@ -48,6 +48,7 @@ staff.acp_label_location=Location
 staff.acp_label_price=Price
 staff.acp_label_cost=Acquisition Cost
 staff.acp_label_status=Status
+staff.acp_label_age_protect=Age-based Hold Protection
 staff.ahr_current_copy_label=Current Copy
 staff.ahr_current_copy_location_label=Current Copy Location
 staff.ahr_email_notify_label=Email Notify
-- 
2.43.2