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.41 -r1.42
--- lams_tool_vote/conf/language/ApplicationResources.properties	13 Jun 2006 17:29:16 -0000	1.41
+++ lams_tool_vote/conf/language/ApplicationResources.properties	14 Jun 2006 13:56:50 -0000	1.42
@@ -125,7 +125,7 @@
 label.export  =Portfolio Export
 label.class.summary =Class Votes Summary
 label.class.summaryAll =All Votes Summary
-label.individual.learnerVotes =Individual Learner Votes
+label.individual.learnerVotes =Learner Votes
 label.all.learnerVotes =All Learner Votes
 label.warning =Warning
 label.summary.sessionSeparator =_________________________________________________
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java,v
diff -u -r1.8 -r1.9
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java	11 Jun 2006 12:25:44 -0000	1.8
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java	14 Jun 2006 13:56:50 -0000	1.9
@@ -127,7 +127,7 @@
     	VoteMonitoringAction voteMonitoringAction= new VoteMonitoringAction();
     	voteMonitoringAction.refreshSummaryData(request, content, voteService, true, true, toolSessionID.toString(), userID.toString() , true);
     	
-    	MonitoringUtil.prepareChartDataForExportLearner(request, voteService, null, content.getVoteContentId(), voteSession.getUid());
+    	MonitoringUtil.prepareChartDataForExportTeacher(request, voteService, null, content.getVoteContentId(), voteSession.getUid());
     	logger.debug("post prepareChartDataForExport");
     	
     	logger.debug("ending learner mode: ");
Index: lams_tool_vote/web/export/ExportContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/export/ExportContent.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_vote/web/export/ExportContent.jsp	30 May 2006 13:19:12 -0000	1.6
+++ lams_tool_vote/web/export/ExportContent.jsp	14 Jun 2006 13:56:50 -0000	1.7
@@ -46,23 +46,12 @@
 									 		<td NOWRAP> <b> <font size=2> <bean:message key="label.nomination"/> </b> </td>
 											<td NOWRAP> <b> <font size=2> <bean:message key="label.total.votes"/> </b> </td>
 										</tr>
-										
-										
+
 										<c:forEach var="currentNomination" items="${mapStandardNominationsHTMLedContent}">
 								  	 		<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}"/>
 								  	 		 <tr>
 					  	 						<td NOWRAP valign=top align=left>
-								  	 		  		<c:forEach var="currentVoteVisibility" items="${mapStandardNominationsVisibility}">
-												  	 		<c:set var="currentVisibilityKey" scope="request" value="${currentVoteVisibility.key}"/>
-											  				<c:if test="${currentNominationKey == currentVisibilityKey}"> 				
-												  				<c:if test="${currentVoteVisibility.value == 'true'}"> 				
-																	<c:out value="${currentNomination.value}" escapeXml="false"/>		
-																</c:if> 	    
-												  				<c:if test="${currentVoteVisibility.value != 'true'}"> 				
-																	<font size=2> <bean:message key="label.hiddenLearner"/> </font>
-																</c:if> 	    
-															</c:if> 	  
-													</c:forEach>		  
+													<c:out value="${currentNomination.value}" escapeXml="false"/>
 												 </td>
 				
 												<td NOWRAP valign=top align=left>				  	 		
@@ -82,6 +71,36 @@
 												</td>								
 											</tr>	
 										</c:forEach>	
+
+										
+										<tr>
+									 		<td NOWRAP colspan=2>
+								 			<table align=left>
+														<tr>
+													 		<th NOWRAP colspan=2>  <bean:message key="label.openVotes"/>  </th>
+														</tr>
+			
+														<tr> 
+															 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.vote"/> </font> </b> </td>  														 
+									  						 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.attemptTime"/></font> </b></td>
+											  			</tr>				 
+													
+								 			
+													<c:forEach var="currentDto" items="${sessionScope.listUserEntries}">
+								  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
+													  	 		<c:set var="userData" scope="request" value="${questionAttemptData.value}"/>
+																<tr> 
+																		<td NOWRAP valign=top align=left> 
+																				<c:out value="${currentDto.question}" escapeXml="false"/> 
+																		</td>
+																		 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
+																</tr>		
+															</c:forEach>		  	
+													</c:forEach>		
+											</table> 
+											</td>
+										</tr>
+										
 									</c:if>											
 
 
