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.16 -r1.17
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java	25 May 2006 15:55:44 -0000	1.16
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java	13 Jun 2006 05:50:20 -0000	1.17
@@ -21,6 +21,7 @@
  * ***********************************************************************/
 package org.lamsfoundation.lams.tool.vote.web;
 
+import java.util.Collection;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.Map;
@@ -50,7 +51,15 @@
 public class LearningUtil implements VoteAppConstants {
 	static Logger logger = Logger.getLogger(LearningUtil.class.getName());
 	
-    public static Map buildQuestionContentMap(HttpServletRequest request, VoteContent voteContent)
+	/** Build a map of the display ids -> nomination text. If checkedOptions != null then 
+	 * only include the display ids in the checkedOptions list.
+	 * 
+	 * @param request 
+	 * @param voteContent the content of the vote from the database
+	 * @param checkedOptions collection of String display IDs to which to restrict the map (optional)
+	 * @return Map of display id -> nomination text.
+	 */
+    public static Map buildQuestionContentMap(HttpServletRequest request, VoteContent voteContent, Collection<String> checkedOptions)
     {
     	IVoteService voteService =VoteUtils.getToolService(request);
     	Map mapQuestionsContent= new TreeMap(new VoteComparator());
@@ -61,11 +70,11 @@
     		VoteQueContent voteQueContent=(VoteQueContent)contentIterator.next();
     		if (voteQueContent != null)
     		{
-    		    int displayOrder=voteQueContent.getDisplayOrder();
-        		if (displayOrder != 0)
+    		    String displayOrder = (new Integer(voteQueContent.getDisplayOrder())).toString();
+        		if ( (checkedOptions==null || checkedOptions.contains(displayOrder)) && ! displayOrder.equals("0"))
         		{
         			/* add the question to the questions Map in the displayOrder*/
-        			mapQuestionsContent.put(new Integer(displayOrder).toString(),voteQueContent.getQuestion());
+        			mapQuestionsContent.put(displayOrder.toString(),voteQueContent.getQuestion());
         		}
     		}
     	}
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.22 -r1.23
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	25 May 2006 15:55:44 -0000	1.22
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	13 Jun 2006 05:50:20 -0000	1.23
@@ -23,6 +23,7 @@
 package org.lamsfoundation.lams.tool.vote.web;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -115,7 +116,6 @@
     	
         VoteUtils.cleanUpUserExceptions(request);
     	VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form;
-    	voteLearningForm.setRevisitingPageActive(new Boolean(false).toString());
     	voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString());
     	
 	 	IVoteService voteService =VoteUtils.getToolService(request);
@@ -134,7 +134,6 @@
         VoteUtils.cleanUpUserExceptions(request);
 		logger.debug("dispatching viewAllResults...");
 		VoteLearningForm voteLearningForm = (VoteLearningForm) form;
-		voteLearningForm.setRevisitingPageActive(new Boolean(false).toString());
 		voteLearningForm.setNominationsSubmited(new Boolean(false).toString());
 		voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString());
 		
@@ -156,7 +155,6 @@
 		logger.debug("dispatching viewAnswers...");
 		
 		VoteLearningForm voteLearningForm = (VoteLearningForm) form;
-		voteLearningForm.setRevisitingPageActive(new Boolean(false).toString());
 		voteLearningForm.setNominationsSubmited(new Boolean(false).toString());
 		voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString());
 		
@@ -193,7 +191,7 @@
 	            	mapQuestionsContent.put(new Integer(order).toString(),voteQueContent.getQuestion());
 	    		}
 	    	}
-	    	request.getSession().setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapQuestionsContent);
+	    	request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapQuestionsContent);
 	 	}
 	 	else
 	 	{
@@ -216,7 +214,6 @@
 		logger.debug("dispatching redoQuestionsOk...");
 		
 		VoteLearningForm voteLearningForm = (VoteLearningForm) form;
-		voteLearningForm.setRevisitingPageActive(new Boolean(false).toString());
 		voteLearningForm.setNominationsSubmited(new Boolean(false).toString());
 		voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString());
 
