Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -rbc66c534c18e8e49ce8ed510418400cbc56fd605 -r44a88056fd3d6cd6dd148a341d804808aabf1a1a
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision bc66c534c18e8e49ce8ed510418400cbc56fd605)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 44a88056fd3d6cd6dd148a341d804808aabf1a1a)
@@ -28,8 +28,11 @@
 			<script type="text/javascript" src="${lams}/includes/javascript/uppy/el_GR.min.js"></script>
 		</c:when>
 	</c:choose>
-	
+		<script type="text/javascript" src="${lams}learning/includes/javascript/gate-check.js"></script>
+		
 	<script type="text/javascript">
+		checkNextGateActivity('finishButton', '${sessionMap.toolSessionID}', '', finish);
+		
 		var LAMS_URL = '<lams:LAMSURL/>',
 			UPLOAD_FILE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_MAX_SIZE}"/>',
 			// convert Java syntax to JSON
@@ -492,7 +495,7 @@
 					</button>
 				</c:when>
 				<c:otherwise>
-					<button type="submit" onclick="javascript:finish();" class="btn btn-primary btn-disable-on-submit pull-right na" id="finishButton">
+					<button type="button" class="btn btn-primary btn-disable-on-submit pull-right na" id="finishButton">
 						<c:choose>
 							<c:when test="${isLastActivity}">
 								<fmt:message key="button.submit" />