Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	7 Jun 2006 17:33:23 -0000	1.2
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	24 Aug 2006 08:43:34 -0000	1.3
@@ -49,6 +49,13 @@
             column="responseFinalized"
    />
 
+   <property
+            name="learnerFinished"
+            type="boolean"
+            access="property"
+            column="learnerFinished"
+   />
+
     <property
         name="qaSessionId"
         type="java.lang.Long"
Index: lams_tool_laqa/db/model/lams_tool_qa.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/db/model/lams_tool_qa.clay,v
diff -u -r1.17 -r1.18
--- lams_tool_laqa/db/model/lams_tool_qa.clay	27 Jun 2006 13:34:47 -0000	1.17
+++ lams_tool_laqa/db/model/lams_tool_qa.clay	24 Aug 2006 08:43:34 -0000	1.18
@@ -283,7 +283,7 @@
 </table>
 <table alias="" name="tl_laqa11_que_usr" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="107" width="163" x="517" y="104"/>
+<table-figure-bounds height="116" width="187" x="517" y="104"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -351,6 +351,19 @@
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="true" name="learnerFinished" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
 </column-list>
 <primary-key alias="" name="PK_TL_LAQA11_QUE_USR" remarks="">
 <primary-key-description></primary-key-description>
@@ -436,7 +449,7 @@
 </table>
 <table alias="" name="tl_laqa11_usr_resp" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="125" width="181" x="987" y="97"/>
+<table-figure-bounds height="135" width="181" x="987" y="97"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="response_id" remarks="">
 <column-description></column-description>
@@ -464,11 +477,10 @@
 <variant type-name-pattern="TINYINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="answer" remarks="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="answer" remarks="">
 <column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
+<variant type-name-pattern="TEXT"/>
 </data-type>
 </column>
 <column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="time_zone" remarks="">
@@ -513,8 +525,8 @@
 <column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="1" mandatory="true" name="visible" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant type-name-pattern="TINYINT"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/create_lams_tool_qa.sql,v
diff -u -r1.36 -r1.37
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	17 Aug 2006 21:43:06 -0000	1.36
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	24 Aug 2006 08:43:34 -0000	1.37
@@ -41,6 +41,7 @@
      , responseFinalized TINYINT(1) NOT NULL DEFAULT 0
      , qa_session_id BIGINT(20) NOT NULL
      , fullname VARCHAR(100)
+     , learnerFinished TINYINT(1) NOT NULL
      , PRIMARY KEY (uid)
      , INDEX (qa_session_id)
      , CONSTRAINT FK_tl_laqa11_que_usr_1 FOREIGN KEY (qa_session_id)
@@ -61,7 +62,7 @@
 CREATE TABLE tl_laqa11_usr_resp (
        response_id BIGINT(20) NOT NULL AUTO_INCREMENT
      , hidden TINYINT(1) DEFAULT 0
-     , answer VARCHAR(255)
+     , answer TEXT
      , time_zone VARCHAR(255)
      , attempt_time DATETIME
      , que_usr_id BIGINT(20) NOT NULL
@@ -88,6 +89,7 @@
                   REFERENCES tl_laqa11_content (uid)
 )TYPE=InnoDB;
 
+
 -- data for content table
 INSERT INTO tl_laqa11_content (qa_content_id, title, instructions, creation_date)  VALUES (${default_content_id}, 'Q&A Title', 'Q&A Instructions', NOW());
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaQueUsr.hbm.xml,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	7 Jun 2006 17:33:23 -0000	1.8
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	24 Aug 2006 08:43:34 -0000	1.9
@@ -49,6 +49,13 @@
             column="responseFinalized"
    />
 
+   <property
+            name="learnerFinished"
+            type="boolean"
+            access="property"
+            column="learnerFinished"
+   />
+
     <property
         name="qaSessionId"
         type="java.lang.Long"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java	7 Jun 2006 17:33:23 -0000	1.8
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java	24 Aug 2006 08:43:34 -0000	1.9
@@ -68,6 +68,8 @@
     
     private boolean responseFinalized;
     
+    private boolean learnerFinished;
+    
     /** persistent field */
     private QaSession qaSession;
     
