Index: lams_tool_vote/conf/language/ApplicationResources.properties
===================================================================
diff -u -r14e58bcc3bb8b0639bd32c4e5cf2467bb276c3d5 -r0ec38b0c90a821a6e5732546f5e035b3c223c12f
--- lams_tool_vote/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 14e58bcc3bb8b0639bd32c4e5cf2467bb276c3d5)
+++ lams_tool_vote/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f)
@@ -1,13 +1,12 @@
 # Language strings for the Voting tool.
 
 # ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
-activity.title=Voting
-activity.description=Allows voting format
-activity.helptext=Voting help text
+activity.title							=Voting
+activity.description					=Allows voting format
+activity.helptext						=Voting help text
+tool.display.name						=Voting
+tool.description						=Allows voting format
 
-tool.display.name=Voting
-tool.description=Allows voting format
-
 #Authoring mode resources
 label.tool.shortname					=Voting
 label.authoring.vote					=Voting
@@ -37,21 +36,12 @@
 label.view.chart						=View Session Votes Chart
 button.delete							=Delete
 label.fileContent						=File Content
-label.learning.reportMessage			=The following are your votes.
-error.maxNominationCount.reached		=You have selected too many nominations. You can only select
-label.nominations						=nominations.			
 
-label.learning.forceFinishMessage		=Voting is no more allowed. Please finish.
 count.total.user						=Total Users Count: 
 count.finished.user						=Finished User Count:
 label.learning.report  					=Learning Report
-label.retake							=Redo Vote
-label.submit.vote						=Submit Vote
 label.view								=View
 label.download							=Download
-label.delete							=Delete
-label.finished							=Finished
-label.overAllResults					=Overall Results
 button.cancel					    	=Cancel
 button.upload					    	=Upload
 button.preview							=Preview
@@ -78,75 +68,38 @@
 label.title.export						=Learner Submission Details
 
 error.maxNominationCount.invalid		=Please correct this: The "Max Nominations" field in Advanced section is invalid.
-error.default.content.notSetup			=The tool initialization error: The tool default content has not been set up properly.
-error.question.empty					=Please correct this: The question text can not be empty.
 error.fields.mandatory					=Please correct this:  The fields "Title", "Instructions" and the "Nomination 1" are mandatory.
-error.title								=Please correct this:  The field "Title" is mandatory. <br>
-error.instructions						=Please correct this: The field "Instructions" is mandatory. <br>
-error.learner.userId.required			=Tool Activity Error! Can't continue. Tool Activity expects learner's user id. 
-error.learner.user.doesNoExist			=Tool Activity Error! Learner is not ready in the tool's database yet. 
-error.file.notPersisted					=An error occurred: The file is not viewable yet. Please save all the content first and check back.
-error.learningUser.notAvailable			=Tool Activity Error! Can't continue. Tool Activity expects a user id. 
-error.toolSession.notAvailable			=Tool Activity Error! Can't continue. Tool session is not ready in the tool's database yet. <br> Please verify the API method: public void createToolSession(Long toolSessionId, Long toolContentId) has already been executed.
-error.toolSession.doesNoExist			=Tool Activity Error! Can't continue. Tool session is not ready in the tool's database yet. 
-error.toolContent.notAvailable			=Tool Activity Error! Can't continue. Tool content is not ready in the tool's database yet. <br> Please verify the API method: public void createToolSession(Long toolSessionId, Long toolContentId) has run properly.
-error.learner.required					=Tool Activity Error! Can't continue. The Learner records are not ready in the tool's database yet. 
 error.fileName.empty					=Please correct this: Under "Instructions", the file(name) to upload can not be empty.
-error.content.locked					=The content has been locked since it is being used by one mor more learners. <br> The modification of the content is not allowed.
 error.content.doesNotExist				=Tool Activity Error! Can't continue. Tool content is not ready in the tool's database yet. 
 error.content.inUse						=The modification of the content is not allowed since it is being used.
