Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== diff -u -re8579f8f7b5afa49dc060d9534683cdaa649cb2b -red40abcc81d077dd1c01791195ac0f0cff0a6dbe --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision e8579f8f7b5afa49dc060d9534683cdaa649cb2b) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision ed40abcc81d077dd1c01791195ac0f0cff0a6dbe) @@ -122,6 +122,9 @@ public static final String MAP_SELECTED_OPTIONS ="mapSelectedOptions"; public static final String MAP_FEEDBACK_INCORRECT ="mapFeedbackIncorrect"; public static final String MAP_INCORRECT_FEEDBACK ="mapIncorrectFeedback"; + + public static final String MAP_INCORRECT_FEEDBACK_LEARNER ="mapIncorrectFeedbackLearner"; + public static final String MAP_CORRECT_FEEDBACK_LEARNER ="mapCorrectFeedbackLearner"; public static final String MAP_CORRECT_FEEDBACK ="mapCorrectFeedback"; public static final String MAP_FEEDBACK_CORRECT ="mapFeedbackCorrect"; @@ -178,7 +181,10 @@ public static final String MAP_TOOL_SESSIONS ="mapToolSessions"; public static final Integer MAX_TOOL_SESSION_COUNT =new Integer(500); public static final String IS_TOOL_SESSION_CHANGED ="isToolSessionChanged"; - public static final String OPTION_OFF ="false"; + public static final String OPTION_OFF ="false"; + public static final String ACTIVITY_TITLE = "activityTitle"; + public static final String ACTIVITY_INSTRUCTIONS = "activityInstructions"; + /* * user actions Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java =================================================================== diff -u -re8579f8f7b5afa49dc060d9534683cdaa649cb2b -red40abcc81d077dd1c01791195ac0f0cff0a6dbe --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision e8579f8f7b5afa49dc060d9534683cdaa649cb2b) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision ed40abcc81d077dd1c01791195ac0f0cff0a6dbe) @@ -722,6 +722,13 @@ request.getSession().removeAttribute(MODE); request.getSession().removeAttribute(LEARNING_MODE); request.getSession().removeAttribute(EXPORT_USER_ID); + request.getSession().removeAttribute(MAP_INCORRECT_FEEDBACK); + request.getSession().removeAttribute(MAP_CORRECT_FEEDBACK); + request.getSession().removeAttribute(MAP_INCORRECT_FEEDBACK_LEARNER); + request.getSession().removeAttribute(MAP_CORRECT_FEEDBACK_LEARNER); + request.getSession().removeAttribute(ACTIVITY_TITLE); + request.getSession().removeAttribute(ACTIVITY_INSTRUCTIONS); + cleanUpUserExceptions(request); logger.debug("completely cleaned the session."); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java =================================================================== diff -u -r61a2088821a0175b973f9d8354f7432f5fcdc566 -red40abcc81d077dd1c01791195ac0f0cff0a6dbe --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision 61a2088821a0175b973f9d8354f7432f5fcdc566) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision ed40abcc81d077dd1c01791195ac0f0cff0a6dbe) @@ -151,6 +151,11 @@ * */ +/** + * + * Note: Because of MCQ's learning reporting structure, Show Learner Report is always ON even if in authoring it is set to false. + */ + public class McLearningStarterAction extends Action implements McAppConstants { static Logger logger = Logger.getLogger(McLearningStarterAction.class.getName()); /* Since the toolSessionId is passed, we will derive toolContentId from the toolSessionId @@ -564,7 +569,10 @@ logger.debug("IS_CONTENT_IN_USE: " + mcContent.isContentInUse()); request.getSession().setAttribute(IS_CONTENT_IN_USE, new Boolean(mcContent.isContentInUse()).toString()); + request.getSession().setAttribute(ACTIVITY_TITLE, mcContent.getTitle()); + request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, mcContent.getInstructions()); + /* * Is the tool activity been checked as Run Offline in the property inspector? */ @@ -591,14 +599,28 @@ Map mapLeanerAssessmentResults= new TreeMap(new McComparator()); request.getSession().setAttribute(MAP_LEARNER_ASSESSMENT_RESULTS, mapLeanerAssessmentResults); + Map mapLeanerFeedbackIncorrect=AuthoringUtil.buildInCorrectFeedbackMap(request, mcContent.getMcContentId()); request.getSession().setAttribute(MAP_LEARNER_FEEDBACK_INCORRECT, mapLeanerFeedbackIncorrect); logger.debug("MAP_LEARNER_FEEDBACK_INCORRECT: " + mapLeanerFeedbackIncorrect); Map mapLeanerFeedbackCorrect=AuthoringUtil.buildCorrectFeedbackMap(request, mcContent.getMcContentId()); request.getSession().setAttribute(MAP_LEARNER_FEEDBACK_CORRECT, mapLeanerFeedbackCorrect); logger.debug("MAP_LEARNER_FEEDBACK_CORRECT: " + mapLeanerFeedbackCorrect); + + + /* + Map mapIncorrectFeedback = AuthoringUtil.rebuildIncorrectFeedbackMapfromDB(request, mcContent.getMcContentId()); + logger.debug("existing mapIncorrectFeedback:" + mapIncorrectFeedback); + request.getSession().setAttribute(MAP_INCORRECT_FEEDBACK_LEARNER, mapIncorrectFeedback); + + Map mapCorrectFeedback = AuthoringUtil.rebuildCorrectFeedbackMapfromDB(request, mcContent.getMcContentId()); + logger.debug("existing mapCorrectFeedback:" + mapCorrectFeedback); + request.getSession().setAttribute(MAP_CORRECT_FEEDBACK_LEARNER, mapCorrectFeedback); + */ + + Map mapQuestionWeights=LearningUtil.buildWeightsMap(request, mcContent.getMcContentId()); request.getSession().setAttribute(MAP_QUESTION_WEIGHTS, mapQuestionWeights); logger.debug("MAP_QUESTION_WEIGHTS: " + mapQuestionWeights); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java =================================================================== diff -u -r61a2088821a0175b973f9d8354f7432f5fcdc566 -red40abcc81d077dd1c01791195ac0f0cff0a6dbe --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision 61a2088821a0175b973f9d8354f7432f5fcdc566) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision ed40abcc81d077dd1c01791195ac0f0cff0a6dbe) @@ -1026,7 +1026,8 @@ HttpServletResponse response) throws IOException, ServletException { - McUtils.cleanUpSessionAbsolute(request); + /*not doing anything for the moment*/ + /*McUtils.cleanUpSessionAbsolute(request); */ request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); return (mapping.findForward(LOAD_MONITORING_CONTENT)); } Index: lams_tool_lamc/web/learning/AnswersContent.jsp =================================================================== diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -red40abcc81d077dd1c01791195ac0f0cff0a6dbe --- lams_tool_lamc/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) +++ lams_tool_lamc/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision ed40abcc81d077dd1c01791195ac0f0cff0a6dbe) @@ -39,6 +39,7 @@ + Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp =================================================================== diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -red40abcc81d077dd1c01791195ac0f0cff0a6dbe --- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp (.../CombinedAnswersContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) +++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp (.../CombinedAnswersContent.jsp) (revision ed40abcc81d077dd1c01791195ac0f0cff0a6dbe) @@ -39,7 +39,19 @@ - + + + + + + + + + + + + + Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp =================================================================== diff -u -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 -red40abcc81d077dd1c01791195ac0f0cff0a6dbe --- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) +++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision ed40abcc81d077dd1c01791195ac0f0cff0a6dbe) @@ -35,7 +35,8 @@ @@ -181,15 +182,15 @@ - + - + Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp =================================================================== diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -red40abcc81d077dd1c01791195ac0f0cff0a6dbe --- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp (.../SingleQuestionAnswersContent.jsp) (revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45) +++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp (.../SingleQuestionAnswersContent.jsp) (revision ed40abcc81d077dd1c01791195ac0f0cff0a6dbe) @@ -39,7 +39,20 @@ + + + + + + + + +
- + +
+ +
+ +
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp =================================================================== diff -u -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 -red40abcc81d077dd1c01791195ac0f0cff0a6dbe --- lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5) +++ lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision ed40abcc81d077dd1c01791195ac0f0cff0a6dbe) @@ -43,7 +43,8 @@
- + +