Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v
diff -u -r1.75 -r1.76
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	8 May 2013 13:18:25 -0000	1.75
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	17 May 2013 14:05:28 -0000	1.76
@@ -473,26 +473,6 @@
 
 	McTempDataHolderDTO mcTempDataHolderDTO = new McTempDataHolderDTO();
 
-	boolean allQuestionsChecked = allQuestionsChecked(mcService, learnerInput, mcContent, mcTempDataHolderDTO);
-
-	if (!allQuestionsChecked) {
-	    // there are no selected answers for any questions
-	    ActionMessages errors = new ActionMessages();
-
-	    ActionMessage error = new ActionMessage("answers.submitted.none");
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-	    saveErrors(request, errors);
-
-	    McLearningStarterAction mcLearningStarterAction = new McLearningStarterAction();
-	    mcLearningStarterAction.commonContentSetup(request, mcContent, mcService, mcLearningForm, toolSessionID);
-
-	    mcGeneralLearnerFlowDTO.setQuestionIndex(mcTempDataHolderDTO.getDisplayOrder());
-
-	    request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
-
-	    return mapping.findForward(McAppConstants.LOAD_LEARNER);
-	}
-
 	List selectedQuestionAndCandidateAnswersDTO = buildSelectedQuestionAndCandidateAnswersDTO(learnerInput,
 		mcTempDataHolderDTO, mcService, mcContent);
 	request.setAttribute(McAppConstants.LIST_SELECTED_QUESTION_CANDIDATEANSWERS_DTO,
@@ -579,44 +559,7 @@
 	return mapping.findForward(McAppConstants.INDIVIDUAL_REPORT);
     }
 