-error.content.beingModified				=The content can not be presented since it is being modified. Please check back later.
-error.content.unstableState				=The content is in an unstable state since it has been left editable while monitored. <br> Please use this screen to redefine the content.
-error.defaultContent.notAvailable		=Tool Activity Error! Can't continue <br> The the default content for the Tool Activity has not been set up.
-error.defaultQuestionContent.notAvailable	=Tool Activity Error! Can't continue <br> The the default question content for the Tool Activity has not been set up.
-error.defaultOptionsContent.notAvailable	=Tool Activity Error! Can't continue <br> The the default options content for the Tool Activity has not been set up.
 error.noLearnerActivity					=The report is not available since no users attempted the activity yet.
 			
 #Learning mode resources
+label.learning.forceFinishMessage		=Voting is no more allowed. Please finish.
+label.learning.reportMessage			=The following are your votes.
+error.maxNominationCount.reached		=You have selected too many nominations. You can only select
+label.nominations						=nominations.			
 label.progressiveResults				=Progressive Voting Results
+label.overAllResults					=Overall Results
+label.retake							=Redo Vote
+label.submit.vote						=Submit Vote
 button.endLearning						=Finish
 label.user								=User
 label.attemptTime						=Voting Time
 label.timezone							=Time-Zone
-label.response							=Response
 sbmt.learner.nominations.successful		=Your votes have been submitted.
+label.finished							=Finished
 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.
 error.toolSessionId.required			=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a toolSession id. 
 error.contentId.required				=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a content id. 
-error.authoringUser.notAvailable		=Tool Activity Error! Can't continue. Tool Activity expects a user id. 
-error.userId.required					=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a user id. 
-error.userId.notNumeric					=Tool Activity Error! Can't continue. The user id passed to the Tool Activity must be numerical.
-error.userId.existing					=Tool Activity Error! Can't continue. The user id passed to the Tool Activity refers to a student that has already used the activity. <br> Each learner activity should be associated with a unique userId.
 error.defaultContent.notSetup			=Tool Activity Error! Can't continue. The default content for the tool has not been setup properly.
-error.mode.required						=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a mode. 
-error.mode.invalid						=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a valid mode: learner or teacher 
-error.learner.sessionId.inconsistent	=Tool Activity Error! Can't continue <br> The session id passed is inconsistent for learner progress report.
-error.options.duplicate  				=Please correct this: The nominations must be unique. 
 
 #Monitoring mode resources
-button.startLesson						=Start Lesson
-button.deleteLesson						=Delete Lesson
-button.forceComplete					=Force Complete
-
-
-error.noStudentActivity					=Sorry, the report can not be generated. <br> No student has attempted the activity yet.
-error.contentAndToolSession.notCompatible	=Tool Activity Error! Can't continue. The content id and tool session(s) passed to the tool activity are not compatible with each other. <br> The Tool Activity expects that each of the passed tool sessions refer to the same passed content id.
-error.toolSessions.wrongFormat				=Tool Activity Error! Can't continue. No valid tool sessions has been passed to the Tool Activity. <br> The expected format is: TOOLURL?toolContentId=A&toolSessionId1=B&toolSessionId2=C&toolSessionId3=D&...
 error.numberFormatException					=Tool Activity Error! Can't continue. The content id and tool session id(s) passed to the Tool Activity must be numerical.
-error.ids.numberFormatException				=Tool Activity Error! Can't continue. The content id and tool session id(s) passed to the Tool Activity must be numerical.
-error.contentId.numberFormatException		=Tool Activity Error! Can't continue. The content id passed to the Tool Activity must be numerical.
 error.sessionId.numberFormatException		=Tool Activity Error! Can't continue. The toolSession id passed to the Tool Activity must be numerical.
