Index: lams_tool_vote/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.11 -r1.12
--- lams_tool_vote/conf/language/ApplicationResources.properties	25 Apr 2006 10:52:46 -0000	1.11
+++ lams_tool_vote/conf/language/ApplicationResources.properties	25 Apr 2006 13:28:49 -0000	1.12
@@ -51,7 +51,7 @@
 label.learner.viewAnswers				=Learner's Answers
 label.withRetries.results.summary		=Voting with Retries Summary
 label.withoutRetries.results.summary	=Voting without Retries Summary
-label.learning.reportMessage			=Thank you for your participation!<br> The following is a summary of your answers.
+label.learning.reportMessage			=Thank you for your participation!<br> The following is your nominations..
 label.learning.forceFinishMessage		=You have reached the maximum number of votes limit. Please finish.
 count.total.user						=Total Users Count: 
 count.finished.user						=Finished User Count:
@@ -154,6 +154,7 @@
 label.timezone							=Time-Zone
 label.response							=Response
 sbmt.learner.nominations.successful		=Your nominations have been submitted.
+label.learner.nominations				=Your nominations are:
 label.learning.forceOfflineMessage		=This is an offline activity. Please see your instructor for details.
 label.learning.runOffline				=This activity is not being done on the computer. Please see your instructor for details.
 error.defineLater						=Sorry, the activity's content is not ready yet. Please wait for the teacher to define this part.
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.9 -r1.10
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	25 Apr 2006 10:52:46 -0000	1.9
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	25 Apr 2006 13:28:49 -0000	1.10
@@ -381,7 +381,7 @@
     	logger.debug("nominations deleted for user: " + voteQueUsr.getUid());
     	LearningUtil.createAttempt(request, voteQueUsr, mapGeneralCheckedOptionsContent, userEntry, newNominationCount, false);
 
-    	logger.debug("using nominationCount: " + nominationCount);
+    	logger.debug("using nominationCount: " + newNominationCount);
     	
     	if ((mapGeneralCheckedOptionsContent.size() == 0  && (userEntryAvailable == true)))
     	{
@@ -394,7 +394,7 @@
 			if (userEntry.length() > 0)
 			{
 			    logger.debug("creating entry for: " + userEntry);
-			    LearningUtil.createAttempt(request, voteQueUsr, mapLeanerCheckedOptionsContent, userEntry, nominationCount, true);    
+			    LearningUtil.createAttempt(request, voteQueUsr, mapLeanerCheckedOptionsContent, userEntry, newNominationCount, true);    
 			}
     	}
     	if ((mapGeneralCheckedOptionsContent.size() > 0) && (userEntryAvailable == true))
@@ -408,7 +408,7 @@
 			if (userEntry.length() > 0)
 			{
 			    logger.debug("creating entry for: " + userEntry);
-			    LearningUtil.createAttempt(request, voteQueUsr, mapLeanerCheckedOptionsContent, userEntry, nominationCount, false);    
+			    LearningUtil.createAttempt(request, voteQueUsr, mapLeanerCheckedOptionsContent, userEntry, newNominationCount, false);    
 			}
     	}
 
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.6 -r1.7
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	25 Apr 2006 10:52:46 -0000	1.6
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	25 Apr 2006 13:28:49 -0000	1.7
@@ -22,6 +22,8 @@
 package org.lamsfoundation.lams.tool.vote.web;
 
 import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -44,8 +46,10 @@
 import org.lamsfoundation.lams.tool.vote.VoteComparator;
 import org.lamsfoundation.lams.tool.vote.VoteUtils;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteContent;
+import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteSession;
+import org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt;
 import org.lamsfoundation.lams.tool.vote.service.IVoteService;
 import org.lamsfoundation.lams.tool.vote.service.VoteServiceProxy;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -127,6 +131,7 @@
 
 	VoteLearningForm voteLearningForm = (VoteLearningForm) form;
 	voteLearningForm.setRevisitingUser(new Boolean(false).toString());
+	voteLearningForm.setUserEntry("");
     /*
      * persist time zone information to session scope. 
      */
