Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java,v
diff -u -r1.16 -r1.17
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java	15 Aug 2007 03:54:49 -0000	1.16
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java	12 Oct 2007 09:23:19 -0000	1.17
@@ -86,6 +86,8 @@
     
     protected String showMarks;
     
+    protected String displayAnswers;
+    
     protected Map mapQueAttempts;
 	
     protected Map mapQueCorrectAttempts;
@@ -357,6 +359,7 @@
             .append("activityTitle: ", activityTitle)
             .append("questionListingMode: ", questionListingMode)
             .append("learnerProgress: ", learnerProgress)
+            .append("displayAnswers: ", displayAnswers)
             .append("reportViewOnly: ", reportViewOnly)
             .append("reflection: ", reflection)
             .append("reflectionSubject: ", reflectionSubject)
@@ -591,7 +594,23 @@
     public void setShowMarks(String showMarks) {
         this.showMarks = showMarks;
     }
+    
     /**
+     * Displays answers on the screen
+     * @return Returns the displayAnswers.
+     */
+    public String getDisplayAnswers() {
+        return displayAnswers;
+    }
+    /**
+     * See getDisplayAnswers() for the meaning of "displayAnswers".
+     * @param displayAnswers The displayAnswers to set.
+     */
+    public void setDisplayAnswers(String displayAnswers) {
+        this.displayAnswers = displayAnswers;
+    }
+    
+    /**
      * @return Returns the mapFinalAnswersContent.
      */
     public Map getMapFinalAnswersContent() {
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v
diff -u -r1.67 -r1.68
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	21 Sep 2007 06:52:48 -0000	1.67
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	12 Oct 2007 09:23:19 -0000	1.68
@@ -870,6 +870,9 @@
 		mcQueUsr.setLastAttemptTotalMark(learnerMark);
 		mcService.updateMcQueUsr(mcQueUsr);
 
+		logger.debug("displayAnswers: " + mcContent.isDisplayAnswers());
+		mcGeneralLearnerFlowDTO.setDisplayAnswers(new Boolean(mcContent.isDisplayAnswers()).toString());
+
 		logger.debug("showMarks: " + mcContent.isShowMarks());
 		mcGeneralLearnerFlowDTO.setShowMarks(new Boolean(mcContent.isShowMarks()).toString());
 		if ( mcContent.isShowMarks() ) {
@@ -1292,6 +1295,7 @@
     	mcGeneralLearnerFlowDTO.setUserOverPassMark (new Boolean(mcQueUsr.isLastAttemptMarkPassed()).toString());
 	    mcGeneralLearnerFlowDTO.setTotalMarksPossible(mcContent.getTotalMarksPossible());
 		mcGeneralLearnerFlowDTO.setShowMarks(new Boolean(mcContent.isShowMarks()).toString());
+		mcGeneralLearnerFlowDTO.setDisplayAnswers(new Boolean(mcContent.isDisplayAnswers()).toString());
 		if ( mcContent.isShowMarks() ) {
 		    Integer[] markStatistics = mcService.getMarkStatistics(mcSession);
 			mcGeneralLearnerFlowDTO.setTopMark(markStatistics[0]);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v
diff -u -r1.75 -r1.76
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	15 Aug 2007 03:54:50 -0000	1.75
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	12 Oct 2007 09:23:19 -0000	1.76
@@ -450,6 +450,10 @@
 	    Boolean showMarks = LearningUtil.isShowMarksOnQuestion(listQuestionAndCandidateAnswersDTO);
 	    mcGeneralLearnerFlowDTO.setShowMarks(showMarks.toString());
 
+		Boolean displayAnswers = mcContent.isDisplayAnswers();
+		mcGeneralLearnerFlowDTO.setDisplayAnswers(displayAnswers.toString());
+		logger.debug("MCQ displayAnswers: " + mcGeneralLearnerFlowDTO.getDisplayAnswers());
+	    
 	    logger.debug("is tool reflective: " + mcContent.isReflect());
 	    mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
 		logger.debug("reflection subject: " + mcContent.getReflectionSubject());
Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/IndividualLearnerResults.jsp,v
diff -u -r1.47 -r1.48
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	15 Aug 2007 03:56:16 -0000	1.47
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	12 Oct 2007 09:23:19 -0000	1.48
@@ -65,32 +65,34 @@
 			<html:hidden property="learnerProgressUserId" />
 			<html:hidden property="questionListingMode" />
 
-			<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
 
+			<c:choose>
+			<c:when test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
+
 				<h3>
 					<fmt:message key="label.individual.results.withRetries" />
 				</h3>
 
-			</c:if>
+			</c:when>
+			<c:when test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
 
-			<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
-
 				<h3>
 					<fmt:message key="label.individual.results.withoutRetries" />
 				</h3>
 
+			</c:when>
+			</c:choose>
+			
+			<c:if test="${(mcGeneralLearnerFlowDTO.retries == 'true') or (mcGeneralLearnerFlowDTO.displayAnswers == 'true')}">
+				<p>
+					<strong><fmt:message key="label.mark" /> </strong>
+					<c:out value="${mcGeneralLearnerFlowDTO.learnerMark}" />
+					<fmt:message key="label.outof" />
+					<c:out value="${mcGeneralLearnerFlowDTO.totalMarksPossible}" />
+				</p>
 			</c:if>
-
+			
 			<p>
-				<strong><fmt:message key="label.mark" /> </strong>
-
-				<c:out value="${mcGeneralLearnerFlowDTO.learnerMark}" />
-				<fmt:message key="label.outof" />
-				<c:out value="${mcGeneralLearnerFlowDTO.totalMarksPossible}" />
-
-			</p>
-
-			<p>
 				<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
 					<c:if
 						test="${mcGeneralLearnerFlowDTO.userOverPassMark != 'true' && 
@@ -119,32 +121,36 @@
 							<c:out value="${dto.question}" escapeXml="false" />
 						</div>									
 
+                    <c:if test="${mcGeneralLearnerFlowDTO.displayAnswers == 'true'}">
 						[
 						<strong> <fmt:message key="label.mark" /> </strong>
-						<c:out value="${dto.mark}" />
+						<c:out value="${dto.mark}" /> 
 						]
+					</c:if>
 
-					<p>
-						<c:forEach var="caText" varStatus="status"
-							items="${dto.candidateAnswers}">
-							<c:out value="${caText.value}" escapeXml="false" />
-						</c:forEach>
+						<p>
+							<c:forEach var="caText" varStatus="status"
+								items="${dto.candidateAnswers}">
+								<c:out value="${caText.value}" escapeXml="false" />
+							</c:forEach>
 
-							<c:if test="${dto.attemptCorrect == 'true'}">
-								<img src="<c:out value="${tool}"/>images/tick.gif" border="0" class="middle">
-							</c:if>
-							<c:if test="${dto.attemptCorrect != 'true'}">
-								<img src="<c:out value="${tool}"/>images/cross.gif" border="0" class="middle">
-							</c:if>
+                    <c:if test="${mcGeneralLearnerFlowDTO.displayAnswers == 'true'}">
+	
+								<c:if test="${dto.attemptCorrect == 'true'}">
+									<img src="<c:out value="${tool}"/>images/tick.gif" border="0" class="middle">
+								</c:if>
+								<c:if test="${dto.attemptCorrect != 'true'}">
+									<img src="<c:out value="${tool}"/>images/cross.gif" border="0" class="middle">
+								</c:if>
+	
+						</p>
 
-					</p>
-
 						<c:if test="${(dto.feedback != null) && (dto.feedback != '')}">
 							<div style="overflow: auto;">
 								<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${dto.feedback}" escapeXml="false" /> 
 							</div>		
 						</c:if>												
-
+					</c:if>
 				</div>
 			</c:forEach>
 
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.54 -r1.55
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	15 Aug 2007 03:56:16 -0000	1.54
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	12 Oct 2007 09:23:20 -0000	1.55
@@ -95,34 +95,33 @@
 						<c:set var="queIndex" scope="request" value="${queIndex +1}" />
 
 						<c:if test="${requestScope.mainQueIndex == requestScope.queIndex}">
-							<ul>
-								<c:forEach var="subEntry" items="${mainEntry.value}">
-									<li>
-										<c:out value="${subEntry.value}" escapeXml="false" />
-									</li>
+							<c:if test="${mcGeneralLearnerFlowDTO.displayAnswers == 'true'}">
+								<ul>
+									<c:forEach var="subEntry" items="${mainEntry.value}">
+										<li>
+											<c:out value="${subEntry.value}" escapeXml="false" /> 
+										</li>
+									</c:forEach>
+								</ul>
+								<c:set var="attemptCount" scope="request" value="0" />
+								<c:forEach var="attemptEntry"
+									items="${mcGeneralLearnerFlowDTO.mapQueAttempts}">
+									<c:if test="${requestScope.mainQueIndex == attemptEntry.key}">
+										<c:set var="attemptCount" scope="request" value="${attemptCount +1}" />								
+									</c:if>
 								</c:forEach>
-							</ul>
-
-
-							<c:set var="attemptCount" scope="request" value="0" />
-							<c:forEach var="attemptEntry"
-								items="${mcGeneralLearnerFlowDTO.mapQueAttempts}">
-								<c:if test="${requestScope.mainQueIndex == attemptEntry.key}">
-									<c:set var="attemptCount" scope="request" value="${attemptCount +1}" />								
-								</c:if>
-							</c:forEach>
-
-							<h4> <fmt:message key="label.attempt.count" />   <c:out value="${highestAttempOrder}" /> </h4>
+								<h4> <fmt:message key="label.attempt.count" />   <c:out value="${highestAttempOrder}" /> </h4>
+							</c:if>
 							
 
-
 							<c:forEach var="attemptEntryFinal"
 								items="${mcGeneralLearnerFlowDTO.mapFinalAnswersContent}">
 								<c:if test="${requestScope.mainQueIndex == attemptEntryFinal.key}">
 									&nbsp <h4> <fmt:message key="label.final.attempt" /> </h4> <c:out value="${attemptEntryFinal.value}" />
 								</c:if>
 							</c:forEach>
 
+						<c:if test="${mcGeneralLearnerFlowDTO.displayAnswers == 'true'}">
 							<c:forEach var="attemptEntryCorrect"
 								items="${mcGeneralLearnerFlowDTO.mapFinalAnswersIsContent}">
 								<c:if test="${requestScope.mainQueIndex == attemptEntryCorrect.key}">
@@ -134,21 +133,22 @@
 									</c:if>									
 								</c:if>
 							</c:forEach>
-
 						</c:if>
-					</c:forEach>
-
-
-					<c:forEach var="feedbackEntry"
-						items="${mcGeneralLearnerFlowDTO.mapFeedbackContent}">
-						<c:if test="${requestScope.mainQueIndex == feedbackEntry.key}">
-							<c:if test="${(feedbackEntry.value != null) && (feedbackEntry.value != '')}">
-								<div style="overflow: auto;">									  							
-									<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${feedbackEntry.value}" escapeXml="false" />
-								</div>								
-							</c:if>																			
 						</c:if>
 					</c:forEach>
+
+					<c:if test="${mcGeneralLearnerFlowDTO.displayAnswers == 'true'}">
+						<c:forEach var="feedbackEntry"
+							items="${mcGeneralLearnerFlowDTO.mapFeedbackContent}">
+							<c:if test="${requestScope.mainQueIndex == feedbackEntry.key}">
+								<c:if test="${(feedbackEntry.value != null) && (feedbackEntry.value != '')}">
+									<div style="overflow: auto;">									  							
+										<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${feedbackEntry.value}" escapeXml="false" />
+									</div>								
+								</c:if>																			
+							</c:if>
+						</c:forEach>
+					</c:if>
 				</div>
 			</c:forEach>
 			<!-- END QUESTION  -->