Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java =================================================================== diff -u -rfdda00dcd7589e8fd1a80c1180a88d695d9a6228 -r4776ddffcd1c1253f24ea7699283a5bf16b318a1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision fdda00dcd7589e8fd1a80c1180a88d695d9a6228) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java (.../McUtils.java) (revision 4776ddffcd1c1253f24ea7699283a5bf16b318a1) @@ -21,7 +21,8 @@ import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent; import org.lamsfoundation.lams.tool.mc.pojos.McSession; import org.lamsfoundation.lams.tool.mc.service.IMcService; -import org.lamsfoundation.lams.tool.mc.web.McAuthoringForm; +import org.lamsfoundation.lams.tool.mc.web.AuthoringUtil; +import org.lamsfoundation.lams.tool.mc.web.LearningUtil; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.web.session.SessionManager; @@ -505,4 +506,207 @@ return LOAD_MONITORING; } } + + + /** + * cleanUpSession(HttpServletRequest request) + * @param request + */ + public static void cleanUpSession(HttpServletRequest request) + { + LearningUtil.cleanUpLearningSession(request); + AuthoringUtil.cleanupAuthoringSession(request); + //MonitoringUtil.cleanupAuthoringSession(request); + } + + + /** + * + * cleanUpSessionAbsolute(HttpServletRequest request) + * @param request + */ + public static void cleanUpSessionAbsolute(HttpServletRequest request) + { + request.getSession().removeAttribute(MY_SIGNATURE); + request.getSession().removeAttribute(DEFAULT_CONTENT_ID); + request.getSession().removeAttribute(TOOL_SERVICE); + request.getSession().removeAttribute(ERROR_MCAPPLICATION); + request.getSession().removeAttribute(LOAD); + request.getSession().removeAttribute(LOAD_QUESTIONS); + request.getSession().removeAttribute(LOAD_STARTER); + request.getSession().removeAttribute(AUTHORING_STARTER); + request.getSession().removeAttribute(LEARNING_STARTER); + request.getSession().removeAttribute(MONITORING_STARTER); + request.getSession().removeAttribute(LOAD_LEARNER); + request.getSession().removeAttribute(LOAD_MONITORING); + request.getSession().removeAttribute(INDIVIDUAL_REPORT); + request.getSession().removeAttribute(VIEW_SUMMARY); + request.getSession().removeAttribute(REDO_QUESTIONS); + request.getSession().removeAttribute(SINGLE_QUESTION_ANSWERS); + request.getSession().removeAttribute(RESULTS_SUMMARY); + request.getSession().removeAttribute(ERROR_LIST); + request.getSession().removeAttribute(PREVIEW); + request.getSession().removeAttribute(LEARNER_PROGRESS); + request.getSession().removeAttribute(LEARNER_PROGRESS_USERID); + request.getSession().removeAttribute(AUTHORING); + request.getSession().removeAttribute(SOURCE_MC_STARTER); + request.getSession().removeAttribute(AUTHORING_CANCELLED); + request.getSession().removeAttribute(DEFINE_LATER_EDIT_ACTIVITY); + request.getSession().removeAttribute(EDIT_OPTIONS_MODE); + request.getSession().removeAttribute(DEFINE_LATER_IN_EDIT_MODE); + request.getSession().removeAttribute(IS_ADD_QUESTION); + request.getSession().removeAttribute(IS_REMOVE_QUESTION); + request.getSession().removeAttribute(SUBMIT_SUCCESS); + request.getSession().removeAttribute(MAP_QUESTIONS_CONTENT); + request.getSession().removeAttribute(IS_REMOVE_CONTENT); + request.getSession().removeAttribute(IS_REVISITING_USER); + request.getSession().removeAttribute(USER); + request.getSession().removeAttribute(TOOL_CONTENT_ID); + request.getSession().removeAttribute(TOOL_CONTENT_UID); + request.getSession().removeAttribute(TOOL_SESSION_ID); + request.getSession().removeAttribute(USER_ID); + request.getSession().removeAttribute(MAX_QUESTION_INDEX); + request.getSession().removeAttribute(COPY_TOOL_CONTENT); + request.getSession().removeAttribute(REMOVE_TOOL_CONTENT); + request.getSession().removeAttribute(MAP_OPTIONS_CONTENT); + request.getSession().removeAttribute(MAP_DEFAULTOPTIONS_CONTENT); + request.getSession().removeAttribute(MAP_DISABLED_QUESTIONS); + request.getSession().removeAttribute(MAP_GENERAL_OPTIONS_CONTENT); + request.getSession().removeAttribute(MAP_GENERAL_SELECTED_OPTIONS_CONTENT); + request.getSession().removeAttribute(MAP_STARTUP_GENERAL_OPTIONS_CONTENT); + request.getSession().removeAttribute(MAP_STARTUP_GENERAL_SELECTED_OPTIONS_CONTENT); + request.getSession().removeAttribute(MAP_STARTUP_GENERAL_OPTIONS_QUEID); + request.getSession().removeAttribute(QUESTIONS_WITHNO_OPTIONS); + request.getSession().removeAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT); + request.getSession().removeAttribute(MAP_LEARNER_QUESTIONS_CONTENT); + request.getSession().removeAttribute(MAP_LEARNER_CHECKED_OPTIONS_CONTENT); + request.getSession().removeAttribute(MAP_LEARNER_ASSESSMENT_RESULTS); + request.getSession().removeAttribute(MAP_LEARNER_FEEDBACK_INCORRECT); + request.getSession().removeAttribute(MAP_LEARNER_FEEDBACK_CORRECT); + request.getSession().removeAttribute(MAP_QUESTION_WEIGHTS); + request.getSession().removeAttribute(MAP_QUE_ATTEMPTS); + request.getSession().removeAttribute(MAP_QUE_CORRECT_ATTEMPTS); + request.getSession().removeAttribute(MAP_QUE_INCORRECT_ATTEMPTS); + request.getSession().removeAttribute(MAP_WEIGHTS); + request.getSession().removeAttribute(MAP_CHECKBOX_STATES); + request.getSession().removeAttribute(MAP_SELECTED_OPTIONS); + request.getSession().removeAttribute(MAP_FEEDBACK_INCORRECT); + request.getSession().removeAttribute(MAP_FEEDBACK_CORRECT); + request.getSession().removeAttribute(SELECTED_QUESTION); + request.getSession().removeAttribute(SELECTED_QUESTION_INDEX); + request.getSession().removeAttribute(DEFAULT_QUESTION_UID); + request.getSession().removeAttribute(TITLE); + request.getSession().removeAttribute(INSTRUCTIONS); + request.getSession().removeAttribute(CREATION_DATE); + request.getSession().removeAttribute(DEFINE_LATER); + request.getSession().removeAttribute(RICHTEXT_FEEDBACK_CORRECT); + request.getSession().removeAttribute(RETRIES); + request.getSession().removeAttribute(ON); + request.getSession().removeAttribute(OFF); + request.getSession().removeAttribute(RICHTEXT_FEEDBACK_INCORRECT); + request.getSession().removeAttribute(RICHTEXT_OFFLINEINSTRUCTIONS); + request.getSession().removeAttribute(PASSMARK); + request.getSession().removeAttribute(VIEW_ANSWERS); + request.getSession().removeAttribute(SHOW_AUTHORING_TABS); + request.getSession().removeAttribute(RICHTEXT_ONLINEINSTRUCTIONS); + request.getSession().removeAttribute(RICHTEXT_REPORT_TITLE); + request.getSession().removeAttribute(RICHTEXT_END_LEARNING_MSG); + request.getSession().removeAttribute(RICHTEXT_TITLE); + request.getSession().removeAttribute(RICHTEXT_INSTRUCTIONS); + request.getSession().removeAttribute(RICHTEXT_BLANK); + request.getSession().removeAttribute(SUBMIT_OFFLINE_FILE); + request.getSession().removeAttribute(SUBMIT_ONLINE_FILE); + request.getSession().removeAttribute(LIST_UPLOADED_OFFLINE_FILENAMES); + request.getSession().removeAttribute(LIST_UPLOADED_ONLINE_FILENAMES); + request.getSession().removeAttribute(LIST_OFFLINEFILES_METADATA); + request.getSession().removeAttribute(LIST_ONLINEFILES_METADATA); + request.getSession().removeAttribute(COUNT_SESSION_COMPLETE); + request.getSession().removeAttribute(COUNT_ALL_USERS); + request.getSession().removeAttribute(COUNT_MAX_ATTEMPT); + request.getSession().removeAttribute(TOP_MARK); + request.getSession().removeAttribute(LOWEST_MARK); + request.getSession().removeAttribute(AVERAGE_MARK); + request.getSession().removeAttribute(ACTIVE_MODULE); + request.getSession().removeAttribute(NOT_ATTEMPTED); + request.getSession().removeAttribute(INCOMPLETE); + request.getSession().removeAttribute(COMPLETED); + request.getSession().removeAttribute(MAP_TOOL_SESSIONS); + request.getSession().removeAttribute(MAX_TOOL_SESSION_COUNT.toString()); + request.getSession().removeAttribute(IS_TOOL_SESSION_CHANGED); + request.getSession().removeAttribute(ADD_NEW_QUESTION); + request.getSession().removeAttribute(OPTION_OFF); + request.getSession().removeAttribute(REMOVE_QUESTION); + request.getSession().removeAttribute(REMOVE_ALL_CONTENT); + request.getSession().removeAttribute(SUBMIT_ALL_CONTENT); + request.getSession().removeAttribute(SUBMIT_TAB_DONE); + request.getSession().removeAttribute(MAP_QUESTION_CONTENT_LEARNER); + request.getSession().removeAttribute(CURRENT_QUESTION_INDEX); + request.getSession().removeAttribute(TOTAL_QUESTION_COUNT); + request.getSession().removeAttribute(LEARNER_MARK); + request.getSession().removeAttribute(LEARNER_BEST_MARK); + request.getSession().removeAttribute(LEARNER_LAST_ATTEMPT_ORDER); + request.getSession().removeAttribute(LEARNER_MARK_ATLEAST); + request.getSession().removeAttribute(MAP_ANSWERS); + request.getSession().removeAttribute(CURRENT_ANSWER); + request.getSession().removeAttribute(USER_FEEDBACK); + request.getSession().removeAttribute(REPORT_TITLE_LEARNER); + request.getSession().removeAttribute(TOTAL_COUNT_REACHED); + request.getSession().removeAttribute(IS_TOOL_ACTIVITY_OFFLINE); + request.getSession().removeAttribute(IS_USERNAME_VISIBLE); + request.getSession().removeAttribute(IS_CONTENT_IN_USE); + request.getSession().removeAttribute(IS_RETRIES); + request.getSession().removeAttribute(IS_SHOW_FEEDBACK); + request.getSession().removeAttribute(IS_SHOW_LEARNERS_REPORT); + request.getSession().removeAttribute(IS_ALL_SESSIONS_COMPLETED); + request.getSession().removeAttribute(CHECK_ALL_SESSIONS_COMPLETED); + request.getSession().removeAttribute(FROM_TOOL_CONTENT_ID); + request.getSession().removeAttribute(TO_TOOL_CONTENT_ID); + request.getSession().removeAttribute(LEARNER_REPORT); + request.getSession().removeAttribute(MAP_USER_RESPONSES); + request.getSession().removeAttribute(MAP_MAIN_REPORT); + request.getSession().removeAttribute(MAP_STATS); + request.getSession().removeAttribute(CURRENT_MONITORING_TAB); + request.getSession().removeAttribute(REPORT_TITLE_MONITOR); + request.getSession().removeAttribute(MONITOR_USER_ID); + request.getSession().removeAttribute(MONITORING_REPORT); + request.getSession().removeAttribute(MONITORING_ERROR); + request.getSession().removeAttribute(MAP_MONITORING_QUESTIONS); + request.getSession().removeAttribute(SUMMARY_TOOL_SESSIONS); + request.getSession().removeAttribute(MONITORED_CONTENT_ID); + request.getSession().removeAttribute(EDITACTIVITY_EDITMODE); + request.getSession().removeAttribute(FORM_INDEX); + request.getSession().removeAttribute(CURRENT_MONITORED_TOOL_SESSION); + request.getSession().removeAttribute(SELECTION_CASE); + request.getSession().removeAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO); + request.getSession().removeAttribute(QUESTION_LISTING_MODE); + request.getSession().removeAttribute(QUESTION_LISTING_MODE_SEQUENTIAL); + request.getSession().removeAttribute(QUESTION_LISTING_MODE_COMBINED); + request.getSession().removeAttribute(PREVIEW_ONLY); + request.getSession().removeAttribute(TIMEZONE); + request.getSession().removeAttribute(MODE); + request.getSession().removeAttribute(LEARNING_MODE); + request.getSession().removeAttribute(USER_EXCEPTION_WRONG_FORMAT); + request.getSession().removeAttribute(USER_EXCEPTION_UNCOMPATIBLE_IDS); + request.getSession().removeAttribute(USER_EXCEPTION_NUMBERFORMAT); + request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_DOESNOTEXIST); + request.getSession().removeAttribute(USER_EXCEPTION_TOOLSESSION_DOESNOTEXIST); + request.getSession().removeAttribute(USER_EXCEPTION_TOOLCONTENT_DOESNOTEXIST); + request.getSession().removeAttribute(USER_EXCEPTION_LEARNER_REQUIRED); + request.getSession().removeAttribute(USER_EXCEPTION_CONTENTID_REQUIRED); + request.getSession().removeAttribute(USER_EXCEPTION_TOOLSESSIONID_REQUIRED); + request.getSession().removeAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOT_AVAILABLE); + request.getSession().removeAttribute(USER_EXCEPTION_DEFAULTQUESTIONCONTENT_NOT_AVAILABLE); + request.getSession().removeAttribute(USER_EXCEPTION_DEFAULTOPTIONSCONTENT_NOT_AVAILABLE); + request.getSession().removeAttribute(USER_EXCEPTION_USERID_NOTAVAILABLE); + request.getSession().removeAttribute(USER_EXCEPTION_USERID_NOTNUMERIC); + request.getSession().removeAttribute(USER_EXCEPTION_ONLYCONTENT_ANDNOSESSIONS); + request.getSession().removeAttribute(USER_EXCEPTION_USERID_EXISTING); + request.getSession().removeAttribute(USER_EXCEPTION_USER_DOESNOTEXIST); + request.getSession().removeAttribute(USER_EXCEPTION_MONITORINGTAB_CONTENTID_REQUIRED); + request.getSession().removeAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP); + request.getSession().removeAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS); + request.getSession().removeAttribute(USER_EXCEPTION_NO_STUDENT_ACTIVITY); + request.getSession().removeAttribute(USER_EXCEPTION_MODE_REQUIRED); + logger.debug("completely cleaned the session."); + } }