Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v
diff -u -r1.53.2.12 -r1.53.2.13
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 24 Feb 2016 12:35:26 -0000 1.53.2.12
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 9 Mar 2016 00:50:25 -0000 1.53.2.13
@@ -1095,11 +1095,11 @@
responcedata.put(AttributeNames.ATTR_COUNT_RATED_ITEMS, countRatedQuestions);
}
- DateFormat dateFormatter = new SimpleDateFormat("d MMMM yyyy h:mm:ss a");
+ DateFormat dateFormatter = new SimpleDateFormat(DateUtil.PRETTY_FORMAT);
+ // setting date format to ISO8601 for jquery.timeago
+ DateFormat dateFormatterTimeAgo = new SimpleDateFormat(DateUtil.ISO8601_FORMAT);
for (QaUsrResp response : responses) {
QaQueUsr user = response.getQaQueUser();
- //JSONArray cell=new JSONArray();
- //cell.put(StringEscapeUtils.escapeHtml(user.getFirstName()) + " " + StringEscapeUtils.escapeHtml(user.getLastName()) + " [" + StringEscapeUtils.escapeHtml(user.getLogin()) + "]");
JSONObject responseRow = new JSONObject();
responseRow.put("responseUid", response.getResponseId().toString());
@@ -1111,6 +1111,7 @@
Date attemptTime = response.getAttemptTime();
attemptTime = DateUtil.convertToTimeZoneFromDefault(userTimeZone, attemptTime);
responseRow.put("attemptTime", dateFormatter.format(attemptTime));
+ responseRow.put("timeAgo", dateFormatterTimeAgo.format(attemptTime));
if (isAllowRateAnswers) {
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/TSTable.tag'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.4 -r1.3.2.5
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld 24 Feb 2016 12:35:26 -0000 1.3.2.4
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld 9 Mar 2016 00:50:25 -0000 1.3.2.5
@@ -440,6 +440,10 @@
/WEB-INF/tags/DefineLater.tag
+ TSTable
+ /WEB-INF/tags/TSTable.tag
+
+
Alert
/WEB-INF/tags/Alert.tag
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp,v
diff -u -r1.32.2.11 -r1.32.2.12
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp 23 Feb 2016 14:36:03 -0000 1.32.2.11
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp 9 Mar 2016 00:50:25 -0000 1.32.2.12
@@ -18,6 +18,7 @@
+
@@ -35,14 +36,16 @@
COMMENT_TEXTAREA_TIP_LABEL = '',
WARN_COMMENTS_IS_BLANK_LABEL = '',
WARN_MIN_NUMBER_WORDS_LABEL = "";
-
+
+
+