Index: lams_tool_lamc/web/learning/mobile/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/mobile/ViewAnswers.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_lamc/web/learning/mobile/ViewAnswers.jsp	12 Aug 2013 16:29:02 -0000	1.9
+++ lams_tool_lamc/web/learning/mobile/ViewAnswers.jsp	8 Jan 2014 17:49:42 -0000	1.10
@@ -3,6 +3,12 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="isUserLeader" value="${sessionMap.isUserLeader}" />
+<c:set var="mode" value="${sessionMap.mode}" />
+<c:set var="isLeadershipEnabled" value="${sessionMap.content.useSelectLeaderToolOuput}" />
+<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
+
 <lams:html>
 <lams:head>
 	<title><fmt:message key="activity.title" /></title>
@@ -54,6 +60,14 @@
 					<fmt:message key="label.learner.viewAnswers" />
 				</c:if>
 			</h2>
+			
+			<c:if test="${isLeadershipEnabled}">
+				<h4>
+					<fmt:message key="label.group.leader" >
+						<fmt:param>${sessionMap.groupLeader.fullname}</fmt:param>
+					</fmt:message>
+				</h4>
+			</c:if>
 
 			<!--  QUESTIONS  -->
 			<ul data-role="listview" data-inset="true" data-theme="d" >
@@ -74,21 +88,18 @@
 
 					<!--  CANDIDATE ANSWERS  -->
 					<c:set var="queIndex" scope="request" value="0" />
-					<c:forEach var="mainEntry"
-						items="${mcGeneralLearnerFlowDTO.mapGeneralOptionsContent}">
+					<c:forEach var="mainEntry" items="${mcGeneralLearnerFlowDTO.mapGeneralOptionsContent}">
 						<c:set var="queIndex" scope="request" value="${queIndex +1}" />
 
 						<c:if test="${requestScope.mainQueIndex == requestScope.queIndex}">
-							<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:if>
-							
+						
 							<p>
 								<c:forEach var="attemptEntry" items="${mcGeneralLearnerFlowDTO.attemptMap}">
 									<c:if test="${requestScope.mainQueIndex == attemptEntry.key}">
@@ -159,15 +170,15 @@
 					</table>
 				</c:if>				
 
-			<c:if test="${(mcGeneralLearnerFlowDTO.learnerProgress != 'true') && (mcGeneralLearnerFlowDTO.retries == 'true')}">
+			<c:if test="${(mcGeneralLearnerFlowDTO.learnerProgress != 'true') && (mcGeneralLearnerFlowDTO.retries == 'true') && hasEditRight}">
 				<div class="small-space-top button-inside" >
 					<button type="submit" name="redoQuestions" data-icon="back">
 						<fmt:message key="label.redo.questions" />
 					</button>
 				</div>
 			</c:if>
 									
-			<c:if test="${mcGeneralLearnerFlowDTO.reflection}">
+			<c:if test="${mcGeneralLearnerFlowDTO.reflection && hasEditRight}">
 				<h2>
 							<c:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />											
 				</h2>
@@ -191,7 +202,7 @@
 			<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}">
 				<c:if test="${(mcGeneralLearnerFlowDTO.retries != 'true') || (mcGeneralLearnerFlowDTO.retries == 'true') && (mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true')}">
 
-					<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
+					<c:if test="${(mcGeneralLearnerFlowDTO.reflection != 'true') || !hasEditRight}">
 						<html:hidden property="learnerFinished" value="Finished" />
 									
 						<button id="finishButton" name="finishButton" onclick="submitForm('finish');return false" data-icon="arrow-r" data-theme="b">
@@ -208,7 +219,7 @@
 						</button>
 					</c:if>
 
-					<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}">
+					<c:if test="${(mcGeneralLearnerFlowDTO.reflection == 'true') && hasEditRight}">
 						<button name="forwardtoReflection" type="submit" data-icon="arrow-r" data-theme="b">
 							<fmt:message key="label.continue" />
 						</button>