added style to indicate a hold thaw date is either invalid or <= today

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

diff --git a/Open-ILS/web/opac/skin/default/js/holds.js b/Open-ILS/web/opac/skin/default/js/holds.js
index d987804..57b0426 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -27,6 +27,9 @@ function holdsHandleStaff() {
     };
 }
 
+$('holds_frozen_thaw_input').onkeyup = 
+        function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');}
+
 function _holdsHandleStaffMe() {
        holdArgs.recipient = G.user;
        holdsDrawEditor();
@@ -707,10 +710,15 @@ function holdsBuildHoldFromWindow() {
         hold.frozen('t');
         unHideMe($('hold_frozen_thaw_row'));
         thawDate = $('holds_frozen_thaw_input').value;
-        if(thawDate) 
-            hold.thaw_date(thawDate);
-        else
+        if(thawDate) {
+            if(holdsVerifyThawDate(thawDate)) {
+                hold.thaw_date(thawDate);
+            } else {
+                /* XXX */
+            }
+        } else {
             hold.thaw_date(null);
+        }
     }
 
        //check for alternate hold formats 
@@ -815,3 +823,31 @@ function holdsUpdate(hold, user) {
 }
 
 
+/* verify that the thaw date is valid and after today */
+function holdsVerifyThawDate(thawDate) {
+    thawDate = Date.parseIso8601(thawDate);
+    if(thawDate) {
+        var today = new Date();
+        today = new Date(today.getFullYear(), today.getMonth(), today.getDate())
+        if(thawDate > today) 
+            return thawDate.iso8601Format('YMD', false, false, true);
+    }
+    return null;
+}
+
+
+function holdsVerifyThawDateUI(element) {
+    value = $(element).value;
+
+    if(!value) {
+        removeCSSClass($(element), 'invalid_field');
+        return;
+    }
+
+    if(!holdsVerifyThawDate(value)) {
+        addCSSClass($(element), 'invalid_field');
+    } else {
+        removeCSSClass($(element), 'invalid_field');
+    }
+}
+

diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index 1f81700..ec1c057 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -19,6 +19,9 @@ function clearNodes( node, keepArray ) {
 function myOPACInit() {
        if(!(G.user && G.user.session)) initLogin();
        else myOPACChangePage( "summary" );
+
+    $('myopac_holds_thaw_date_input').onkeyup = 
+        function(){holdsVerifyThawDateUI('myopac_holds_thaw_date_input'); }
 }
 
 function myopacReload() {
@@ -1432,8 +1435,8 @@ function myopacDrawHoldThawDateForm() {
 function myopacApplyThawDate() {
     var dateString = $('myopac_holds_thaw_date_input').value;
     if(dateString) {
-        dateString = (dateString == null) ? null : 
-            Date.parseIso8601(dateString).iso8601Format('YMDHM', false, false, true);
+        dateString = holdsVerifyThawDate(dateString);
+        if(!dateString) return;
     } else {
         dateString = null;
     }

diff --git a/Open-ILS/web/opac/skin/default/xml/common/holds.xml b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
index 68367b8..fdd251c 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
@@ -3,6 +3,7 @@
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/jscalendar/calendar.js'></script>
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/jscalendar/lang/calendar-en.js'></script>
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/jscalendar/calendar-setup.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/DP_DateExtensions.js'></script>
 
 <div>
        <div id='xulholds_box' class='hide_me canvas' style='margin-top: 6px;'>

diff --git a/Open-ILS/web/opac/theme/default/css/colors.css b/Open-ILS/web/opac/theme/default/css/colors.css
index f12fdb8..9bfe478 100644 (file)
--- a/Open-ILS/web/opac/theme/default/css/colors.css
+++ b/Open-ILS/web/opac/theme/default/css/colors.css
@@ -94,3 +94,5 @@ a:focus { background: #E0F0E0; color: #000000;}
 .check_mark { color: green; }
 
 #myopac_holds_thaw_date_form { border: 1px solid #E0E0E0; } 
+
+.invalid_field { border: 3px solid red; }