Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.420.2.84 -r1.420.2.85 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java,v diff -u -r1.11.4.6 -r1.11.4.7 --- lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java 11 May 2016 07:07:25 -0000 1.11.4.6 +++ lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java 26 Jul 2016 00:43:48 -0000 1.11.4.7 @@ -53,7 +53,16 @@ public static final String SCHEDULE_LESSON_FORMAT = "dd/M/yyyy h:mm a"; public static final String ISO8601_FORMAT = "yyyy-MM-dd'T'HH:mmZ"; public static final String PRETTY_FORMAT = "d MMMM yyyy h:mm:ss a"; - + private static DateFormat dateFormatterTimeAgo; // access via getTimeagoDateFormatter() + + private static DateFormat getTimeagoDateFormatter() { + if (dateFormatterTimeAgo == null) { + dateFormatterTimeAgo = new SimpleDateFormat(DateUtil.ISO8601_FORMAT); + dateFormatterTimeAgo.setTimeZone(TimeZone.getTimeZone("GMT")); + } + return dateFormatterTimeAgo; + } + /** * Convert your local time to Universal Time Coordinator. TODO conversion is not working properly. The returned Date * object still contain server local timezone rather than GMT time zone. @@ -259,4 +268,12 @@ return df.format(value); } + /** + * Convert a date to the ISO08601 format needed for Timeago. Used to return dates through JSON. + */ + public static String convertToStringForTimeagoJSON(Date value) { + return getTimeagoDateFormatter().format(value); + + } + }