@@ -237,7 +234,6 @@
 		logger.debug("requested learner finished, the learner should be directed to next activity.");
 
 		VoteLearningForm voteLearningForm = (VoteLearningForm) form;
-		voteLearningForm.setRevisitingPageActive(new Boolean(false).toString());
 		voteLearningForm.setNominationsSubmited(new Boolean(false).toString());
 		voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString());
 	 	
@@ -288,59 +284,6 @@
 
     }
 
-    public ActionForward castVotes(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException,
-                                         ServletException
-	{   
-        VoteUtils.cleanUpUserExceptions(request);
-		logger.debug("dispatching castVotes...");
-		
-		VoteLearningForm voteLearningForm = (VoteLearningForm) form;
-		voteLearningForm.setRevisitingPageActive(new Boolean(false).toString());
-		voteLearningForm.setNominationsSubmited(new Boolean(false).toString());
-		voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString());
-
-		Map mapGeneralCheckedOptionsContent=(Map) request.getSession().getAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT);
-    	logger.debug("mapGeneralCheckedOptionsContent: " + mapGeneralCheckedOptionsContent);
-
-    	int castVoteCount=mapGeneralCheckedOptionsContent.size();
-    	logger.debug("castVoteCount pre user entry count: " + castVoteCount);
-    	
-    	String userEntry=voteLearningForm.getUserEntry();
-    	logger.debug("userEntry: " + userEntry);
-    	
-    	if ((userEntry != null) && (userEntry.length() > 0))
-    	{
-    	    logger.debug("userEntry available: " + userEntry);
-    	    ++castVoteCount;
-    	}
-    	logger.debug("castVoteCount post user entry count: " + castVoteCount);
-    	
-
-		String maxNominationCount=voteLearningForm.getMaxNominationCount();
-    	logger.debug("maxNominationCount: " + maxNominationCount);
-    	
-    	int intMaxNominationCount=0;
-    	if (maxNominationCount != null)
-    	    intMaxNominationCount=new Integer(maxNominationCount).intValue();
-    	logger.debug("intMaxNominationCount: " + intMaxNominationCount);
-    	logger.debug("intMaxNominationCount versus current voting count: " + intMaxNominationCount + " versus " + castVoteCount );
-
-    	if (castVoteCount > intMaxNominationCount )
-    	{
-    	    voteLearningForm.setMaxNominationCountReached(new Boolean(true).toString());
-    	    persistError(request, "error.maxNominationCount.reached");
-	        logger.debug("give warning,  max nom count reached...");
-    	    logger.debug("fwd'ing to: " + LOAD_LEARNER);
-    	    return (mapping.findForward(LOAD_LEARNER));
-    	}
-
-		return (mapping.findForward(INDIVIDUAL_REPORT));
-	}
-
-    
     public ActionForward continueOptionsCombined(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
@@ -351,16 +294,14 @@
 		logger.debug("dispatching continueOptionsCombined...");
 		
 		VoteLearningForm voteLearningForm = (VoteLearningForm) form;
-		voteLearningForm.setRevisitingPageActive(new Boolean(false).toString());
 		voteLearningForm.setNominationsSubmited(new Boolean(false).toString());
 		voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString());
 
-		Map mapGeneralCheckedOptionsContent=(Map) request.getSession().getAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT);
-    	logger.debug("mapGeneralCheckedOptionsContent: " + mapGeneralCheckedOptionsContent);
-
-    	int castVoteCount=mapGeneralCheckedOptionsContent.size();
-    	logger.debug("castVoteCount pre user entry count: " + castVoteCount);
-    	
+		Collection<String> voteDisplayOrderIds = voteLearningForm.votesAsCollection();
+		logger.debug("Checkbox votes "+voteDisplayOrderIds);
+		
+		// check number of votes
+		int castVoteCount= voteDisplayOrderIds!=null ? voteDisplayOrderIds.size() : 0;
     	String userEntry=voteLearningForm.getUserEntry();
     	logger.debug("userEntry: " + userEntry);
     	
@@ -392,7 +333,6 @@
 
 		IVoteService voteService =VoteUtils.getToolService(request);
 	 	setContentInUse(request);