-error.toolSessions.doesNotExist				=Tool Activity Error! Can't continue. One of the toolsession ids passed to the Tool Activity does not refer to an existing tool session.
-error.toolSession.doesNotExist				=Tool Activity Error! Can't continue. The toolsession id passed to the Tool Activity does not refer to an existing tool session.
-error.content.onlyContentAndNoSessions		=A report can not be generated since no tool sessions has been passed to the Tool Activity.
-error.content.noToolSessions				=A report can not be generated since there has not been any student activity on this content.
-error.user.doesNotExist 					=Tool Activity Error! Can't continue. The user id passed to the Tool Activity does not refer to an existing user.
-error.tab.contentId.required				=Sorry, the screen is not available. The Tool Activity requires a content id. 
-
-
 label.edit									=Edit
 label.selectGroup							=Select Group:
 label.learner.progress						=Learner Progress Report
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java
===================================================================
diff -u -r2422ef6cbe87acd7830e1d1da524fe062bc912a6 -r0ec38b0c90a821a6e5732546f5e035b3c223c12f
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision 2422ef6cbe87acd7830e1d1da524fe062bc912a6)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f)
@@ -356,20 +356,6 @@
 	    authoringUtil.reconstructOptionsContentMapForSubmit(mapOptionsContent, request);
 	    logger.debug("before saveOrUpdateVoteContent.");
 	    
-	    boolean verifyDuplicatesOptionsMap=AuthoringUtil.verifyDuplicatesOptionsMap(mapOptionsContent);
-	 	logger.debug("verifyDuplicatesOptionsMap: " + verifyDuplicatesOptionsMap);
-	 	request.getSession().removeAttribute(USER_EXCEPTION_OPTIONS_DUPLICATE);
-	 	
-	 	if (verifyDuplicatesOptionsMap == false)
-		{
-			request.getSession().setAttribute(USER_EXCEPTION_OPTIONS_DUPLICATE, new Boolean(true).toString());
-			logger.debug("add error.options.duplicate to ActionMessages");
-			persistError(request,"error.options.duplicate");
-			voteAuthoringForm.resetUserAction();
-			//return mapping.findForward(destination);
-			return false;
-		}
-	 	
 	 	logger.debug("submitting mapOptionsContent:" + mapOptionsContent);
 	    
 	    /*to remove deleted entries in the questions table based on mapQuestionContent */
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
diff -u -r714df94653eb0195275d4086ece5b856c3a632c3 -r0ec38b0c90a821a6e5732546f5e035b3c223c12f
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision 714df94653eb0195275d4086ece5b856c3a632c3)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f)
@@ -581,6 +581,9 @@
 		
 		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/VoteLearningStarterAction.java
===================================================================
diff -u -rdd298335db00afcb64815700a40f32b78c6b8998 -r0ec38b0c90a821a6e5732546f5e035b3c223c12f
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision dd298335db00afcb64815700a40f32b78c6b8998)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f)
@@ -211,8 +211,6 @@
     {
     	VoteUtils.cleanUpSessionAbsolute(request);
     	logger.debug("error: The tool expects voteSession.");
-    	//request.getSession().setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true).toString());
-    	//persistError(request,"error.toolSession.notAvailable");
 		return (mapping.findForward(ERROR_LIST));
     }
 
@@ -569,16 +567,14 @@
 	    if ((mode == null) || (mode.length() == 0)) 
 	    {
 	    	VoteUtils.cleanUpSessionAbsolute(request);
-	    	request.getSession().setAttribute(USER_EXCEPTION_MODE_REQUIRED, new Boolean(true).toString());
-	    	persistError(request, "error.mode.required");
+	    	logger.error("mode missing: ");
 	    	return (mapping.findForward(ERROR_LIST));
 	    }
 	    
 	    if ((!mode.equals("learner")) && (!mode.equals("teacher")) && (!mode.equals("author")))
 	    {
 	    	VoteUtils.cleanUpSessionAbsolute(request);
-	    	request.getSession().setAttribute(USER_EXCEPTION_MODE_INVALID, new Boolean(true).toString());
-	    	persistError(request, "error.mode.invalid");
+	    	logger.error("mode invalid: ");
 			return (mapping.findForward(ERROR_LIST));
 	    }
 		logger.debug("session LEARNING_MODE set to:" + mode);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
===================================================================
diff -u -r2422ef6cbe87acd7830e1d1da524fe062bc912a6 -r0ec38b0c90a821a6e5732546f5e035b3c223c12f
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	(.../VoteMonitoringAction.java)	(revision 2422ef6cbe87acd7830e1d1da524fe062bc912a6)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	(.../VoteMonitoringAction.java)	(revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f)
@@ -136,7 +136,7 @@
 			logger.debug("retrieving voteService from session: " + voteService);
 		}
     	VoteMonitoringForm voteMonitoringForm = (VoteMonitoringForm) form;