@@ -480,4 +482,16 @@
     public void setResponseFinalized(boolean responseFinalized) {
         this.responseFinalized = responseFinalized;
     }
+    /**
+     * @return Returns the learnerFinished.
+     */
+    public boolean isLearnerFinished() {
+        return learnerFinished;
+    }
+    /**
+     * @param learnerFinished The learnerFinished to set.
+     */
+    public void setLearnerFinished(boolean learnerFinished) {
+        this.learnerFinished = learnerFinished;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java,v
diff -u -r1.31 -r1.32
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	4 Aug 2006 14:13:20 -0000	1.31
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	24 Aug 2006 08:43:34 -0000	1.32
@@ -58,10 +58,15 @@
 	
 	public static void saveFormRequestData(HttpServletRequest request, QaLearningForm qaLearningForm)
 	{
+	    logger.debug("saving form request data...");
 	 	String toolSessionID=request.getParameter("toolSessionID");
 	 	logger.debug("toolSessionID: " + toolSessionID);
 	 	qaLearningForm.setToolSessionID(toolSessionID);
 
+	 	String userID=request.getParameter("userID");
+	 	logger.debug("userID: " + userID);
+	 	qaLearningForm.setUserID(userID);
+	 	
 	 	String httpSessionID=request.getParameter("httpSessionID");
 	 	logger.debug("httpSessionID: " + httpSessionID);
 	 	qaLearningForm.setHttpSessionID(httpSessionID);
@@ -70,7 +75,6 @@
 	 	logger.debug("totalQuestionCount: " + totalQuestionCount);
 	 	qaLearningForm.setTotalQuestionCount(totalQuestionCount);
 	 	
-
 	 	logger.debug("done saving form request data.");
 	}
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v
diff -u -r1.16 -r1.17
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	20 Aug 2006 20:55:06 -0000	1.16
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	24 Aug 2006 08:43:34 -0000	1.17
@@ -107,6 +107,7 @@
 import org.lamsfoundation.lams.tool.qa.QaComparator;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
+import org.lamsfoundation.lams.tool.qa.QaQueUsr;
 import org.lamsfoundation.lams.tool.qa.QaSession;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
 import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
@@ -151,8 +152,10 @@
                                          ServletException
 	{
     	logger.debug("dispatching submitAnswersContent..." + request);
-    	
     	QaLearningForm qaLearningForm = (QaLearningForm) form;
+    	
+    	LearningUtil.saveFormRequestData(request,  qaLearningForm);
+    	
     	IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
 		logger.debug("qaService: " + qaService);
 
@@ -172,7 +175,7 @@
     	GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
 	    logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO);
     	
-	    LearningUtil.saveFormRequestData(request,  qaLearningForm);
+	    
    	
  	    String totalQuestionCount=generalLearnerFlowDTO.getTotalQuestionCount().toString();
  	    logger.debug("totalQuestionCount: " + totalQuestionCount);
@@ -236,6 +239,9 @@
 	{
     	logger.debug("dispatching redoQuestions...");
     	QaLearningForm qaLearningForm = (QaLearningForm) form;
+    	
+    	LearningUtil.saveFormRequestData(request,  qaLearningForm);
+    	
     	IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
 		logger.debug("qaService: " + qaService);
 
@@ -255,9 +261,7 @@
     	GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
 	    logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO);
 	    
-	    LearningUtil.saveFormRequestData(request,  qaLearningForm);
-
-	    Map mapQuestions= new TreeMap(new QaComparator());
+	    	    Map mapQuestions= new TreeMap(new QaComparator());
 		Map mapAnswers= new TreeMap(new QaComparator());
 		
 	    generalLearnerFlowDTO.setCurrentQuestionIndex(new Integer(1));
@@ -392,6 +396,9 @@
 	{
     	logger.debug("dispatching viewAllResults...");
     	QaLearningForm qaLearningForm = (QaLearningForm) form;
+    	
+    	LearningUtil.saveFormRequestData(request,  qaLearningForm);
+    	
     	IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
 		logger.debug("qaService: " + qaService);
 
@@ -411,9 +418,7 @@
     	GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
 	    logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO);
     	
-	    LearningUtil.saveFormRequestData(request,  qaLearningForm);
-		
-		String isUserNamesVisibleBoolean=generalLearnerFlowDTO.getUserNameVisible();
+	    String isUserNamesVisibleBoolean=generalLearnerFlowDTO.getUserNameVisible();
     	boolean isUserNamesVisible=new Boolean(isUserNamesVisibleBoolean).booleanValue();
     	logger.debug("isUserNamesVisible: " + isUserNamesVisible);
 
@@ -476,6 +481,8 @@
     	logger.debug("dispatching getNextQuestion...");
     	QaLearningForm qaLearningForm = (QaLearningForm) form;
     	
+    	LearningUtil.saveFormRequestData(request,  qaLearningForm);
+    	
 		IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
 		logger.debug("qaService: " + qaService);
 
@@ -496,7 +503,6 @@
 	    logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO);
     	
     	
