Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
===================================================================
diff -u -rd14a9bdf360ad0cdc1ab569ada51505314aaa09d -rc57ff53dca1350c876aed0ab150fbe0411b2d44f
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	(.../GeneralLearnerFlowDTO.java)	(revision d14a9bdf360ad0cdc1ab569ada51505314aaa09d)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	(.../GeneralLearnerFlowDTO.java)	(revision c57ff53dca1350c876aed0ab150fbe0411b2d44f)
@@ -103,7 +103,9 @@
     
     protected String initialScreen;
     
+    protected String lockWhenFinished;
     
+    
     /**
      * @return Returns the currentMonitoredToolSession.
      */
@@ -237,6 +239,7 @@
             .append("totalQuestionCount : ", totalQuestionCount)
             .append("activityInstructions: ", activityInstructions)
             .append("teacherViewOnly: ", teacherViewOnly)
+            .append("lockWhenFinished: ", lockWhenFinished)
             .append("activityTitle: ", activityTitle)
             .append("countSessionComplete: ", countSessionComplete)
             .append("toolSessionID: ", toolSessionID)
@@ -553,4 +556,17 @@
     public void setInitialScreen(String initialScreen) {
         this.initialScreen = initialScreen;
     }
+
+    /**
+     * @return Returns the lockWhenFinished.
+     */
+    public String getLockWhenFinished() {
+        return lockWhenFinished;
+    }
+    /**
+     * @param lockWhenFinished The lockWhenFinished to set.
+     */
+    public void setLockWhenFinished(String lockWhenFinished) {
+        this.lockWhenFinished = lockWhenFinished;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -reb1b09f9be47e1b73c657af090683e414fd47655 -rc57ff53dca1350c876aed0ab150fbe0411b2d44f
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision eb1b09f9be47e1b73c657af090683e414fd47655)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision c57ff53dca1350c876aed0ab150fbe0411b2d44f)
@@ -243,7 +243,8 @@
     public static final String REQUEST_LEARNING_REPORT					="requestLearningReport";
     public static final String REQUEST_LEARNING_REPORT_PROGRESS			="requestLearningReportProgress";
     public static final String REQUEST_PREVIEW							="requestPreview";
-    public static final String REQUEST_LEARNING_REPORT_VIEWONLY			="requestLearningReportViewOnly";    
+    public static final String REQUEST_LEARNING_REPORT_VIEWONLY			="requestLearningReportViewOnly";
+    public static final String REVISITED_LEARNER_REP					="revisitedLearnerRep";
     
             
     /*
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java
===================================================================
diff -u -r0db83894504dc7652d3670a6ce496605b961faa1 -rc57ff53dca1350c876aed0ab150fbe0411b2d44f
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	(.../QaContent.java)	(revision 0db83894504dc7652d3670a6ce496605b961faa1)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	(.../QaContent.java)	(revision c57ff53dca1350c876aed0ab150fbe0411b2d44f)
@@ -99,6 +99,8 @@
     
     private boolean questionsSequenced;
     
+    private boolean lockWhenFinished;
+    
     /** nullable persistent field */
     private boolean usernameVisible;
     
@@ -141,6 +143,7 @@
 					 boolean 	questionsSequenced,
 	                 boolean 	usernameVisible,
 	                 boolean 	synchInMonitor,
+	                 boolean 	lockWhenFinished,
 	                 boolean 	contentLocked,
 	                 boolean 	reflect,
 	                 String 	reflectionSubject,
@@ -164,6 +167,7 @@
         this.questionsSequenced	 = questionsSequenced;
         this.usernameVisible 	 = usernameVisible;
         this.synchInMonitor 	 = synchInMonitor;
+        this.lockWhenFinished 	 = lockWhenFinished;
         this.contentLocked		 = contentLocked;
         this.reflect		 	 = reflect;
         this.reflectionSubject	 =reflectionSubject;
@@ -201,6 +205,7 @@
 					 qa.isQuestionsSequenced(),
                      qa.isUsernameVisible(),
                      qa.isSynchInMonitor(),
+                     qa.isLockWhenFinished(),
 					 qa.isContentLocked(),
 					 qa.isReflect(),
 					 qa.getReflectionSubject(),
@@ -590,4 +595,16 @@
     public void setReflectionSubject(String reflectionSubject) {
         this.reflectionSubject = reflectionSubject;
     }
