added new iso-compliant date lib. using new date lib to proplery parse and handle...

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

diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index a881a5d..fc7ea13 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -505,10 +505,17 @@ function _finesFormatNumber(num) {
 //function _trimTime(time) { if(!time) return ""; return time.replace(/\ .*/,""); }
 function _trimTime(time) { 
        if(!time) return ""; 
-       return time.replace(/T.*/,""); 
+    var d = Date.parseIso8601(time);
+    if(!d) return ""; /* date parse failed */
+    return d.iso8601Format('YMD');
 }
 
-function _trimSeconds(time) { if(!time) return ""; return time.replace(/:\d\d\..*$/,""); }
+function _trimSeconds(time) { 
+    if(!time) return ""; 
+    var d = Date.parseIso8601(time);
+    if(!d) return ""; /* date parse failed */
+    return d.iso8601Format('YMDHM',null,true,true);
+}
 
 function myOPACShowTransactions(r) {
 
@@ -741,6 +748,12 @@ function _myOPACSummaryShowUer(r) {
        fleshedUser = user;
        if(!user) return;
 
+    var expireDate = Date.parseIso8601(user.expire_date());
+    if( expireDate < new Date() ) {
+        appendClear($('myopac.expired.date'), expireDate.iso8601Format('YMD'));
+        unHideMe($('myopac.expired.alert'));
+    }
+
        var iv1 = user.ident_value()+'';
        if (iv1.length > 4) iv1 = iv1.replace(new RegExp(iv1.substring(0,iv1.length - 4)), '***********');
 
@@ -1151,18 +1164,9 @@ function myOPACDrawNonCatCirc(r) {
        duration = parseInt(duration + '000');
 
        var dtf = circ.circ_time();
-
-       /*Date.W3CDTF is not happy with the milliseonds, nor is it
-       happy without minute component of the timezone */
-       dtf = dtf.replace(/\.\d+/,'');
-       dtf += ":00"; 
-
-       var start = new Date.W3CDTF();
-       start.setW3CDTF(dtf);
+    var start = Date.parseIso8601(circ.circ_time());
        var due = new Date(  start.getTime() + duration );
-       due = (due+'').replace(/(.*?:\d\d):.*/, '$1');
-
-       appendClear($n(row, 'circ_time'), text(due));
+       appendClear($n(row, 'circ_time'), text(due.iso8601Format('YMDHM', null, true, true)));
 }
 
 

diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js
index 2d44afa..57b774b 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/rdetail.js
+++ b/Open-ILS/web/opac/skin/default/js/rdetail.js
@@ -145,8 +145,6 @@ function rdetailViewMarc(r,id) {
        hideMe($('rdetail_extras_loading'));
        $('rdetail_view_marc_box').innerHTML = r.getResultObject();
 
-       var d = new Date();
-
        var div = elem('div', { "class" : 'hide_me' });
        var span = div.appendChild( elem('abbr') );
 

diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml
index 6d2dc02..ce95d24 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml
@@ -1,7 +1,9 @@
 
 <div id='myopac_checked_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Date.W3CDTF.js'/>
+    <!--
+       <script language='javascript' src='<!||#echo var="OILS_JS_BASE"||>/Date.W3CDTF.js'/>
+    -->
 
    <table width='100%'><tbody>
       <tr>

diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml
index a1ffb88..56086e6 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml
@@ -1,6 +1,20 @@
 
 <div id='myopac_summary_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
+
+    <div id='myopac.expired.alert' class='hide_me' style='margin-bottom: 20px;'>
+               <table class='data_grid' width='100%'>
+            <tbody>
+                <tr>
+                    <td width='100%' style='color:red;'>
+                        Your account expired on <span id='myopac.expired.date'/>!  
+                        Please see a librarian to renew your account.
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+
        <div id='myopac.notes.div' class='hide_me'>
                <table class='data_grid' width='100%'>
                        <thead>
@@ -19,26 +33,8 @@
                <br/>
        </div>
 
-       <!--
-       <table class='light_border data_grid'>
-       -->
        <table width='70%' class='light_border myopac_summary_table'>
                <tbody id='myopac_summary_tbody'>
-                       <!--
-                       <tr>
-                               <td class='color_4 light_border' width='20%'>First Name</td>
-                               <td class='light_border' id='myopac_summary_first'> </td>
-                       </tr>
-                       <tr>
-                               <td class='color_4 light_border'>Middle Name</td>
-                               <td class='light_border' id='myopac_summary_middle'> </td>
-                       </tr>
-                       <tr>
-                               <td class='color_4 light_border'>Last Name</td>
-                               <td class='light_border' id='myopac_summary_last'> </td>
-                       </tr>
-                       -->
-
                        <tr>
                                <td width='30%' class='color_4 light_border'>Name</td>
                                <td class='light_border'>

diff --git a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
index 8524352..6c93feb 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
@@ -1,6 +1,8 @@
 <div id='canvas_main' class='hide_me'>
 
        <script language='javascript' src='../js/myopac.js'> </script>
+    <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/DP_DateExtensions.js'/>
+
        <script> config.ids.altcanvas.myopac_reload = 'myopac_reloading'; </script>
        <div id='myopac_reloading' class='hide_me non_canvas'> Loading... </div>