Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/Attic/McContent.hbm.xml,v
diff -u -r1.11 -r1.12
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	12 Nov 2005 11:32:07 -0000	1.11
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml	15 Nov 2005 12:52:26 -0000	1.12
@@ -188,6 +188,7 @@
     
    	 <set
             name="mcQueContents"
+            order-by="display_order"
             lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java,v
diff -u -r1.19 -r1.20
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java	11 Nov 2005 17:53:19 -0000	1.19
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java	15 Nov 2005 12:52:26 -0000	1.20
@@ -46,7 +46,7 @@
 	 	
 	 	private static final String CLEAN_QUESTION_CONTENT_BY_CONTENT_ID = "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId and mcQueContent.disabled=true";
 	 	
-	 	private static final String REFRESH_QUESTION_CONTENT 			= "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId and mcQueContent.disabled=false";
+	 	private static final String REFRESH_QUESTION_CONTENT 			= "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId and mcQueContent.disabled=false order by mcQueContent.displayOrder";
 	 	
 	 	private static final String LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT = "from mcQueContent in class McQueContent where mcQueContent.question=:question and mcQueContent.mcContentId=:mcContentUid";
 	 		 	
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java,v
diff -u -r1.5 -r1.6
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	13 Nov 2005 13:20:24 -0000	1.5
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	15 Nov 2005 12:52:26 -0000	1.6
@@ -291,7 +291,7 @@
 	    }
 
 	
-    public Map rebuildQuestionMapfromDB(HttpServletRequest request, Long toolContentId)
+    public static Map rebuildQuestionMapfromDB(HttpServletRequest request, Long toolContentId)
     {
     	Map mapQuestionsContent= new TreeMap(new McComparator());
     	
@@ -317,6 +317,42 @@
     	logger.debug("refreshed Map:" + mapQuestionsContent);
     	return mapQuestionsContent;
     }
+    
+    /**
+     * returns all the options for all the questions for a content
+     * generateGeneralOptionsContentMap(HttpServletRequest request, McContent mcContent)
+     * 
+     * @param request
+     * @param mcContent
+     * @return Map
+     */
+    public static Map generateGeneralOptionsContentMap(HttpServletRequest request, McContent mcContent)
+    {
+    	Map mapGeneralOptionsContent= new TreeMap(new McComparator());
+    	IMcService mcService =McUtils.getToolService(request);
+    	
+    	Iterator mcQueIterator=mcContent.getMcQueContents().iterator();
+		Long mapIndex=new Long(1);
+    	while (mcQueIterator.hasNext())
+    	{
+    		McQueContent mcQueContent=(McQueContent)mcQueIterator.next();
+    		if (mcQueContent != null)
+    		{
+    			Long uid=mcQueContent.getUid();
+    			logger.debug("uid : " + uid);
+    			/* get the options for this question */
+    			List listMcOptions=mcService.findMcOptionsContentByQueId(uid);
+    			logger.debug("listMcOptions : " + listMcOptions);
+    			Map mapOptionsContent=McUtils.generateOptionsMap(listMcOptions);
+    			logger.debug("mapOptionsContent : " + mapOptionsContent);
+    			mapGeneralOptionsContent.put(mapIndex.toString(), mapOptionsContent);
+        		mapIndex=new Long(mapIndex.longValue()+1);
+    		}
+    	}
+		logger.debug("current mapGeneralOptionsContent: " + mapGeneralOptionsContent);
+		return mapGeneralOptionsContent;
+    }
+    
 
     public Map rebuildWeightsMapfromDB(HttpServletRequest request, Long toolContentId)
     {
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v
diff -u -r1.51 -r1.52
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	14 Nov 2005 18:44:10 -0000	1.51
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	15 Nov 2005 12:52:26 -0000	1.52
@@ -2098,6 +2098,45 @@
     	McLearningForm mcLearningForm = (McLearningForm) form;
 	 	IMcService mcService =McUtils.getToolService(request);
 	 	
+	 	String optionCheckBoxSelected=request.getParameter("optionCheckBoxSelected");
+    	logger.debug("parameter optionCheckBoxSelected: " + optionCheckBoxSelected);
+    	
+    	mcLearningForm.setOptionCheckBoxSelected(null);
+    	mcLearningForm.setQuestionIndex(null);
+		mcLearningForm.setOptionIndex(null);
+		mcLearningForm.setChecked(null);
+    	
+    	if ((optionCheckBoxSelected != null) && optionCheckBoxSelected.equals("1"))
+    	{
+    		logger.debug("parameter optionCheckBoxSelected is selected " + optionCheckBoxSelected);
+    		mcLearningForm.setOptionCheckBoxSelected("1");
+    	}
+    	
+    	String questionIndex=request.getParameter("questionIndex");
+    	logger.debug("parameter questionIndex: " + questionIndex);
+    	if ((questionIndex != null))
+    	{
+    		logger.debug("parameter questionIndex is selected " + questionIndex);
+    		mcLearningForm.setQuestionIndex(questionIndex);
+    	}
+    	
+    	String optionIndex=request.getParameter("optionIndex");
+    	logger.debug("parameter optionIndex: " + optionIndex);
+    	if (optionIndex != null)
+    	{
+    		logger.debug("parameter optionIndex is selected " + optionIndex);
+    		mcLearningForm.setOptionIndex(optionIndex);
+    	}
+    	
+    	String checked=request.getParameter("checked");
+    	logger.debug("parameter checked: " + checked);
+    	if (checked != null)
+    	{
+    		logger.debug("parameter checked is selected " + checked);
+    		mcLearningForm.setChecked(checked);
+    	}
+
+    	
     	if (mcLearningForm.getContinueOptions() != null)
 	 	{
     		logger.debug("continue options requested.");
@@ -2156,6 +2195,15 @@
         		return (mapping.findForward(LOAD_LEARNER));
         	}
 	 	}
