Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java =================================================================== diff -u -r51190e07e3d8dfaee600d9912e0a3d723363570a -r602d14e8850480e62c23b1c981c4157b83702306 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java (.../McUserMarkDTO.java) (revision 51190e07e3d8dfaee600d9912e0a3d723363570a) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java (.../McUserMarkDTO.java) (revision 602d14e8850480e62c23b1c981c4157b83702306) @@ -40,6 +40,7 @@ private String sessionName; private String queUsrId; private String userName; + private String fullName; private Integer[] marks; private Long totalMark; @@ -49,6 +50,7 @@ .append("sessionId", sessionId) .append("queUsrId", queUsrId) .append("userName", userName) + .append("fullName", fullName) .append("marks", marks) .append("totalMark", totalMark) .toString(); @@ -73,25 +75,42 @@ public String getQueUsrId() { return queUsrId; } + /** * @param queUsrId The queUsrId to set. */ public void setQueUsrId(String queUsrId) { this.queUsrId = queUsrId; } + /** * @return Returns the userName. */ public String getUserName() { return userName; } + /** * @param userName The userName to set. */ public void setUserName(String userName) { this.userName = userName; } - + + /** + * @return Returns the userName. + */ + public String getFullName() { + return fullName; + } + + /** + * @param userName The userName to set. + */ + public void setFullName(String fullName) { + this.fullName = fullName; + } + public int compareTo(Object o) { McUserMarkDTO mcUserMarkDTO = (McUserMarkDTO) o; @@ -101,7 +120,6 @@ else return (int) (new Long(queUsrId).longValue() - new Long(mcUserMarkDTO.queUsrId).longValue()); } - /** * @return Returns the sessionId. Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java =================================================================== diff -u -r7936e8f7de045aea09aaa715f3027061f05a1c15 -r602d14e8850480e62c23b1c981c4157b83702306 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision 7936e8f7de045aea09aaa715f3027061f05a1c15) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision 602d14e8850480e62c23b1c981c4157b83702306) @@ -4747,13 +4747,20 @@ cell.setCellValue(currentSessionName); idx++; + int count = 0; + row = sheet.createRow(idx++); - cell = row.createCell((short) 0); + + cell = row.createCell((short) count++); cell.setEncoding(HSSFCell.ENCODING_UTF_16); - cell.setCellValue(messageService.getMessage("label.user")); + cell.setCellValue(messageService.getMessage("label.learner")); + cell = row.createCell((short) count++); + cell.setEncoding(HSSFCell.ENCODING_UTF_16); + cell.setCellValue(messageService.getMessage("label.monitoring.downloadMarks.username")); + Iterator answersIterator = listMonitoredAnswersContainerDTO.iterator(); - int count = 1; + while(answersIterator.hasNext()) { McMonitoredAnswersDTO mcMonitoredAnswersDTO = (McMonitoredAnswersDTO) answersIterator.next(); @@ -4774,11 +4781,16 @@ McUserMarkDTO userMark = (McUserMarkDTO) userMarkIterator.next(); String currentUserSessionId = userMark.getSessionId(); + + cell = row.createCell((short) count++); + cell.setEncoding(HSSFCell.ENCODING_UTF_16); + cell.setCellValue(userMark.getFullName()); cell = row.createCell((short) count++); cell.setEncoding(HSSFCell.ENCODING_UTF_16); cell.setCellValue(userMark.getUserName()); - + + Integer[] marks = userMark.getMarks(); for(int i=0; i - + Index: lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp =================================================================== diff -u -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f -r602d14e8850480e62c23b1c981c4157b83702306 --- lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f) +++ lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision 602d14e8850480e62c23b1c981c4157b83702306) @@ -55,7 +55,7 @@ - + @@ -81,7 +81,7 @@ - + Index: lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp =================================================================== diff -u -ree243d4e5cb79d63c83f87a473b996d6b2c2e86f -r602d14e8850480e62c23b1c981c4157b83702306 --- lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision ee243d4e5cb79d63c83f87a473b996d6b2c2e86f) +++ lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision 602d14e8850480e62c23b1c981c4157b83702306) @@ -66,7 +66,7 @@ - + @@ -92,7 +92,7 @@ - +