@@ -392,7 +397,32 @@
     		logger.debug("the learner has already responsed to this content, just generate a read-only report. Use redo questions for this.");
     		
     		voteLearningForm.setRevisitingUser(new Boolean(true).toString());
-	    	return (mapping.findForward(REDO_QUESTIONS));
+    		
+    		logger.debug("start building MAP_GENERAL_CHECKED_OPTIONS_CONTENT");
+		 	Long toolContentId=(Long) request.getSession().getAttribute(TOOL_CONTENT_ID);
+	    	logger.debug("toolContentId: " + toolContentId);
+
+	    	List attempts=voteService.getAttemptsForUser(voteQueUsr.getUid());
+	    	logger.debug("attempts: " + attempts);
+	    	
+	    	Map localMapQuestionsContent= new TreeMap(new VoteComparator());
+			Iterator listIterator=attempts.iterator();
+			int order=0;
+	    	while (listIterator.hasNext())
+	    	{
+	    	    VoteUsrAttempt attempt=(VoteUsrAttempt)listIterator.next();
+	        	logger.debug("attempt: " + attempt);
+	        	VoteQueContent voteQueContent=attempt.getVoteQueContent();
+	        	logger.debug("voteQueContent: " + voteQueContent);        	
+	        	order++;
+	    		if (voteQueContent != null)
+	    		{
+	    		    localMapQuestionsContent.put(new Integer(order).toString(),voteQueContent.getQuestion());
+	    		}
+	    	}
+	    	request.getSession().setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, localMapQuestionsContent);
+    		logger.debug("end building MAP_GENERAL_CHECKED_OPTIONS_CONTENT: " + localMapQuestionsContent);
+    		return (mapping.findForward(ALL_NOMINATIONS));
     	}
     }
     else if (learningMode.equals("teacher"))
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_vote/web/learning/AllNominations.jsp	25 Apr 2006 10:52:45 -0000	1.2
+++ lams_tool_vote/web/learning/AllNominations.jsp	25 Apr 2006 13:28:49 -0000	1.3
@@ -55,31 +55,58 @@
 						</td></tr>
 					</c:if> 		
 					  
-					  
-				
 					  <tr>
 					  	<td NOWRAP align=center class="input" valign=top colspan=2> 
 							 CHART FOR ALL RESULTS 
 					  	</td>
 					  </tr>	
 
+
+					  <tr>
+					  	<td NOWRAP align=center class="input" valign=top colspan=2> 
+								&nbsp&nbsp&nbsp&nbsp
+					  	</td>
+					  </tr>	
+
+					  <tr>
+					  	<td NOWRAP align=center class="input" valign=top bgColor="#333366" colspan=2> 
+						  	<font size=2 color="#FFFFFF"> <b>  <bean:message key="label.learner.nominations"/> </b> </font>
+					  	</td>
+					  </tr>
+
+			  		<c:forEach var="entry" items="${sessionScope.mapGeneralCheckedOptionsContent}">
+						  <tr>
+						  	<td NOWRAP align=left valign=top  colspan=2> 
+								  <c:out value="${entry.value}" escapeXml="false" />									
+						  	</td>
+						  </tr>
+					</c:forEach>
+
+						<tr> 
+							<td NOWRAP align=left class="input" valign=top colspan=2> 
+						 	  		<c:out value="${VoteLearningForm.userEntry}"/> 						 			
+					 		</td>
+					  	</tr>
+
+
 				  <tr>
 				  	<td NOWRAP colspan=2 align=center class="input" valign=top> 
 					  	<font size=2>
-                                <html:submit property="viewAnswers" 
-                                             styleClass="linkbutton" 
-                                             onclick="submitMethod('viewAnswers');">
-                                    <bean:message key="label.view.answers"/>
-                                </html:submit>
-	   						&nbsp&nbsp&nbsp&nbsp&nbsp
-								<c:if test="${VoteLearningForm.voteChangable == 'true'}"> 				   						
+					  	
+								<c:if test="${VoteLearningForm.voteChangable == 'true' && VoteLearningForm.lockOnFinish != 'true'}"> 				   						
 			                                <html:submit property="redoQuestionsOk" 
 			                                             styleClass="linkbutton" 
 			                                             onclick="submitMethod('redoQuestionsOk');">
 			                                    <bean:message key="label.retake"/>
 			                                </html:submit>
