Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v
diff -u -r1.23 -r1.24
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	21 Jun 2006 00:55:09 -0000	1.23
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	26 Jun 2006 22:33:25 -0000	1.24
@@ -504,9 +504,7 @@
     	
     	logger.debug("final mcQueUsr: " + mcQueUsr);
     	
-    	//String highestAttemptOrder=(String)request.getSession().getAttribute(LEARNER_LAST_ATTEMPT_ORDER);
-        //logger.debug("current highestAttemptOrder:" + highestAttemptOrder);
-    	
+   	
     	String highestAttemptOrder="0";
     	McUsrAttempt mcUsrAttempt = mcService.getAttemptWithLastAttemptOrderForUserInSession(mcQueUsr.getUid(), toolSessionUid);
     	logger.debug("mcUsrAttempt with highest attempt order: " + mcUsrAttempt);
@@ -529,10 +527,6 @@
     	LearningUtil.createAttempt(request, mcQueUsr, mapGeneralCheckedOptionsContent, mark, passed, new Integer(highestAttemptOrder).intValue(), mapLearnerAssessmentResults);
     	logger.debug("created user attempt in the db");
     	
-    	//int intHighestAttemptOrder=new Integer(highestAttemptOrder).intValue()+ 1 ;
-        //logger.debug("updated highestAttemptOrder:" + intHighestAttemptOrder);
-        //request.getSession().setAttribute(LEARNER_LAST_ATTEMPT_ORDER, new Integer(intHighestAttemptOrder).toString());
-        
         logger.debug("before getLearnerMarkAtLeast: passMark" + passMark);
         logger.debug("before getLearnerMarkAtLeast: mapQuestionWeights" + mapQuestionWeights);
         
@@ -912,11 +906,8 @@
 		
 		String previewOnly=(String)request.getSession().getAttribute(PREVIEW_ONLY);
 		logger.debug("previewOnly: " + previewOnly);
-		if ((previewOnly != null) && (previewOnly.equalsIgnoreCase("true")))
-		{
-	    	logger.debug("request for preview.");
-			return (mapping.findForward(PREVIEW));
-		}
+
+		logger.debug("fwding to LOAD_LEARNER: " + LOAD_LEARNER);
     	return (mapping.findForward(LOAD_LEARNER));
     }
 
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	15 Jun 2006 17:40:18 -0000	1.14
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	26 Jun 2006 22:33:25 -0000	1.15
@@ -177,7 +177,7 @@
 			  	   </tr>
 
 
-			 		<c:if test="${sessionScope.learningMode == 'learner'}"> 					  	   
+
 				 		<c:if test="${sessionScope.isRetries == 'true'}"> 					  	   
 			  	   		  <tr>
 						  	<td NOWRAP colspan=2 align=center valign=top> 
@@ -215,7 +215,6 @@
 						  	 </td>
 						  </tr>
 						</c:if> 																		
-					</c:if> 																		
 					
 				  	<html:hidden property="doneLearnerProgress"/>						   
 				</table>
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.25 -r1.26
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	13 Jun 2006 18:06:40 -0000	1.25
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	26 Jun 2006 22:23:52 -0000	1.26
@@ -136,6 +136,19 @@
 		setContentInUse(request);
 		IVoteService voteService =VoteUtils.getToolService(request);
 	 	
+		Collection<String> voteDisplayOrderIds = voteLearningForm.votesAsCollection();
+		logger.debug("Checkbox votes "+voteDisplayOrderIds);
+		
+    	Long toolContentId=(Long)request.getSession().getAttribute(TOOL_CONTENT_ID);
+    	logger.debug("toolContentId:" + toolContentId);
+    	
+    	VoteContent voteContent=voteService.retrieveVote(toolContentId);
+    	logger.debug("voteContent:" + voteContent);
+
+		Map mapGeneralCheckedOptionsContent = LearningUtil.buildQuestionContentMap(request, voteContent, voteDisplayOrderIds);
+		logger.debug("mapGeneralCheckedOptionsContent: "+ mapGeneralCheckedOptionsContent);
+		request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent);
+
     	voteLearningForm.resetCommands();
 	    return (mapping.findForward(ALL_NOMINATIONS));
     }
@@ -439,6 +452,7 @@
     	logger.debug("calling  prepareChartData: " + toolContentId);
     	MonitoringUtil.prepareChartData(request, voteService, null, toolContentId, toolSessionUid);
     	
+    	logger.debug("fwding to INDIVIDUAL_REPORT: " + INDIVIDUAL_REPORT);
     	return (mapping.findForward(INDIVIDUAL_REPORT));
     }
 
@@ -477,14 +491,7 @@
 	    
 	    String previewOnly=(String)request.getSession().getAttribute(PREVIEW_ONLY);
 	    logger.debug("previewOnly : " + previewOnly);
-	    if (previewOnly != null)
-	    {
-		    if (previewOnly.equals("true"))
-		    {
-		        logger.debug("request is for previewOnly : " + previewOnly);
-		        return (mapping.findForward(PREVIEW));
-		    }
-	    }
+	    logger.debug("fwd'ing to LOAD_LEARNER : " + LOAD_LEARNER);
 	    return (mapping.findForward(LOAD_LEARNER));
    }
 
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.22 -r1.23
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	25 Jun 2006 23:31:23 -0000	1.22
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	26 Jun 2006 22:23:52 -0000	1.23
@@ -136,7 +136,7 @@
 	voteLearningForm.setActivityRunOffline(new Boolean(false).toString());
 	
     /*
-     * persist time zone information to session scope. 
+     * save time zone information to session scope. 
      */
     VoteUtils.persistInSessionTimeZone(request);
     ActionForward validateParameters=validateParameters(request, mapping);
@@ -217,8 +217,7 @@
 		/* PREVIEW_ONLY for jsp*/
     	request.getSession().setAttribute(PREVIEW_ONLY, new Boolean(true).toString());
     	VoteLearningAction voteLearningAction= new VoteLearningAction();
-    	//return voteLearningAction.redoQuestions(mapping, form, request, response);
-    	logger.debug("presenting standard learner screen forpreview mode...");
+    	logger.debug("presenting standard learner screen for preview mode...");
         return (mapping.findForward(LOAD_LEARNER));	
 	}