Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McTempDataHolderDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McTempDataHolderDTO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McTempDataHolderDTO.java	11 Oct 2006 22:44:03 -0000	1.4
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McTempDataHolderDTO.java	10 Dec 2006 23:18:08 -0000	1.5
@@ -39,6 +39,7 @@
     protected String totalUserMark;
     protected String totalReportableUserMark;
     protected String totalMarksPossible;
+    protected String displayOrder;
 
     
 	public int compareTo(Object o)
@@ -58,6 +59,7 @@
             .append("totalUserMark : ", totalUserMark)
             .append("totalReportableUserMark : ", totalReportableUserMark)
             .append("totalMarksPossible : ", totalMarksPossible)
+            .append("displayOrder : ", displayOrder)
             .toString();
     }
     
@@ -122,4 +124,16 @@
     public void setTotalMarksPossible(String totalMarksPossible) {
         this.totalMarksPossible = totalMarksPossible;
     }
+    /**
+     * @return Returns the displayOrder.
+     */
+    public String getDisplayOrder() {
+        return displayOrder;
+    }
+    /**
+     * @param displayOrder The displayOrder to set.
+     */
+    public void setDisplayOrder(String displayOrder) {
+        this.displayOrder = displayOrder;
+    }
 }
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.62 -r1.63
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	5 Dec 2006 16:30:27 -0000	1.62
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	10 Dec 2006 23:18:08 -0000	1.63
@@ -872,10 +872,16 @@
     	List allQuestionUidsList = getAllQuestionUids(mcContent);
     	logger.debug("allQuestionUidsList: " + allQuestionUidsList);
 
-
-    	boolean allQuestionsChecked=allQuestionsChecked(learnerInput, allQuestionUidsList);
+    	McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO=LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
+    	logger.debug("constructed a new mcGeneralLearnerFlowDTO");
+    	
+    	McTempDataHolderDTO mcTempDataHolderDTO= new McTempDataHolderDTO();
+    	
+    	boolean allQuestionsChecked=allQuestionsChecked(mcService,learnerInput, allQuestionUidsList, mcTempDataHolderDTO);
     	logger.debug("allQuestionsChecked: " + allQuestionsChecked);
+    	logger.debug("mcTempDataHolderDTO displayOrder: " + mcTempDataHolderDTO.getDisplayOrder());
     	
+    	
     	if (!allQuestionsChecked)
         {
             logger.debug("there are no selected answers for any questions: " + learnerInput);
@@ -889,14 +895,17 @@
 
 	        McLearningStarterAction mcLearningStarterAction= new McLearningStarterAction();
 	        mcLearningStarterAction.commonContentSetup(request, mcContent, mcService, mcLearningForm, toolSessionID);
+	    
+	        mcGeneralLearnerFlowDTO.setQuestionIndex(mcTempDataHolderDTO.getDisplayOrder());
+
+	        request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
+			logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " +  request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
 	        
 	        logger.debug("returning to LOAD_LEARNER: " + LOAD_LEARNER);
 	      	return (mapping.findForward(LOAD_LEARNER));
         }
     	
-    	
-    	
-	 	McTempDataHolderDTO mcTempDataHolderDTO= new McTempDataHolderDTO();
+	 	
 
 	 	List selectedQuestionAndCandidateAnswersDTO=buildSelectedQuestionAndCandidateAnswersDTO(allQuestionUidsList, learnerInput,mcTempDataHolderDTO 
 	 	        , mcService, mcContent);
@@ -917,8 +926,7 @@
 		String totalMarksPossible=mcTempDataHolderDTO.getTotalMarksPossible(); 
 		logger.debug("totalMarksPossible: " + totalMarksPossible);
 		
-		McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO=LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
-    	logger.debug("constructed a new mcGeneralLearnerFlowDTO");
+		
     	mcGeneralLearnerFlowDTO.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
     	
     	int totalQuestionCount=mcContent.getMcQueContents().size();
@@ -1085,7 +1093,8 @@
     
     
     
-    public boolean allQuestionsChecked(List learnerInput, List allQuestionUidsList)
+    public boolean allQuestionsChecked(IMcService mcService, List learnerInput, 
+            List allQuestionUidsList, McTempDataHolderDTO mcTempDataHolderDTO)
     {
     	logger.debug("starting allQuestionsChecked learnerInput: " +  learnerInput);
     	logger.debug("using  allQuestionUidsList: " +  allQuestionUidsList);
@@ -1122,7 +1131,12 @@
 
     	    if (questionSelected == false)
     	    {
-    	        logger.debug("this question is not selected at all, question uid :" +  uid);
+    	        logger.debug("mcTempDataHolderDTO displayOrder:" +  uid);
+    	        String unselectedQuestionUid=uid;
+    	        McQueContent mcQueContent=mcService.findMcQuestionContentByUid(new Long(unselectedQuestionUid));
+    	        logger.debug("mcQueContent :" +  mcQueContent);
+    	        logger.debug("mcQueContent displayorder:" +  mcQueContent.getDisplayOrder());
+    	        mcTempDataHolderDTO.setDisplayOrder(mcQueContent.getDisplayOrder().toString());
     	        return false;
     	    }
     	}
Index: lams_tool_lamc/web/images/send.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/images/Attic/send.gif,v
diff -u
Binary files differ
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/AnswersContent.jsp,v
diff -u -r1.29 -r1.30
--- lams_tool_lamc/web/learning/AnswersContent.jsp	5 Dec 2006 03:02:23 -0000	1.29
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	10 Dec 2006 23:17:25 -0000	1.30
@@ -45,7 +45,13 @@
 				document.McLearningForm.nextQuestionSelected.value = 1;
 				document.McLearningForm.submit();
 			}
-			
+
+			function submitAllAnswers() 
+			{
+				document.McLearningForm.continueOptionsCombined.value = 1;			
+				document.McLearningForm.submit();
+			}
+
 			function verifyCandidateSelected()
 			{
 				var candidateSelected = false;
Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp,v
diff -u -r1.24 -r1.25
--- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	1 Dec 2006 05:54:34 -0000	1.24
+++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	10 Dec 2006 23:17:25 -0000	1.25
@@ -41,6 +41,7 @@
 	</c:if>
 
 <html:hidden property="nextQuestionSelected" />
+<html:hidden property="continueOptionsCombined" />
 <html:hidden property="questionIndex"
 	value="${mcGeneralLearnerFlowDTO.questionIndex}" />
 
@@ -103,9 +104,8 @@
 
 
 	<c:if test="${mcGeneralLearnerFlowDTO.totalCountReached == 'true'}">
-		<html:submit property="continueOptionsCombined" onclick="javascript:verifyCandidateSelected()" styleClass="button">
-			<fmt:message key="button.continue" />
-		</html:submit>
+		<img src="<c:out value="${tool}"/>images/send.gif"
+			align=left onclick="javascript:if (verifyCandidateSelected()){ submitAllAnswers();}">
 	</c:if>
 
 	<p>&nbsp;</p>