-    	LearningUtil.saveFormRequestData(request,  qaLearningForm);
     	populateAnswersMap(qaLearningForm, request, generalLearnerFlowDTO, true, false);
     	
         return (mapping.findForward(LOAD_LEARNER));
@@ -601,6 +607,8 @@
     	logger.debug("dispatching getPreviousQuestion...");
     	QaLearningForm qaLearningForm = (QaLearningForm) form;
     	
+    	LearningUtil.saveFormRequestData(request,  qaLearningForm);
+    	
 		IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
 		logger.debug("qaService: " + qaService);
 
@@ -620,7 +628,6 @@
     	GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
 	    logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO);
     	
-    	LearningUtil.saveFormRequestData(request,  qaLearningForm);
     	populateAnswersMap(qaLearningForm, request, generalLearnerFlowDTO, false, false);
     	
         return (mapping.findForward(LOAD_LEARNER));
@@ -643,26 +650,38 @@
 	{ 
         logger.debug("dispatching endLearning...");
     	QaLearningForm qaLearningForm = (QaLearningForm) form;        
-
     	
+    	LearningUtil.saveFormRequestData(request,  qaLearningForm);
+    	
     	IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
 		logger.debug("qaService: " + qaService);
 
 	 	String toolSessionID=request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 	 	logger.debug("toolSessionID: " + toolSessionID);
 	 	qaLearningForm.setToolSessionID(toolSessionID);
+
+	 	String userID=request.getParameter("userID");
+	 	logger.debug("userID: " + userID);	 	
+	 	qaLearningForm.setUserID(userID);
+
 	 	
 	 	QaSession qaSession=qaService.retrieveQaSessionOrNullById(new Long(toolSessionID).longValue());
 	    logger.debug("retrieving qaSession: " + qaSession);
-	 	
+	
+	    QaQueUsr qaQueUsr=qaService.getQaUserBySession(new Long(userID), qaSession.getUid());
+	    logger.debug("QaQueUsr:" + qaQueUsr);
+	    
+	    qaQueUsr.setLearnerFinished(true);
+	    logger.debug("learner is finished:" + qaQueUsr);
+	    qaService.updateQaQueUsr(qaQueUsr);	    
+
+	    
 	    String toolContentID=qaSession.getQaContent().getQaContentId().toString();
 	    logger.debug("toolContentID: " + toolContentID);
 	    
 	    QaContent qaContent=qaSession.getQaContent();
 	    logger.debug("using qaContent: " + qaContent);
     	
-	    LearningUtil.saveFormRequestData(request,  qaLearningForm);
-	    
 	    /*
 	     * The learner is done with the tool session. The tool needs to clean-up.
 	     */
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v
diff -u -r1.50 -r1.51
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	21 Aug 2006 16:01:59 -0000	1.50
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	24 Aug 2006 08:43:34 -0000	1.51
@@ -448,12 +448,12 @@
 		    		    	qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, 
 		    		    	        currentToolSessionID.toString(), null, generalLearnerFlowDTO, false);
 		    		    	logger.debug("final generalLearnerFlowDTO: " + generalLearnerFlowDTO);
-		    	    		
+	
 		    		    	
