[open-ils-commits] [GIT] Evergreen ILS branch master updated. f75e86d796a4658d9a60a9f61ddbeb0119612fa7

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  f75e86d796a4658d9a60a9f61ddbeb0119612fa7 (commit)
      from  c26ef914b2b460b4cbaaf2aa43f10f3efd3feb87 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f75e86d796a4658d9a60a9f61ddbeb0119612fa7
Author: Kyle Tomita <ktomita at catalystitservices.com>
Date:   Thu Feb 14 14:42:10 2013 -0800

    LP1100482 - Add max checked out indicator to patron interface
    
    Patron exceeds max checked out indicator is not being displayed on patron page.
    
    Created the indicator on the xul pages and the css to style it.  The js code
    to hide and show indicator was there.
    
    Signed-off-by: Kyle Tomita <ktomita at catalystitservices.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index b700232..f5880ff 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -3222,6 +3222,7 @@
 <!ENTITY staff.patron.display_overlay.see_notes.value "(See Notes)">
 <!ENTITY staff.patron.display_overlay.max_bills.value "(Maximum Bills)">
 <!ENTITY staff.patron.display_overlay.max_overdues.value "(Maximum Overdues)">
+<!ENTITY staff.patron.display_overlay.max_checked_out.value "(Maximum Checked Out)">
 <!ENTITY staff.patron.display_overlay.has_bills.value "(Has Bills)">
 <!ENTITY staff.patron.display_overlay.has_overdues.value "(Has Overdues)">
 <!ENTITY staff.patron.display_overlay.invalid_dob.value "(Invalid Date of Birth)">
diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 5e766b2..a7055ae 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -3748,6 +3748,7 @@ circ.util.renew_via_barcode = function ( params, async ) {
                         case null /* custom event */ : break;
                         case 5000 /* PERM_FAILURE */: break;
                         case 1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */ : break;
+                        case 7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */ : break;
                         case 1213 /* PATRON_BARRED */ : break;
                         case 1215 /* CIRC_EXCEEDS_COPY_RANGE */ : break;
                         case 1224 /* PATRON_ACCOUNT_EXPIRED */ : break;
diff --git a/Open-ILS/xul/staff_client/server/patron/display_horiz_overlay.xul b/Open-ILS/xul/staff_client/server/patron/display_horiz_overlay.xul
index f1a1361..81fc680 100644
--- a/Open-ILS/xul/staff_client/server/patron/display_horiz_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display_horiz_overlay.xul
@@ -26,6 +26,7 @@
         <label class="hideme note_indicator" value="&staff.patron.display_overlay.see_notes.value;" command="cmd_patron_info_notes"/>
         <label class="hideme max_bills_indicator" value="&staff.patron.display_overlay.max_bills.value;" command="cmd_patron_bills"/>
         <label class="hideme max_overdues_indicator" value="&staff.patron.display_overlay.max_overdues.value;" command="cmd_patron_items"/>
+        <label class="hideme max_out_indicator" value="&staff.patron.display_overlay.max_checked_out.value;" command="cmd_patron_items"/>
         <label class="hideme bills_indicator" value="&staff.patron.display_overlay.has_bills.value;" command="cmd_patron_bills"/>
         <label class="hideme overdues_indicator" value="&staff.patron.display_overlay.has_overdues.value;" command="cmd_patron_items"/>
         <label class="hideme invalid_dob_indicator" value="&staff.patron.display_overlay.invalid_dob.value;" command="cmd_patron_edit"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/display_overlay.xul b/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
index fdbee54..1fcaa1e 100644
--- a/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display_overlay.xul
@@ -26,6 +26,7 @@
         <label class="hideme note_indicator" value="&staff.patron.display_overlay.see_notes.value;" command="cmd_patron_info_notes"/>
         <label class="hideme max_bills_indicator" value="&staff.patron.display_overlay.max_bills.value;" command="cmd_patron_bills"/>
         <label class="hideme max_overdues_indicator" value="&staff.patron.display_overlay.max_overdues.value;" command="cmd_patron_items"/>
+        <label class="hideme max_out_indicator" value="&staff.patron.display_overlay.max_checked_out.value;" command="cmd_patron_items"/>
         <label class="hideme bills_indicator" value="&staff.patron.display_overlay.has_bills.value;" command="cmd_patron_bills"/>
         <label class="hideme overdues_indicator" value="&staff.patron.display_overlay.has_overdues.value;" command="cmd_patron_items"/>
         <label class="hideme invalid_dob_indicator" value="&staff.patron.display_overlay.invalid_dob.value;" command="cmd_patron_edit"/>
diff --git a/Open-ILS/xul/staff_client/server/skin/patron_display.css b/Open-ILS/xul/staff_client/server/skin/patron_display.css
index ff0a7d6..f8cecf0 100644
--- a/Open-ILS/xul/staff_client/server/skin/patron_display.css
+++ b/Open-ILS/xul/staff_client/server/skin/patron_display.css
@@ -45,6 +45,7 @@ row#row_billing_zip { padding-bottom: 10px; }
 .PATRON_EXCEEDS_CHECKOUT_COUNT label.items_out { color: purple; }
 /* .PATRON_EXCEEDS_CHECKOUT_COUNT label.items_out.label { text-decoration: underline; } */
 .PATRON_EXCEEDS_CHECKOUT_COUNT label.items_out.value { }
+.PATRON_EXCEEDS_CHECKOUT_COUNT label.max_out_indicator { display: inline; color: purple; }
 
 .PATRON_EXCEEDS_OVERDUE_COUNT .patronNameLarge { border-color: #C99DFF; }
 .PATRON_EXCEEDS_OVERDUE_COUNT label.items_overdue { color: purple; }

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/opac/locale/en-US/lang.dtd            |    1 +
 Open-ILS/xul/staff_client/server/circ/util.js      |    1 +
 .../server/patron/display_horiz_overlay.xul        |    1 +
 .../staff_client/server/patron/display_overlay.xul |    1 +
 .../staff_client/server/skin/patron_display.css    |    1 +
 5 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS