[open-ils-commits] r15719 - branches/rel_1_6/Open-ILS/web/opac/skin/default/js (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-03-05 14:22:10 -0500 (Fri, 05 Mar 2010)
New Revision: 15719

Modified:
   branches/rel_1_6/Open-ILS/web/opac/skin/default/js/myopac.js
Log:
Forward port r15718 from rel_1_6_0: improved date/time formatting in My Account


Modified: branches/rel_1_6/Open-ILS/web/opac/skin/default/js/myopac.js
===================================================================
--- branches/rel_1_6/Open-ILS/web/opac/skin/default/js/myopac.js	2010-03-05 19:20:10 UTC (rev 15718)
+++ branches/rel_1_6/Open-ILS/web/opac/skin/default/js/myopac.js	2010-03-05 19:22:10 UTC (rev 15719)
@@ -248,7 +248,7 @@
 	//rnlink.setAttribute('href', 'javascript:myOPACRenewCirc("'+circ.id()+'");');
 	circsCache.push(circ);
 
-	if( circ.renewal_remaining() < 1 ) {
+   if( circ.renewal_remaining() < 1 ) {
       $n(row, 'selectme').disabled = true;
       if(!__can_renew_one)
          $('mo_renew_button').disabled = true;
@@ -397,7 +397,7 @@
 
         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 _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 _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);
 }
@@ -698,8 +699,7 @@
 
 	$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))
@@ -1396,7 +1396,7 @@
 	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)));
 }