-    	logger.debug("final mapGeneralCheckedOptionsContent: " + mapGeneralCheckedOptionsContent);
     	
     	Long toolContentId=(Long) request.getSession().getAttribute(TOOL_CONTENT_ID);
     	logger.debug("toolContentId: " + toolContentId);
@@ -451,7 +391,12 @@
         	logger.debug("votes deleted for user: " + voteQueUsr.getUid());
     	}
     	
+    	// To mimize changes to working code, convert the String[] array to the mapGeneralCheckedOptionsContent structure 
+    	VoteContent voteContent=voteSession.getVoteContent();
+    	Map mapGeneralCheckedOptionsContent = LearningUtil.buildQuestionContentMap(request, voteContent, voteDisplayOrderIds);
+    	
     	logger.debug("mapGeneralCheckedOptionsContent size: " + mapGeneralCheckedOptionsContent.size());
+    	
     	if (mapGeneralCheckedOptionsContent.size() > 0)
     	{
     	    LearningUtil.createAttempt(request, voteQueUsr, mapGeneralCheckedOptionsContent, userEntry, false, voteSession);    
@@ -484,12 +429,13 @@
 			    LearningUtil.createAttempt(request, voteQueUsr, mapLeanerCheckedOptionsContent, userEntry, false, voteSession);    
 			}
     	}
-
+    
     	
     	logger.debug("created user attempt in the db");
     	voteLearningForm.resetCommands();
 
-    	mapGeneralCheckedOptionsContent=(Map) request.getSession().getAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT);
+    	// Put the map in the request ready for the next screen
+    	request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent);
     	logger.debug("final mapGeneralCheckedOptionsContent: " + mapGeneralCheckedOptionsContent);
     	
     	voteLearningForm.setNominationsSubmited(new Boolean(true).toString());
@@ -500,7 +446,7 @@
     	return (mapping.findForward(INDIVIDUAL_REPORT));
     }
 
-    public ActionForward redoQuestions(ActionMapping mapping,
+     public ActionForward redoQuestions(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException,
@@ -509,7 +455,6 @@
         logger.debug("dispatching redoQuestions...");
     	VoteUtils.cleanUpUserExceptions(request);
     	VoteLearningForm voteLearningForm = (VoteLearningForm) form;
-    	voteLearningForm.setRevisitingPageActive(new Boolean(false).toString());
     	voteLearningForm.setNominationsSubmited(new Boolean(false).toString());
     	voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString());
     	
@@ -522,15 +467,15 @@
     	logger.debug("voteContent:" + voteContent);
 
     	Map mapQuestionsContent= new TreeMap(new VoteComparator());
-    	mapQuestionsContent=LearningUtil.buildQuestionContentMap(request,voteContent);
+    	mapQuestionsContent=LearningUtil.buildQuestionContentMap(request,voteContent,null);
 	    logger.debug("mapQuestionsContent: " + mapQuestionsContent);
 		
-		request.getSession().setAttribute(MAP_QUESTION_CONTENT_LEARNER, mapQuestionsContent);
-		logger.debug("MAP_QUESTION_CONTENT_LEARNER: " +  request.getSession().getAttribute(MAP_QUESTION_CONTENT_LEARNER));
+		request.setAttribute(MAP_QUESTION_CONTENT_LEARNER, mapQuestionsContent);
+		logger.debug("MAP_QUESTION_CONTENT_LEARNER: " +  request.getAttribute(MAP_QUESTION_CONTENT_LEARNER));
 		logger.debug("voteContent has : " + mapQuestionsContent.size() + " entries.");
 		
 		Map mapGeneralCheckedOptionsContent= new TreeMap(new VoteComparator());
-	    request.getSession().setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent);
+	    request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent);
 	    
 	    voteLearningForm.setUserEntry("");
 	    
@@ -549,44 +494,6 @@
 
     
     
