From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 11 Aug 2008 20:49:21 +0000 (+0000)
Subject: display expire date on myopac hold list.  if hold expire is less than the expire... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ed43655e4cbbcec2349d696206dc2fbf7a1acdf6;p=Evergreen.git

display expire date on myopac hold list.  if hold expire is less than the expire alert interval, style the expire date



git-svn-id: svn://svn.open-ils.org/ILS/trunk@10340 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/web/opac/locale/en-US/opac.dtd b/Open-ILS/web/opac/locale/en-US/opac.dtd
index 7e3ff996f8..862543a7d9 100644
--- a/Open-ILS/web/opac/locale/en-US/opac.dtd
+++ b/Open-ILS/web/opac/locale/en-US/opac.dtd
@@ -223,7 +223,7 @@ If an item has already been selected to fulfill the hold, it will not be suspend
 <!ENTITY opac.holds.freeze "Suspend this hold">
 <!ENTITY opac.holds.freeze.help "A suspended hold will retain its place in the queue, but will not be fulfilled until it has been activated.">
 <!ENTITY opac.holds.freeze.thaw_date "Automatically activate hold on:">
-<!ENTITY opac.holds.expire_time "Hold expiration date">
+<!ENTITY opac.holds.expire_time "Expiration date">
 
 <!--	================================================================= 
 	MyOPAC Preferences Page 
diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index a3a4fdc1dc..4deca438f1 100644
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -358,11 +358,23 @@ function myOPACDrawHolds(r) {
 
         $n(row, 'myopac_holds_selected_chkbx').checked = false;
 
+        var exp_date = dojo.date.stamp.fromISOString(h.expire_time());
+        $n(row, 'myopac_hold_expire_time').appendChild(
+            text(dojo.date.locale.format(exp_date, {selector:'date'})));
+
 		unHideMe(row);
 
-		myOPACDrawHoldTitle(h);
-		myOPACDrawHoldStatus(h);
-	}
+        var interval = fetchOrgSettingDefault(G.user.home_ou(), 'circ.hold_expire_alert_interval');
+        if(interval) {
+            secs = interval_to_seconds(interval) * 1000;
+            var diff = exp_date.getTime() - new Date().getTime();
+            if(diff < secs)
+                addCSSClass($n(row, 'myopac_hold_expire_time'), 'hold_expire_warning');
+        }
+
+        myOPACDrawHoldTitle(h);
+        myOPACDrawHoldStatus(h);
+    }
 }
 
 function myOPACEditHold(holdid) {
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
index 3644764ad3..0553754f0f 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
@@ -47,6 +47,7 @@
 				<td>&common.status;</td>
 				<td>&myopac.holds.unfrozen;</td>
 				<td>&myopac.holds.frozen.until;</td>
+				<td>&opac.holds.expire_time;</td>
                 <td width='15%'>&common.select;
                     (<a id='myopac_select_all_holds' onclick='myopacSelectAllHolds();' 
                         class='classic_link' href='javascript:void(0);'>&common.all;</a>/<a id='myopac_select_none_holds' 
@@ -96,7 +97,9 @@
                     <span name='myopac_hold_unfrozen_true' class='hide_me check_mark'>&common.yes;</span>
                 </td>
 
+
                 <td name='myopac_holds_frozen_until'></td>
+                <td name='myopac_hold_expire_time'></td>
                 <td><input type='checkbox' name='myopac_holds_selected_chkbx'/></td>
 
 				<td name='myopac_holds_cancel' style='border-left: 3px solid #E0E0E0; border-right: 3px solid #E0E0E0;'>
diff --git a/Open-ILS/web/opac/theme/default/css/colors.css b/Open-ILS/web/opac/theme/default/css/colors.css
index 9bfe478d33..93365a7e0e 100644
--- a/Open-ILS/web/opac/theme/default/css/colors.css
+++ b/Open-ILS/web/opac/theme/default/css/colors.css
@@ -96,3 +96,6 @@ a:focus { background: #E0F0E0; color: #000000;}
 #myopac_holds_thaw_date_form { border: 1px solid #E0E0E0; } 
 
 .invalid_field { border: 3px solid red; }
+
+.hold_expire_warning { color:red; }
+