Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java,v
diff -u -r1.10 -r1.11
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java	26 Sep 2006 02:26:51 -0000	1.10
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java	8 Nov 2006 22:07:58 -0000	1.11
@@ -78,8 +78,6 @@
     /** nullable persistent field */
     private long createdBy;
     
-    private boolean voteChangable;
-    
     private boolean reflect;
     
     private boolean allowText;
@@ -110,7 +108,7 @@
 
     /** full constructor */
     public VoteContent(Long voteContentId, String content, String title, String instructions, boolean defineLater, boolean runOffline, 
-            Date creationDate, Date updateDate, boolean voteChangable, boolean allowText,boolean reflect, String reflectionSubject,
+            Date creationDate, Date updateDate, boolean allowText,boolean reflect, String reflectionSubject,
             String maxNominationCount, long createdBy, boolean lockOnFinish, boolean contentInUse, String offlineInstructions, 
             String onlineInstructions, Set voteQueContents, Set voteSessions, 
 			Set voteAttachments) {
@@ -122,7 +120,6 @@
         this.runOffline = runOffline;
         this.creationDate = creationDate;
         this.updateDate = updateDate;
-        this.voteChangable=voteChangable;
         this.maxNominationCount=maxNominationCount;
         this.allowText=allowText;
         this.reflect=reflect;
@@ -172,7 +169,6 @@
     				 vote.isRunOffline(),
     				 vote.getCreationDate(),
     				 vote.getUpdateDate(),
-    				 vote.isVoteChangable(),
     				 vote.isAllowText(),
     				 vote.isReflect(),
     				 vote.getReflectionSubject(),
@@ -430,18 +426,6 @@
         this.voteContentId = voteContentId;
     }
     
