Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java =================================================================== diff -u -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 -r1a81f68941dbfe322ed23348d2806fa0b3fc615d --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java (.../LearningUtil.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java (.../LearningUtil.java) (revision 1a81f68941dbfe322ed23348d2806fa0b3fc615d) @@ -267,13 +267,16 @@ public static Map selectOptionsCheckBox(HttpServletRequest request,VoteLearningForm voteLearningForm, String questionIndex, - Map mapGeneralCheckedOptionsContent) + Map mapGeneralCheckedOptionsContent, Map mapQuestionContentLearner) { logger.debug("requested optionCheckBoxSelected..."); logger.debug("questionIndex: " + voteLearningForm.getQuestionIndex()); - logger.debug("optionIndex: " + voteLearningForm.getOptionIndex()); logger.debug("optionValue: " + voteLearningForm.getOptionValue()); logger.debug("checked: " + voteLearningForm.getChecked()); + logger.debug("mapQuestionContentLearner: " + mapQuestionContentLearner); + + String selectedNomination=(String)mapQuestionContentLearner.get(voteLearningForm.getQuestionIndex()); + logger.debug("selectedNomination: " + selectedNomination); Map mapFinal= new TreeMap(new VoteComparator()); @@ -283,7 +286,7 @@ Map mapLeanerCheckedOptionsContent= new TreeMap(new VoteComparator()); if (voteLearningForm.getChecked().equals("true")) - mapLeanerCheckedOptionsContent.put(voteLearningForm.getQuestionIndex(), voteLearningForm.getOptionValue()); + mapLeanerCheckedOptionsContent.put(voteLearningForm.getQuestionIndex(), selectedNomination); else mapLeanerCheckedOptionsContent.remove(voteLearningForm.getQuestionIndex()); @@ -298,7 +301,7 @@ if (mapCurrentOptions != null) { if (voteLearningForm.getChecked().equals("true")) - mapCurrentOptions.put(voteLearningForm.getQuestionIndex(), voteLearningForm.getOptionValue()); + mapCurrentOptions.put(voteLearningForm.getQuestionIndex(), selectedNomination); else mapCurrentOptions.remove(voteLearningForm.getQuestionIndex()); @@ -312,7 +315,7 @@ Map mapLeanerCheckedOptionsContent= new TreeMap(new VoteComparator()); if (voteLearningForm.getChecked().equals("true")) - mapLeanerCheckedOptionsContent.put(voteLearningForm.getQuestionIndex(), voteLearningForm.getOptionValue()); + mapLeanerCheckedOptionsContent.put(voteLearningForm.getQuestionIndex(), selectedNomination); else mapLeanerCheckedOptionsContent.remove(voteLearningForm.getOptionIndex()); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java =================================================================== diff -u -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 -r1a81f68941dbfe322ed23348d2806fa0b3fc615d --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision 1a81f68941dbfe322ed23348d2806fa0b3fc615d) @@ -574,14 +574,14 @@ Map mapGeneralCheckedOptionsContent=(Map) request.getSession().getAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT); logger.debug("mapGeneralCheckedOptionsContent: " + mapGeneralCheckedOptionsContent); - Map mapLeanerCheckedOptionsContent=LearningUtil.selectOptionsCheckBox(request,voteLearningForm, voteLearningForm.getQuestionIndex(), mapGeneralCheckedOptionsContent); + Map mapQuestionContentLearner=(Map)request.getSession().getAttribute(MAP_QUESTION_CONTENT_LEARNER); + logger.debug("mapQuestionContentLearner: " + mapQuestionContentLearner); + + Map mapLeanerCheckedOptionsContent=LearningUtil.selectOptionsCheckBox(request,voteLearningForm, voteLearningForm.getQuestionIndex(), mapGeneralCheckedOptionsContent, mapQuestionContentLearner); logger.debug("post select mapLeanerCheckedOptionsContent: " + mapLeanerCheckedOptionsContent); request.getSession().setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapLeanerCheckedOptionsContent); - Map mapQuestionContentLearner=(Map)request.getSession().getAttribute(MAP_QUESTION_CONTENT_LEARNER); - logger.debug("mapQuestionContentLearner: " + mapQuestionContentLearner); - voteLearningForm.resetCommands(); return (mapping.findForward(LOAD_LEARNER)); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java =================================================================== diff -u -r0f6c8333c4187ad33fafc3fc874525e091be8d21 -r1a81f68941dbfe322ed23348d2806fa0b3fc615d --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 0f6c8333c4187ad33fafc3fc874525e091be8d21) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 1a81f68941dbfe322ed23348d2806fa0b3fc615d) @@ -123,6 +123,7 @@ voteMonitoringForm.setSelectedToolSessionId("All"); voteMonitoringForm.setSbmtSuccess(new Boolean(false).toString()); request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(false).toString()); + request.getSession().setAttribute(IS_PORTFOLIO_EXPORT, new Boolean(false).toString()); voteMonitoringForm.setShowOpenVotesSection(new Boolean(false).toString()); return voteMonitoringAction.submitSession(mapping, form, request, response); } Index: lams_tool_vote/web/index.jsp =================================================================== diff -u -ra178ed11c7cc66dbfbff48645b8c6cc33eb2dbf8 -r1a81f68941dbfe322ed23348d2806fa0b3fc615d --- lams_tool_vote/web/index.jsp (.../index.jsp) (revision a178ed11c7cc66dbfbff48645b8c6cc33eb2dbf8) +++ lams_tool_vote/web/index.jsp (.../index.jsp) (revision 1a81f68941dbfe322ed23348d2806fa0b3fc615d) @@ -42,11 +42,6 @@ String strSetDefineLater="/authoringStarter?toolContentID=" + hardCodedCopiedToolContentId + "&setDefineLater=1"; String strSetRunoffline="/authoringStarter?toolContentID=" + hardCodedCopiedToolContentId + "&strSetRunoffline=1"; - String strClearSession="/clearsession"; - String strClearSession1="/clearsession?action=confirm&mode=author&signature=lavote11&toolContentID=1"; - String strClearSession2="/clearsession?action=confirm&mode=author&signature=lavote11&toolContentID=2"; - - %> @@ -99,21 +94,4 @@ - - -

