Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java =================================================================== diff -u -r602d14e8850480e62c23b1c981c4157b83702306 -r13b3303dd460ab8ee1f9ab0841972620e4b29943 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java (.../McUserMarkDTO.java) (revision 602d14e8850480e62c23b1c981c4157b83702306) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java (.../McUserMarkDTO.java) (revision 13b3303dd460ab8ee1f9ab0841972620e4b29943) @@ -22,8 +22,7 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.mc; -import java.util.Collection; -import java.util.LinkedList; +import java.util.Date; import org.apache.commons.lang.builder.ToStringBuilder; @@ -41,7 +40,8 @@ private String queUsrId; private String userName; private String fullName; - private Integer[] marks; + private Date attemptTime; + private Integer[] marks; private Long totalMark; public String toString() { @@ -52,7 +52,8 @@ .append("userName", userName) .append("fullName", fullName) .append("marks", marks) - .append("totalMark", totalMark) + .append("totalMark", totalMark) + .append("attemptTime", attemptTime) .toString(); } @@ -157,4 +158,16 @@ public void setSessionName(String sessionName) { this.sessionName = sessionName; } + /** + * @return Returns the attemptTime. + */ + public Date getAttemptTime() { + return attemptTime; + } + /** + * @param attemptTime The attemptTime to set. + */ + public void setAttemptTime(Date attemptTime) { + this.attemptTime = attemptTime; + } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java =================================================================== diff -u -r602d14e8850480e62c23b1c981c4157b83702306 -r13b3303dd460ab8ee1f9ab0841972620e4b29943 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 602d14e8850480e62c23b1c981c4157b83702306) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 13b3303dd460ab8ee1f9ab0841972620e4b29943) @@ -22,7 +22,7 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.mc.web; -import java.util.Collection; +import java.util.Date; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -37,7 +37,6 @@ import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.mc.McAllGroupsDTO; import org.lamsfoundation.lams.tool.mc.McAppConstants; -import org.lamsfoundation.lams.tool.mc.McComparator; import org.lamsfoundation.lams.tool.mc.McGeneralMonitoringDTO; import org.lamsfoundation.lams.tool.mc.McMonitoredAnswersDTO; import org.lamsfoundation.lams.tool.mc.McMonitoredUserDTO; @@ -220,6 +219,7 @@ // than one in the future and if so, we don't want to count the mark twice hence // we need to check if we've already processed this question in the total. Integer[] userMarks = new Integer[numQuestions]; + Date attemptTime = null; Iterator attemptIterator = mcService.getLatestAttemptsForAUser(mcQueUsr.getUid()).iterator(); long totalMark = 0; while (attemptIterator.hasNext()) @@ -236,9 +236,13 @@ userMarks[arrayIndex] = mark; totalMark += mark.intValue(); } + // get the attempt time, (NB all questions will have the same attempt time) + // Not efficient, since we assign this value for each attempt + attemptTime = attempt.getAttemptTime(); } - + mcUserMarkDTO.setMarks(userMarks); + mcUserMarkDTO.setAttemptTime(attemptTime); mcUserMarkDTO.setTotalMark(new Long(totalMark)); mapSessionUsersData.put(mapIndex.toString(), mcUserMarkDTO); Index: lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp =================================================================== diff -u -r602d14e8850480e62c23b1c981c4157b83702306 -r13b3303dd460ab8ee1f9ab0841972620e4b29943 --- lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision 602d14e8850480e62c23b1c981c4157b83702306) +++ lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision 13b3303dd460ab8ee1f9ab0841972620e4b29943) @@ -36,6 +36,7 @@ + @@ -57,6 +58,10 @@ + + + + @@ -83,6 +88,10 @@ + + + + Index: lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp =================================================================== diff -u -r602d14e8850480e62c23b1c981c4157b83702306 -r13b3303dd460ab8ee1f9ab0841972620e4b29943 --- lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision 602d14e8850480e62c23b1c981c4157b83702306) +++ lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision 13b3303dd460ab8ee1f9ab0841972620e4b29943) @@ -40,7 +40,8 @@ - + + @@ -68,7 +69,9 @@ - + + + @@ -94,7 +97,11 @@ - + + + + +