From d504c27c153b951a6004e689e776a24a1a96f2b4 Mon Sep 17 00:00:00 2001 From: phasefx Date: Sun, 24 Jul 2005 20:29:14 +0000 Subject: [PATCH] date tweaks git-svn-id: svn://svn.open-ils.org/ILS/trunk@1390 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../chrome/content/evergreen/util/util.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/util.js b/Evergreen/staff_client/chrome/content/evergreen/util/util.js index c2e4c2523d..604e57474b 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/util.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/util.js @@ -154,15 +154,22 @@ function formatted_date(date,format) { if (typeof(date) == 'string') { date = new Date( parseInt( date + '000' ) ); } - var mm = date.getMonth() + 1; - mm = mm.toString(); - if (mm.length == 1) mm = '0' +mm; - var dd = date.getDate().toString(); - if (dd.length == 1) dd = '0' +dd; + var mm = date.getMonth() + 1; mm = mm.toString(); if (mm.length == 1) mm = '0' +mm; + var dd = date.getDate().toString(); if (dd.length == 1) dd = '0' +dd; var yyyy = date.getFullYear().toString(); - var s = format.replace( /%m/g, mm ); + var yy = yyyy.substr(2); + var H = date.getHours(); H = H.toString(); if (H.length == 1) H = '0' + H; + var I = date.getHours(); if (I > 12) I -= 12; I = I.toString(); + var M = date.getMinutes(); M = M.toString(); if (M.length == 1) M = '0' + M; + var s = format; + s = s.replace( /%m/g, mm ); s = s.replace( /%d/g, dd ); s = s.replace( /%Y/g, yyyy ); + s = s.replace( /%D/g, mm + '/' + dd + '/' + yy ); + s = s.replace( /%F/g, YYYY + '-' + mm + '-' + dd ); + s = s.replace( /%H/g, H ); + s = s.replace( /%I/g, I ); + s = s.replace( /%M/g, M ); return s; } -- 2.11.0