-    public boolean allQuestionsChecked(IMcService mcService, List learnerInput, McContent mcContent,
-	    McTempDataHolderDTO mcTempDataHolderDTO) {
-
-	boolean questionSelected = false;
-	Iterator listIterator = mcContent.getMcQueContents().iterator();
-	while (listIterator.hasNext()) {
-	    McQueContent mcQueContent = (McQueContent) listIterator.next();
-	    String uid = mcQueContent.getUid().toString();
-
-	    questionSelected = false;
-	    Iterator learnerInputIterator = learnerInput.iterator();
-	    while (learnerInputIterator.hasNext() && !questionSelected) {
-		String learnerInputLine = (String) learnerInputIterator.next();
-
-		int sepIndex = learnerInputLine.indexOf("-");
-
-		String selectedUid = learnerInputLine.substring(0, sepIndex);
-
-		if (uid.equals(selectedUid)) {
-		    questionSelected = true;
-		}
-
-	    }
-
-	    if (questionSelected == false) {
-		mcTempDataHolderDTO.setDisplayOrder(mcQueContent.getDisplayOrder());
-		return false;
-	    }
-	}
-
-	return true;
-    }
-
     /**
-     * 
-     * continueOptionsCombined(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse
-     * response)
-     * 
      * takes the learner to the next set of questions
      * 
      * @param request
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/AnswersContent.jsp,v
diff -u -r1.31 -r1.32
--- lams_tool_lamc/web/learning/AnswersContent.jsp	8 Jun 2007 01:38:22 -0000	1.31
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	17 May 2013 14:05:28 -0000	1.32
@@ -37,37 +37,43 @@
 	<lams:css/>
 	<title><fmt:message key="activity.title" /></title>
 	
+		<script src="${lams}includes/javascript/jquery.js"></script>
 		<script language="JavaScript" type="text/JavaScript">
-			function submitNextQuestionSelected() 
-			{
-				++document.McLearningForm.questionIndex.value;
-				document.McLearningForm.nextQuestionSelected.value = 1;
-				document.McLearningForm.submit();
+			function submitNextQuestionSelected() {
+				if (verifyAllQuestionsAnswered()) {
+					++document.McLearningForm.questionIndex.value;
+					document.McLearningForm.nextQuestionSelected.value = 1;
+					disableContinueButton();
+					document.McLearningForm.submit();
+				}
 			}
 
-			function submitAllAnswers() 
-			{
+			function submitAllAnswers() {
 				document.McLearningForm.continueOptionsCombined.value = 1;			
-				document.McLearningForm.submit();
+				doSubmit();
 			}
+			
+			function doSubmit() {
+				if (verifyAllQuestionsAnswered()) {
+					disableContinueButton();
+					document.McLearningForm.submit();
+				}
+			}
 
-			function verifyCandidateSelected()
-			{
-				var candidateSelected = false;
+			function verifyAllQuestionsAnswered() {
+				// in case oneQuestionPerPage option is ON user has to select 1 answer, and all answers otherwise
+				var isOneQuestionPerPage = ${mcGeneralLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'};
+				var answersRequiredNumber = (isOneQuestionPerPage) ? 1 : ${fn:length(requestScope.listQuestionCandidateAnswersDto)};
 				
-				for (counter = 0; counter < document.McLearningForm.checkedCa.length; counter++)
-				{
-					if (document.McLearningForm.checkedCa[counter].checked)
-						candidateSelected = true; 
-				}
-				
-				if (!candidateSelected)
-				{
+				//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);
+					return false;
 				}
-				return (true);
 			}
 			
 			function disableContinueButton() {
@@ -83,7 +89,7 @@
 <body class="stripes">
 
 <div id="content">
-	<html:form  action="/learning?method=displayMc&validate=false" enctype="multipart/form-data" method="POST" target="_self" onsubmit="disableContinueButton();">
+	<html:form  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="httpSessionID"/>			
@@ -115,14 +121,4 @@
 
 </body>
 </lams:html>
-
-
-
-
-
-
-
-
-
-	
 	
\ No newline at end of file
Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/CombinedAnswersContent.jsp,v
diff -u -r1.30 -r1.31
--- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	16 May 2011 05:11:30 -0000	1.30
+++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	17 May 2013 14:05:28 -0000	1.31
@@ -57,36 +57,27 @@
 
 
 
-<c:forEach var="dto" varStatus="status"
-	items="${requestScope.listQuestionCandidateAnswersDto}">
+<c:forEach var="dto" varStatus="status" items="${requestScope.listQuestionCandidateAnswersDto}">
 
 	<div class="shading-bg">
 		<div style="overflow: auto;">
 			<c:out value="${dto.question}" escapeXml="false" />
 
 			<c:if test="${mcGeneralLearnerFlowDTO.showMarks == 'true'}">			
 				[
-				<strong><fmt:message key="label.mark" />
-				</strong>
+				<strong><fmt:message key="label.mark" /></strong>
 				<c:out value="${dto.mark}" />
 				]
 			</c:if>							
 		</div>
 	</div>
 
+	<c:forEach var="ca" varStatus="status" items="${dto.candidateAnswerUids}">
 
-	<c:forEach var="ca" varStatus="status"
-		items="${dto.candidateAnswerUids}">
-
 		<div class="indent">
-			<input type="radio" name="checkedCa${dto.questionUid}" class="noBorder"
-				value="${dto.questionUid}-${ca.value}">
+			<input type="radio" name="checkedCa${dto.questionUid}" class="noBorder" value="${dto.questionUid}-${ca.value}">
 
-			<c:forEach var="caText" varStatus="status"
-				items="${dto.candidateAnswers}">
-
-
-
+			<c:forEach var="caText" varStatus="status" items="${dto.candidateAnswers}">
 				<c:if test="${ca.key == caText.key}">
 					<c:out value="${caText.value}" escapeXml="false" />
 		</div>
@@ -102,9 +93,9 @@
 <div class="space-bottom-top align-right">
 	<html:hidden property="continueOptionsCombined" value="Continue" />
 
-	<html:submit styleClass="button" styleId="continueButton">
+	<html:button property="continueButton" styleClass="button" onclick="doSubmit();" styleId="continueButton">
 		<fmt:message key="button.continue" />
-	</html:submit>
+	</html:button>
 </div>
 
 <!--options content ends here-->
Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp,v
diff -u -r1.29 -r1.30
--- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	1 Mar 2012 16:28:40 -0000	1.29
+++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	17 May 2013 14:05:28 -0000	1.30
@@ -95,21 +95,20 @@
 <html:hidden property="donePreview" />
 
 <div class="space-bottom-top">
-        <c:if 
-                test="${mcGeneralLearnerFlowDTO.totalCountReached != 'true'  &&  mcGeneralLearnerFlowDTO.totalQuestionCount != '1'}"> 
-                <html:submit property="continueOptionsCombined" onclick="if (verifyCandidateSelected()){ submitNextQuestionSelected();}" styleClass="button"> 
-                        <fmt:message key="button.continue" /> 
-                </html:submit> 
-        </c:if>
+    <c:if test="${mcGeneralLearnerFlowDTO.totalCountReached != 'true'  &&  mcGeneralLearnerFlowDTO.totalQuestionCount != '1'}"> 
+    	<html:button property="continueOptionsCombined" onclick="submitNextQuestionSelected();" styleClass="button"> 
+        	<fmt:message key="button.continue" /> 
+        </html:button> 
+    </c:if>
 
 	<c:if test="${mcGeneralLearnerFlowDTO.totalQuestionCount == '1'}">
-		<html:submit property="continueOptionsCombined" onclick="javascript:verifyCandidateSelected()" styleClass="button">
+		<html:button property="continueOptionsCombined" onclick="doSubmit();" styleClass="button">
 			<fmt:message key="button.continue" />
-		</html:submit>
+		</html:button>
 	</c:if>
 
 	<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached == 'true'}">
-		<html:button property="continueOptionsCombined" onclick="javascript:if (verifyCandidateSelected()){ submitAllAnswers();}" styleClass="button">
+		<html:button property="continueOptionsCombined" onclick="submitAllAnswers();" styleClass="button">
 			<fmt:message key="button.submit" />
 		</html:button>
 	</c:if>
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.2 -r1.3
--- lams_tool_lamc/web/learning/mobile/AnswersContent.jsp	29 Sep 2012 13:58:06 -0000	1.2
+++ lams_tool_lamc/web/learning/mobile/AnswersContent.jsp	17 May 2013 14:05:28 -0000	1.3
@@ -41,47 +41,52 @@
 	
 	<script src="${lams}includes/javascript/jquery.js"></script>
 	<script src="${lams}includes/javascript/jquery.mobile.js"></script>	
-		<script language="JavaScript" type="text/JavaScript">
-			function submitNextQuestionSelected() 
-			{
+	<script language="JavaScript" type="text/JavaScript">
+		function submitNextQuestionSelected() {
+			if (verifyAllQuestionsAnswered()) {
 				++document.McLearningForm.questionIndex.value;
 				document.McLearningForm.nextQuestionSelected.value = 1;
+				disableContinueButton();
 				document.McLearningForm.submit();
 			}
+		}
 
-			function submitAllAnswers() 
-			{
-				document.McLearningForm.continueOptionsCombined.value = 1;			
+		function submitAllAnswers() {
+			document.McLearningForm.continueOptionsCombined.value = 1;			
+			doSubmit();
+		}
+		
+		function doSubmit() {
+			if (verifyAllQuestionsAnswered()) {
+				disableContinueButton();
 				document.McLearningForm.submit();
 			}
+		}
 
-			function verifyCandidateSelected()
-			{
-				var candidateSelected = false;
+		function verifyAllQuestionsAnswered() {
+			// in case oneQuestionPerPage option is ON user has to select 1 answer, and all answers otherwise
+			var isOneQuestionPerPage = ${mcGeneralLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'};
+			var answersRequiredNumber = (isOneQuestionPerPage) ? 1 : ${fn:length(requestScope.listQuestionCandidateAnswersDto)};
+			
+			//check each question is answered
+			if ($(':radio:checked').length == answersRequiredNumber) {
+				return true;
 				
-				for (counter = 0; counter < document.McLearningForm.checkedCa.length; counter++)
-				{
-					if (document.McLearningForm.checkedCa[counter].checked)
-						candidateSelected = true; 
-				}
-				
-				if (!candidateSelected)
-				{
-					var msg = "<fmt:message key="answers.submitted.none"/>";
-					alert(msg);
-					return (false);
-				}
-				return (true);
+			} 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;
-				}				
-			}
+		function disableContinueButton() {
+			var elem = document.getElementById("continueButton");
+			if (elem != null) {
+				elem.disabled = true;
+			}				
+		}
 			
-		</script>
+	</script>
 </lams:head>
 
 <body class="large-font">
@@ -94,7 +99,7 @@
 	</div>
 
 	<div data-role="content">
-	<html:form  action="/learning?method=displayMc&validate=false" enctype="multipart/form-data" method="POST" target="_self" onsubmit="disableContinueButton();">
+	<html:form  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="httpSessionID"/>			
@@ -120,15 +125,4 @@
 </div>
 
 </body>
-</lams:html>
-
-
-
-
-
-
-
-
-
-	
-	
\ No newline at end of file
+</lams:html>
\ No newline at end of file
Index: lams_tool_lamc/web/learning/mobile/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/mobile/CombinedAnswersContent.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/web/learning/mobile/CombinedAnswersContent.jsp	22 Feb 2012 22:38:26 -0000	1.1
+++ lams_tool_lamc/web/learning/mobile/CombinedAnswersContent.jsp	17 May 2013 14:05:28 -0000	1.2
@@ -56,8 +56,7 @@
 
 
 <ul data-role="listview" data-inset="true" data-theme="d" >
-<c:forEach var="dto" varStatus="status"
-	items="${requestScope.listQuestionCandidateAnswersDto}">
+<c:forEach var="dto" varStatus="status"	items="${requestScope.listQuestionCandidateAnswersDto}">
 
 	<li>
 	<fieldset data-role="controlgroup">
@@ -66,8 +65,7 @@
 
 			<c:if test="${mcGeneralLearnerFlowDTO.showMarks == 'true'}">			
 				[
-				<strong><fmt:message key="label.mark" />
-				</strong>
+				<strong><fmt:message key="label.mark" /></strong>
 				<c:out value="${dto.mark}" />
 				]
 			</c:if>							
@@ -94,7 +92,7 @@
 <div class="space-top button-inside">
 	<html:hidden property="continueOptionsCombined" value="Continue" />
 
-	<button name="continueButton" id="continueButton" data-theme="b">
+	<button type="button" name="continueButton" id="continueButton" data-theme="b" onclick="doSubmit();">
 		<fmt:message key="button.continue" />
 	</button>
 </div>
Index: lams_tool_lamc/web/learning/mobile/SingleQuestionAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/mobile/SingleQuestionAnswersContent.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/web/learning/mobile/SingleQuestionAnswersContent.jsp	22 Feb 2012 22:38:26 -0000	1.1
+++ lams_tool_lamc/web/learning/mobile/SingleQuestionAnswersContent.jsp	17 May 2013 14:05:28 -0000	1.2
@@ -100,21 +100,20 @@
 <html:hidden property="donePreview" />
 
 <div class="space-top button-inside">
-        <c:if 
-                test="${mcGeneralLearnerFlowDTO.totalCountReached != 'true'  &&  mcGeneralLearnerFlowDTO.totalQuestionCount != '1'}"> 
-                <button name="continueOptionsCombined" id="continueOptionsCombined" onclick="if (verifyCandidateSelected()){ submitNextQuestionSelected();}" data-theme="b"> 
-                        <fmt:message key="button.continue" /> 
-                </button> 
+        <c:if test="${mcGeneralLearnerFlowDTO.totalCountReached != 'true'  &&  mcGeneralLearnerFlowDTO.totalQuestionCount != '1'}"> 
+        	<button type="button" name="continueOptionsCombined" id="continueOptionsCombined" onclick="submitNextQuestionSelected();" data-theme="b"> 
+        		<fmt:message key="button.continue" /> 
+            </button> 
         </c:if>
 
 	<c:if test="${mcGeneralLearnerFlowDTO.totalQuestionCount == '1'}">
-		<button name="continueOptionsCombined" id="continueOptionsCombined" onclick="javascript:if (verifyCandidateSelected()){ submitAllAnswers();}" data-theme="b">
+		<button type="button" name="continueOptionsCombined" id="continueOptionsCombined" onclick="doSubmit();" data-theme="b">
 			<fmt:message key="button.continue" />
 		</button>
 	</c:if>
 
 	<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached == 'true'}">
-		<button name="continueOptionsCombined" id="continueOptionsCombined" onclick="javascript:if (verifyCandidateSelected()){ submitAllAnswers();}" data-theme="b">
+		<button type="button" name="continueOptionsCombined" id="continueOptionsCombined" onclick="submitAllAnswers();" data-theme="b">
 			<fmt:message key="button.submit" />
 		</button>
 	</c:if>