+    	else if (mcLearningForm.getOptionCheckBoxSelected() != null)
+    	{
+    		logger.debug("requested optionCheckBoxSelected...");
+    		logger.debug("questionIndex: " + mcLearningForm.getQuestionIndex());
+    		logger.debug("optionIndex: " + mcLearningForm.getOptionIndex());
+    		logger.debug("checked: " + mcLearningForm.getChecked());
+    	}
+    	
+    	
  		return (mapping.findForward(LOAD_LEARNER));
   }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java	14 Nov 2005 17:54:48 -0000	1.2
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java	15 Nov 2005 12:52:26 -0000	1.3
@@ -11,7 +11,12 @@
  */
 public class McLearningForm extends ActionForm implements McAppConstants {
 	protected String continueOptions;
+	protected String optionCheckBoxSelected;
+	protected String questionIndex;
+	protected String optionIndex;
+	protected String checked;
 	
+	
 
 	/**
 	 * @return Returns the continueOptions.
@@ -25,4 +30,52 @@
 	public void setContinueOptions(String continueOptions) {
 		this.continueOptions = continueOptions;
 	}
+	/**
+	 * @return Returns the checked.
+	 */
+	public String getChecked() {
+		return checked;
+	}
+	/**
+	 * @param checked The checked to set.
+	 */
+	public void setChecked(String checked) {
+		this.checked = checked;
+	}
+	/**
+	 * @return Returns the optionCheckBoxSelected.
+	 */
+	public String getOptionCheckBoxSelected() {
+		return optionCheckBoxSelected;
+	}
+	/**
+	 * @param optionCheckBoxSelected The optionCheckBoxSelected to set.
+	 */
+	public void setOptionCheckBoxSelected(String optionCheckBoxSelected) {
+		this.optionCheckBoxSelected = optionCheckBoxSelected;
+	}
+	/**
+	 * @return Returns the optionIndex.
+	 */
+	public String getOptionIndex() {
+		return optionIndex;
+	}
+	/**
+	 * @param optionIndex The optionIndex to set.
+	 */
+	public void setOptionIndex(String optionIndex) {
+		this.optionIndex = optionIndex;
+	}
+	/**
+	 * @return Returns the questionIndex.
+	 */
+	public String getQuestionIndex() {
+		return questionIndex;
+	}
+	/**
+	 * @param questionIndex The questionIndex to set.
+	 */
+	public void setQuestionIndex(String questionIndex) {
+		this.questionIndex = questionIndex;
+	}
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	14 Nov 2005 18:44:10 -0000	1.4
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	15 Nov 2005 12:52:26 -0000	1.5
@@ -25,7 +25,6 @@
 import org.lamsfoundation.lams.tool.mc.McApplicationException;
 import org.lamsfoundation.lams.tool.mc.McComparator;
 import org.lamsfoundation.lams.tool.mc.McContent;
-import org.lamsfoundation.lams.tool.mc.McOptsContent;
 import org.lamsfoundation.lams.tool.mc.McQueContent;
 import org.lamsfoundation.lams.tool.mc.McQueUsr;
 import org.lamsfoundation.lams.tool.mc.McSession;
@@ -235,9 +234,6 @@
 	    if (mcQueUsr != null)
 	    {
 	    	logger.debug("the learner has already responsed to this content, just generate a read-only report.");
-	    	//LearningUtil learningUtil= new LearningUtil();
-	    	//learningUtil.buidLearnerReport(request,1);    	
-	    	//logger.debug("buidLearnerReport called successfully, forwarding to: " + LEARNER_REPORT);
 	    	return (mapping.findForward(LEARNER_REPORT));
 	    }
 	    
@@ -246,18 +242,12 @@
 		logger.debug("CURRENT_QUESTION_INDEX: " + request.getSession().getAttribute(CURRENT_QUESTION_INDEX));
 		logger.debug("final Options Map for the first question: " + request.getSession().getAttribute(MAP_OPTIONS_CONTENT));
 		
-		
-		/*also prepare for combined answers view */
-		Map mapGeneralOptionsContent= new TreeMap(new McComparator());
-		logger.debug("current mapGeneralOptionsContent: " + mapGeneralOptionsContent);
+		/*also prepare data into mapGeneralOptionsContent for combined answers view */
+		Map mapGeneralOptionsContent=AuthoringUtil.generateGeneralOptionsContentMap(request, mcContent);
+		logger.debug("returned mapGeneralOptionsContent: " + mapGeneralOptionsContent);
 		request.getSession().setAttribute(MAP_GENERAL_OPTIONS_CONTENT, mapGeneralOptionsContent);
-    		
 		
-		
-		
-		
 		return (mapping.findForward(LOAD_LEARNER));	
-		
 	}
 	
 	
