Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rd1d8f658b5b65ceb887ecb17d1883a17a5d5a1e3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 5e63656a12c02f7476564e278b43ff4ce86ac930) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision d1d8f658b5b65ceb887ecb17d1883a17a5d5a1e3) @@ -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) { Index: lams_tool_laqa/web/WEB-INF/tags/TSTable.tag =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/tags/TSTable.tag (revision 0) +++ lams_tool_laqa/web/WEB-INF/tags/TSTable.tag (revision d1d8f658b5b65ceb887ecb17d1883a17a5d5a1e3) @@ -0,0 +1,53 @@ +<%-- Tablesorter Table and Pager --%> +<%@ tag body-content="scriptless"%> +<%@ taglib uri="tags-core" prefix="c"%> + +<%@ attribute name="numColumns" required="true" rtexprvalue="true"%> +<%@ attribute name="dataId" required="false" rtexprvalue="true"%> +<%@ attribute name="tableClass" required="false" rtexprvalue="true"%> +<%@ attribute name="pagerClass" required="false" rtexprvalue="true"%> +<%@ attribute name="test" required="false" rtexprvalue="true"%> + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + \ No newline at end of file Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rd1d8f658b5b65ceb887ecb17d1883a17a5d5a1e3 --- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 5e63656a12c02f7476564e278b43ff4ce86ac930) +++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision d1d8f658b5b65ceb887ecb17d1883a17a5d5a1e3) @@ -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 =================================================================== diff -u -r099554309e1f77769667c041fb6d0fa91a89ea03 -rd1d8f658b5b65ceb887ecb17d1883a17a5d5a1e3 --- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp (.../RevisitedLearnerRep.jsp) (revision 099554309e1f77769667c041fb6d0fa91a89ea03) +++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp (.../RevisitedLearnerRep.jsp) (revision d1d8f658b5b65ceb887ecb17d1883a17a5d5a1e3) @@ -18,6 +18,7 @@ + @@ -35,14 +36,16 @@ COMMENT_TEXTAREA_TIP_LABEL = '', WARN_COMMENTS_IS_BLANK_LABEL = '', WARN_MIN_NUMBER_WORDS_LABEL = ""; - + + +