+    /**
+     * @return Returns the lockWhenFinished.
+     */
+    public boolean isLockWhenFinished() {
+        return lockWhenFinished;
+    }
+    /**
+     * @param lockWhenFinished The lockWhenFinished to set.
+     */
+    public void setLockWhenFinished(boolean lockWhenFinished) {
+        this.lockWhenFinished = lockWhenFinished;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java
===================================================================
diff -u -r0db83894504dc7652d3670a6ce496605b961faa1 -rc57ff53dca1350c876aed0ab150fbe0411b2d44f
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java	(.../QaGeneralAuthoringDTO.java)	(revision 0db83894504dc7652d3670a6ce496605b961faa1)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java	(.../QaGeneralAuthoringDTO.java)	(revision c57ff53dca1350c876aed0ab150fbe0411b2d44f)
@@ -57,6 +57,7 @@
     protected String reflect;
     protected String synchInMonitor;
     protected String questionsSequenced;
+    protected String lockWhenFinished;
     protected String editActivityEditMode;
     protected String reflectionSubject;
     
@@ -100,6 +101,7 @@
             .append("usernameVisible: ", usernameVisible)
             .append("synchInMonitor: ", synchInMonitor)
             .append("questionsSequenced: ", questionsSequenced)
+            .append("lockWhenFinished: ", lockWhenFinished)
             .append("editActivityEditMode: ", editActivityEditMode)
             .append("reflectionSubject: ", reflectionSubject)
             .append("requestedModule: ", requestedModule)
@@ -513,4 +515,16 @@
     public void setReflectionSubject(String reflectionSubject) {
         this.reflectionSubject = reflectionSubject;
     }
+    /**
+     * @return Returns the lockWhenFinished.
+     */
+    public String getLockWhenFinished() {
+        return lockWhenFinished;
+    }
+    /**
+     * @param lockWhenFinished The lockWhenFinished to set.
+     */
+    public void setLockWhenFinished(String lockWhenFinished) {
+        this.lockWhenFinished = lockWhenFinished;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
diff -u -reb1b09f9be47e1b73c657af090683e414fd47655 -rc57ff53dca1350c876aed0ab150fbe0411b2d44f
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	(.../QaUtils.java)	(revision eb1b09f9be47e1b73c657af090683e414fd47655)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	(.../QaUtils.java)	(revision c57ff53dca1350c876aed0ab150fbe0411b2d44f)
@@ -70,14 +70,6 @@
 		
 	    qaGeneralAuthoringDTO.setOnlineInstructions(defaultQaContent.getOnlineInstructions());
 	    qaGeneralAuthoringDTO.setOfflineInstructions(defaultQaContent.getOfflineInstructions());
-		
-         /* set the status of radio boxes */
-	    /*
-	    qaGeneralAuthoringDTO.setUsernameVisible(defaultQaContent.isUsernameVisible()?ON:OFF);
-	    qaGeneralAuthoringDTO.setSynchInMonitor(defaultQaContent.isSynchInMonitor()?ON:OFF);
-	    qaGeneralAuthoringDTO.setQuestionsSequenced(defaultQaContent.isQuestionsSequenced()?ON:OFF);
-	    qaGeneralAuthoringDTO.setReflect(defaultQaContent.isReflect()?ON:OFF);
-	    */
 	}
     
     
@@ -128,6 +120,13 @@
 		qaAuthoringForm.setQuestionsSequenced(questionsSequenced);
 		qaGeneralAuthoringDTO.setQuestionsSequenced(questionsSequenced);
 		
+
+		String lockWhenFinished=request.getParameter("lockWhenFinished");
+		logger.debug("lockWhenFinished: " + lockWhenFinished);
+		qaAuthoringForm.setLockWhenFinished(lockWhenFinished);
+		qaGeneralAuthoringDTO.setLockWhenFinished(lockWhenFinished);
+		
+		
 		String offlineInstructions=request.getParameter(OFFLINE_INSTRUCTIONS);
 		logger.debug("offlineInstructions: " + offlineInstructions);
 		qaAuthoringForm.setOfflineInstructions(offlineInstructions);
Index: lams_tool_laqa/web/authoring/itemlist.jsp
===================================================================
diff -u -racc5f651c03bd0895c8b189c932ea35dea91dc7d -rc57ff53dca1350c876aed0ab150fbe0411b2d44f
--- lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision acc5f651c03bd0895c8b189c932ea35dea91dc7d)
+++ lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision c57ff53dca1350c876aed0ab150fbe0411b2d44f)
@@ -32,7 +32,7 @@
 		value="<%=request
 									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
-	<table id="itemTable" class="alternative-color" cellspacing="0">
+	<table id="itemTable" class="alternative-color">
 		<c:set var="queIndex" scope="request" value="0" />
 
 		<c:forEach items="${listQuestionContentDTO}" var="currentDTO"
@@ -89,7 +89,7 @@
 
 					<img src="<c:out value="${tool}"/>images/edit.gif" border="0"
 						title="<fmt:message key='label.tip.editQuestion'/>"
-						onclick="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}"/>');">
+						onclick="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&lockWhenFinished=${qaGeneralAuthoringDTO.lockWhenFinished}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}"/>');">
 				</td>
 
 				<td width="10%" align="right">