Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== diff -u -r690cf7460e6899ac1279fc823d9819a2060744b1 -r3c0610afe854d95fd8153fc895c00b71d01a7e86 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision 690cf7460e6899ac1279fc823d9819a2060744b1) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision 3c0610afe854d95fd8153fc895c00b71d01a7e86) @@ -150,8 +150,11 @@ public static final String MAP_LEARNER_QUESTIONS_CONTENT ="mapLearnerQuestionsContent"; public static final String MAP_LEARNER_CHECKED_OPTIONS_CONTENT ="mapLearnerCheckedOptionsContent"; public static final String MAP_LEARNER_ASSESSMENT_RESULTS ="mapLearnerAssessmentResults"; + public static final String MAP_LEARNER_FEEDBACK_INCORRECT ="mapLeanerFeedbackIncorrect"; + public static final String MAP_LEARNER_FEEDBACK_CORRECT ="mapLeanerFeedbackCorrect"; + public static final String MAP_WEIGHTS ="mapWeights"; public static final String MAP_CHECKBOX_STATES ="mapCheckBoxStates"; public static final String MAP_SELECTED_OPTIONS ="mapSelectedOptions"; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java =================================================================== diff -u -r690cf7460e6899ac1279fc823d9819a2060744b1 -r3c0610afe854d95fd8153fc895c00b71d01a7e86 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 690cf7460e6899ac1279fc823d9819a2060744b1) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 3c0610afe854d95fd8153fc895c00b71d01a7e86) @@ -411,6 +411,56 @@ logger.debug("refreshed Map:" + mapWeightsContent); return mapWeightsContent; } + + + public static Map buildInCorrectFeedbackMap(HttpServletRequest request, Long toolContentId) + { + IMcService mcService =McUtils.getToolService(request); + Map mapIncorrectFeedback= new TreeMap(new McComparator()); + + McContent mcContent=mcService.retrieveMc(toolContentId); + logger.debug("mcContent:" + mcContent); + + List questionsContent=mcService.refreshQuestionContent(mcContent.getUid()); + logger.debug("questionsContent:" + questionsContent); + + Iterator listIterator=questionsContent.iterator(); + Long mapIndex=new Long(1); + while (listIterator.hasNext()) + { + McQueContent mcQueContent=(McQueContent)listIterator.next(); + logger.debug("mcQueContent:" + mcQueContent); + mapIncorrectFeedback.put(mapIndex.toString(),mcQueContent.getFeedbackIncorrect()); + mapIndex=new Long(mapIndex.longValue()+1); + } + + return mapIncorrectFeedback; + } + + + public static Map buildCorrectFeedbackMap(HttpServletRequest request, Long toolContentId) + { + IMcService mcService =McUtils.getToolService(request); + Map mapCorrectFeedback= new TreeMap(new McComparator()); + + McContent mcContent=mcService.retrieveMc(toolContentId); + logger.debug("mcContent:" + mcContent); + + List questionsContent=mcService.refreshQuestionContent(mcContent.getUid()); + logger.debug("questionsContent:" + questionsContent); + + Iterator listIterator=questionsContent.iterator(); + Long mapIndex=new Long(1); + while (listIterator.hasNext()) + { + McQueContent mcQueContent=(McQueContent)listIterator.next(); + logger.debug("mcQueContent:" + mcQueContent); + mapCorrectFeedback.put(mapIndex.toString(),mcQueContent.getFeedbackCorrect()); + mapIndex=new Long(mapIndex.longValue()+1); + } + + return mapCorrectFeedback; + } public void simulatePropertyInspector_RunOffline(HttpServletRequest request) Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java =================================================================== diff -u -r690cf7460e6899ac1279fc823d9819a2060744b1 -r3c0610afe854d95fd8153fc895c00b71d01a7e86 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision 690cf7460e6899ac1279fc823d9819a2060744b1) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision 3c0610afe854d95fd8153fc895c00b71d01a7e86) @@ -182,7 +182,13 @@ */ setupAttributes(request, mcContent); + Map mapLeanerFeedbackIncorrect=AuthoringUtil.buildInCorrectFeedbackMap(request, mcContent.getMcContentId()); + request.getSession().setAttribute(MAP_LEARNER_FEEDBACK_INCORRECT, mapLeanerFeedbackIncorrect); + Map mapLeanerFeedbackCorrect=AuthoringUtil.buildInCorrectFeedbackMap(request, mcContent.getMcContentId()); + request.getSession().setAttribute(MAP_LEARNER_FEEDBACK_CORRECT, mapLeanerFeedbackCorrect); + + /* * fetch question content from content */ @@ -336,6 +342,16 @@ Map mapLeanerAssessmentResults= new TreeMap(new McComparator()); request.getSession().setAttribute(MAP_LEARNER_ASSESSMENT_RESULTS, mapLeanerAssessmentResults); + Map mapLeanerFeedbackIncorrect= new TreeMap(new McComparator()); + request.getSession().setAttribute(MAP_LEARNER_FEEDBACK_INCORRECT, mapLeanerFeedbackIncorrect); + + + + + + Map mapLeanerFeedbackCorrect= new TreeMap(new McComparator()); + request.getSession().setAttribute(MAP_LEARNER_FEEDBACK_CORRECT, mapLeanerFeedbackCorrect); + /* .. till here */ } Index: lams_tool_lamc/web/IndividualLearnerResults.jsp =================================================================== diff -u -r690cf7460e6899ac1279fc823d9819a2060744b1 -r3c0610afe854d95fd8153fc895c00b71d01a7e86 --- lams_tool_lamc/web/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 690cf7460e6899ac1279fc823d9819a2060744b1) +++ lams_tool_lamc/web/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 3c0610afe854d95fd8153fc895c00b71d01a7e86) @@ -99,7 +99,12 @@ - + + + + + +