-	 	
+    	
     	String currentMonitoredToolSession=voteMonitoringForm.getSelectedToolSessionId(); 
 	    logger.debug("currentMonitoredToolSession: " + currentMonitoredToolSession);
 	    
@@ -168,6 +168,8 @@
 	    request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession);
 	    logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION));
 	    
+	    voteMonitoringForm.setSbmtSuccess(new Boolean(false).toString());
+	    request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(false).toString());
     	return (mapping.findForward(LOAD_MONITORING));	
 	}
 
@@ -545,9 +547,13 @@
                                          ToolException
     {
     	logger.debug("dispatching editActivityQuestions...");
+    	
+	    VoteMonitoringForm voteMonitoringForm = (VoteMonitoringForm) form;
+	    logger.debug("voteMonitoringForm :" +voteMonitoringForm);
+	    
     	request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString());
-
 		request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(true));
+		
 		VoteUtils.setDefineLater(request, true);
 		
 	    Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID);
@@ -577,8 +583,9 @@
 
     	request.setAttribute(SOURCE_VOTE_STARTER, "monitoring");
 	    logger.debug("SOURCE_VOTE_STARTER: monitoring");
-
-		
+    	
+	    voteMonitoringForm.setSbmtSuccess(new Boolean(false).toString());
+	    logger.debug("submit success is false");
         return (mapping.findForward(LOAD_MONITORING));
     }
 	
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java
===================================================================
diff -u -r2422ef6cbe87acd7830e1d1da524fe062bc912a6 -r0ec38b0c90a821a6e5732546f5e035b3c223c12f
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java	(.../VoteMonitoringStarterAction.java)	(revision 2422ef6cbe87acd7830e1d1da524fe062bc912a6)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java	(.../VoteMonitoringStarterAction.java)	(revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f)
@@ -121,6 +121,7 @@
 		voteMonitoringForm.setActiveModule(MONITORING);
 		voteMonitoringForm.setSelectedToolSessionId("All");
 		voteMonitoringForm.setSbmtSuccess(new Boolean(false).toString());
+		request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(false).toString());
 		return voteMonitoringAction.submitSession(mapping, form,  request, response);
 	}
 
@@ -272,8 +273,8 @@
 			}
 	    	catch(NumberFormatException e)
 			{
-	    		persistError(request, "error.contentId.numberFormatException");
-	    		logger.debug("add error.contentId.numberFormatException to ActionMessages.");
+	    		persistError(request, "error.numberFormatException");
+	    		logger.debug("add error.numberFormatException to ActionMessages.");
 	    		VoteUtils.cleanUpSessionAbsolute(request);
 				return (mapping.findForward(ERROR_LIST));
 			}
Index: lams_tool_vote/web/SystemErrorContent.jsp
===================================================================
diff -u -r6cfdabe63a1d792f3135529031f9a969768a6b10 -r0ec38b0c90a821a6e5732546f5e035b3c223c12f
--- lams_tool_vote/web/SystemErrorContent.jsp	(.../SystemErrorContent.jsp)	(revision 6cfdabe63a1d792f3135529031f9a969768a6b10)
+++ lams_tool_vote/web/SystemErrorContent.jsp	(.../SystemErrorContent.jsp)	(revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f)
@@ -34,7 +34,7 @@
 		<table width="100%" height="190" border="0" align="center" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF" summary="This table is being used for layout purposes only">
 			<tr> 
 				<td NOWRAP valign="top"> 
-					<font size=2> <bean:message key="error.system.mc"/> </font>
+					<font size=2> <bean:message key="error.system.vote"/> </font>
 				</td>
 			 </tr>
 		</table>