@@ -119,6 +138,44 @@
 												</td>								
 											</tr>	
 										</c:forEach>	
+										
+										
+								<tr>
+							 		<td NOWRAP colspan=2>
+						 			<table align=left>
+												<tr>
+											 		<th NOWRAP colspan=3>  <bean:message key="label.openVotes"/>  </th>
+												</tr>
+	
+												<tr> 
+													 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.vote"/> </font> </b> </td>  														 
+													 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.user"/> </font> </b> </td>  
+							  						 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.attemptTime"/></font> </b></td>
+									  			</tr>				 
+											
+						 			
+											<c:forEach var="currentDto" items="${sessionScope.listUserEntries}">
+						  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
+											  	 		<c:set var="userData" scope="request" value="${questionAttemptData.value}"/>
+		  	 									  	 		<c:set var="currentUid" scope="request" value="${userData.uid}"/>
+														<tr> 
+																<td NOWRAP valign=top align=left> 
+																	<c:out value="${currentDto.question}" escapeXml="false"/> 
+																	<c:if test="${userData.visible != 'true' }"> 			
+												                                <font size=2> <i><bean:message key="label.hidden"/> </i> </font>											                                
+																	</c:if> 								
+																</td>
+																 
+																 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
+																 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
+														</tr>		
+													</c:forEach>		  	
+											</c:forEach>		
+									</table> 
+									</td>
+								</tr>
+
+										
 									</c:if>											
 
 								</table>
@@ -164,6 +221,8 @@
 										</tr>
 									</c:if>											
 	
+					 			
+					 			
 									<c:if test="${(portfolioExportMode != 'learner')}">
 										<tr>
 									 		<th NOWRAP>  <bean:message key="label.all.learnerVotes"/>  </th>
Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/AllSessionsSummary.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	13 Jun 2006 17:32:37 -0000	1.6
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	14 Jun 2006 13:56:50 -0000	1.7
@@ -202,7 +202,8 @@
 							<c:if test="${currentDto.existsOpenVote == 'true' }"> 			
 							
 								<tr>
-							 		<td NOWRAP colspan=2> <bean:message key="label.summary.sessionSeparator"/></td>
+									
+							 		<td NOWRAP colspan=2> <hr size="1"> </td>
 								</tr>
 	
 								<tr>
@@ -212,11 +213,9 @@
 								<tr>
 							 		<td NOWRAP colspan=2>
 						 			<table align=left>
-						 					<tr>
-										 		<td NOWRAP align=center> 
-													<b> <font size=2> <bean:message key="label.openVotes"/> </b>
-												</td>
-											</tr>
+												<tr>
+											 		<th NOWRAP colspan=3>  <bean:message key="label.openVotes"/>  </th>
+												</tr>
 	
 												<tr> 
 													 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.vote"/> </font> </b> </td>  														 
@@ -273,7 +272,7 @@
 							 
 		 					<tr> <td NOWRAP colspan=2>  </td>
 							</tr>
-		 					<tr> <td NOWRAP colspan=2> <HR> </td>
+		 					<tr> <td NOWRAP colspan=2> <hr size="2"></td>
 							</tr>
 		 					<tr> <td NOWRAP colspan=2>  </td>
 							</tr>
Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/IndividualSessionSummary.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	13 Jun 2006 17:32:37 -0000	1.6
+++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	14 Jun 2006 13:56:50 -0000	1.7
@@ -192,7 +192,7 @@
 	
 			  				<c:if test="${existsOpenVotes == 'true'}"> 				
 								<tr>
-							 		<td NOWRAP colspan=2> <bean:message key="label.summary.sessionSeparator"/> </td>
+							 		<td NOWRAP colspan=2> <hr size="1"> </td>
 								</tr>
 	
 								<tr>
@@ -202,11 +202,9 @@
 								<tr>
 							 		<td NOWRAP colspan=2>
 						 			<table align=left>
-						 					<tr>
-										 		<td NOWRAP align=center> 
-													<b> <font size=2> <bean:message key="label.openVotes"/> </b>
-												</td>
-											</tr>
+												<tr>
+											 		<th NOWRAP colspan=3>  <bean:message key="label.openVotes"/>  </th>
+												</tr>
 	
 												<tr> 
 													 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.vote"/> </font> </b> </td>