- -
- - -

- -
- - - -

- -
- Index: lams_tool_vote/web/learning/AnswersContent.jsp =================================================================== diff -u -rca438ee67636fd831f44725bdb36bb7ff5108ebf -r1a81f68941dbfe322ed23348d2806fa0b3fc615d --- lams_tool_vote/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision ca438ee67636fd831f44725bdb36bb7ff5108ebf) +++ lams_tool_vote/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision 1a81f68941dbfe322ed23348d2806fa0b3fc615d) @@ -79,11 +79,12 @@ - + + @@ -92,7 +93,6 @@ name=optionCheckBox- onclick="javascript:document.forms[0].optionCheckBoxSelected.value=1; document.forms[0].questionIndex.value=; - document.forms[0].optionValue.value=''; if (this.checked == 1) { @@ -125,8 +125,9 @@ name=optionCheckBox- onclick="javascript:document.forms[0].optionCheckBoxSelected.value=1; document.forms[0].questionIndex.value=; - document.forms[0].optionValue.value=''; + + if (this.checked == 1) { document.forms[0].checked.value=true; Index: lams_tool_vote/web/learningIndex.jsp =================================================================== diff -u -r0ec38b0c90a821a6e5732546f5e035b3c223c12f -r1a81f68941dbfe322ed23348d2806fa0b3fc615d --- lams_tool_vote/web/learningIndex.jsp (.../learningIndex.jsp) (revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f) +++ lams_tool_vote/web/learningIndex.jsp (.../learningIndex.jsp) (revision 1a81f68941dbfe322ed23348d2806fa0b3fc615d) @@ -35,12 +35,18 @@ String toolSessionID2="55555555"; + + String toolSessionID3="1"; + String toolUrl2="/learningStarter?toolSessionID=" + toolSessionID2 + "&mode=learner"; + String toolUrl3="/learningStarter?toolSessionID=" + toolSessionID3 + "&mode=learner"; String toolUrlTeacher="/learningStarter?toolSessionID=" + toolSessionID + "&mode=teacher"; String strCreateToolSession="/learningStarter?toolSessionID=" + toolSessionID2 + "&mode=learner" + "&createToolSession=1"; String strCreateToolSession2="/learningStarter?toolSessionID=" + toolSessionID + "&mode=learner" + "&createToolSession=1"; + String strCreateToolSession3="/learningStarter?toolSessionID=" + toolSessionID3 + "&mode=learner" + "&createToolSession=1"; + String strRemoveToolSession="/learningStarter?toolSessionID=" + toolSessionID2 + "&mode=learner" + "&removeToolSession=1"; String strLeaveToolSession="/learningStarter?toolSessionID=" + toolSessionID2 + "&mode=learner" + "&leaveToolSession=1" + "&learnerId=4"; @@ -64,10 +70,10 @@ - +


- +
@@ -83,6 +89,14 @@
+ + +


+ +
+ + +