Index: lams_tool_vote/web/VoteErrorBox.jsp
===================================================================
diff -u -r6cfdabe63a1d792f3135529031f9a969768a6b10 -r0ec38b0c90a821a6e5732546f5e035b3c223c12f
--- lams_tool_vote/web/VoteErrorBox.jsp	(.../VoteErrorBox.jsp)	(revision 6cfdabe63a1d792f3135529031f9a969768a6b10)
+++ lams_tool_vote/web/VoteErrorBox.jsp	(.../VoteErrorBox.jsp)	(revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f)
@@ -35,11 +35,6 @@
 
 
 <table border="0" cellspacing="2" cellpadding="2" summary="This table is being used for layout purposes only">
-		<c:if test="${userExceptionQuestionEmpty == 'true'}"> 			
-			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.question.empty"/> </font>
-			</td> </tr>
-		</c:if> 				    
 
 		<c:if test="${userExceptionWeightTotal == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
@@ -89,13 +84,6 @@
 			</td> </tr>
 		</c:if> 				    
 
-		<c:if test="${userExceptionNoToolSessions == 'true'}"> 			
-			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.toolSession.doesNoExist"/> </font>
-			</td> </tr>
-		</c:if> 				
-		
-
 		<c:if test="${userExceptionWeightMustEqual100 == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
 						<font size=2> <bean:message key="error.weights.total.invalid"/> </font>
@@ -108,12 +96,6 @@
 			</td> </tr>
 		</c:if> 				
 
-		<c:if test="${userExceptionLearnerRequired == 'true'}"> 			
-			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.learner.user.doesNoExist"/> </font>
-			</td> </tr>
-		</c:if> 				    
-
 		<c:if test="${userExceptionContentDoesNotExist == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
 						<font size=2> <bean:message key="error.content.doesNotExist"/> </font>
@@ -132,24 +114,12 @@
 			</td> </tr>
 		</c:if> 				    
 
-		<c:if test="${userExceptionUserDoesNotExist == 'true'}"> 			
-			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.learner.userId.required"/> </font>
-			</td> </tr>
-		</c:if> 				    
-
 		<c:if test="${userExceptionContentIdRequired == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
 						<font size=2> <bean:message key="error.contentId.required"/> </font>
 			</td> </tr>
 		</c:if> 				    
 
-		<c:if test="${userExceptionToolSessionIdInconsistent == 'true'}"> 			
-			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.learner.sessionId.inconsistent"/> </font>
-			</td> </tr>
-		</c:if> 				    
-
 		<c:if test="${userExceptionContentRunOffline == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
 						<font size=2> <bean:message key="label.learning.runOffline"/> </font>
@@ -175,24 +145,12 @@
 			</td> </tr>
 		</c:if> 				    
 
-		<c:if test="${userExceptionContentBeingModified == 'true'}"> 			
-			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.content.beingModified"/> </font>
-			</td> </tr>
-		</c:if> 				    
-
 		<c:if test="${userExceptionDefaultContentNotSetup == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
 						<font size=2> <bean:message key="error.defaultContent.notSetup"/> </font>
 			</td> </tr>
 		</c:if> 				    
 
-		<c:if test="${userExceptionModeInvalid == 'true'}"> 			
-			<tr> <td NOWRAP valign=top>
-						<font size=2> <bean:message key="error.mode.invalid"/> </font>
-			</td> </tr>
-		</c:if> 				    
-
 		<c:if test="${userExceptionSingleOption == 'true'}"> 			
 			<tr> <td NOWRAP valign=top>
 						<font size=2> <bean:message key="error.singleOption"/> </font>
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -r2422ef6cbe87acd7830e1d1da524fe062bc912a6 -r0ec38b0c90a821a6e5732546f5e035b3c223c12f
--- lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 2422ef6cbe87acd7830e1d1da524fe062bc912a6)
+++ lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f)
@@ -32,12 +32,15 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
+VoteAuthoringForm.sbmtSuccess: <c:out value="${VoteAuthoringForm.sbmtSuccess}"  />						
+VoteMonitoringForm.sbmtSuccess: <c:out value="${VoteMonitoringForm.sbmtSuccess}"  />						
+
 	                                     
 		           <h2><font size=2> <b> <bean:message key="label.authoring.vote.basic"/> </b></font></h2>
 		        	<table align=center> 	  
 						<tr>   
 						<td NOWRAP class=error>