-    public ActionForward selectOption(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException,
-                                      ServletException
-   {
-        logger.debug("dispatching selectOption...");
-    	VoteUtils.cleanUpUserExceptions(request);
-    	VoteLearningForm voteLearningForm = (VoteLearningForm) form;
-    	voteLearningForm.setRevisitingPageActive(new Boolean(false).toString());
-    	voteLearningForm.setNominationsSubmited(new Boolean(false).toString());
-    	voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString());
-    	
-	 	IVoteService voteService =VoteUtils.getToolService(request);
-	 	voteLearningForm.resetParameters();
-    	LearningUtil.readParameters(request, voteLearningForm);
-    	
-    	
-		logger.debug("doing getOptionCheckBoxSelected");
-		setContentInUse(request);
-		voteLearningForm.resetCommands();
-		
-		Map mapGeneralCheckedOptionsContent=(Map) request.getSession().getAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT);
-    	logger.debug("mapGeneralCheckedOptionsContent: " + 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);
-		
-    	voteLearningForm.resetCommands();	
- 		return (mapping.findForward(LOAD_LEARNER));
-   }
-
-
     protected void setContentInUse(HttpServletRequest request)
     {
     	IVoteService voteService =VoteUtils.getToolService(request);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/VoteLearningForm.java,v
diff -u -r1.13 -r1.14
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java	23 May 2006 12:48:52 -0000	1.13
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java	13 Jun 2006 05:50:20 -0000	1.14
@@ -22,7 +22,13 @@
 
 package org.lamsfoundation.lams.tool.vote.web;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
 
 /**
@@ -44,7 +50,7 @@
 	protected String toolContentID;
 	
 	protected String maxNominationCount;
-	protected String allowTextEntry;;
+	protected String allowTextEntry;
 	protected String lockOnFinish;
 	protected String voteChangable;
 	protected String activityRunOffline;
@@ -76,10 +82,19 @@
 	
 	protected String nominationsSubmited;
 	protected String revisitingUser;
-	protected String revisitingPageActive;
 	protected String maxNominationCountReached;
 	protected int 	 castVoteCount;
 	
+	/** The check boxes selected on the first voting screen */
+	protected String[] checkedVotes;
+	/** The text of the user's votes, including their free text entry vote */
+	protected String[] votes;
+	
+	public void reset(ActionMapping mapping, HttpServletRequest request) {
+		checkedVotes = new String[0];
+		votes = new String[0];
+	}
+	
 	protected void resetUserActions()
     {
     	this.getNextQuestion=null;
@@ -557,18 +572,6 @@
     public void setRevisitingUser(String revisitingUser) {
         this.revisitingUser = revisitingUser;
     }
-    /**
-     * @return Returns the revisitingPageActive.
-     */
-    public String getRevisitingPageActive() {
-        return revisitingPageActive;
-    }
-    /**
-     * @param revisitingPageActive The revisitingPageActive to set.
-     */
-    public void setRevisitingPageActive(String revisitingPageActive) {
-        this.revisitingPageActive = revisitingPageActive;
-    }
 
     /**
      * @return Returns the castVoteCount.
@@ -621,4 +624,32 @@
         this.sbmtSuccess = sbmtSuccess;
     }
 
+
+    /** Get the votes based on the checkboxes */
+	public String[] getCheckedVotes() {
+		return checkedVotes;
+	}
+
+    /** Get the votes based on the checkboxes as a collection */
+	public Collection<String> votesAsCollection() {
+		ArrayList<String> votes = new ArrayList<String>();
+		for ( String vote: checkedVotes) {
+			votes.add(vote);
+		}		
+		return votes;
+	}
+
+	/** Set the votes based on the checkboxes */
+	public void setCheckedVotes(String[] checkedVotes) {
+		this.checkedVotes = checkedVotes;
+	}
+
+	public String[] getVotes() {
+		return votes;
+	}
+
+	public void setVotes(String[] votes) {
+		this.votes = votes;
+	}
+
 }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java,v
diff -u -r1.18 -r1.19
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	12 Jun 2006 11:32:50 -0000	1.18
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	13 Jun 2006 05:50:20 -0000	1.19
@@ -131,7 +131,6 @@
 
 	VoteLearningForm voteLearningForm = (VoteLearningForm) form;
 	voteLearningForm.setRevisitingUser(new Boolean(false).toString());
-	voteLearningForm.setRevisitingPageActive(new Boolean(false).toString());
 	voteLearningForm.setUserEntry("");
 	voteLearningForm.setCastVoteCount(0);
 	voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString());
