Index: lams_tool_lamc/web/learning/mobile/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/mobile/AnswersContent.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/web/learning/mobile/AnswersContent.jsp	12 Aug 2013 16:29:02 -0000	1.6
+++ lams_tool_lamc/web/learning/mobile/AnswersContent.jsp	8 Jan 2014 17:49:42 -0000	1.7
@@ -3,6 +3,13 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" scope="request"/>
+<c:set var="isUserLeader" value="${sessionMap.isUserLeader}" scope="request"/>
+<c:set var="mode" value="${sessionMap.mode}" scope="request"/>
+<c:set var="isLeadershipEnabled" value="${sessionMap.content.useSelectLeaderToolOuput}" scope="request"/>
+<c:set var="isPrefixAnswersWithLetters" value="${sessionMap.content.prefixAnswersWithLetters}" scope="request"/>
+<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" scope="request"/>
+
 <lams:html>
 <lams:head>
 	<title><fmt:message key="activity.title" /></title>
@@ -18,18 +25,21 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>	
 	<script language="JavaScript" type="text/JavaScript">
-		var interval = "30000"; // = 30 seconds
-		window.setInterval(
-			function(){
-				//ajax form submit
-				$('#learningForm').ajaxSubmit({
-					url: "<c:url value='/learning.do?method=autoSaveAnswers&date='/>" + new Date().getTime(),
-		            success: function() {
-		                $.growlUI('<fmt:message key="label.learning.draft.autosaved" />');
-		            }
-				});
-	        }, interval
-	    );
+		//autoSaveAnswers if hasEditRight
+		if (${hasEditRight}) {
+			var interval = "30000"; // = 30 seconds
+			window.setInterval(
+				function(){
+					//ajax form submit
+					$('#learningForm').ajaxSubmit({
+						url: "<c:url value='/learning.do?method=autoSaveAnswers&date='/>" + new Date().getTime(),
+			            success: function() {
+			                $.growlUI('<fmt:message key="label.learning.draft.autosaved" />');
+			            }
+					});
+		        }, interval
+		    );
+		}
 	
 		function submitNextQuestionSelected() {
 			if (verifyAllQuestionsAnswered()) {
@@ -74,7 +84,27 @@
 				elem.disabled = true;
 			}				
 		}
+		
+		if (${!hasEditRight && mode != "teacher"}) {
+			setInterval("checkLeaderProgress();",60000);// Auto-Refresh every 1 minute for non-leaders
+		}
+		
+		function checkLeaderProgress() {
 			
+	        $.ajax({
+	        	async: false,
+	            url: '<c:url value="/learning.do"/>',
+	            data: 'method=checkLeaderProgress&toolSessionID=' + $("#tool-session-id").val(),
+	            dataType: 'json',
+	            type: 'post',
+	            success: function (json) {
+	            	if (json.isLeaderResponseFinalized) {
+	            		location.reload();
+	            	}
+	            }
+	       	});
+		}
+			
 	</script>
 </lams:head>
 
@@ -90,7 +120,7 @@
 	<div data-role="content">
 	<html:form styleId="learningForm" action="/learning?method=displayMc&validate=false" enctype="multipart/form-data" method="POST" target="_self">
 		<html:hidden property="toolContentID"/>						
-		<html:hidden property="toolSessionID"/>						
+		<html:hidden property="toolSessionID" styleId="tool-session-id"/>						
 		<html:hidden property="httpSessionID"/>			
 		<html:hidden property="userID"/>								
 		<html:hidden property="userOverPassMark"/>						
@@ -100,9 +130,17 @@
 		<html:hidden property="questionListingMode"/>					
 		
 		<%@ include file="/common/messages.jsp"%>
+						
+		<c:if test="${isLeadershipEnabled}">
+			<h4>
+				<fmt:message key="label.group.leader" >
+					<fmt:param>${sessionMap.groupLeader.fullname}</fmt:param>
+				</fmt:message>
+			</h4>
+		</c:if>
 		
 		<c:choose> 
-		  <c:when test="${mcGeneralLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}" > 
+		  <c:when test="${(mcGeneralLearnerFlowDTO.questionListingMode == 'questionListingModeSequential') && hasEditRight}" > 
 				<jsp:include page="/learning/mobile/SingleQuestionAnswersContent.jsp" /> 
 		  </c:when> 
 		  <c:otherwise>