Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -rf0997a08e6b5eeae233351103cfe619432f88016 -r6d4d26d1701e92c9056fb0d18dc4e6638b459c3f
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision f0997a08e6b5eeae233351103cfe619432f88016)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 6d4d26d1701e92c9056fb0d18dc4e6638b459c3f)
@@ -8,8 +8,14 @@
 	<title><fmt:message key="activity.title" /></title>
 
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL />learning/includes/javascript/gate-check.js"></script>
+	
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${qaLearningForm.toolSessionID}', '', function(){
+			submitMethod('storeAllResults');
+		});
 
-	<script language="JavaScript" type="text/JavaScript">
 		function submitMethod(actionMethod) {
 			$('.btn').prop('disabled', true);
 			document.forms.qaLearningForm.action = actionMethod+".do";
@@ -129,8 +135,7 @@
 			<c:if test="${!generalLearnerFlowDTO.showOtherAnswers}">
 				<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
 					<div class="space-bottom-top align-right">
-						<button type="button" id="finishButton" 
-							onclick="javascript:submitMethod('storeAllResults');return false" class="btn btn-primary pull-right na">
+						<button type="button" id="finishButton" class="btn btn-primary pull-right na">
 							<c:choose>
 								<c:when test="${sessionMap.isLastActivity}">
 									<fmt:message key="button.submit" />
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r71214349374413ceff22bcdf92734911bf79c3b7 -r6d4d26d1701e92c9056fb0d18dc4e6638b459c3f
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 71214349374413ceff22bcdf92734911bf79c3b7)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 6d4d26d1701e92c9056fb0d18dc4e6638b459c3f)
@@ -80,11 +80,16 @@
 	<script src="${lams}includes/javascript/jquery.tablesorter-widgets.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/portrait.js" type="text/javascript" ></script>
-
+	<script src="${lams}learning/includes/javascript/gate-check.js" type="text/javascript"></script>
+	
 	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${toolSessionID}', '', function(){
+			submitMethod('endLearning');
+		});
+		
 		var AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
-		IS_DISABLED =  ${sessionMap.isDisabled};
+			YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+			IS_DISABLED =  ${sessionMap.isDisabled};
 		
 		$(document).ready(function(){
 			
@@ -277,7 +282,6 @@
 			}
 		}
 		function submitMethod(actionMethod) {
-			$('.btn').prop('disabled', true);
 			document.forms.qaLearningForm.action=actionMethod+".do"; 
 			document.forms.qaLearningForm.submit();
 		}
@@ -502,8 +506,7 @@
 						</c:when>
 	
 						<c:when test="${(generalLearnerFlowDTO.reflection != 'true') || !hasEditRight || generalLearnerFlowDTO.isLearnerFinished}">
-							<button type="button" id="finishButton"
-									onclick="javascript:submitMethod('endLearning'); return false;" class="btn btn-primary pull-right na">
+							<button type="button" id="finishButton" class="btn btn-primary pull-right na">
 								<c:choose>
 									<c:when test="${sessionMap.isLastActivity}">
 										<fmt:message key="button.submit" />
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
diff -u -r242fb55e2d8a84388c3a7eb168f86c4f4ab2437b -r6d4d26d1701e92c9056fb0d18dc4e6638b459c3f
--- lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 242fb55e2d8a84388c3a7eb168f86c4f4ab2437b)
+++ lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 6d4d26d1701e92c9056fb0d18dc4e6638b459c3f)
@@ -5,8 +5,13 @@
 	<lams:css />
 	<title><fmt:message key="activity.title" /></title>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-
-	<script language="JavaScript" type="text/JavaScript">
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>learning/includes/javascript/gate-check.js"></script>
+	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${qaLearningForm.toolSessionID}', '', function(){
+			$('#qaLearningForm').submit();
+		});
+		
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}