Index: lams_admin/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_admin/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_admin/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_central/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_central/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_central/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_gradebook/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_gradebook/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_gradebook/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_learning/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_learning/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_learning/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_monitoring/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_monitoring/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_monitoring/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_assessment/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_assessment/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_assessment/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_chat/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_chat/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_chat/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_daco/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_daco/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_daco/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_doku/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_doku/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_doku/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_forum/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_forum/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_forum/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_gmap/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_gmap/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_gmap/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_images/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_images/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_images/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_imscc/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_imscc/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_imscc/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_lamc/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_lamc/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_lamc/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_laqa/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_laqa/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_laqa/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_larsrc/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_larsrc/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_larsrc/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_leader/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_leader/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_leader/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_mindmap/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_mindmap/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_mindmap/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_nb/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_nb/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_nb/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_notebook/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_notebook/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_notebook/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_pixlr/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_pixlr/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_pixlr/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_preview/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_preview/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_preview/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_sbmt/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_sbmt/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_sbmt/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_scratchie/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_scratchie/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_scratchie/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_scribe/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_scribe/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_scribe/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_spreadsheet/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_spreadsheet/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_survey/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_survey/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_survey/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_task/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_task/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_task/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_vote/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_vote/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_vote/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_whiteboard/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_whiteboard/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_whiteboard/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_wiki/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_wiki/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_wiki/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_tool_zoom/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_tool_zoom/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_tool_zoom/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />
Index: lams_www/web/WEB-INF/tags/SubmissionDeadline.tag
===================================================================
diff -u -r4506f2f22412fe355a36c51e0ce06b483b85c2e3 -rdbab32d4c855179365bd666cc6a06a7b714201bb
--- lams_www/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision 4506f2f22412fe355a36c51e0ce06b483b85c2e3)
+++ lams_www/web/WEB-INF/tags/SubmissionDeadline.tag	(.../SubmissionDeadline.tag)	(revision dbab32d4c855179365bd666cc6a06a7b714201bb)
@@ -39,10 +39,12 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" >
 	<script type="text/javascript">
+		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+		
 		function finishSession(){
-			document.getElementById("finish-button").disabled = true;
 			document.location.href ='<c:url value="${finishSessionUrl}"/>';
 		}
+		
 		function continueReflect(){
 			document.location.href='<c:url value="${continueReflectUrl}"/>';
 		}
@@ -100,7 +102,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="button" name="FinishButton" id="finish-button" onclick="finishSession()" class="btn btn-primary na">
+					<button type="button" name="FinishButton" id="finish-button" class="btn btn-primary na">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="${finishButtonLastActivityLabelKey}" />