Index: lams_tool_survey/conf/language/ApplicationResources.properties
===================================================================
diff -u -r697d4471b76679e3f961360a1fa26b545d06cd9f -raf90466abe57cb9be572bfc519ac6902cb8166fa
--- lams_tool_survey/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 697d4471b76679e3f961360a1fa26b545d06cd9f)
+++ lams_tool_survey/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision af90466abe57cb9be572bfc519ac6902cb8166fa)
@@ -65,7 +65,10 @@
 
 
 # learning
-label.submit.survey=Submit survey
+label.submit.survey=Done
+label.retake.survey=Retake survey
+label.retake = [Retake]
+label.append.text=Append text:
 label.next=Next
 label.previous=Previous
 
Index: lams_tool_survey/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -ra2c091a27056e7b41531ca140012603bf027d5b8 -raf90466abe57cb9be572bfc519ac6902cb8166fa
--- lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
+++ lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision af90466abe57cb9be572bfc519ac6902cb8166fa)
@@ -149,8 +149,9 @@
 			validate="false"
 			parameter="start" >
 			<forward name="success" path="/pages/learning/learning.jsp" />
-			<forward name="defineLater" path="/pages/learning/definelater.jsp" />
-			<forward name="runOffline" path="/pages/learning/runoffline.jsp" />			
+			<forward name="definelater" path="/pages/learning/definelater.jsp" />
+			<forward name="runOffline" path="/pages/learning/runoffline.jsp" />	
+			<forward name="result" path="/pages/learning/result.jsp" />	
 		</action>
 		
 		<action path="/learning/nextQuestion"
@@ -172,6 +173,16 @@
 			<forward name="success" path="/pages/learning/learning.jsp" />
 		</action>
 		
+		<action path="/learning/retake"
+			type="org.lamsfoundation.lams.tool.survey.web.action.LearningAction"
+			input="/pages/learning/learning.jsp"
+			name="answerForm" 
+			scope="request" 
+			validate="false"			
+			parameter="retake" >
+			<forward name="success" path="/pages/learning/learning.jsp" />
+		</action>
+		
 		<action path="/learning/doSurvey"
 			type="org.lamsfoundation.lams.tool.survey.web.action.LearningAction"
 			input="/pages/learning/learning.jsp"
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java
===================================================================
diff -u -ra2c091a27056e7b41531ca140012603bf027d5b8 -raf90466abe57cb9be572bfc519ac6902cb8166fa
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	(.../SurveyConstants.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	(.../SurveyConstants.java)	(revision af90466abe57cb9be572bfc519ac6902cb8166fa)
@@ -38,7 +38,9 @@
 	public static final String SUCCESS = "success";
 	public static final String ERROR = "error";
 	public static final String DEFINE_LATER = "definelater";
-	
+	public static final String RUN_OFFLINE = "runOffline";
+	public static final String FORWARD_RESULT = "result";
+
 	//for parameters' name
 	public static final String PARAM_FILE_VERSION_ID = "fileVersionId";
 	public static final String PARAM_FILE_UUID = "fileUuid";
@@ -87,7 +89,7 @@
 	public static final String PREFIX_QUESTION_CHOICE = "optionChoice";
 	public static final String PREFIX_QUESTION_TEXT= "optionText";
 	public static final String ERROR_MSG_KEY = "questionError";
-
+	
 	//POSITION
 	public static int POSITION_INSIDE = 0;
 	public static int POSITION_FIRST = 1;
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
===================================================================
diff -u -r5bc5ec74a1a58a332b029c020e006c8aa03f3e62 -raf90466abe57cb9be572bfc519ac6902cb8166fa
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision 5bc5ec74a1a58a332b029c020e006c8aa03f3e62)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision af90466abe57cb9be572bfc519ac6902cb8166fa)
@@ -29,15 +29,10 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.SortedMap;
-import java.util.SortedSet;
 import java.util.TreeMap;
-import java.util.TreeSet;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -52,7 +47,6 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.survey.SurveyConstants;
@@ -63,21 +57,17 @@
 import org.lamsfoundation.lams.tool.survey.model.SurveyUser;
 import org.lamsfoundation.lams.tool.survey.service.ISurveyService;
 import org.lamsfoundation.lams.tool.survey.service.SurveyApplicationException;
-import org.lamsfoundation.lams.tool.survey.service.UploadSurveyFileException;
 import org.lamsfoundation.lams.tool.survey.util.IntegerComparator;
-import org.lamsfoundation.lams.tool.survey.util.QuestionsComparator;
 import org.lamsfoundation.lams.tool.survey.util.SurveyWebUtils;
 import org.lamsfoundation.lams.tool.survey.web.form.AnswerForm;
 import org.lamsfoundation.lams.tool.survey.web.form.ReflectionForm;
