Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java,v diff -u -r1.59.2.4 -r1.59.2.5 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 26 May 2016 13:01:09 -0000 1.59.2.4 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 26 Jul 2016 03:59:40 -0000 1.59.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java,v diff -u -r1.59.2.3 -r1.59.2.4 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java 5 May 2016 08:09:50 -0000 1.59.2.3 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java 26 Jul 2016 03:59:40 -0000 1.59.2.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/common/monitorheader.jsp,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_vote/web/common/monitorheader.jsp 26 May 2016 13:01:09 -0000 1.1.2.3 +++ lams_tool_vote/web/common/monitorheader.jsp 26 Jul 2016 03:59:40 -0000 1.1.2.4 @@ -23,6 +23,7 @@ + Index: lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp 26 May 2016 13:01:08 -0000 1.1.2.3 +++ lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp 26 Jul 2016 03:59:40 -0000 1.1.2.4 @@ -93,7 +93,11 @@ rows += ''; rows += '