plugged in hold freezing and thaw date logic. changed display to show a green check...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@7772 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 04c1339..bb1762e 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/opac.dtd
+++ b/Open-ILS/web/opac/locale/en-US/opac.dtd
@@ -229,7 +229,7 @@ avoid using bookbags all together.  Thank you.">
 <!ENTITY myopac.prefs.help "This setting defines how you will be notified of holds that are ready to be picked up from the library.
 By default, holds will use the notification style you choose here.  
 However, you will still have the option to change individual holds regardless of this setting.">
-<!ENTITY myopac.holds.frozen "Frozen">
+<!ENTITY myopac.holds.unfrozen "Un-Frozen">
 <!ENTITY myopac.holds.frozen.until "Frozen Until">
 
 <!--   ================================================================= 

diff --git a/Open-ILS/web/opac/skin/default/js/holds.js b/Open-ILS/web/opac/skin/default/js/holds.js
index 22d4a75..14b597f 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -91,12 +91,19 @@ function _holdsUpdateEditHold() {
        var status = holdArgs.status;
 
        var orgsel = $('holds_org_selector');
+    var frozenbox = $('holds_frozen_chkbox');
+
        setSelector(orgsel, hold.pickup_lib());
 
-       if( hold.capture_time() || status > 2 )
+       if( hold.capture_time() || status > 2 ) {
                orgsel.disabled = true;
-       else    
+        frozenbox.disabled = true;
+        $('holds_frozen_thaw_input').disabled = true;
+
+    } else {
                orgsel.disabled = false;
+        frozenbox.disabled = false;
+    }
 
 
        $('holds_submit').onclick = holdsEditHold;
@@ -117,6 +124,21 @@ function _holdsUpdateEditHold() {
        } else {
                $('holds_enable_email').checked = false;
        }
+
+    /* populate the hold freezing info */
+    if(!frozenbox.disabled && isTrue(hold.frozen())) {
+        frozenbox.checked = true;
+        unHideMe($('hold_frozen_thaw_row'));
+        if(hold.thaw_date()) {
+            $('holds_frozen_thaw_input').value = hold.thaw_date();
+        } else {
+            $('holds_frozen_thaw_input').value = '';
+        }
+    } else {
+        frozenbox.checked = false;
+        $('holds_frozen_thaw_input').value = '';
+        hideMe($('hold_frozen_thaw_row'));
+    }
 }
 
 function holdsEditHold() {
@@ -672,6 +694,17 @@ function holdsBuildHoldFromWindow() {
        hold.target(target);
        hold.hold_type(holdArgs.type);
 
+    // see if this hold should be frozen and for how long
+    if($('holds_frozen_chkbox').checked) {
+        hold.frozen('t');
+        unHideMe($('hold_frozen_thaw_row'));
+        thawDate = $('holds_frozen_thaw_input').value;
+        if(thawDate) 
+            hold.thaw_date(thawDate);
+        else
+            hold.thaw_date(null);
+    }
+
        //check for alternate hold formats 
        var fstring = holdsSetSelectedFormats();
        if(fstring) { 

diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index bfe6a24..888986b 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -337,6 +337,18 @@ function myOPACDrawHolds(r) {
                $n(row,'myopac_holds_edit_link').setAttribute(
                        'href','javascript:myOPACEditHold("'+ h.id()+'");'); 
 
+        if(isTrue(h.frozen())) {
+            hideMe($n(row, 'myopac_hold_unfrozen_true'))
+            unHideMe($n(row, 'myopac_hold_unfrozen_false'))
+            if(h.thaw_date()) {
+                var d = Date.parseIso8601(h.thaw_date());
+                $n(row, 'myopac_holds_frozen_until').appendChild(text(d.iso8601Format('YMD')));
+            }
+        } else {
+            unHideMe($n(row, 'myopac_hold_unfrozen_true'))
+            hideMe($n(row, 'myopac_hold_unfrozen_false'))
+        }
+
                unHideMe(row);
 
                myOPACDrawHoldTitle(h);

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 24c90ab..a276421 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
@@ -12,7 +12,7 @@
                                <td>&myopac.holds.formats;</td>
                                <td>&myopac.holds.location;</td>
                                <td>&common.status;</td>
-                               <td>&myopac.holds.frozen;</td>
+                               <td>&myopac.holds.unfrozen;</td>
                                <td>&myopac.holds.frozen.until;</td>
                                <td>&myopac.holds.edit.cancel;</td>
                        </tr>
@@ -49,8 +49,8 @@
                                </td>
 
                 <td>
-                    <span name='myopac_hold_frozen_false' class='x_mark'>&#x2717;</span>
-                    <span name='myopac_hold_frozen_true' class='hide_me check_mark'>&#x2713;</span>
+                    <span name='myopac_hold_unfrozen_false' class='x_mark'>&#x2717;</span>
+                    <span name='myopac_hold_unfrozen_true' class='hide_me check_mark'>&#x2713;</span>
                 </td>
 
                 <td name='myopac_holds_frozen_until'></td>