Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java =================================================================== diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -rc00d4f7e506c90755c2bbbf106cdfdb44c802640 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision ff7583ba24a271222b91ab3ecc460b931fe20e37) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision c00d4f7e506c90755c2bbbf106cdfdb44c802640) @@ -249,6 +249,7 @@ public static final String ATTR_SESSION_UID = "sessionUid"; // not the tool session id supplied by the core public static final String ATTR_USER_NAME = "userName"; public static final String ATTR_ATTEMPT_TIME = "attemptTime"; + public static final String ATTR_ATTEMPT_TIME_TIMEAGO = "attemptTimeTimeago"; /* * exception constants Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rc00d4f7e506c90755c2bbbf106cdfdb44c802640 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision c00d4f7e506c90755c2bbbf106cdfdb44c802640) @@ -175,6 +175,8 @@ responseRow.put(VoteAppConstants.ATTR_USER_NAME, StringEscapeUtils.escapeHtml((String) userAndAnswers[1])); responseRow.put(VoteAppConstants.ATTR_ATTEMPT_TIME, DateUtil.convertToStringForJSON((Date) userAndAnswers[2], request.getLocale())); + responseRow.put(VoteAppConstants.ATTR_ATTEMPT_TIME_TIMEAGO, + DateUtil.convertToStringForTimeagoJSON((Date) userAndAnswers[2])); rows.put(responseRow); } responsedata.put("rows", rows); @@ -289,6 +291,8 @@ responseRow.put("userEntry", StringEscapeUtils.escapeHtml(userAndAttempt.getUserEntry())); responseRow.put(VoteAppConstants.ATTR_ATTEMPT_TIME, DateUtil.convertToStringForJSON(userAndAttempt.getAttemptTime(), request.getLocale())); + responseRow.put(VoteAppConstants.ATTR_ATTEMPT_TIME_TIMEAGO, + DateUtil.convertToStringForTimeagoJSON(userAndAttempt.getAttemptTime())); responseRow.put("visible", userAndAttempt.isVisible()); rows.put(responseRow); Index: lams_tool_vote/web/common/monitorheader.jsp =================================================================== diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -rc00d4f7e506c90755c2bbbf106cdfdb44c802640 --- lams_tool_vote/web/common/monitorheader.jsp (.../monitorheader.jsp) (revision ff7583ba24a271222b91ab3ecc460b931fe20e37) +++ lams_tool_vote/web/common/monitorheader.jsp (.../monitorheader.jsp) (revision c00d4f7e506c90755c2bbbf106cdfdb44c802640) @@ -23,6 +23,7 @@ + Index: lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp =================================================================== diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -rc00d4f7e506c90755c2bbbf106cdfdb44c802640 --- lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp (.../OtherTextNominationViewer.jsp) (revision ff7583ba24a271222b91ab3ecc460b931fe20e37) +++ lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp (.../OtherTextNominationViewer.jsp) (revision c00d4f7e506c90755c2bbbf106cdfdb44c802640) @@ -93,7 +93,11 @@ rows += ''; rows += '