Index: lams_tool_lamc/conf/language/ApplicationResources.properties =================================================================== diff -u -r8924c33e8d628e97e7e3668ada071f38b6372c02 -race2e94a6c8e3f5a1980661bb2746444f780776f --- lams_tool_lamc/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 8924c33e8d628e97e7e3668ada071f38b6372c02) +++ lams_tool_lamc/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision ace2e94a6c8e3f5a1980661bb2746444f780776f) @@ -242,6 +242,8 @@ label.mark.only =Mark label.total =Total label.groupName =Group Name: +label.yourAnswers =Your answers: +label.learner= Learner error.system.mc =A system exception has occured. Please contact Lams International technical support at 95806666. The error to report is\:
{0}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== diff -u -rf931ace3d9f38ea25225bd0cd55adfdcb3dfc376 -race2e94a6c8e3f5a1980661bb2746444f780776f --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision f931ace3d9f38ea25225bd0cd55adfdcb3dfc376) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision ace2e94a6c8e3f5a1980661bb2746444f780776f) @@ -250,6 +250,7 @@ public static final String CURRENT_MONITORED_TOOL_SESSION ="currentMonitoredToolSession"; public static final String SELECTION_CASE ="selectionCase"; public static final String LIST_MONITORED_ANSWERS_CONTAINER_DTO ="listMonitoredAnswersContainerDto"; + public static final String LEARNER_NAME ="learnerName"; public static final String LIST_MONITORED_MARKS_CONTAINER_DTO ="listMonitoredMarksContainerDto"; public static final String TIMEZONE ="timeZone"; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java =================================================================== diff -u -r4762fc4bc1815d58fe23977ad1d536d21753eb57 -race2e94a6c8e3f5a1980661bb2746444f780776f --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java (.../ExportServlet.java) (revision 4762fc4bc1815d58fe23977ad1d536d21753eb57) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java (.../ExportServlet.java) (revision ace2e94a6c8e3f5a1980661bb2746444f780776f) @@ -117,9 +117,12 @@ request.getSession().setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO); logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO)); - List listMonitoredMarksContainerDTO=MonitoringUtil.buildGroupsMarkData(request, content, mcService); + + List listMonitoredMarksContainerDTO=MonitoringUtil.buildGroupsMarkDataForExportLearner(request, content, mcService, mcSession, learner.getUid() ); request.getSession().setAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO, listMonitoredMarksContainerDTO); logger.debug("LIST_MONITORED_MARKS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO)); + + request.getSession().setAttribute(LEARNER_NAME,learner.getFullname() ); logger.debug("ending learner mode: "); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java =================================================================== diff -u -rae7f0d44518e7b49d09bd544cc12bf7bce242cb3 -race2e94a6c8e3f5a1980661bb2746444f780776f --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision ae7f0d44518e7b49d09bd544cc12bf7bce242cb3) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision ace2e94a6c8e3f5a1980661bb2746444f780776f) @@ -142,6 +142,66 @@ } + public static List buildGroupsMarkDataForExportLearner(HttpServletRequest request, McContent mcContent, IMcService mcService, McSession mcSession, Long learnerUid) + { + logger.debug("will be building export learner groups mark data for content:..." + mcContent); + + logger.debug("mcSession: " + mcSession); + logger.debug("learnerUid: " + learnerUid); + List listMonitoredMarksContainerDTO= new LinkedList(); + + + McSessionMarkDTO mcSessionMarkDTO= new McSessionMarkDTO(); + mcSessionMarkDTO.setSessionId(mcSession.getMcSessionId().toString()); + mcSessionMarkDTO.setSessionName(mcSession.getSession_name().toString()); + + + LinkedList sessionUsersData= new LinkedList(); + Map mapSessionUsersData= new TreeMap(new McStringComparator()); + + McUserMarkDTO mcUserMarkDTO= new McUserMarkDTO(); + mcUserMarkDTO.setSessionId(mcSession.getMcSessionId().toString()); + + List listQuestions=mcService.getAllQuestionEntries(mcContent.getUid()); + logger.debug("listQuestions:..." + listQuestions); + + Iterator itListQuestions = listQuestions.iterator(); + LinkedList userMarks= new LinkedList(); + + while (itListQuestions.hasNext()) + { + McQueContent mcQueContent =(McQueContent)itListQuestions.next(); + logger.debug("mcQueContent:..." + mcQueContent); + if (mcQueContent != null) + { + String learnerMark=getLearnerMarkForQuestionInSession(mcQueContent.getUid(), mcSession.getUid(),learnerUid, mcSession, mcService); + logger.debug("learnerMark for queContent uid, mcSession uid, mcUser uid:..." + mcQueContent.getUid() + "--" + mcSession.getUid() + + "--" + "is: " + learnerMark); + + userMarks.add(learnerMark); + } + } + + logger.debug("final userMarks:..." + userMarks); + mcUserMarkDTO.setMarks(userMarks); + + String totalMark=getTotalUserMarkForQuestions(userMarks); + logger.debug("totalMark: " + totalMark); + mcUserMarkDTO.setTotalMark(totalMark); + + logger.debug("final mcUserMarkDTO:..." + mcUserMarkDTO); + sessionUsersData.add(mcUserMarkDTO); + logger.debug("final sessionUsersData: " + sessionUsersData); + mapSessionUsersData=convertToMcUserMarkDTOMap(sessionUsersData); + logger.debug("final mapSessionUsersData: " + mapSessionUsersData); + mcSessionMarkDTO.setUserMarks(mapSessionUsersData); + listMonitoredMarksContainerDTO.add(mcSessionMarkDTO); + + logger.debug("final listMonitoredMarksContainerDTO:..." + listMonitoredMarksContainerDTO); + return listMonitoredMarksContainerDTO; + } + + public static List buildGroupsMarkData(HttpServletRequest request, McContent mcContent, IMcService mcService) { logger.debug("will be building groups mark data for content:..." + mcContent);