Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	21 Apr 2006 14:56:19 -0000	1.1
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	22 Apr 2006 11:33:16 -0000	1.2
@@ -32,60 +32,21 @@
 
 		<html:form  action="/learning?method=displayMc&validate=false" method="POST" target="_self">
 				<table align=center bgcolor="#FFFFFF">
+
 					  <tr>
 					  	<td NOWRAP align=left class="input" valign=top bgColor="#333366" colspan=2> 
 						  	<font size=2 color="#FFFFFF"> <b>  <bean:message key="label.assessment"/> </b> 
 						  	<c:out value="${reportTitleLearner}" escapeXml="false" /></font>
 					  	</td>
 					  </tr>
 				
-			 		<c:if test="${sessionScope.isRetries == 'true'}"> 		
-						  <tr>
-						  	<td NOWRAP align=center class="input" valign=top colspan=2> 
-							  	<font size=3> <b>  <bean:message key="label.individual.results.withRetries"/> </b> </font>
-						  	</td>
-						  </tr>
-  					</c:if> 			
 
-					<c:if test="${sessionScope.isRetries != 'true'}"> 							  
-						  <tr>
-						  	<td NOWRAP align=center class="input" valign=top colspan=2> 
-							  	<font size=3> <b>  <bean:message key="label.individual.results.withoutRetries"/> </b> </font>
-						  	</td>
-						  </tr>
-					</c:if> 			
-
-
-					  <tr>
-					  	<td NOWRAP align=right class="input" valign=top colspan=2> 
-						  	<font size=2 color="#000000"> <b>  <bean:message key="label.mark"/>  
-						  	<c:out value="${sessionScope.learnerMark}"/>  &nbsp
-							<bean:message key="label.outof"/> &nbsp
-						  	<c:out value="${sessionScope.totalQuestionCount}"/>
-						  	</b> </font>
-					  	</td>
-					  </tr>	
-
 					<tr>
 						<td NOWRAP align=right class="input" valign=top colspan=2> 
 							<hr>
 						</td> 
 					</tr>
 					
-					<c:if test="${sessionScope.userPassed != 'true'}">
-						 <tr>
-						  	<td NOWRAP align=left class="input" valign=top colspan=2> 
-							  	<font size=2 color="#FF0000"> <b>  <bean:message key="label.mustGet"/> &nbsp
-							  	<c:out value="${sessionScope.learnerMarkAtLeast}"/>  &nbsp
-								<bean:message key="label.outof"/> &nbsp
-							  	<c:out value="${sessionScope.totalQuestionCount}"/>
-								<bean:message key="label.toFinish"/>						  	
-							  	</b> </font>
-						  	</td>
-						  </tr>	
-  					</c:if> 			
-					
-					
   		  	 		<c:set var="mainQueIndex" scope="session" value="0"/>
 					<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
 					<c:set var="mainQueIndex" scope="session" value="${mainQueIndex +1}"/>
@@ -147,57 +108,7 @@
 												  			</c:forEach>											
 														</table>
 													</td>
-
-													<td NOWRAP align=right class="input" valign=top> 											
-														<font size=2>
-															<c:forEach var="mainEntry" items="${sessionScope.mapLearnerAssessmentResults}">
-																	<c:if test="${mainEntry.key == sessionScope.queIndex}"> 		
-																		<c:if test="${mainEntry.value == 'true'}"> 		
-																			<c:forEach var="feedbackEntry" items="${sessionScope.mapLeanerFeedbackCorrect}">
-																				<c:if test="${feedbackEntry.key == sessionScope.queIndex}"> 		
-																					    <img src="<c:out value="${tool}"/>images/tick.gif" align=right width=20 height=20>
-																				</c:if> 																																				
-																			</c:forEach>											
-																		</c:if> 														
-																		
-																		<c:if test="${mainEntry.value == 'false'}"> 		
-																			<c:forEach var="feedbackEntry" items="${sessionScope.mapLeanerFeedbackIncorrect}">
-																				<c:if test="${feedbackEntry.key == sessionScope.queIndex}"> 		
-																					    <img src="<c:out value="${tool}"/>images/cross.gif" align=right width=20 height=20>
-																				</c:if> 																																				
-																			</c:forEach>											
-																		</c:if> 														
-																	</c:if> 																		
-															</c:forEach>		
-														</font>
-													</td>
 												</tr>
-
-												<tr>
-												<td NOWRAP bgcolor="#CCCC99" colspan=2 align=left class="input" valign=top> 											
-													<font size=2>
-														<c:forEach var="mainEntry" items="${sessionScope.mapLearnerAssessmentResults}">
-																<c:if test="${mainEntry.key == sessionScope.queIndex}"> 		
-																	<c:if test="${mainEntry.value == 'true'}"> 		
-																		<c:forEach var="feedbackEntry" items="${sessionScope.mapLeanerFeedbackCorrect}">
-																			<c:if test="${feedbackEntry.key == sessionScope.queIndex}"> 		
-																				<c:out value="${feedbackEntry.value}" escapeXml="false" />
-																			</c:if> 																																				
-																		</c:forEach>											
-																	</c:if> 														
-																	
-																	<c:if test="${mainEntry.value != 'true'}"> 		
-																		<c:forEach var="feedbackEntryIncorrect" items="${sessionScope.mapLeanerFeedbackIncorrect}">
-																			<c:if test="${feedbackEntryIncorrect.key == sessionScope.queIndex}"> 		
-																				<c:out value="${feedbackEntryIncorrect.value}" escapeXml="false" />
-																			</c:if> 																																				
-																		</c:forEach>											
-																	</c:if> 														
-																</c:if> 																		
-														</c:forEach>											
-													</font>
-												</td>
-												</tr>
 											
 										</c:if> 			
 								</c:forEach>
@@ -222,12 +133,10 @@
 									<bean:message key="label.redo.questions"/>
 								</html:submit>	 		
 			       
-								<c:if test="${sessionScope.userPassed == 'true'}">
-							  	   <html:submit property="learnerFinished" styleClass="button">
-										<bean:message key="label.finished"/>
-								   </html:submit>
-						  	   </c:if>
-	
+						  	   <html:submit property="learnerFinished" styleClass="button">
+									<bean:message key="label.finished"/>
+							   </html:submit>
+
 		   						<html:submit property="viewSummary" styleClass="button">
 									<bean:message key="label.view.summary"/>
 								</html:submit>