Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java,v
diff -u -r1.11 -r1.12
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	27 Sep 2006 07:11:45 -0000	1.11
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	28 Sep 2006 06:21:43 -0000	1.12
@@ -471,10 +471,10 @@
 			errors.add(SurveyConstants.ERROR_MSG_KEY+ question.getUid(),new ActionMessage(SurveyConstants.ERROR_MSG_MANDATORY_QUESTION));
 		}
 		if(question.getType() == SurveyConstants.QUESTION_TYPE_SINGLE_CHOICE
-				&& question.isAppendText()){
+				&& question.isAppendText() && answer != null){
 			//for single choice, user only can choose one option or open text (if it has)
-			if(!StringUtils.isBlank(question.getAnswer().getAnswerChoices())
-				&& !StringUtils.isBlank(question.getAnswer().getAnswerText())){
+			if(!StringUtils.isBlank(answer.getAnswerChoices())
+				&& !StringUtils.isBlank(answer.getAnswerText())){
 				errors.add(SurveyConstants.ERROR_MSG_KEY+ question.getUid(),new ActionMessage(SurveyConstants.ERROR_MSG_SINGLE_CHOICE));
 			}
 		}
Index: lams_tool_survey/web/pages/authoring/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/definelater.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/web/pages/authoring/definelater.jsp	15 Sep 2006 02:07:06 -0000	1.2
+++ lams_tool_survey/web/pages/authoring/definelater.jsp	28 Sep 2006 06:21:43 -0000	1.3
@@ -76,8 +76,6 @@
 			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=SurveyConstants.TOOL_SIGNATURE%>" 
 				toolContentID="${formBean.survey.contentId}"  accessMode="teacher" defineLater="yes"  
 				customiseSessionID="${formBean.sessionMapID}" contentFolderID="${formBean.contentFolderID}"/>
-
-			<lams:HTMLEditor />
 		</div>
 
 
Index: lams_tool_survey/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_survey/web/pages/monitoring/editactivity.jsp	12 Sep 2006 04:15:19 -0000	1.1
+++ lams_tool_survey/web/pages/monitoring/editactivity.jsp	28 Sep 2006 06:21:43 -0000	1.2
@@ -30,6 +30,7 @@
 				<c:when test='${isPageEditable == "true"}'>
 					<c:url  var="authoringUrl" value="/definelater.do">
 						<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
+						<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 					</c:url>
 					<html:link href="${authoringUrl}" styleClass="button" target="_blank">
 						<fmt:message key="label.monitoring.edit.activity.edit" />
Index: lams_tool_survey/web/pages/monitoring/statistic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/statistic.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/web/pages/monitoring/statistic.jsp	28 Sep 2006 05:44:04 -0000	1.3
+++ lams_tool_survey/web/pages/monitoring/statistic.jsp	28 Sep 2006 06:21:43 -0000	1.4
@@ -1,6 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-<c:set var="summaryList" value="${sessionMap.summaryList}"/>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
 <table  class="alternative-color">
@@ -12,13 +11,11 @@
 			<fmt:message key="label.number.learners"/>
 		</th>
 	</tr>
-	<c:forEach var="entry" items="${statistic}">
+	<c:forEach var="entry" items="${sessionMap.statistic}">
 		<c:set var="session" value="${entry.key}"/>
 		<c:set var="usersInSession" value="${entry.value}"/>
 		<tr>
 			<td>${session.sessionName}</td>
-		</tr>
-		<tr>
 			<td>${usersInSession}</td>
 		</tr>
 	</c:forEach>