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.1 -r1.2
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	19 Feb 2006 19:13:42 -0000	1.1
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	7 Jun 2006 17:33:23 -0000	1.2
@@ -41,6 +41,13 @@
         length="100"
     >
     </property>
+    
+   <property
+            name="responseFinalized"
+            type="boolean"
+            access="property"
+            column="responseFinalized"
+   />
 
     <property
         name="qaSessionId"
Index: lams_tool_laqa/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.5 -r1.6
--- lams_tool_laqa/conf/language/ApplicationResources.properties	6 Jun 2006 16:07:27 -0000	1.5
+++ lams_tool_laqa/conf/language/ApplicationResources.properties	7 Jun 2006 17:33:23 -0000	1.6
@@ -168,7 +168,9 @@
 error.system.qa  =<font color\="red">A system exception has occured. Please contact technical support. The error to report is\: <br/> <b>{0}</b></font>
 
 label.learning.reportMessage  =The following are your answers:
-label.allResponses  =All Responses
+label.allResponses  =View All Responses
+label.learning.forceFinish =You are required to finish this activity now.
+label.learning.yourAnswer =Your Answer:
 
 #======= End labels: Exported 160 labels for en AU =====
 
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.15 -r1.16
--- lams_tool_laqa/db/model/lams_tool_qa.clay	2 Apr 2006 20:30:22 -0000	1.15
+++ lams_tool_laqa/db/model/lams_tool_qa.clay	7 Jun 2006 17:33:23 -0000	1.16
@@ -151,8 +151,8 @@
 <column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="0" mandatory="true" name="questions_sequenced" 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"/>
@@ -174,7 +174,7 @@
 <variant type-name-pattern="TINYINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="100" decimal-digits="0" default-value="Combined Learner Results" mandatory="false" name="monitoring_report_title" remarks="">
+<column alias="" auto-increment="false" column-size="100" decimal-digits="0" default-value="Learner Results" mandatory="false" name="monitoring_report_title" 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)"/>
@@ -283,7 +283,7 @@
 </table>
 <table alias="" name="tl_laqa11_que_usr" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="96" width="163" x="517" y="104"/>
