Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -rdf77b7fe375d1d68d4e064748653be8ac8816f93 -r0b1d534ce1915b907afff0171909f90226b31921
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
@@ -9,158 +9,159 @@
 <c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" scope="request" />
 
 <lams:PageLearner title="${mcGeneralLearnerFlowDTO.activityTitle}" toolSessionID="${mcLearningForm.toolSessionID}">
-	<style media="screen,projection" type="text/css">
-		div.growlUI h1, div.growlUI h2 {
-			color: white;
-			margin: 5px 5px 5px 0px;
-			text-align: center;
-			font-size: 18px;
-		}
-		.card-subheader { 
-			font-style: italic;
-		}
-	</style>
+    <style media="screen,projection" type="text/css">
+        div.growlUI h1, div.growlUI h2 {
+            color: white;
+            margin: 5px 5px 5px 0px;
+            text-align: center;
+            font-size: 18px;
+        }
+        .card-subheader {
+            font-style: italic;
+        }
+    </style>
 
-	<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 type="text/javaScript">
+    <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 type="text/javaScript">
         //autoSaveAnswers if hasEditRight
         if (${hasEditRight}) {
-          var interval = "30000"; // = 30 seconds
-          window.setInterval(learnerAutosave, interval);
-          
-          function learnerAutosave(isCommand){
-              // isCommand means that the autosave was triggered by force complete or another command websocket message
-			  // in this case do not check multiple tabs open, just autosave
-			  if (!isCommand) {
-				let shouldAutosave = preventLearnerAutosaveFromMultipleTabs(interval);
-				if (!shouldAutosave) {
-					return;
-				}
-			  }
-				
-              //ajax form submit
-              $('#mcLearningForm').ajaxSubmit({
-                url: "<c:url value='/learning/autoSaveAnswers.do?date='/>" + new Date().getTime(),
-                success: function() {
-                  $.growlUI('<i class="fa fa-lg fa-floppy-o"></i> <fmt:message key="label.learning.draft.autosaved" />');
+          var interval = "30000",  // = 30 seconds
+				  autosaveWindowId = new Date().getTime(); // all we need for this ID is to be unique;
+            window.setInterval(learnerAutosave, interval);
+
+            function learnerAutosave(isCommand){
+                // isCommand means that the autosave was triggered by force complete or another command websocket message
+                // in this case do not check multiple tabs open, just autosave
+                if (!isCommand) {
+				let shouldAutosave = preventLearnerAutosaveFromMultipleTabs(autosaveWindowId, interval);
+                    if (!shouldAutosave) {
+                        return;
+                    }
                 }
-              });
-          }
+
+                //ajax form submit
+                $('#mcLearningForm').ajaxSubmit({
+                    url: "<c:url value='/learning/autoSaveAnswers.do?date='/>" + new Date().getTime(),
+                    success: function() {
+                        $.growlUI('<i class="fa fa-lg fa-floppy-o"></i> <fmt:message key="label.learning.draft.autosaved" />');
+                    }
+                });
+            }
         }
 
         function submitNextQuestionSelected() {
-          if (verifyAllQuestionsAnswered()) {
-            ++document.forms.mcLearningForm.questionIndex.value;
-            document.forms.mcLearningForm.nextQuestionSelected.value = 1;
-            disableContinueButton();
-            document.forms.mcLearningForm.submit();
-          }
+            if (verifyAllQuestionsAnswered()) {
+                ++document.forms.mcLearningForm.questionIndex.value;
+                document.forms.mcLearningForm.nextQuestionSelected.value = 1;
+                disableContinueButton();
+                document.forms.mcLearningForm.submit();
+            }
         }
 
         function submitAllAnswers() {
-          document.forms.mcLearningForm.continueOptionsCombined.value = 1;			
-          doSubmit();
+            document.forms.mcLearningForm.continueOptionsCombined.value = 1;
+            doSubmit();
         }
 
         function doSubmit() {
-          if (verifyAllQuestionsAnswered()) {
-            disableContinueButton();
-            document.forms.mcLearningForm.submit();
-          }
+            if (verifyAllQuestionsAnswered()) {
+                disableContinueButton();
+                document.forms.mcLearningForm.submit();
+            }
         }
 
         function verifyAllQuestionsAnswered() {
-          // in case oneQuestionPerPage option is ON user has to select 1 answer, and all answers otherwise
-          var isOneQuestionPerPage = ${sessionMap.content.questionsSequenced};
-          var answersRequiredNumber = (isOneQuestionPerPage) ? 1 : ${fn:length(requestScope.learnerAnswerDtos)};
+            // in case oneQuestionPerPage option is ON user has to select 1 answer, and all answers otherwise
+            var isOneQuestionPerPage = ${sessionMap.content.questionsSequenced};
+            var answersRequiredNumber = (isOneQuestionPerPage) ? 1 : ${fn:length(requestScope.learnerAnswerDtos)};
 
-          //check each question is answered
-          if ($(':radio:checked').length == answersRequiredNumber) {
-            return true;
+            //check each question is answered
+            if ($(':radio:checked').length == answersRequiredNumber) {
+                return true;
 
-          } else {
-            var msg = "<fmt:message key="answers.submitted.none"/>";
-            alert(msg);
-            return false;
-          }
+            } else {
+                var msg = "<fmt:message key="answers.submitted.none"/>";
+                alert(msg);
+                return false;
+            }
         }
 
         function disableContinueButton() {
-          var elem = document.getElementById("continueButton");
-          if (elem != null) {
-            elem.disabled = true;
-          }				
+            var elem = document.getElementById("continueButton");
+            if (elem != null) {
+                elem.disabled = true;
+            }
         }
 
         if (${!hasEditRight && mode != "teacher"}) {
-          setInterval("checkLeaderProgress();",60000);// Auto-Refresh every 1 minute for non-leaders
+            setInterval("checkLeaderProgress();",60000);// Auto-Refresh every 1 minute for non-leaders
         }
 
         function checkLeaderProgress() {
-          $.ajax({
-            async: false,
-            url: '<c:url value="/learning/checkLeaderProgress.do"/>',
-            data: 'toolSessionID=' + $("#tool-session-id").val(),
-            dataType: 'json',
-            type: 'post',
-            success: function (json) {
-	            if (json.isLeaderResponseFinalized) {
-	            	location.reload();
-	         	}
-			}
-		  });
+            $.ajax({
+                async: false,
+                url: '<c:url value="/learning/checkLeaderProgress.do"/>',
+                data: 'toolSessionID=' + $("#tool-session-id").val(),
+                dataType: 'json',
+                type: 'post',
+                success: function (json) {
+                    if (json.isLeaderResponseFinalized) {
+                        location.reload();
+                    }
+                }
+            });
         }
-      </script>
+    </script>
 
-	<div id="container-main">
-		<!-- Announcements and advanced settings -->
-		<c:if test="${not empty submissionDeadline}">
-			<lams:Alert5 close="false" id="submissionDeadline" type="danger">
-				<fmt:message key="authoring.info.teacher.set.restriction">
-					<fmt:param>
-						<lams:Date value="${submissionDeadline}" />
-					</fmt:param>
-				</fmt:message>
-			</lams:Alert5>
-		</c:if>
+    <div id="container-main">
+        <!-- Announcements and advanced settings -->
+        <c:if test="${not empty submissionDeadline}">
+            <lams:Alert5 close="false" id="submissionDeadline" type="danger">
+                <fmt:message key="authoring.info.teacher.set.restriction">
+                    <fmt:param>
+                        <lams:Date value="${submissionDeadline}" />
+                    </fmt:param>
+                </fmt:message>
+            </lams:Alert5>
+        </c:if>
 
-		<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true' && mcGeneralLearnerFlowDTO.passMark != '0'}">
-			<lams:Alert5 close="true" id="passingMark" type="info">
-				<fmt:message key="label.learner.message" /> ( <c:out value="${mcGeneralLearnerFlowDTO.passMark}" /> )
-			</lams:Alert5>
-		</c:if>
+        <c:if test="${mcGeneralLearnerFlowDTO.retries == 'true' && mcGeneralLearnerFlowDTO.passMark != '0'}">
+            <lams:Alert5 close="true" id="passingMark" type="info">
+                <fmt:message key="label.learner.message" /> ( <c:out value="${mcGeneralLearnerFlowDTO.passMark}" /> )
+            </lams:Alert5>
+        </c:if>
 
-		<c:if test="${isLeadershipEnabled}">
-			<lams:LeaderDisplay idName="leader-info" username="${sessionMap.groupLeader.fullname}" userId="${sessionMap.groupLeader.userId}" />
-		</c:if>
-		<!-- End announcements and advanced settings -->
-		
-		<div id="instructions" class="instructions">
-			<c:out value="${mcGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" />
-		</div>
+        <c:if test="${isLeadershipEnabled}">
+            <lams:LeaderDisplay idName="leader-info" username="${sessionMap.groupLeader.fullname}" userId="${sessionMap.groupLeader.userId}" />
+        </c:if>
+        <!-- End announcements and advanced settings -->
 
-		<div id="questions">
-			<form:form id="mcLearningForm" modelAttribute="mcLearningForm" action="displayMc.do" enctype="multipart/form-data"
-				method="POST" target="_self">
-				<form:hidden path="toolContentID" />
-				<form:hidden path="toolSessionID" id="tool-session-id" />
-				<form:hidden path="httpSessionID" />
-				<form:hidden path="userID" />
-				<form:hidden path="userOverPassMark" />
-				<form:hidden path="passMarkApplicable" />
+        <div id="instructions" class="instructions">
+            <c:out value="${mcGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" />
+        </div>
 
-				<lams:errors5/>
+        <div id="questions">
+            <form:form id="mcLearningForm" modelAttribute="mcLearningForm" action="displayMc.do" enctype="multipart/form-data"
+                       method="POST" target="_self">
+                <form:hidden path="toolContentID" />
+                <form:hidden path="toolSessionID" id="tool-session-id" />
+                <form:hidden path="httpSessionID" />
+                <form:hidden path="userID" />
+                <form:hidden path="userOverPassMark" />
+                <form:hidden path="passMarkApplicable" />
 
-				<c:choose>
-					<c:when test="${sessionMap.content.questionsSequenced && hasEditRight}">
-						<jsp:include page="/learning/SingleQuestionAnswersContent.jsp" />
-					</c:when>
-					<c:otherwise>
-						<jsp:include page="/learning/CombinedAnswersContent.jsp" />
-					</c:otherwise>
-				</c:choose>
-			</form:form>
-		</div>
-	</div>
-</lams:PageLearner>
+                <lams:errors5/>
+
+                <c:choose>
+                    <c:when test="${sessionMap.content.questionsSequenced && hasEditRight}">
+                        <jsp:include page="/learning/SingleQuestionAnswersContent.jsp" />
+                    </c:when>
+                    <c:otherwise>
+                        <jsp:include page="/learning/CombinedAnswersContent.jsp" />
+                    </c:otherwise>
+                </c:choose>
+            </form:form>
+        </div>
+    </div>
+</lams:PageLearner>
\ No newline at end of file