Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java,v
diff -u -r1.29 -r1.30
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	2 Jul 2006 21:18:10 -0000	1.29
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	4 Jul 2006 00:03:52 -0000	1.30
@@ -217,6 +217,7 @@
     public static final String FROM_TOOL_CONTENT_ID						="fromToolContentId";
     public static final String TO_TOOL_CONTENT_ID						="toToolContentId";
     public static final String LEARNER_REPORT							="learnerReport";
+    public static final String INDIVIDUAL_LEARNER_REPORT				="individualLearnerReport";
     public static final String MAP_USER_RESPONSES						="mapUserResponses";
     public static final String MAP_MAIN_REPORT							="mapMainReport";
     public static final String MAP_STATS								="mapStats";
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/VoteChartGenerator.java,v
diff -u -r1.11 -r1.12
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java	29 May 2006 15:40:57 -0000	1.11
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java	4 Jul 2006 00:03:50 -0000	1.12
@@ -41,6 +41,7 @@
 import org.jfree.data.general.DefaultPieDataset;
 import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteContent;
+import org.lamsfoundation.lams.tool.vote.pojos.VoteSession;
 import org.lamsfoundation.lams.tool.vote.service.IVoteService;
 
 /**
@@ -83,7 +84,10 @@
         	    VoteContent voteContent=voteService.retrieveVote(toolContentId);
         		logger.debug("existing voteContent:" + voteContent);
 
-                MonitoringUtil.prepareChartData(request, voteService, null, voteContent.getVoteContentId(), new Long(currentSessionId));
+        		VoteSession voteSession=voteService.retrieveVoteSession(new Long(currentSessionId));
+        		logger.debug("voteSession uid:" + voteSession.getUid());
+        		
+                MonitoringUtil.prepareChartData(request, voteService, null, voteContent.getVoteContentId(), voteSession.getUid());
                 logger.debug("creating maps MAP_STANDARD_NOMINATIONS_CONTENT and MAP_STANDARD_RATES_CONTENT: " + currentSessionId);
 
                 logger.debug("post prepareChartData : MAP_STANDARD_NOMINATIONS_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_NOMINATIONS_CONTENT));
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.24 -r1.25
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	2 Jul 2006 21:18:10 -0000	1.24
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	4 Jul 2006 00:03:50 -0000	1.25
@@ -240,8 +240,8 @@
     	
 		request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(true).toString());
 		request.getSession().setAttribute(REQUEST_LEARNING_REPORT_PROGRESS, new Boolean(true).toString());
-		logger.debug("fwd'ing to for learner progress" + LEARNER_REPORT);
-		return (mapping.findForward(LEARNER_REPORT));		
+		logger.debug("fwd'ing to for learner progress" + INDIVIDUAL_LEARNER_REPORT);
+		return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT));		
 
 	}
 	
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java,v
diff -u -r1.32 -r1.33
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	25 Jun 2006 15:14:30 -0000	1.32
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	4 Jul 2006 00:03:50 -0000	1.33
@@ -159,7 +159,10 @@
 	    {
 		    logger.debug("preparing chart data for content id: " + voteContent.getVoteContentId());
 		    logger.debug("preparing chart data for currentMonitoredToolSession: " + currentMonitoredToolSession);
-		    MonitoringUtil.prepareChartData(request, voteService, voteMonitoringForm, voteContent.getVoteContentId(), new Long(currentMonitoredToolSession));
+		    
+		    VoteSession voteSession=voteService.retrieveVoteSession(new Long(currentMonitoredToolSession));
+    		logger.debug("voteSession uid:" + voteSession.getUid());
+		    MonitoringUtil.prepareChartData(request, voteService, voteMonitoringForm, voteContent.getVoteContentId(), voteSession.getUid());
 
 		    refreshSummaryData(request, voteContent, voteService, true, false, currentMonitoredToolSession, null, true);
 		    request.getSession().setAttribute(SELECTION_CASE, new Long(1));
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java,v
diff -u -r1.25 -r1.26
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java	13 Jun 2006 17:59:45 -0000	1.25
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java	4 Jul 2006 00:03:50 -0000	1.26
@@ -125,6 +125,7 @@
 		request.getSession().setAttribute(IS_PORTFOLIO_EXPORT, new Boolean(false).toString());
 		voteMonitoringForm.setShowOpenVotesSection(new Boolean(false).toString());
 		
+		logger.debug("calling submitSession:" + toolContentId);
 		return voteMonitoringAction.submitSession(mapping, form,  request, response);
 	}
 
Index: lams_tool_vote/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/struts-config.xml,v
diff -u -r1.19 -r1.20
--- lams_tool_vote/web/WEB-INF/struts-config.xml	13 Jun 2006 17:33:16 -0000	1.19
+++ lams_tool_vote/web/WEB-INF/struts-config.xml	4 Jul 2006 00:04:24 -0000	1.20
@@ -223,6 +223,13 @@
 	        path="/monitoring/LearnerRep.jsp"
 		    redirect="false"
 	      />
+
+	    <forward
+	        name="individualLearnerReport"
+	        path="/learning/LearnerRep.jsp"
+		    redirect="false"
+	      />
+
 	  	
 	  	<forward
 		    name="viewAnswers"
Index: lams_tool_vote/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Attic/LearnerRep.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_vote/web/learning/LearnerRep.jsp	4 Jul 2006 00:03:53 -0000	1.1
@@ -0,0 +1,179 @@
+<%-- 
+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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  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 var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<html:html>
+<head>
+	<html:base />
+	<lams:headItems />
+	<title><bean:message key="activity.title" /></title>
+
+	<script language="JavaScript" type="text/JavaScript">
+
+		function submitMonitoringMethod(actionMethod) 
+		{
+			document.VoteMonitoringForm.method.value=actionMethod; 
+			document.VoteMonitoringForm.submit();
+		}
+		
+		function submitMethod(actionMethod) 
+		{
+			submitMonitoringMethod(actionMethod);
+		}
+
+	</script>		
+</head>
+
+<body>
+	<div id="page-learner">
+	
+	<h1 class="no-tabs-below">
+		<c:out value="${sessionScope.activityTitle}" escapeXml="false" />
+	</h1>
+
+	<div id="header-no-tabs-learner"></div>
+	
+
+	<div id="content-learner">
+
+
+		<table  class="forms">
+				<tr>
+			 		<th NOWRAP>  <bean:message key="label.learner.progress"/>   </th>
+				</tr>
+		</table>
+
+		<c:set var="monitoringURL">
+			<html:rewrite page="/monitoring.do" />
+		</c:set>
+
+	  <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
+		<html:hidden property="method"/>	 
+
+				<table  class="forms">
+					<tr>
+						<td NOWRAP valign=top align=left>
+			 			<table align=left>
+			 			
+						<c:forEach var="currentDto" items="${sessionScope.listMonitoredAnswersContainerDto}">
+				  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
+				  	 		<tr>
+				  	 			<td> &nbsp&nbsp</td>
+				  	 		</tr>
+							<tr>			
+								<td NOWRAP valign=top align=left><b>  <bean:message key="label.nomination"/>: </b>
+									<c:out value="${currentDto.question}" escapeXml="false"/>
+								 </td>
+							</tr>	
+							
+							<tr> 
+								<td NOWRAP valign=top>
+									<table align=center>
+										<tr> 
+											 <td NOWRAP valign=top> <b>  <bean:message key="label.user"/>  </b> </td>  
+					  						 <td NOWRAP valign=top> <b>  <bean:message key="label.attemptTime"/> </b></td>
+							  			</tr>				 
+			  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
+											<c:forEach var="sData" items="${questionAttemptData.value}">
+									  	 		<c:set var="userData" scope="request" value="${sData.value}"/>
+									  	 		<c:set var="responseUid" scope="request" value="${userData.uid}"/>
+	
+		  	 									<c:if test="${currentQuestionId == userData.questionUid}">
+			  	 									<c:if test="${sessionScope.currentMonitoredToolSession == 'All'}"> 			
+																<jsp:include page="/monitoring/UserResponses.jsp" />
+													</c:if>														  					 									  			
+													
+			  	 									<c:if test="${sessionScope.currentMonitoredToolSession != 'All'}"> 			
+			  	 										<c:if test="${sessionScope.currentMonitoredToolSession == userData.sessionId}"> 			
+																<jsp:include page="/monitoring/UserResponses.jsp" />										
+														</c:if>														  					 									  													  			
+													</c:if>														  					 									  													  			
+												</c:if>														  					 
+		 									</c:forEach>		  	
+										</c:forEach>		  	
+									</table>
+								</td>  
+				  			</tr>
+						</c:forEach>		  
+							
+						
+					<c:forEach var="currentDto" items="${sessionScope.listUserEntries}">
+				  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
+				  	 		<tr>
+				  	 			<td> &nbsp&nbsp</td>
+				  	 		</tr>
+							<tr>			
+								<td NOWRAP valign=top align=left><b>  <bean:message key="label.nomination"/>: </b>
+									<c:out value="${currentDto.question}" escapeXml="false"/>
+								 </td>
+							</tr>	
+							
+							<tr> 
+								<td NOWRAP  valign=top>
+									<table align=center>
+										<tr> 
+											 <td NOWRAP valign=top> <b>  <bean:message key="label.user"/>  </b> </td>  
+					  						 <td NOWRAP valign=top> <b>  <bean:message key="label.attemptTime"/> </b></td>
+							  			</tr>				 
+	
+			  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
+									  	 		<c:set var="userData" scope="request" value="${questionAttemptData.value}"/>
+													<jsp:include page="/monitoring/UserResponses.jsp" />										
+										</c:forEach>		  	
+							  			
+									</table>
+								</td>  
+				  			</tr>
+					</c:forEach>		  	
+
+					</table>
+			 		</td>
+				</tr>
+			</table>
+	</html:form>
+
+	</div>
+	
+
+<div id="footer-learner"></div>	
+
+</div>
+</body>
+</html:html>
+
+
+
+
+
+
+
+
Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/VoteNominationViewer.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	30 Jun 2006 03:26:26 -0000	1.2
+++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	4 Jul 2006 00:03:53 -0000	1.3
@@ -34,9 +34,10 @@
 	
 </head>
 <body>
+<div id="page">
 
     <table class='forms'>
-	    <tr> <th NOWRAP colspan=2>  <bean:message key="label.learnersVoted"/> </th> </tr>
+	    <tr> <th NOWRAP colspan=2 align=center>  <bean:message key="label.learnersVoted"/> </th> </tr>
 	
 		<tr> 
 	       <td NOWRAP align=center valign=top><b> <bean:message key="label.user"/> </b></td>
@@ -51,5 +52,6 @@
 		</c:forEach>		  	
     </table>
 
+</div>
 </body>
 </html:html>