@@ -325,12 +324,12 @@
     /*
 	 * fetch question content from content
 	 */
-    mapQuestionsContent=LearningUtil.buildQuestionContentMap(request,voteContent);
+    mapQuestionsContent=LearningUtil.buildQuestionContentMap(request,voteContent,null);
     logger.debug("mapQuestionsContent: " + mapQuestionsContent);
 	
-	request.getSession().setAttribute(MAP_QUESTION_CONTENT_LEARNER, mapQuestionsContent);
-	logger.debug("MAP_QUESTION_CONTENT_LEARNER: " +  request.getSession().getAttribute(MAP_QUESTION_CONTENT_LEARNER));
-	request.getSession().setAttribute(MAP_OPTIONS_CONTENT, mapQuestionsContent);
+	request.setAttribute(MAP_QUESTION_CONTENT_LEARNER, mapQuestionsContent);
+	logger.debug("MAP_QUESTION_CONTENT_LEARNER: " +  request.getAttribute(MAP_QUESTION_CONTENT_LEARNER));
+	request.setAttribute(MAP_OPTIONS_CONTENT, mapQuestionsContent);
 	
 	
 	/*
@@ -414,7 +413,7 @@
 	    		    }
 	    		}
 	    	}
-	    	request.getSession().setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, localMapQuestionsContent);
+	    	request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, localMapQuestionsContent);
     		logger.debug("end building MAP_GENERAL_CHECKED_OPTIONS_CONTENT: " + localMapQuestionsContent);
     
     	    boolean isSessionCompleted=isSessionCompleted(userSessionId, voteService);
@@ -433,7 +432,6 @@
     		logger.debug("the user's session id AND user id exists in the tool tables go to redo questions. " + toolSessionId + " voteQueUsr: " + 
     				voteQueUsr + " user id: " + voteQueUsr.getQueUsrId());
     		voteLearningForm.setRevisitingUser(new Boolean(true).toString());
-     		voteLearningForm.setRevisitingPageActive(new Boolean(true).toString());
     		
      		logger.debug("preparing chart data for readonly mode");
      		MonitoringUtil.prepareChartData(request, voteService, null, voteContent.getVoteContentId(), toolSessionId);
@@ -461,12 +459,11 @@
 	 */
 	protected void commonContentSetup(HttpServletRequest request, VoteContent voteContent)
 	{
-		Map mapQuestionsContent= new TreeMap(new VoteComparator());
-		mapQuestionsContent=LearningUtil.buildQuestionContentMap(request,voteContent);
+		Map mapQuestionsContent=LearningUtil.buildQuestionContentMap(request,voteContent,null);
 	    logger.debug("mapQuestionsContent: " + mapQuestionsContent);
 		
-		request.getSession().setAttribute(MAP_QUESTION_CONTENT_LEARNER, mapQuestionsContent);
-		logger.debug("MAP_QUESTION_CONTENT_LEARNER: " +  request.getSession().getAttribute(MAP_QUESTION_CONTENT_LEARNER));
+		request.setAttribute(MAP_QUESTION_CONTENT_LEARNER, mapQuestionsContent);
+		logger.debug("MAP_QUESTION_CONTENT_LEARNER: " +  request.getAttribute(MAP_QUESTION_CONTENT_LEARNER));
 		logger.debug("voteContent has : " + mapQuestionsContent.size() + " entries.");
 		request.getSession().setAttribute(TOTAL_QUESTION_COUNT, new Long(mapQuestionsContent.size()).toString());
 	}
@@ -485,7 +482,7 @@
 	    logger.debug("IS_CONTENT_IN_USE: " + voteContent.isContentInUse());
 	    
 	    Map mapGeneralCheckedOptionsContent= new TreeMap(new VoteComparator());
