Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_vote/web/learning/ExitLearning.jsp	14 Nov 2006 21:00:30 -0000	1.19
+++ lams_tool_vote/web/learning/ExitLearning.jsp	15 Nov 2006 22:27:53 -0000	1.20
@@ -36,6 +36,9 @@
 	<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">
@@ -73,31 +76,142 @@
 						key="label.learning.forceFinishMessage" /> </strong>
 			</p>
 
-			<p>
-				<strong> <fmt:message key="label.learning.reportMessage" />
-				</strong>
-			</p>
 
-			<c:forEach var="entry"
-				items="${requestScope.mapGeneralCheckedOptionsContent}">
+			<h2>
+				<fmt:message key="label.progressiveResults" />
+			</h2>
+
+			<!--present  a mini summary table here -->
+
+			<table cellspacing="0" class="alternative-color">
+				<tr>
+					<th>
+						<fmt:message key="label.nomination" />
+					</th>
+					<th>
+						<fmt:message key="label.total.votes" />
+					</th>
+				</tr>
+
+				<c:forEach var="currentNomination"
+					items="${voteGeneralLearnerFlowDTO.mapStandardNominationsHTMLedContent}">
+					<c:set var="currentNominationKey" scope="request"
+						value="${currentNomination.key}" />
+					<tr>
+						<td class="space">
+							<c:out value="${currentNomination.value}" escapeXml="false" />
+						</td>
+
+						<td>
+
+							<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>
+
+			<div>
+				<div style="float:right">
+
+					<c:set scope="request" var="viewURL">
+						<html:rewrite page="/chartGenerator?type=pie" />
+					</c:set>
+
+					<img src="<c:out value="${tool}"/>images/piechart.gif" width=30
+						title="<fmt:message key='label.tip.displayPieChart'/>"
+						onclick="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"
+						height="30" border="0" style="cursor: pointer;">
+
+					<c:set scope="request" var="viewURL">
+						<html:rewrite page="/chartGenerator?type=bar" />
+					</c:set>
+
+					<img src="<c:out value="${tool}"/>images/columnchart.gif" width=30
+						title="<fmt:message key='label.tip.displayBarChart'/>"
+						onclick="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"
+						height=30 border="0" style="cursor: pointer;">
+				</div>
+				<strong> <fmt:message key="label.learner.nominations" /> </strong>
+
+				<c:forEach var="entry"
+					items="${requestScope.listGeneralCheckedOptionsContent}">
+					<div>
+						<c:out value="${entry}" escapeXml="false" />
+					</div>
+				</c:forEach>
 				<div>
-				<c:out value="${entry.value}" escapeXml="false" />
+					<c:out value="${VoteLearningForm.userEntry}" />
 				</div>
-			</c:forEach>
-			
+
+
 				<c:if
 					test="${voteGeneralLearnerFlowDTO.notebookEntry != null && voteGeneralLearnerFlowDTO.notebookEntry != ''}">
 
-				<h2>
-					<fmt:message key="label.notebook.entries" />
-				</h2>
+					<h2>
+						<fmt:message key="label.notebook.entries" />
+					</h2>
 	
-				<p>
-					<c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
-						escapeXml="false" />
-				</p>
-			</c:if>													
+					<p>
+						<c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
+							escapeXml="false" />
+					</p>
+				</c:if>				
 
+
+
+
+
 			<div align="right" class="space-bottom-top">
 				<html:submit property="learnerFinished" styleClass="button"
 					onclick="submitMethod('learnerFinished');">