You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/06/11 19:39:59 UTC
[9/9] airavata-php-gateway git commit: adding timezone to time fields
adding timezone to time fields
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/b5ca077e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b5ca077e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b5ca077e
Branch: refs/heads/master
Commit: b5ca077e13a00eec48205d976283ba4b282f9bbf
Parents: 13dad2e
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jun 10 01:21:14 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Thu Jun 11 23:07:36 2015 +0530
----------------------------------------------------------------------
public/js/time-conversion.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b5ca077e/public/js/time-conversion.js
----------------------------------------------------------------------
diff --git a/public/js/time-conversion.js b/public/js/time-conversion.js
index 29bf960..1675aa8 100644
--- a/public/js/time-conversion.js
+++ b/public/js/time-conversion.js
@@ -25,7 +25,9 @@ function convertTimestamp(timestamp) {
// ie: 2013-02-18, 8:35 AM
time = yyyy + '-' + mm + '-' + dd + ', ' + h + ':' + min + ' ' + ampm;
- return time;
+ var offset = new Date().toString().match(/([A-Z]+[\+-][0-9]+.*)/)[1];
+
+ return time + " - " + offset;
}
$(document).ready( function(){