-								</c:if> 		                                
-	   						&nbsp&nbsp&nbsp&nbsp&nbsp                                
+								</c:if> 		          
+								<c:if test="${VoteLearningForm.voteChangable == 'true' && VoteLearningForm.lockOnFinish == 'true' && VoteLearningForm.revisitingUser == 'false' }"> 				   						
+				                                <html:submit property="redoQuestionsOk" 
+				                                             styleClass="linkbutton" 
+				                                             onclick="submitMethod('redoQuestionsOk');">
+				                                    <bean:message key="label.retake"/>
+				                                </html:submit>
+								</c:if> 		          								                      
 	                            <html:submit property="continueOptionsCombined" 
 	                                         styleClass="linkbutton" 
 	                                         onclick="submitMethod('continueOptionsCombined');">
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AnswersContent.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_vote/web/learning/AnswersContent.jsp	25 Apr 2006 10:52:46 -0000	1.5
+++ lams_tool_vote/web/learning/AnswersContent.jsp	25 Apr 2006 13:28:49 -0000	1.6
@@ -50,13 +50,13 @@
 	
 					<c:if test="${VoteLearningForm.activityRunOffline != 'true'}"> 			
 	  					  <tr>
-						  	<td NOWRAP align=center class="input" valign=top bgColor="white" colspan=2> 
+						  	<td NOWRAP align=center valign=top colspan=2> 
 								  <c:out value="${VoteLearningForm.activityTitle}" escapeXml="false" />						  								
 						  	</td>
 						  </tr>
 						  
 						  <tr>
-						  	<td  NOWRAP align=left class="input" valign=top bgColor="white" colspan=2> 
+						  	<td  NOWRAP align=left valign=top colspan=2> 
 								  <c:out value="${VoteLearningForm.activityInstructions}" escapeXml="false" />						  																
 						  	</td>
 						  </tr>
@@ -95,7 +95,7 @@
 																								submitMethod('selectOption');" CHECKED> 
 																							</font>
 																						</td> 
-																						<td NOWRAP align=left class="input" valign=top> 
+																						<td NOWRAP align=left valign=top> 
 																							<c:out value="${subEntry.value}" escapeXml="false" />														
 								  														</td>
 																					</tr>	
@@ -127,7 +127,7 @@
 																								submitMethod('selectOption');"> 
 																							</font>
 																						</td> 
-																						<td NOWRAP align=left class="input" valign=top> 
+																						<td NOWRAP align=left valign=top> 
 																							<c:out value="${subEntry.value}" escapeXml="false" />																									</td>
 																					</tr>	
 				  												</c:if> 			
@@ -138,7 +138,7 @@
 							  
 							<c:if test="${VoteLearningForm.allowTextEntry == 'true'}"> 			
 									<tr> 
-										<td NOWRAP align=left class="input" valign=top bgColor="#999966" colspan=2> 
+										<td NOWRAP align=left valign=top bgColor="#999966" colspan=2> 
 							      			<font size=2> <b>
 										 		<bean:message key="label.other"/>: 
 									      		</b> 
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	25 Apr 2006 10:52:46 -0000	1.5
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	25 Apr 2006 13:28:49 -0000	1.6
@@ -38,14 +38,14 @@
 					
 			  		<c:forEach var="entry" items="${sessionScope.mapGeneralCheckedOptionsContent}">
 						  <tr>
-						  	<td NOWRAP align=left class="input" valign=top  colspan=2> 
+						  	<td NOWRAP align=left valign=top colspan=2> 
 								  <c:out value="${entry.value}" escapeXml="false" />						  																	
 						  	</td>
 						  </tr>
 					</c:forEach>
 										
 						<tr> 
-							<td NOWRAP align=left class="input" valign=top colspan=2> 
+							<td NOWRAP align=left valign=top colspan=2> 
 						 	  		<c:out value="${VoteLearningForm.userEntry}"/> 						 			
 					 		</td>
 					  	</tr>
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_vote/web/learning/RedoQuestions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_vote/web/learning/ViewAnswers.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?