-import org.lamsfoundation.lams.tool.survey.web.form.QuestionForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
-import org.springframework.web.util.WebUtils;
 /**
  * 
  * @author Steve.Ni
@@ -105,6 +95,11 @@
 		if(param.equals("doSurvey")){
 			return doSurvey(mapping, form, request, response);
 		}
+		
+		if(param.equals("retake")){
+			return retake(mapping, form, request, response);
+		}
+		
 		if(param.equals("finish")){
 			return finish(mapping, form, request, response);
 		}
@@ -120,8 +115,9 @@
 		return  mapping.findForward(SurveyConstants.ERROR);
 	}
 
-	
 
+
+
 	/**
 	 * Read survey data from database and put them into HttpSession. It will redirect to init.do directly after this
 	 * method run successfully. 
@@ -140,8 +136,9 @@
 		//save toolContentID into HTTPSession
 		ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, true);
 		Long sessionId =  new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
+		//it will be use when runOffline or lock on finish page.
+		request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 		
-		
 //		get back the survey and question list and display them on page
 		ISurveyService service = getSurveyService();
 		SurveyUser surveyUser = getCurrentUser(service,sessionId);
@@ -168,7 +165,7 @@
 		
 		//add define later support
 		if(survey.isDefineLater()){
-			return mapping.findForward("defineLater");
+			return mapping.findForward(SurveyConstants.DEFINE_LATER);
 		}
 		
 		//set contentInUse flag to true!
@@ -179,7 +176,7 @@
 		//add run offline support
 		if(survey.getRunOffline()){
 			sessionMap.put(SurveyConstants.PARAM_RUN_OFFLINE, true);
-			return mapping.findForward("runOffline");
+			return mapping.findForward(SurveyConstants.RUN_OFFLINE);
 		}else
 			sessionMap.put(SurveyConstants.PARAM_RUN_OFFLINE, false);
 				
@@ -203,6 +200,11 @@
 			answerForm.setPosition(SurveyConstants.POSITION_ONLY_ONE);
 		else
 			answerForm.setPosition(SurveyConstants.POSITION_FIRST);
+		
+		//if page is locked, only go to result pages.
+		if(lock){
+			return mapping.findForward(SurveyConstants.FORWARD_RESULT);
+		}
 		return mapping.findForward(SurveyConstants.SUCCESS);
 	}
 
@@ -269,7 +271,14 @@
 		answerForm.setQuestionSeqID(questionSeqID);
 		return mapping.findForward(SurveyConstants.SUCCESS);
 	}
+	
 
+	private ActionForward retake(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		AnswerForm answerForm = (AnswerForm) form;
+		answerForm.setPosition(SurveyConstants.POSITION_ONLY_ONE);
+		return mapping.findForward(SurveyConstants.SUCCESS);
+	}
+
 	private ActionForward doSurvey(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		AnswerForm answerForm = (AnswerForm) form;
 		Integer questionSeqID = answerForm.getQuestionSeqID();
Index: lams_tool_survey/web/pages/learning/learning.jsp
===================================================================
diff -u -rc43839b5fdd3e80db9792b154b3496802aae6553 -raf90466abe57cb9be572bfc519ac6902cb8166fa
--- lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c43839b5fdd3e80db9792b154b3496802aae6553)
+++ lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision af90466abe57cb9be572bfc519ac6902cb8166fa)
@@ -61,6 +61,7 @@
 					</c:choose>
 				</table>
 				<%-- Display button according to different situation --%>
+				<%--POSITION: 0=middle of survey, 1=first question, 2=last question, 3=Only one question available--%>
 					<c:choose>
 						<c:when test="${(sessionMap.showOnOnePage && (empty questionSeqID or questionSeqID == 0)) or position == 3}">
 							<div class="right-buttons">
@@ -88,9 +89,9 @@
 									<fmt:message key="label.next" />
 								</html:button>
 								<c:if test="${position == 2}">
-										<html:submit property="doSurvey"  disabled="${sessionMap.finishedLock}"  styleClass="button">
-											<fmt:message key="label.submit.survey" />
-										</html:submit>
+									<html:submit property="doSurvey"  disabled="${sessionMap.finishedLock}"  styleClass="button">
+										<fmt:message key="label.submit.survey" />
+									</html:submit>
 								</c:if>
 							</span>
 						</c:otherwise>
Index: lams_tool_survey/web/pages/learning/question.jsp
===================================================================
diff -u -r5bc5ec74a1a58a332b029c020e006c8aa03f3e62 -raf90466abe57cb9be572bfc519ac6902cb8166fa
--- lams_tool_survey/web/pages/learning/question.jsp	(.../question.jsp)	(revision 5bc5ec74a1a58a332b029c020e006c8aa03f3e62)
+++ lams_tool_survey/web/pages/learning/question.jsp	(.../question.jsp)	(revision af90466abe57cb9be572bfc519ac6902cb8166fa)
@@ -42,10 +42,10 @@
 			</c:choose>
 		</c:forEach>
 		<c:if test="${question.type == 3}">
-			<textarea name="optionText${question.uid}" rows="7" cols="50" type="_moz"><lams:out value="${answerText}"/></textarea><BR><BR>
+			<textarea name="optionText${question.uid}" rows="7" cols="50" type="_moz">${answerText}</textarea><BR><BR>
 		</c:if>
 		<c:if test="${question.appendText}">
-			<textarea name="optionText${question.uid}" rows="7" cols="50" type="_moz"><lams:out value="${answerText}"/></textarea><BR><BR>
+			<textarea name="optionText${question.uid}" rows="7" cols="50" type="_moz">${answerText}</textarea><BR><BR>
 		</c:if>
 	</td>
 </tr>
\ No newline at end of file
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -r5bc5ec74a1a58a332b029c020e006c8aa03f3e62 -raf90466abe57cb9be572bfc519ac6902cb8166fa
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 5bc5ec74a1a58a332b029c020e006c8aa03f3e62)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision af90466abe57cb9be572bfc519ac6902cb8166fa)
@@ -13,13 +13,19 @@
 	<!--
 		
 		function finishSession(){
-			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
+			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}"/>';
 			return false;
 		}
 		function continueReflect(){
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
-		
+		function retakeSurvey(questionSeqId){
+			//retake for all questions
+			if(questionSeqId == -1)
+				document.location.href='<c:url value="/learning/start.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}"/>';
+			else
+				document.location.href='<c:url value="/learning/retake.do?sessionMapID=${sessionMapID}&questionSeqID="/>' +questionSeqId ;
+		}
 	-->        
     </script>
 
@@ -48,6 +54,9 @@
 								<span style="color: #FF0000">*</span>
 							</c:if>
 							<c:out value="${question.description}" escapeXml="false"/>
+							<c:if test="${(not sessionMap.finishedLock) && (not sessionMap.showOnOnePage)}">
+								<a href="#" onclick="retakeSurvey(${question.sequenceId})"><fmt:message key="label.retake"/></a>
+							</c:if>
 						</th>
 					</tr>
 					<tr>
@@ -57,11 +66,11 @@
 								<c:set var="answerText" value="${question.answer.answerText}"/>
 							</c:if>
 							<c:forEach var="option" items="${question.options}">
-								<c:set var="checked" value="true"/>
+								<c:set var="checked" value="false"/>
 								<c:if test="${not empty question.answer}">
 									<c:forEach var="choice" items="${question.answer.choices}">
 										<c:if test="${choice == option.uid}">
-											<c:set var="checked" value="false"/>
+											<c:set var="checked" value="true"/>
 										</c:if>
 									</c:forEach>
 								</c:if>
@@ -72,7 +81,8 @@
 							<c:if test="${question.type == 3}">
 								<lams:out value="${answerText}"/>
 							</c:if>
-							<c:if test="${question.appendText}">
+							<c:if test="${question.appendText && (not empty answerText)}">
+								<B><fmt:message key="label.append.text"/></B><BR>
 								<lams:out value="${answerText}"/><BR><BR>
 							</c:if>
 						</td>
@@ -82,26 +92,33 @@
 				</c:forEach>
 					
 			</table>
-			<c:if test="${mode != 'teacher'}">
-				<div class="right-buttons">
-					<c:choose>
-						<c:when test="${sessionMap.reflectOn}">
-							<html:button property="ContinueButton"
-								onclick="return continueReflect()" disabled="${finishedLock}"
-								styleClass="button">
-								<fmt:message key="label.continue" />
-							</html:button>
-						</c:when>
-						<c:otherwise>
-							<html:button property="FinishButton"
-								onclick="return finishSession()" disabled="${finishedLock}"
-								styleClass="button">
-								<fmt:message key="label.finished" />
-							</html:button>
-						</c:otherwise>
-					</c:choose>
-				</div>
+			<c:if test="${not sessionMap.finishedLock}">
+				<span class="left-buttons">
+					<html:button property="RetakeButton"
+									onclick="return retakeSurvey(-1)"
+									styleClass="button">
+									<fmt:message key="label.retake.survey" />
+					</html:button>
+				</span>
 			</c:if>
+			<span class="right-buttons">
+				<c:choose>
+					<c:when test="${sessionMap.reflectOn && mode != 'teacher' && not sessionMap.finishedLock}">
+						<html:button property="ContinueButton"
+							onclick="return continueReflect()"
+							styleClass="button">
+							<fmt:message key="label.continue" />
+						</html:button>
+					</c:when>
+					<c:otherwise>
+						<html:button property="FinishButton"
+							onclick="return finishSession()"
+							styleClass="button">
+							<fmt:message key="label.finished" />
+						</html:button>
+					</c:otherwise>
+				</c:choose>
+			</span>
 
 		</div>
 		<!--closes content-->