-    /**
-     * @return Returns the voteChangable.
-     */
-    public boolean isVoteChangable() {
-        return voteChangable;
-    }
-    /**
-     * @param voteChangable The voteChangable to set.
-     */
-    public void setVoteChangable(boolean voteChangable) {
-        this.voteChangable = voteChangable;
-    }
 
     /**
      * @return Returns the allowText.
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.28 -r1.29
--- lams_tool_vote/web/learning/AllNominations.jsp	17 Oct 2006 20:29:42 -0000	1.28
+++ lams_tool_vote/web/learning/AllNominations.jsp	8 Nov 2006 22:07:58 -0000	1.29
@@ -64,7 +64,6 @@
 	<html:hidden property="previewOnly"/>	
 	<html:hidden property="maxNominationCount"/>	
 	<html:hidden property="allowTextEntry"/>	
-	<html:hidden property="voteChangable"/>	
 	<html:hidden property="lockOnFinish"/>	
 	<html:hidden property="reportViewOnly"/>		
 	<html:hidden property="userEntry"/>		
@@ -223,7 +222,7 @@
 		                                    <fmt:message key="label.refresh"/>
 		                                </html:submit>
 		                                
-							<c:if test="${VoteLearningForm.voteChangable == 'true'}"> 				   										  
+							<c:if test="${VoteLearningForm.lockOnFinish != 'true'}"> 				   										  
 										&nbsp&nbsp	
 		                                <html:submit property="redoQuestionsOk" 
 		                                             styleClass="button" 
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AnswersContent.jsp,v
diff -u -r1.24 -r1.25
--- lams_tool_vote/web/learning/AnswersContent.jsp	17 Oct 2006 20:29:42 -0000	1.24
+++ lams_tool_vote/web/learning/AnswersContent.jsp	8 Nov 2006 22:07:58 -0000	1.25
@@ -113,7 +113,6 @@
 	<html:hidden property="previewOnly"/>		
 	<html:hidden property="maxNominationCount"/>		
 	<html:hidden property="allowTextEntry"/>		
-	<html:hidden property="voteChangable"/>	
 	<html:hidden property="lockOnFinish"/>	
 	<html:hidden property="reportViewOnly"/>			
 	
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_vote/web/learning/ExitLearning.jsp	17 Oct 2006 20:29:42 -0000	1.14
+++ lams_tool_vote/web/learning/ExitLearning.jsp	8 Nov 2006 22:07:58 -0000	1.15
@@ -64,7 +64,6 @@
 	<html:hidden property="previewOnly"/>	
 	<html:hidden property="maxNominationCount"/>		
 	<html:hidden property="allowTextEntry"/>	
-	<html:hidden property="voteChangable"/>	
 	<html:hidden property="lockOnFinish"/>	
 	<html:hidden property="reportViewOnly"/>		
 	<html:hidden property="userEntry"/>			
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	17 Oct 2006 20:29:42 -0000	1.20
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	8 Nov 2006 22:07:58 -0000	1.21
@@ -64,7 +64,6 @@
 	<html:hidden property="previewOnly"/>	
 	<html:hidden property="maxNominationCount"/>		
 	<html:hidden property="allowTextEntry"/>		
-	<html:hidden property="voteChangable"/>	
 	<html:hidden property="lockOnFinish"/>	
 	<html:hidden property="reportViewOnly"/>			
 	<html:hidden property="userEntry"/>			
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/RevisitedAllNominations.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	8 Nov 2006 22:07:58 -0000	1.1
@@ -0,0 +1,261 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set scope="request" var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set scope="request" var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<html:html>
+<head>
+	<html:base />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<title><fmt:message key="activity.title" /></title>
+	
+	<script language="JavaScript" type="text/JavaScript">
+		function submitMethod(actionMethod) 
+		{
+			document.VoteLearningForm.dispatch.value=actionMethod; 
+			document.VoteLearningForm.submit();
+		}
+	</script>
+</head>
+
+<body class="stripes">
+
+<div id="content">
+
+<h1>
+	<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+</h1>
+
+<html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
+	<html:hidden property="dispatch"/>
+	<html:hidden property="toolSessionID"/>
+	<html:hidden property="userID"/>	
+	<html:hidden property="revisitingUser"/>	
+	<html:hidden property="previewOnly"/>	
+	<html:hidden property="maxNominationCount"/>	
+	<html:hidden property="allowTextEntry"/>	
+	<html:hidden property="lockOnFinish"/>	
+	<html:hidden property="reportViewOnly"/>		
+	<html:hidden property="userEntry"/>		
+	
+		<table cellpadding="0">
+		
+			  <tr>
+			  	<td NOWRAP valign=top align=center colspan=2> 
+					<b> <fmt:message key="label.progressiveResults"/>  </b>
+			  	</td>
+			  </tr>	
+
+				  		<!--present  a mini summary table here -->
+			  			<tr> 
+						  	<td NOWRAP align=center  valign=top> 
+							  	<table cellpadding="0" class="alternative-color">
+						  				<tr>
+									 		<td NOWRAP> <b>  <fmt:message key="label.nomination"/> </b> </td>
+											<td NOWRAP> <b>  <fmt:message key="label.total.votes"/> </b> </td>
+										</tr>
+										
+										<c:forEach var="currentNomination" items="${voteGeneralLearnerFlowDTO.mapStandardNominationsHTMLedContent}">
+								  	 		<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}"/>
+								  	 		 <tr>
+					  	 						<td NOWRAP valign=top align=left>
+													<c:out value="${currentNomination.value}" escapeXml="false"/>
+												 </td>
+				
+												<td NOWRAP valign=top align=left>				  	 		
+										  	 		<c:forEach var="currentUserCount" items="${voteGeneralLearnerFlowDTO.mapStandardUserCount}">
+											  	 		<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}"/>
+										  				<c:if test="${currentNominationKey == currentUserKey}"> 				
+										  				
+										  					<c:if test="${currentUserCount.value != '0' }"> 	
+													  	 		<c:forEach var="currentQuestionUid" items="${voteGeneralLearnerFlowDTO.mapStandardQuestionUid}">
+														  	 		<c:set var="currentQuestionUidKey" scope="request" value="${currentQuestionUid.key}"/>
+													  				<c:if test="${currentQuestionUidKey == currentUserKey}"> 				
+	
+															  	 		<c:forEach var="currentSessionUid" items="${voteGeneralLearnerFlowDTO.mapStandardToolSessionUid}">
+																  	 		<c:set var="currentSessionUidKey" scope="request" value="${currentSessionUid.key}"/>
+															  				<c:if test="${currentSessionUidKey == currentQuestionUidKey}"> 				
+			
+																	  				<c:if test="${currentNomination.value != 'Open Vote'}"> 				
+																						<c:set scope="request" var="viewURL">
+																							<lams:WebAppURL/>monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}
+																						</c:set>
+	
+																						 <c:out value="${currentUserCount.value}"/>  
+	
+																					</c:if> 	    
+																	  				<c:if test="${currentNomination.value == 'Open Vote'}"> 				
+																							 <c:out value="${currentUserCount.value}"/>  
+																					</c:if> 	    
+																			</c:if> 	    
+																		</c:forEach>		  
+	
+																	</c:if> 	    
+																</c:forEach>		  
+															</c:if> 	    								
+											  				<c:if test="${currentUserCount.value == '0' }"> 		  				
+																	<c:out value="${currentUserCount.value}"/>  
+															</c:if> 	
+															    																								
+														</c:if> 	    
+													</c:forEach>		  
+				
+										  	 		<c:forEach var="currentRate" items="${voteGeneralLearnerFlowDTO.mapStandardRatesContent}">
+											  	 		<c:set var="currentRateKey" scope="request" value="${currentRate.key}"/>
+										  				<c:if test="${currentNominationKey == currentRateKey}"> 				
+																	 &nbsp(<c:out value="${currentRate.value}"/> <fmt:message key="label.percent"/>) 
+														</c:if> 	    
+													</c:forEach>		  
+												</td>						
+											</tr>	
+										</c:forEach>	
+						  
+						  			</table>
+								</td> 
+
+							  	<td NOWRAP align=center valign=top> 
+									<c:set scope="request" var="viewURL">
+										<html:rewrite page="/chartGenerator?type=pie"/>
+									</c:set>
+									<a title="<fmt:message key='label.tip.displayPieChart'/>" href="javascript:;" onclick="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+			                                    <img src="<c:out value="${tool}"/>images/piechart.gif" width=30 height=30 border="0">
+									</a> 
+									&nbsp
+									<c:set scope="request" var="viewURL">
+										<html:rewrite page="/chartGenerator?type=bar"/>
+									</c:set>
+		
+									<a title="<fmt:message key='label.tip.displayBarChart'/>" href="javascript:;" onclick="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+			                                    <img src="<c:out value="${tool}"/>images/columnchart.gif" width=30 height=30 border="0">
+									</a> 
+								</td>
+
+							</tr>					  
+
+					  <tr>
+					  	<td NOWRAP valign=top colspan=2> 
+								&nbsp
+					  	</td>
+					  </tr>	
+
+					  <tr>
+					  	<td NOWRAP align=center  valign=top colspan=2> 
+						  	 <b>  <fmt:message key="label.learner.nominations"/> </b> 
+					  	</td>
+					  </tr>
+
+			  		<c:forEach var="entry" items="${requestScope.listGeneralCheckedOptionsContent}">
+						  <tr>
+						  	<td NOWRAP align=center valign=top  colspan=2> 
+								  <c:out value="${entry}" escapeXml="false" />									
+						  	</td>
+						  </tr>
+					</c:forEach>
+
+					<tr> 
+						<td NOWRAP align=center  valign=top colspan=2> 
+					 	  		<c:out value="${VoteLearningForm.userEntry}"/> 						 			
+				 		</td>
+				  	</tr>
+
+
+
+
+						<tr> 
+						<td NOWRAP align=center  valign=top colspan=2> 
+								<table>
+									<tr> 
+					  	   		  		<td>
+											<b> <fmt:message key="label.notebook.entries"/> </b>						
+										 </td>
+									</tr>
+									
+									<tr> 
+					  	   		  		<td>
+											<c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false"/>				  	   		  		
+										 </td>
+									</tr>
+							</table>
+	
+						</td>
+						</tr>
+
+
+
+
+
+					  <tr>
+					  	<td NOWRAP valign=top> 
+		                                <html:submit property="redoQuestionsOk" 
+		                                             styleClass="button" 
+		                                             onclick="submitMethod('redoQuestionsOk');">
+		                                    <fmt:message key="label.retake"/>
+		                                </html:submit>
+
+		                                
+		                                
+						</td>					
+						<td NOWRAP valign=top align=right> 			
+	                                
+									<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}"> 						  			  		
+										<html:submit property="learnerFinished"  onclick="javascript:submitMethod('learnerFinished');" styleClass="button">
+											<fmt:message key="label.finished"/>
+										</html:submit>	 				
+								  	</c:if> 				    					
+					
+									<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true'}"> 						  			  		
+										<html:submit property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');" styleClass="button">
+											<fmt:message key="label.continue"/>
+										</html:submit>	 				
+								  	</c:if> 				    					
+
+					  	 </td>
+					  </tr>
+
+		</table>
+	
+</html:form>
+
+</div>
+
+<div id="footer"></div>
+
+</body>
+</html:html>
+
+
+
+
+
+
+