Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/LearningUtil.java,v
diff -u -r1.15 -r1.16
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java	23 May 2006 12:48:52 -0000	1.15
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java	25 May 2006 15:55:44 -0000	1.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java,v
diff -u -r1.21 -r1.22
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	23 May 2006 12:48:52 -0000	1.21
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	25 May 2006 15:55:44 -0000	1.22
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java,v
diff -u -r1.21 -r1.22
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java	25 May 2006 00:40:34 -0000	1.21
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java	25 May 2006 15:55:44 -0000	1.22
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/Attic/index.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_vote/web/index.jsp	16 May 2006 17:39:26 -0000	1.3
+++ lams_tool_vote/web/index.jsp	25 May 2006 15:55:44 -0000	1.4
@@ -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 @@
       <html:submit value="Set as run offline on the copied content"/>
 </html:form>
 
-<html:form action="<%=strClearSession%>" method="post">
-      <table border=1>
-      </table><br/>
-      <html:submit value="Clear session"/>
-</html:form>
 
-<html:form action="<%=strClearSession1%>" method="post">
-      <table border=1>
-      </table><br/>
-      <html:submit value="Clear session1"/>
-</html:form>
-
-<html:form action="<%=strClearSession2%>" method="post">
-      <table border=1>
-      </table><br/>
-      <html:submit value="Clear session2"/>
-</html:form>
-
Index: lams_tool_vote/web/learningIndex.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/Attic/learningIndex.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_vote/web/learningIndex.jsp	15 May 2006 15:30:59 -0000	1.3
+++ lams_tool_vote/web/learningIndex.jsp	25 May 2006 15:55:44 -0000	1.4
@@ -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 @@
       <html:submit value="Create Tool Session: 88888888"/>
 </html:form>
 
-<html:form action="<%=strCreateToolSession2%>" method="post">
+<html:form action="<%=strCreateToolSession3%>" method="post">
       <table border=1>
       </table><br/><BR>
-      <html:submit value="Create Tool Session - for sysadmin: 88888888"/>
+      <html:submit value="Create Tool Session - 1"/>
 </html:form>
 
 
@@ -83,6 +89,14 @@
       <html:submit value="Session 2 - Learning Starter, mode:learner"/>
 </html:form>
 
+<html:form action="<%=toolUrl3%>" method="post">
+      <table border=1>
+      </table><br/><BR>
+      <html:submit value="Session 3 - Learning Starter, mode:learner"/>
+</html:form>
+
+
+
 <html:form action="<%=toolUrlTeacher%>" method="post">
       <table border=1>
       </table><br/><BR>
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AnswersContent.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_vote/web/learning/AnswersContent.jsp	21 May 2006 14:02:09 -0000	1.13
+++ lams_tool_vote/web/learning/AnswersContent.jsp	25 May 2006 15:55:44 -0000	1.14
@@ -79,11 +79,12 @@
 				  		  	 		<c:set var="queIndex" scope="session" value="0"/>
 										  		<c:forEach var="subEntry" items="${sessionScope.mapQuestionContentLearner}">
 											  		<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
-											  		
+
 									  		  	 		<c:set var="checkedOptionFound" scope="request" value="0"/>
 														<!-- traverse the selected option from here --> 									  		
 																	<c:if test="${subEntry.key == sessionScope.queIndex}"> 		
 																	  		<c:forEach var="selectedSubEntry" items="${sessionScope.mapGeneralCheckedOptionsContent}">
+
 																				<c:if test="${subEntry.value == selectedSubEntry.value}"> 		
 																					<tr> 
 																						<td NOWRAP align=left class="input" valign=top> 
@@ -92,7 +93,6 @@
 																								name=optionCheckBox<c:out value="${sessionScope.queIndex}"/>-<c:out value="${subEntry.key}"/>
 																								onclick="javascript:document.forms[0].optionCheckBoxSelected.value=1; 
 																								document.forms[0].questionIndex.value=<c:out value="${sessionScope.queIndex}"/>; 
-																								document.forms[0].optionValue.value='<c:out value="${subEntry.value}"/>';
 																								
 																								if (this.checked == 1)
 																								{
@@ -125,8 +125,9 @@
 																								name=optionCheckBox<c:out value="${sessionScope.queIndex}"/>-<c:out value="${subEntry.key}"/>
 																								onclick="javascript:document.forms[0].optionCheckBoxSelected.value=1; 
 																								document.forms[0].questionIndex.value=<c:out value="${sessionScope.queIndex}"/>; 
-																								document.forms[0].optionValue.value='<c:out value="${subEntry.value}"/>';																			
 					
+
+																													
 																								if (this.checked == 1)
 																								{
 																									document.forms[0].checked.value=true;