-							<c:if test="${VoteAuthoringForm.sbmtSuccess == 'true' || VoteMonitoringForm.sbmtSuccess == 'true'}"> 			
+							<c:if test="${(VoteAuthoringForm.sbmtSuccess == 'true') || (VoteMonitoringForm.sbmtSuccess) == 'true'}"> 			
 								<img src="<c:out value="${tool}"/>images/success.gif" align="left" width=20 height=20>  <font size=2> <bean:message key="sbmt.successful"/> </font> </img>
 							</c:if> 			
 
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
diff -u -r83ebb6f565f6d5ce638160e37fc6793c074c6356 -r0ec38b0c90a821a6e5732546f5e035b3c223c12f
--- lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 83ebb6f565f6d5ce638160e37fc6793c074c6356)
+++ lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f)
@@ -70,13 +70,19 @@
 						  	</td>
 						  </tr>
 	
-	
+
+mapQuestionContentLearner: <c:out value="${sessionScope.mapQuestionContentLearner}"  />						
+sessionScope.mapGeneralCheckedOptionsContent: <c:out value="${sessionScope.mapGeneralCheckedOptionsContent}"  />						
+								
+						<c:out value="${subEntry.value}" escapeXml="false" />																				
+																								
 							  <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}"/>
+											  		queIndex: <c:out value="${sessionScope.queIndex}"  />						
 											  		
 									  		  	 		<c:set var="checkedOptionFound" scope="request" value="0"/>
 														<!-- traverse the selected option from here --> 									  		
Index: lams_tool_vote/web/learningIndex.jsp
===================================================================
diff -u -r6cfdabe63a1d792f3135529031f9a969768a6b10 -r0ec38b0c90a821a6e5732546f5e035b3c223c12f
--- lams_tool_vote/web/learningIndex.jsp	(.../learningIndex.jsp)	(revision 6cfdabe63a1d792f3135529031f9a969768a6b10)
+++ lams_tool_vote/web/learningIndex.jsp	(.../learningIndex.jsp)	(revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f)
@@ -50,9 +50,6 @@
 	String strLearnerProgress3="/learningStarter?toolSessionID=" + toolSessionID +  "&mode=teacher" + "&userID=4";
 	String strLearnerProgress4="/learningStarter?toolSessionID=" + toolSessionID +  "&mode=teacher" + "&userID=1";
 
-	String exportPortfolioStudent8 = "/exportPortfolio.do?mode=learner&toolSessionID=88888888&userID=4";	
-	String exportPortfolioStudent5 = "/exportPortfolio.do?mode=learner&toolSessionID=55555555&userID=4";	
-
 %>
 
 <html:form action="<%=strCreateToolSession%>" method="post">
@@ -134,15 +131,4 @@
       <html:submit value="View Learner Progress 88888888 id:1"/>
 </html:form>
 
-<html:form action="<%=exportPortfolioStudent8%>" method="post">
-      <table border=1>
-      </table><br/><BR>
-      <html:submit value="Export Portfolio Student, session id: 88888888"/>
-</html:form>
 
-<html:form action="<%=exportPortfolioStudent5%>" method="post">
-      <table border=1>
-      </table><br/><BR>
-      <html:submit value="Export Portfolio Student, session id: 55555555"/>
-</html:form>
-
Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r3a984c9bc1a3a01f8cd91635fb437dd44d07f950 -r0ec38b0c90a821a6e5732546f5e035b3c223c12f
--- lams_tool_vote/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 3a984c9bc1a3a01f8cd91635fb437dd44d07f950)
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 0ec38b0c90a821a6e5732546f5e035b3c223c12f)
@@ -51,7 +51,7 @@
 
 
 
-				<c:if test="${(requestLearningReport != 'true')}"> 	
+					<c:if test="${(requestLearningReport != 'true')}"> 	
 						<c:if test="${(isPortfolioExport != 'true') }"> 	
 							<c:if test="${sessionScope.selectionCase != 2}"> 			
 								<tr>