Fix date displays in My Account and Copy Details

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/branches/rel_1_6_0@823 6d9bc8c9-1ec2-4278-b937-99fde70a366f

diff --git a/web/opac/skin/default/js/copy_details.js b/web/opac/skin/default/js/copy_details.js
index 94adfd1..ad03478 100644 (file)
--- a/web/opac/skin/default/js/copy_details.js
+++ b/web/opac/skin/default/js/copy_details.js
@@ -256,12 +256,12 @@ function cpdDrawCopy(r) {
                if( copy.circulations() ) {
                        circ = copy.circulations()[0];
                        if( circ ) {
-                                var due_time = dojo.date.stamp.fromISOString(circ.due_date());
-                                if( showDueTime ) {
-                                        $n(row, 'copy_due_date').appendChild(text(dojo.date.locale.format(due_time, {"formatLength": "medium"})));
-                                } else {
-                                        $n(row, 'copy_due_date').appendChild(text(dojo.date.locale.format(due_time, {"selector": "date", "formatLength": "medium"})));
-                                }
+                               var due_time = dojo.date.stamp.fromISOString(circ.due_date().replace(/(T\d\d:\d\d:\d\d)([+-]\d\d)(\d)/, "$1$2:$3"));
+                               if( showDueTime ) {
+                                       $n(row, 'copy_due_date').appendChild(text(dojo.date.locale.format(due_time, {"formatLength": "medium"})));
+                               } else {
+                                       $n(row, 'copy_due_date').appendChild(text(dojo.date.locale.format(due_time, {"selector": "date", "formatLength": "medium"})));
+                               }
                        }
                }
        }

diff --git a/web/opac/skin/default/js/myopac.js b/web/opac/skin/default/js/myopac.js
index e62032f..887bbf6 100644 (file)
--- a/web/opac/skin/default/js/myopac.js
+++ b/web/opac/skin/default/js/myopac.js
@@ -397,7 +397,7 @@ function myOPACDrawHolds(r) {
 
         var exp_date;
         if(h.expire_time()) {
-            exp_date = dojo.date.stamp.fromISOString(h.expire_time());
+            exp_date = dojo.date.stamp.fromISOString(h.expire_time().replace(/(T\d\d:\d\d:\d\d)([+-]\d\d)(\d)/, "$1$2:$3"));
             $n(row, 'myopac_hold_expire_time').appendChild(
                 text(dojo.date.locale.format(exp_date, {selector:'date'})));
         }
@@ -587,6 +587,7 @@ function _finesFormatNumber(num) {
 //function _trimTime(time) { if(!time) return ""; return time.replace(/\ .*/,""); }
 function _trimTime(time) { 
        if(!time) return ""; 
+    time = time.replace(/(T\d\d:\d\d:\d\d)([+-]\d\d)(\d)/, "$1$2:$3");
     var d = dojo.date.stamp.fromISOString(time);
     if(!d) return ""; /* date parse failed */
     return d.iso8601Format('YMD');
@@ -594,7 +595,7 @@ function _trimTime(time) {
 
 function _trimSeconds(time) { 
     if(!time) return ""; 
-    var d = dojo.date.stamp.fromISOString(time);
+    var d = dojo.date.stamp.fromISOString(time.replace(/(T\d\d:\d\d:\d\d)([+-]\d\d)(\d)/, "$1$2:$3"));
     if(!d) return ""; /* date parse failed */
     return d.iso8601Format('YMDHM',null,true,true);
 }
@@ -692,8 +693,7 @@ function myOPACShowCircTransaction(trans, record, circ) {
 
        $n(row,'myopac_circ_trans_start').
                appendChild(text(_trimTime(trans.xact_start())));
-
-   var due = _trimTime(circ.due_date());
+       var due = _trimTime(circ.due_date());
        var checkin = _trimTime(circ.stop_fines_time());
 
        $n(row,'myopac_circ_trans_due').appendChild(text(due))
@@ -1374,7 +1374,7 @@ function myOPACDrawNonCatCirc(r) {
        duration = parseInt(duration + '000');
 
        var dtf = circ.circ_time();
-    var start = dojo.date.stamp.fromISOString(circ.circ_time());
+       var start = dojo.date.stamp.fromISOString(circ.circ_time().replace(/(T\d\d:\d\d:\d\d)([+-]\d\d)(\d)/, "$1$2:$3"));
        var due = new Date(  start.getTime() + duration );
        appendClear($n(row, 'circ_time'), text(due.iso8601Format('YMDHM', null, true, true)));
 }