-	    request.getSession().setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent);
+	    request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent);
 	    /*
 	     * Is the tool activity been checked as Run Offline in the property inspector?
 	     */
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_vote/web/learning/AllNominations.jsp	21 May 2006 14:02:09 -0000	1.11
+++ lams_tool_vote/web/learning/AllNominations.jsp	13 Jun 2006 05:50:20 -0000	1.12
@@ -93,7 +93,7 @@
 					  	</td>
 					  </tr>
 
-			  		<c:forEach var="entry" items="${sessionScope.mapGeneralCheckedOptionsContent}">
+			  		<c:forEach var="entry" items="${requestScope.mapGeneralCheckedOptionsContent}">
 						  <tr>
 						  	<td NOWRAP align=center valign=top  colspan=2> 
 								  <c:out value="${entry.value}" escapeXml="false" />									
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AnswersContent.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_vote/web/learning/AnswersContent.jsp	25 May 2006 15:55:44 -0000	1.14
+++ lams_tool_vote/web/learning/AnswersContent.jsp	13 Jun 2006 05:50:20 -0000	1.15
@@ -34,6 +34,55 @@
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<jsp:include page="/learning/learningHeader.jsp" />
+
+	<script language="JavaScript" type="text/JavaScript">
+
+	var noSelected = 0;
+	var maxVotes = <c:out value="${VoteLearningForm.maxNominationCount}"/>; 
+	function updateCount(clickedObj){
+		var userEntry = 0;
+		<c:if test="${VoteLearningForm.allowTextEntry == true}">	
+			if(document.forms[0].userEntry.value != ""){
+				userEntry = 1;
+			}
+		</c:if>
+		if(clickedObj.checked){
+			noSelected++;
+		}else{
+			noSelected--;
+		}
+		
+		if((maxVotes != -1) && (noSelected + userEntry) > maxVotes){
+			clickedObj.checked = false;
+			noSelected--;
+			alertTooManyVotes(maxVotes);
+		}
+	
+	}
+
+	function validateSubmit(actionMethod){
+		var error = "";
+		var userEntry = 0;
+		<c:if test="${VoteLearningForm.allowTextEntry == true}">	
+			if(document.forms[0].userEntry.value != ""){
+				userEntry = 1;
+			}
+		</c:if>
+
+		if((maxVotes != -1) && (noSelected + userEntry) > maxVotes){
+			alertTooManyVotes(maxVotes);
+		} else {
+			submitMethod(actionMethod);
+		}
+		 
+	}
+
+	function alertTooManyVotes(maxVotes) {
+		var msg = "<bean:message key="error.maxNominationCount.reached"/> "+maxVotes+" <bean:message key="label.nominations"/>";
+		alert(msg);
+	}
+	</script>
+
 </head>
 <body>
 
@@ -76,74 +125,9 @@
 							  <tr>						 
 								<td NOWRAP align=left>
 								<table align=left>
-				  		  	 		<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> 
-																							<font size=2>
-																								<input type="checkbox" 
-																								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}"/>; 
-																								
-																								if (this.checked == 1)
-																								{
-																									document.forms[0].checked.value=true;
-																								}
-																								else
-																								{
-																									document.forms[0].checked.value=false;
-																								}
-																								
-																								submitMethod('selectOption');" CHECKED> 
-																							</font>
-																						</td> 
-																						<td NOWRAP align=left valign=top> 
-																							<c:out value="${subEntry.value}" escapeXml="false" />														
-								  														</td>
-																					</tr>	
-																  		  	 		<c:set var="checkedOptionFound" scope="request" value="1"/>
-								  												</c:if> 			
-																		</c:forEach>																						
-				  												</c:if> 			
-		
-														<!-- till  here --> 									  					
-		
-																<c:if test="${requestScope.checkedOptionFound == 0}"> 		
-																					<tr> 
-																						<td NOWRAP align=left class="input" valign=top> 
-																							<font size=2>
-																								<input type="checkbox" 
-																								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}"/>; 
-					
-
-																													
-																								if (this.checked == 1)
-																								{
-																									document.forms[0].checked.value=true;
-																								}
-																								else
-																								{
-																									document.forms[0].checked.value=false;
-																								}
-																								submitMethod('selectOption');"> 
-																							</font>
-																						</td> 
-																						<td NOWRAP align=left valign=top> 
-																							<c:out value="${subEntry.value}" escapeXml="false" />																									</td>
-																					</tr>	
-				  												</c:if> 			
-												</c:forEach>
+										<c:forEach var="subEntry" varStatus="status" items="${requestScope.mapQuestionContentLearner}">
+											<input type="checkbox" name="checkedVotes" value="${subEntry.key}" onClick="updateCount(this);"><c:out value="${subEntry.value}" escapeXml="false"/><BR>
+										</c:forEach>
 								</table>
 								</td>
 							</tr>