Index: lams_tool_lamc/web/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/CombinedAnswersContent.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/web/CombinedAnswersContent.jsp	14 Nov 2005 18:44:10 -0000	1.4
+++ lams_tool_lamc/web/CombinedAnswersContent.jsp	15 Nov 2005 12:52:25 -0000	1.5
@@ -38,31 +38,64 @@
 					  </tr>
 					</c:if> 								  
 				
+  		  	 		<c:set var="mainQueIndex" scope="session" value="0"/>
 					<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
+					<c:set var="mainQueIndex" scope="session" value="${mainQueIndex +1}"/>
 						  <tr>
-						  	<td align=left class="input" valign=top bgColor="#009999" colspan=2> 
+						  	<td align=left class="input" valign=top bgColor="#669999" colspan=2> 
 							  	<font color="#FFFFFF"> 
 							  		<c:out value="${questionEntry.value}"/> 
 							  	</font> 
 						  	</td>
 						  </tr>
-					</c:forEach>
-					
 
-		  	 		<c:set var="queIndex" scope="session" value="0"/>
-					<c:forEach var="optionEntry" items="${sessionScope.mapOptionsContent}">
-						<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
-						<tr> 
-							<td align=left class="input" valign=top> 
-								<input type="checkbox" name=optionCheckBox<c:out value="${queIndex}"/>> 
-							</td> 
-							<td align=left class="input" valign=top> 
-								<c:out value="${optionEntry.value}"/>
+								  								  
+						  <tr>						 
+							<td align=left>
+							<table align=left>
+			  		  	 		<c:set var="queIndex" scope="session" value="0"/>
+								<c:forEach var="mainEntry" items="${sessionScope.mapGeneralOptionsContent}">
+									<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
+										<c:if test="${sessionScope.mainQueIndex == sessionScope.queIndex}"> 		
+									  		<c:forEach var="subEntry" items="${mainEntry.value}">
+									  		
+										
+												<tr> 
+													<td align=left class="input" valign=top> 
+														<input type="checkbox" 
+														name=optionCheckBox<c:out value="${sessionScope.queIndex}"/>-<c:out value="${subEntry.key}"/>
+														onclick="javascript:document.forms[0].optionCheckBoxSelected.value=1; 
+														document.forms[0].questionIndex.value=<c:out value="${sessionScope.queIndex}"/>; 
+														document.forms[0].optionIndex.value=<c:out value="${subEntry.key}"/>;
+														if (this.checked == 1)
+														{
+															document.forms[0].checked.value=true;
+														}
+														else
+														{
+															document.forms[0].checked.value=false;
+														}
+														document.forms[0].submit();"> 
+													</td> 
+													<td align=left class="input" valign=top> 
+														<c:out value="${subEntry.value}"/>
+													</td>
+												</tr>										
+
+										
+											</c:forEach>
+										</c:if> 			
+								</c:forEach>
+							</table>
 							</td>
 						</tr>
 					</c:forEach>
 
 			  	   	<tr> 
+				  	   	<html:hidden property="optionCheckBoxSelected"/>
+						<html:hidden property="questionIndex"/>
+						<html:hidden property="optionIndex"/>
+						<html:hidden property="checked"/>
 				 		<td colspan=2 class="input" valign=top> 
 				 		&nbsp
 				 		</td>