+<table-figure-bounds height="107" width="163" 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>
@@ -318,6 +318,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="0" mandatory="true" name="responseFinalized" 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 alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="qa_session_id" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
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.33 -r1.34
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	4 Apr 2006 01:45:44 -0000	1.33
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	7 Jun 2006 17:33:23 -0000	1.34
@@ -1,5 +1,3 @@
--- $Id$
-
 CREATE TABLE tl_laqa11_content (
        uid BIGINT(20) NOT NULL AUTO_INCREMENT
      , qa_content_id BIGINT(20) NOT NULL
@@ -9,7 +7,7 @@
      , update_date DATETIME
      , questions_sequenced TINYINT(1) NOT NULL DEFAULT 0
      , username_visible TINYINT(1) NOT NULL DEFAULT 0
-     , monitoring_report_title VARCHAR(100) DEFAULT 'Combined Learner Results'
+     , monitoring_report_title VARCHAR(100) DEFAULT 'Learner Results'
      , report_title VARCHAR(100) DEFAULT 'Report'
      , created_by BIGINT(20) NOT NULL DEFAULT 0
      , run_offline TINYINT(1) DEFAULT 0
@@ -40,6 +38,7 @@
        uid BIGINT(20) NOT NULL AUTO_INCREMENT
      , que_usr_id BIGINT(20) NOT NULL
      , username VARCHAR(100)
+     , responseFinalized TINYINT(1) NOT NULL DEFAULT 0
      , qa_session_id BIGINT(20) NOT NULL
      , fullname VARCHAR(100)
      , PRIMARY KEY (uid)
@@ -93,5 +92,5 @@
 INSERT INTO tl_laqa11_content (qa_content_id, 	creation_date)  VALUES (${default_content_id}, NOW());
 
 -- data for content questions table
-INSERT INTO tl_laqa11_que_content (question, display_order, qa_content_id) VALUES ('What is the largest continent in the world?',1,1);
+INSERT INTO tl_laqa11_que_content (question, display_order, qa_content_id) VALUES ('Sample Question 1?',1,1);
 
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.7 -r1.8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	23 Feb 2006 19:33:19 -0000	1.7
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.hbm.xml	7 Jun 2006 17:33:23 -0000	1.8
@@ -41,6 +41,13 @@
         length="100"
     >
     </property>
+    
+   <property
+            name="responseFinalized"
+            type="boolean"
+            access="property"
+            column="responseFinalized"
+   />
 
     <property
         name="qaSessionId"
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.7 -r1.8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java	7 Apr 2006 00:44:22 -0000	1.7
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java	7 Jun 2006 17:33:23 -0000	1.8
@@ -66,6 +66,8 @@
     /** nullable persistent field */
     private String fullname;
     
+    private boolean responseFinalized;
+    
     /** persistent field */
     private QaSession qaSession;
     
@@ -466,4 +468,16 @@
 	public void setUid(Long uid) {
 		this.uid = uid;
 	}
+    /**
+     * @return Returns the responseFinalized.
+     */
+    public boolean isResponseFinalized() {
+        return responseFinalized;
+    }
+    /**
+     * @param responseFinalized The responseFinalized to set.
+     */
+    public void setResponseFinalized(boolean responseFinalized) {
+        this.responseFinalized = responseFinalized;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java,v
diff -u -r1.11 -r1.12
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java	7 Apr 2006 00:44:23 -0000	1.11
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java	7 Jun 2006 17:33:23 -0000	1.12
@@ -45,6 +45,8 @@
     
     public void createUsr(QaQueUsr usr);
     
+    public void updateUsr(QaQueUsr usr);
+    
     public void deleteQaQueUsr(QaQueUsr qaQueUsr);
     
     public int countSessionUser(QaSession qaSession);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java,v
diff -u -r1.14 -r1.15
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java	7 Apr 2006 00:44:23 -0000	1.14
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java	7 Jun 2006 17:33:23 -0000	1.15
@@ -121,6 +121,13 @@
 	    	this.getHibernateTemplate().save(usr);
 	    }
 	 	
+	 	public void updateUsr(QaQueUsr usr) 
+	    {
+	 		this.getSession().setFlushMode(FlushMode.AUTO);
+	    	this.getHibernateTemplate().update(usr);
+	    }
+
+	 	
 	 	public void deleteQaQueUsr(QaQueUsr qaQueUsr) 
 	    {
 	 		this.getSession().setFlushMode(FlushMode.AUTO);
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	6 Jun 2006 16:07:27 -0000	1.1
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	7 Jun 2006 17:33:23 -0000	1.2
@@ -63,14 +63,37 @@
 							<hr>
 						</td> 
 					</tr>
+
+			
+					<tr> <td align=left>		
+						<table align="left">
+							<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
+									  <tr>
+									  	<td colspan=2 NOWRAP valign=top> <font size=2> <b> <bean:message key="label.question"/> <c:out value="${questionEntry.key}" escapeXml="false"/>:  </b>  </font> 
+									  		<c:out value="${questionEntry.value}" escapeXml="false"/> 
+									  	 </td>
+									  </tr>
+									  
+				  			  		<c:forEach var="answerEntry" items="${sessionScope.mapAnswers}">
+										<c:if test="${answerEntry.key == questionEntry.key}"> 						  			  		
+										  <tr>
+  										  	<td colspan=2 NOWRAP align=left  valign=top> <font size=2> <b> <bean:message key="label.learning.yourAnswer"/>  </b>  </font> 
+												  <c:out value="${answerEntry.value}" escapeXml="false" />						  																	
+										  	</td>
+										  </tr>
+									  	</c:if> 				    
+									</c:forEach>
+									
+									  <tr>
+									  	<td colspan=2 NOWRAP valign=top> 
+											&nbsp&nbsp
+									  	 </td>
+									  </tr>
+									
+							</c:forEach>
+						</table>
+					</td></tr>
 					
-			  		<c:forEach var="entry" items="${sessionScope.mapAnswers}">
-						  <tr>
-						  	<td NOWRAP align=center valign=top colspan=2> 
-								  <c:out value="${entry.value}" escapeXml="false" />						  																	
-						  	</td>
-						  </tr>
-					</c:forEach>
 			  	   	<tr> 
 				 		<td NOWRAP colspan=2 class="input" valign=top> 
 				 		&nbsp
Index: lams_tool_laqa/web/monitoring/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/LearnerRep.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/web/monitoring/LearnerRep.jsp	24 May 2006 15:43:24 -0000	1.8
+++ lams_tool_laqa/web/monitoring/LearnerRep.jsp	7 Jun 2006 17:33:23 -0000	1.9
@@ -102,21 +102,30 @@
 
 			<jsp:include page="/monitoring/SummaryContent.jsp" />
 
-			<c:if test="${ requestLearningReportViewOnly != 'true'}"> 			
-				<table align=right> 	  
-				<tr> <td> 
-					<c:out value="${sessionScope.endLearningMessage}" escapeXml="false"/>
-				</td> </tr>
-			
-				<tr>
-					 <td> 
-						<html:submit onclick="javascript:submitMethod('endLearning');" styleClass="button">
-							<bean:message key="button.endLearning"/>
-						</html:submit>	 				 		  					
-					</td> 
-				</tr>
-				</table>
-			</c:if> 			
+				<c:if test="${ requestLearningReportViewOnly == 'true'}"> 			
+					<table align=right> 	  
+							<tr> <td align=right> 
+								<font size=2> <bean:message key="label.learning.forceFinish"/> </font> &nbsp&nbsp
+
+								<html:submit onclick="javascript:submitMethod('endLearning');" styleClass="button">
+									<bean:message key="button.endLearning"/>
+								</html:submit>	 				 		  					
+								</td> 
+							</tr>
+					</table>
+				</c:if> 			
+
+				<c:if test="${ requestLearningReportViewOnly != 'true'}"> 			
+					<table align=right> 	  
+							<tr> <td align=right> 
+								<html:submit onclick="javascript:submitMethod('endLearning');" styleClass="button">
+									<bean:message key="button.endLearning"/>
+								</html:submit>	 				 		  					
+								</td> 
+							</tr>
+					</table>
+				</c:if> 			
+
 	</html:form>
 </c:if>