@@ -159,22 +143,16 @@
 								 		</td>
 								  	</tr>
 							</c:if> 									  	
-				
-					  	   	<html:hidden property="optionCheckBoxSelected"/>
-							<html:hidden property="questionIndex"/>
-							<html:hidden property="optionIndex"/>
-							<html:hidden property="optionValue"/>						
-							<html:hidden property="checked"/>
 				  	   
 				  	<html:hidden property="donePreview"/>						   
 		  	   		  <tr>
 					  	<td NOWRAP align=right class="input" valign=top> 
 						  	<font size=2>
-		                            <html:submit property="continueOptionsCombined" 
+		                            <html:button property="continueOptionsCombined" 
 		                                         styleClass="linkbutton" 
-		                                         onclick="submitMethod('continueOptionsCombined');">
+		                                         onclick="validateSubmit('continueOptionsCombined');">
 										<bean:message key="label.submit.vote"/>
-		                            </html:submit>
+		                            </html:button>
 							</font>
 					  	 </td>
 					  </tr>
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_vote/web/learning/ExitLearning.jsp	21 May 2006 14:02:09 -0000	1.4
+++ lams_tool_vote/web/learning/ExitLearning.jsp	13 Jun 2006 05:50:20 -0000	1.5
@@ -40,7 +40,7 @@
 				  	</td>
 				  </tr>
 				
-			  		<c:forEach var="entry" items="${sessionScope.mapGeneralCheckedOptionsContent}">
+			  		<c:forEach var="entry" items="${requestScope.mapGeneralCheckedOptionsContent}">
 						  <tr>
 						  	<td NOWRAP align=left valign=top colspan=2> 
 								  <c:out value="${entry.value}" escapeXml="false" />						  																	
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	21 May 2006 14:02:09 -0000	1.11
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	13 Jun 2006 05:50:20 -0000	1.12
@@ -36,7 +36,7 @@
 						</td> 
 					</tr>
 					
-			  		<c:forEach var="entry" items="${sessionScope.mapGeneralCheckedOptionsContent}">
+			  		<c:forEach var="entry" items="${requestScope.mapGeneralCheckedOptionsContent}">
 						  <tr>
 						  	<td NOWRAP align=center valign=top colspan=2> 
 								  <c:out value="${entry.value}" escapeXml="false" />						  																	
Index: lams_tool_vote/web/learning/Preview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Attic/Preview.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_vote/web/learning/Preview.jsp	21 May 2006 14:02:09 -0000	1.5
+++ lams_tool_vote/web/learning/Preview.jsp	13 Jun 2006 05:50:20 -0000	1.6
@@ -59,14 +59,12 @@
 							  <tr>						 
 								<td NOWRAP align=left>
 								<table align=left>
-					  		  	 		<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:forEach var="subEntry" varStatus="status" items="${requestScope.mapQuestionContentLearner}">
 															<tr> 
 																<td NOWRAP align=left class="input" valign=top> 
 																	<font size=2>
 																		<input type="checkbox" 
-																		name=optionCheckBox<c:out value="${sessionScope.queIndex}"/>-<c:out value="${subEntry.key}"/>> 
+																		name=optionCheckBox<c:out value="${status.count}"/>-<c:out value="${subEntry.key}"/>> 
 																			  <c:out value="${subEntry.value}" escapeXml="false" />																			
 																	</font>
 																</td>