-		    	    	    boolean isSessionCompleted=isSessionCompleted(currentToolSessionID.toString(), qaService);
-		    	    	    logger.debug("isSessionCompleted: " + isSessionCompleted);
-		    	    	    
-		    	    	    if (isSessionCompleted)
+		    		    	boolean isLearnerFinished=qaQueUsr.isLearnerFinished();
+		    	    	    logger.debug("isLearnerFinished: " + isLearnerFinished);
+
+		    	    	    if (isLearnerFinished)
 		    	    	    {
 		    	    	        logger.debug("since the session is completed present a screen which can not be edited");
 			    		    	generalLearnerFlowDTO.setRequestLearningReportViewOnly(new Boolean(true).toString());
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_laqa/web/learning/AnswersContent.jsp	9 Aug 2006 10:38:35 -0000	1.15
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	24 Aug 2006 08:43:34 -0000	1.16
@@ -66,6 +66,7 @@
 	  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
   		<html:hidden property="method"/>	 
 		<html:hidden property="toolSessionID"/>						
+		<html:hidden property="userID"/>						
 		<html:hidden property="httpSessionID"/>		
 		<html:hidden property="questionIndex"/>		
 		<html:hidden property="totalQuestionCount"/>		
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	20 Aug 2006 20:55:05 -0000	1.9
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	24 Aug 2006 08:43:34 -0000	1.10
@@ -64,7 +64,8 @@
 <div id="content-learner">
 	  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
   		<html:hidden property="method"/>	 
-		<html:hidden property="toolSessionID"/>						
+		<html:hidden property="toolSessionID"/>		
+		<html:hidden property="userID"/>										
 		<html:hidden property="httpSessionID"/>								
 		<html:hidden property="totalQuestionCount"/>				
 
@@ -112,6 +113,7 @@
 						</table>
 					</td></tr>
 					
+
 	  	   		  <tr>
 	  	   		  		<td>
                                <html:submit property="redoQuestions" 
@@ -129,6 +131,7 @@
                             </html:submit>
 					  	 </td>
 				  </tr>
+
 				  
 				</table>
 	</html:form>
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_laqa/web/learning/LearnerRep.jsp	23 Aug 2006 12:40:05 -0000	1.9
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	24 Aug 2006 08:43:34 -0000	1.10
@@ -86,7 +86,8 @@
 		
 			  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
 		  		<html:hidden property="method"/>	 
-				<html:hidden property="toolSessionID"/>						
+				<html:hidden property="toolSessionID"/>		
+				<html:hidden property="userID"/>										
 				<html:hidden property="httpSessionID"/>		
 				<html:hidden property="totalQuestionCount"/>		
 
@@ -95,13 +96,9 @@
 			  	 		<tr>
 			  	 			<td> &nbsp</td>
 			  	 		</tr>
+	
 						<tr>			
 							<td valign=top align=left><b>  <bean:message key="label.question"/> : </b> 
-							 </td>
-						</tr>	
-
-						<tr>			
-							<td valign=top align=left>
 								<c:out value="${currentDto.question}" escapeXml="false"/>
 							 </td>
 						</tr>	
@@ -137,6 +134,7 @@
 
 		
 
+				<c:if test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }"> 								
 			       	<table> 	  
 							<tr> 
 	  	   		  		<td>
@@ -158,7 +156,7 @@
 								</td> 
 							</tr>
 					</table>
-
+			  	</c:if> 				    				  
 		
 		
 			</html:form>
@@ -175,6 +173,7 @@
 			  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
 		  		<html:hidden property="method"/>	 
 				<html:hidden property="toolSessionID"/>						
+				<html:hidden property="userID"/>														
 				<html:hidden property="httpSessionID"/>		
 				<html:hidden property="totalQuestionCount"/>		
 						
@@ -189,12 +188,6 @@
 							 </td>
 						</tr>	
 
-						<tr>			
-							<td valign=top align=left>
-								<c:out value="${currentDto.question}" escapeXml="false"/>
-							 </td>
-						</tr>	
-
 						
 						<tr> 
 							<td valign=top>
@@ -224,7 +217,7 @@
 					</c:forEach>		  	
 
 
-
+				<c:if test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }"> 								
 			       	<table> 	  
 						<tr> 
 	  	   		  		<td>
@@ -245,8 +238,8 @@
 								</td> 
 							</tr>
 					</table>
+				</c:if> 				    
 
-
 			</html:form>
 		</c:if>