Index: lams_tool_survey/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rc4a429ad90657aa55fb72fccf49cf717a3e7fd12 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision c4a429ad90657aa55fb72fccf49cf717a3e7fd12)
+++ lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -72,7 +72,7 @@
 		<!-- ==========  Survey Item : URL ========== -->
 		<action path="/authoring/newItemInit"
 			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
-			name="surveyItemForm" 
+			name="questionForm" 
 			scope="request" 
 			validate="false"			
 			parameter="newItemInit">
@@ -82,7 +82,7 @@
 		
 		<action path="/authoring/editItemInit"
 			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
-			name="surveyItemForm" 
+			name="questionForm" 
 			scope="request" 
 			parameter="editItemInit" 
 			validate="false">
@@ -93,7 +93,7 @@
 		<action path="/authoring/saveOrUpdateItem"
 			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
 			parameter="saveOrUpdateItem"
-			name="surveyItemForm" 
+			name="questionForm" 
 			scope="request" 
 			validate="false">
 			<forward name="success" path="/pages/authoring/parts/itemlist.jsp" />
@@ -144,16 +144,44 @@
 		<!-- ========== BEGIN: Learning Definitions ============================== -->
 		<action path="/learning/start"
 			type="org.lamsfoundation.lams.tool.survey.web.action.LearningAction"
+			name="answerForm" 
+			scope="request" 
+			validate="false"
 			parameter="start" >
-			<forward name="success" path="/pages/learning/start.jsp" />
+			<forward name="success" path="/pages/learning/learning.jsp" />
 			<forward name="defineLater" path="/pages/learning/definelater.jsp" />
 			<forward name="runOffline" path="/pages/learning/runoffline.jsp" />			
 		</action>
-		<action path="/learning/completeItem"
+		
+		<action path="/learning/nextQuestion"
 			type="org.lamsfoundation.lams.tool.survey.web.action.LearningAction"
-			parameter="complete" >
+			input="/pages/learning/learning.jsp"
+			name="answerForm" 
+			scope="request" 
+			validate="false"			
+			parameter="nextQuestion" >
 			<forward name="success" path="/pages/learning/learning.jsp" />
 		</action>
+		<action path="/learning/previousQuestion"
+			type="org.lamsfoundation.lams.tool.survey.web.action.LearningAction"
+			input="/pages/learning/learning.jsp"
+			name="answerForm" 
+			scope="request" 
+			validate="false"			
+			parameter="previousQuestion" >
+			<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"
+			name="answerForm" 
+			scope="request" 
+			validate="false"			
+			parameter="doSurvey" >
+			<forward name="success" path="/pages/learning/result.jsp" />
+		</action>
+		
 		<action path="/learning/finish"
 			type="org.lamsfoundation.lams.tool.survey.web.action.LearningAction"
 			input="/pages/learning/learning.jsp"
Index: lams_tool_survey/db/sql/create_lams_tool_survey.sql
===================================================================
diff -u -rc4a429ad90657aa55fb72fccf49cf717a3e7fd12 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/db/sql/create_lams_tool_survey.sql	(.../create_lams_tool_survey.sql)	(revision c4a429ad90657aa55fb72fccf49cf717a3e7fd12)
+++ lams_tool_survey/db/sql/create_lams_tool_survey.sql	(.../create_lams_tool_survey.sql)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -31,7 +31,7 @@
 
 create table tl_lasurv11_answer (
 uid bigint not null auto_increment, 
-survey_item_uid bigint, 
+question_uid bigint, 
 user_uid bigint, 
 session_id bigint, 
 answer_choices varchar(255), 
@@ -55,12 +55,13 @@
 uid bigint not null auto_increment, 
 description text,
 sequence_id integer, 
-answer_uid bigint, 
+question_uid bigint, 
 primary key (uid)
 );
 
 create table tl_lasurv11_question (
 uid bigint not null auto_increment, 
+sequence_id integer,
 description text,
 create_by bigint, 
 create_date datetime, 
@@ -95,9 +96,9 @@
 );
 
 alter table tl_lasurv11_answer add index FK6DAAFE3BB1423DC1 (user_uid), add constraint FK6DAAFE3BB1423DC1 foreign key (user_uid) references tl_lasurv11_user (uid);
-alter table tl_lasurv11_answer add index FK6DAAFE3BAE4CB69 (survey_item_uid), add constraint FK6DAAFE3BAE4CB69 foreign key (survey_item_uid) references tl_lasurv11_question (uid);
+alter table tl_lasurv11_answer add index FK6DAAFE3B25F3BB77 (question_uid), add constraint FK6DAAFE3B25F3BB77 foreign key (question_uid) references tl_lasurv11_question (uid);
 alter table tl_lasurv11_attachment add index FKD92A9120D14146E5 (survey_uid), add constraint FKD92A9120D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid);
-alter table tl_lasurv11_option add index FK85AB46F282152886 (answer_uid), add constraint FK85AB46F282152886 foreign key (answer_uid) references tl_lasurv11_question (uid);
+alter table tl_lasurv11_option add index FK85AB46F26966134F (question_uid), add constraint FK85AB46F26966134F foreign key (question_uid) references tl_lasurv11_question (uid);
 alter table tl_lasurv11_question add index FK872D4F23D14146E5 (survey_uid), add constraint FK872D4F23D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid);
 alter table tl_lasurv11_question add index FK872D4F23E4C99A5F (create_by), add constraint FK872D4F23E4C99A5F foreign key (create_by) references tl_lasurv11_user (uid);
 alter table tl_lasurv11_session add index FKF08793B9D14146E5 (survey_uid), add constraint FKF08793B9D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid);
Index: lams_tool_survey/db/sql/library_insert.sql
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/db/sql/library_insert.sql	(.../library_insert.sql)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/db/sql/library_insert.sql	(.../library_insert.sql)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -11,8 +11,8 @@
 )
 VALUES
 (
-'Share surveys',
-'Share surveys',
+'Survey',
+'Survey',
 0,
 NOW()
 )
Index: lams_tool_survey/db/sql/table-schema.sql
===================================================================
diff -u -r0b9b61d67c2dcf6f83c513325afca117cb1967f2 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 0b9b61d67c2dcf6f83c513325afca117cb1967f2)
+++ lams_tool_survey/db/sql/table-schema.sql	(.../table-schema.sql)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -1,5 +1,5 @@
 alter table tl_lasurv11_answer drop foreign key FK6DAAFE3BB1423DC1;
-alter table tl_lasurv11_answer drop foreign key FK6DAAFE3BAE4CB69;
+alter table tl_lasurv11_answer drop foreign key FK6DAAFE3B25F3BB77;
 alter table tl_lasurv11_attachment drop foreign key FKD92A9120D14146E5;
 alter table tl_lasurv11_option drop foreign key FK85AB46F26966134F;
 alter table tl_lasurv11_question drop foreign key FK872D4F23D14146E5;
@@ -15,15 +15,15 @@
 drop table if exists tl_lasurv11_session;
 drop table if exists tl_lasurv11_survey;
 drop table if exists tl_lasurv11_user;
-create table tl_lasurv11_answer (uid bigint not null auto_increment, survey_item_uid bigint, user_uid bigint, session_id bigint, answer_choices varchar(255), udpate_date datetime, answer_text varchar(255), primary key (uid));
+create table tl_lasurv11_answer (uid bigint not null auto_increment, question_uid bigint, user_uid bigint, answer_choices varchar(255), udpate_date datetime, answer_text varchar(255), primary key (uid));
 create table tl_lasurv11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, survey_uid bigint, primary key (uid));
-create table tl_lasurv11_option (uid bigint not null auto_increment, description varchar(255), sequence_id integer, answer_uid bigint, primary key (uid));
-create table tl_lasurv11_question (uid bigint not null auto_increment, description varchar(255), create_by bigint, create_date datetime, question_type smallint, append_text bit, compulsory bit, max_answers integer, survey_uid bigint, primary key (uid));
+create table tl_lasurv11_option (uid bigint not null auto_increment, description text, sequence_id integer, answer_uid bigint, primary key (uid));
+create table tl_lasurv11_question (uid bigint not null auto_increment, description text, create_by bigint, create_date datetime, question_type smallint, append_text bit, optional bit, allow_multiple_answer bit, sequence_id integer, survey_uid bigint, primary key (uid));
 create table tl_lasurv11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, survey_uid bigint, session_id bigint, session_name varchar(250), primary key (uid));
 create table tl_lasurv11_survey (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, reflect_instructions varchar(255), reflect_on_activity bit, show_questions_on_one_page bit, primary key (uid));
 create table tl_lasurv11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), session_uid bigint, survey_uid bigint, session_finished bit, primary key (uid));
 alter table tl_lasurv11_answer add index FK6DAAFE3BB1423DC1 (user_uid), add constraint FK6DAAFE3BB1423DC1 foreign key (user_uid) references tl_lasurv11_user (uid);
-alter table tl_lasurv11_answer add index FK6DAAFE3BAE4CB69 (survey_item_uid), add constraint FK6DAAFE3BAE4CB69 foreign key (survey_item_uid) references tl_lasurv11_question (uid);
+alter table tl_lasurv11_answer add index FK6DAAFE3B25F3BB77 (question_uid), add constraint FK6DAAFE3B25F3BB77 foreign key (question_uid) references tl_lasurv11_question (uid);
 alter table tl_lasurv11_attachment add index FKD92A9120D14146E5 (survey_uid), add constraint FKD92A9120D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid);
 alter table tl_lasurv11_option add index FK85AB46F26966134F (answer_uid), add constraint FK85AB46F26966134F foreign key (answer_uid) references tl_lasurv11_question (uid);
 alter table tl_lasurv11_question add index FK872D4F23D14146E5 (survey_uid), add constraint FK872D4F23D14146E5 foreign key (survey_uid) references tl_lasurv11_survey (uid);
Index: lams_tool_survey/db/sql/tool_insert.sql
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -31,10 +31,10 @@
 VALUES
 (
 'lasurv11',
-'surveyService',
-'Shared Surveys',
-'Shared Surveys',
-'sharedsurveys',
+'lasurvSurveyService',
+'Survey',
+'Survey',
+'survey',
 '1.1',
 NULL,
 NULL,
@@ -51,6 +51,6 @@
 'tool/lasurv11/exportPortfolio?mode=teacher',
 'tool/lasurv11/contribute.do',
 'tool/lasurv11/moderate.do',
-'org.lamsfoundation.lams.tool.survey.ApplicationSurveys',
+'org.lamsfoundation.lams.tool.survey.ApplicationResources',
 NOW()
 )
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java
===================================================================
diff -u -rc4a429ad90657aa55fb72fccf49cf717a3e7fd12 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	(.../SurveyConstants.java)	(revision c4a429ad90657aa55fb72fccf49cf717a3e7fd12)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	(.../SurveyConstants.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -57,6 +57,7 @@
 	public static final String ERROR_MSG_FILE_BLANK = "error.survey.item.file.blank";
 	public static final String ERROR_MSG_INVALID_URL = "error.survey.item.invalid.url";
 	public static final String ERROR_MSG_UPLOAD_FAILED = "error.upload.failed";
+	public static final String ERROR_MSG_MANDATORY_QUESTION = "error.mandatory.question";
 	
 	
 	public static final String ATTR_REFLECTION_ON = "reflectOn";
@@ -76,12 +77,20 @@
 	public static final String ATTR_TITLE = "title";
 	public static final String ATTR_SURVEY_INSTRUCTION = "instructions";
 	public static final String ATTR_FINISH_LOCK = "finishedLock";
-	public static final String ATTR_SURVEY = "survey";
 	public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl";
 	public static final short SURVEY_TYPE_TEXT_ENTRY = 3;
 	public static final short SURVEY_TYPE_MULTIPLE_CHOICES = 2;
 	public static final short SURVEY_TYPE_SINGLE_CHOICE = 1;
 	public static final String FORWARD_OPEN_QUESTION = "opentext";
 	public static final String FORWARD_CHOICE_QUESTION = "question";
+	public static final String ATTR_SHOW_ON_ONE_PAGE = "showOnOnePage";
+	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;
+	public static int POSITION_LAST = 2;
+	public static int POSITION_ONLY_ONE = 3;
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java	(.../SurveyAnswerDAO.java)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java	(.../SurveyAnswerDAO.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -1,5 +1,9 @@
 package org.lamsfoundation.lams.tool.survey.dao;
 
+import org.lamsfoundation.lams.tool.survey.model.SurveyAnswer;
+
 public interface SurveyAnswerDAO extends DAO {
 
+	SurveyAnswer getAnswer(Long uid, Long userUid);
+
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyQuestionDAO.java
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyQuestionDAO.java	(.../SurveyQuestionDAO.java)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyQuestionDAO.java	(.../SurveyQuestionDAO.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -23,6 +23,8 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.survey.dao;
 
+import java.util.List;
+
 import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion;
 
 public interface SurveyQuestionDAO extends DAO {
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java	(.../SurveyAnswerDAOHibernate.java)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java	(.../SurveyAnswerDAOHibernate.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -1,7 +1,19 @@
 package org.lamsfoundation.lams.tool.survey.dao.hibernate;
 
+import java.util.List;
+
 import org.lamsfoundation.lams.tool.survey.dao.SurveyAnswerDAO;
+import org.lamsfoundation.lams.tool.survey.model.SurveyAnswer;
 
 public class SurveyAnswerDAOHibernate extends BaseDAOHibernate implements SurveyAnswerDAO {
+private static final String GET_LEARNER_ANSWER = "from "+SurveyAnswer.class.getName()+" as a where a.surveyQuestion.uid=? and a.user.uid=?";
+	
+	public SurveyAnswer getAnswer(Long QuestionUid, Long userUid) {
+		List list = getHibernateTemplate().find(GET_LEARNER_ANSWER,new Object[]{QuestionUid,userUid});
+		if(list.size() > 0)
+			return (SurveyAnswer) list.get(0);
+		else
+			return null;
+	}
 
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyQuestionDAOHibernate.java
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyQuestionDAOHibernate.java	(.../SurveyQuestionDAOHibernate.java)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyQuestionDAOHibernate.java	(.../SurveyQuestionDAOHibernate.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -4,11 +4,11 @@
 import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion;
 
 public class SurveyQuestionDAOHibernate  extends BaseDAOHibernate implements SurveyQuestionDAO {
-
 	public SurveyQuestion getByUid(Long questionUid) {
 		
 		return (SurveyQuestion) this.getObject(SurveyQuestion.class, questionUid);
 	}
 
 
+
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml	(.../Survey.hbm.xml)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.hbm.xml	(.../Survey.hbm.xml)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -125,7 +125,7 @@
             inverse="false"
             cascade="all"
             sort="unsorted"
-            order-by="create_date desc"
+            order-by="sequence_id desc"
         >
 
             <key
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java	(.../Survey.java)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java	(.../Survey.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -70,15 +70,15 @@
 	//instructions
 	private String onlineInstructions;
 	private String offlineInstructions;
-	private Set attachments;
+	private Set<SurveyAttachment> attachments;
 	
 	//general infomation
 	private Date created;
 	private Date updated;
 	private SurveyUser createdBy;
 	
 	//survey Items
-	private Set questions;
+	private Set<SurveyQuestion> questions;
 
 	
 	//*************** NON Persist Fields ********************
@@ -91,8 +91,8 @@
 	 *
 	 */
   	public Survey(){
-  		attachments = new HashSet();
-  		questions = new HashSet();
+  		attachments = new HashSet<SurveyAttachment>();
+  		questions = new HashSet<SurveyQuestion>();
   	}
 //  **********************************************************
   	//		Function method for Survey
@@ -121,7 +121,7 @@
   			survey.setUid(null);
   			if(questions != null){
   				Iterator iter = questions.iterator();
-  				Set set = new HashSet();
+  				Set<SurveyQuestion> set = new HashSet<SurveyQuestion>();
   				while(iter.hasNext()){
   					SurveyQuestion item = (SurveyQuestion)iter.next(); 
   					SurveyQuestion newItem = (SurveyQuestion) item.clone();
@@ -417,13 +417,13 @@
 	 * @hibernate.set lazy="true"
 	 *                inverse="false"
 	 *                cascade="all"
-	 *                order-by="create_date desc"
+	 *                order-by="sequence_id desc"
 	 * @hibernate.collection-key column="survey_uid"
 	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.survey.model.SurveyQuestion"
 	 * 
 	 * @return
 	 */
-	public Set getQuestions() {
+	public Set<SurveyQuestion> getQuestions() {
 		return questions;
 	}
 	public void setQuestions(Set questions) {
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml	(.../SurveyAnswer.hbm.xml)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.hbm.xml	(.../SurveyAnswer.hbm.xml)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -32,7 +32,7 @@
             outer-join="auto"
             update="true"
             insert="true"
-            column="survey_item_uid"
+            column="question_uid"
         />
 
         <many-to-one
@@ -46,14 +46,6 @@
         />
 
         <property
-            name="sessionId"
-            type="java.lang.Long"
-            update="true"
-            insert="true"
-            column="session_id"
-        />
-
-        <property
             name="answerChoices"
             type="java.lang.String"
             update="true"
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java	(.../SurveyAnswer.java)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java	(.../SurveyAnswer.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -36,18 +36,22 @@
 
 	private Long uid;
 	
-	private Long sessionId;
 	private SurveyUser user;
 	
 	private SurveyQuestion surveyQuestion;
-	//options choice string: conjunction by &. Such as 2&5&3
+	//options choice string: option UIDs are conjunctioned by &. Such as 2&5&3
 	private String answerChoices;
 	private String answerText;
 	private Date updateDate;
 	
-
+	//************************************************
+	// DTO fields
+	//************************************************
+	//it is list of optionl UIDs
+	private String[] choices;
+	
 	/**
-	 * @hibernate.many-to-one  column="survey_item_uid"
+	 * @hibernate.many-to-one  column="question_uid"
  	 * cascade="none"
 	 * @return
 	 */
@@ -80,16 +84,6 @@
 		this.user = user;
 	}
 	/**
-	 * @hibernate.property column="session_id"
-	 * @return
-	 */
-	public Long getSessionId() {
-		return sessionId;
-	}
-	public void setSessionId(Long sessionId) {
-		this.sessionId = sessionId;
-	}
-	/**
 	 * @hibernate.property column="answer_choices"
 	 * @return
 	 */
@@ -119,6 +113,12 @@
 	public void setAnswerText(String textEntry) {
 		this.answerText = textEntry;
 	}
+	public String[] getChoices() {
+		return choices;
+	}
+	public void setChoices(String[] choices) {
+		this.choices = choices;
+	}
 	
 
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml
===================================================================
diff -u -rc4a429ad90657aa55fb72fccf49cf717a3e7fd12 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml	(.../SurveyQuestion.hbm.xml)	(revision c4a429ad90657aa55fb72fccf49cf717a3e7fd12)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml	(.../SurveyQuestion.hbm.xml)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -43,7 +43,7 @@
         >
 
             <key
-                column="answer_uid"
+                column="question_uid"
             >
             </key>
 
@@ -103,6 +103,14 @@
             column="allow_multiple_answer"
         />
 
+        <property
+            name="sequenceId"
+            type="int"
+            update="true"
+            insert="true"
+            column="sequence_id"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-SurveyQuestion.xml
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java
===================================================================
diff -u -rc4a429ad90657aa55fb72fccf49cf717a3e7fd12 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java	(.../SurveyQuestion.java)	(revision c4a429ad90657aa55fb72fccf49cf717a3e7fd12)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java	(.../SurveyQuestion.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -29,7 +29,6 @@
 import java.util.Set;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
 
 /**
  * Survey
@@ -42,10 +41,12 @@
 	private static final Logger log = Logger.getLogger(SurveyQuestion.class);
 	
 	private Long uid;
+	
 	//Survey Type:1=Single Choice,2=Multiple Choice,3=Text Entry
 	private short type;
 	
 	private String description;
+	private int sequenceId;
 	
 	//option of Question
 	private boolean appendText;
@@ -60,6 +61,8 @@
 	//***********************************************
 	//DTO fields:
 	private String shortTitle;
+	//this is DTO field. For answer, which is user and session level. For question, which is content level.
+	private SurveyAnswer answer;
 	
     public Object clone(){
     	SurveyQuestion obj = null;
@@ -120,7 +123,7 @@
 	     * 					cascade="all-delete-orphan"
 	     * 					inverse="false"
 	     * 					order-by="sequence_id asc"
-	     * @hibernate.collection-key column="answer_uid"
+	     * @hibernate.collection-key column="question_uid"
 	     * @hibernate.collection-one-to-many
 	     * 			class="org.lamsfoundation.lams.tool.survey.model.SurveyOption"
 	     * @return
@@ -197,6 +200,18 @@
 		public void setAllowMultipleAnswer(boolean allowMultipleAnswer) {
 			this.allowMultipleAnswer = allowMultipleAnswer;
 		}
+		  /**
+	     * @hibernate.property  column="sequence_id" 
+	     * @return
+	     */
+		public int getSequenceId() {
+			return sequenceId;
+		}
+		public void setSequenceId(int sequenceId) {
+			this.sequenceId = sequenceId;
+		}
+
+	
 		
 		//****************************************************************
 		// DTO fields
@@ -207,5 +222,12 @@
 		public void setShortTitle(String shortTitle) {
 			this.shortTitle = shortTitle;
 		}
+		public SurveyAnswer getAnswer() {
+			return answer;
+		}
+		public void setAnswer(SurveyAnswer answer) {
+			this.answer = answer;
+		}
 
+
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java	(.../SurveySession.java)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveySession.java	(.../SurveySession.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -37,8 +37,6 @@
  */
 public class SurveySession{
 	
-	private static Logger log = Logger.getLogger(SurveySession.class);
-	
 	private Long uid;
 	private Long sessionId;
 	private String sessionName;
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	(.../ISurveyService.java)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	(.../ISurveyService.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -31,6 +31,7 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.survey.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.survey.model.Survey;
+import org.lamsfoundation.lams.tool.survey.model.SurveyAnswer;
 import org.lamsfoundation.lams.tool.survey.model.SurveyAttachment;
 import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion;
 import org.lamsfoundation.lams.tool.survey.model.SurveySession;
@@ -105,8 +106,9 @@
 	 */
 	void deleteQuestion(Long uid);
 
-	List<SurveyQuestion> getQuestionsBySessionId(Long sessionId);
+	List<SurveyQuestion> getQuestionAnswer(Long sessionId, Long userUid);
 
+	void updateAnswerList(List<SurveyAnswer> answerList);
 	//******************************************************************************************
 	//********** user methods *************
 	//******************************************************************************************
@@ -198,6 +200,7 @@
 	 * @return
 	 */
 	Map<Long, Set<ReflectDTO>> getReflectList(Long contentId);
+	
 
 }
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
===================================================================
diff -u -r0b9b61d67c2dcf6f83c513325afca117cb1967f2 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision 0b9b61d67c2dcf6f83c513325afca117cb1967f2)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -24,6 +24,7 @@
 package org.lamsfoundation.lams.tool.survey.service;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
@@ -72,12 +73,14 @@
 import org.lamsfoundation.lams.tool.survey.dao.SurveyUserDAO;
 import org.lamsfoundation.lams.tool.survey.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.survey.model.Survey;
+import org.lamsfoundation.lams.tool.survey.model.SurveyAnswer;
 import org.lamsfoundation.lams.tool.survey.model.SurveyAttachment;
 import org.lamsfoundation.lams.tool.survey.model.SurveyOption;
 import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion;
 import org.lamsfoundation.lams.tool.survey.model.SurveySession;
 import org.lamsfoundation.lams.tool.survey.model.SurveyUser;
 import org.lamsfoundation.lams.tool.survey.util.SurveyToolContentHandler;
+import org.lamsfoundation.lams.tool.survey.util.SurveyWebUtils;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -291,16 +294,36 @@
 
 
 	public void deleteQuestion(Long uid) {
-		//TODO
+		surveyQuestionDao.removeObject(SurveyQuestion.class, uid);
 		
 	}
 
-	public List<SurveyQuestion> getQuestionsBySessionId(Long sessionId) {
-		// TODO Auto-generated method stub
-		return null;
+	public List<SurveyQuestion> getQuestionAnswer(Long sessionId,Long userUid) {
+		List<SurveyQuestion> questions = null;
+		SurveySession session = surveySessionDao.getSessionBySessionId(sessionId);
+		if(session != null){
+			Survey survey = session.getSurvey();
+			if(survey != null)
+				questions = new ArrayList<SurveyQuestion>(survey.getQuestions());
+		}
+		
+		//set answer for this question acoording
+		for(SurveyQuestion question:questions){
+			SurveyAnswer answer = surveyAnswerDao.getAnswer(question.getUid(),userUid);
+			if(answer != null)
+				answer.setChoices(SurveyWebUtils.getChoiceList(answer.getAnswerChoices()));
+			question.setAnswer(answer);
+		}
+		return questions;
 	}
 
+	public void updateAnswerList(List<SurveyAnswer> answerList) {
+		for(SurveyAnswer ans : answerList){
+			surveyAnswerDao.saveObject(ans);
+		}
+	}
 
+
 	//*****************************************************************************
 	// private methods
 	//*****************************************************************************
@@ -711,4 +734,5 @@
 		this.surveyAnswerDao = surveyAnswerDao;
 	}
 
+
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -128,6 +128,7 @@
                 <prop key="delete*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="remove*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="save*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="update*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 
                 <prop key="setAsDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="setAsRunOffline">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/IntegerComparator.java
===================================================================
diff -u
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/IntegerComparator.java	(revision 0)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/IntegerComparator.java	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -0,0 +1,20 @@
+package org.lamsfoundation.lams.tool.survey.util;
+
+import java.util.Comparator;
+/**
+ * 
+ * @author steven
+ *
+ */
+public class IntegerComparator implements Comparator<Integer> {
+
+	public int compare(Integer o1, Integer o2) {
+		if(o1 != null && o2 != null){
+			return o1.compareTo(o2);
+		}else if(o1 != null)
+			return 1;
+		else
+			return -1;
+	}
+
+}
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/QuestionsComparator.java
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/QuestionsComparator.java	(.../QuestionsComparator.java)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/QuestionsComparator.java	(.../QuestionsComparator.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -11,8 +11,8 @@
 public class QuestionsComparator implements Comparator<SurveyQuestion> {
 
 	public int compare(SurveyQuestion o1, SurveyQuestion o2) {
-		if(o1 != null && o2 != null & o1.getCreateDate() !=null && o2.getCreateDate() != null){
-			return (o1.getCreateDate().getTime() - o2.getCreateDate().getTime()) > 0?1:-1;
+		if(o1 != null && o2 != null){
+			return o1.getSequenceId() -o2.getSequenceId();
 		}else if(o1 != null)
 			return 1;
 		else
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyWebUtils.java
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyWebUtils.java	(.../SurveyWebUtils.java)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyWebUtils.java	(.../SurveyWebUtils.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -51,5 +51,18 @@
 	        else //  (content.isContentInUse()==true && content.isDefineLater() == false)
 	            return false;
 		}
+
+	public static String getChoicesStr(String[] choiceList) {
+		String choices = "";
+		for(String c: choiceList)
+			choices = choices + c + "&";
+		return choices;
+	}
 	
+	public static String[] getChoiceList(String choiceList) {
+		if(choiceList == null)
+			return new String[]{};
+		
+		return choiceList.split("&");
+	}
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
===================================================================
diff -u -rec918a1f6fa717d59f8074f508fe798eb3cbdf41 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision ec918a1f6fa717d59f8074f508fe798eb3cbdf41)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -815,6 +815,12 @@
 		
 		if(itemIdx == -1){ //add
 			item.setCreateDate(new Timestamp(new Date().getTime()));
+			int maxSeq = 1;
+			if(surveyList != null && surveyList.size() > 0){
+				SurveyQuestion last = surveyList.last();
+				maxSeq = last.getSequenceId()+1;
+			}
+			item.setSequenceId(maxSeq);
 			surveyList.add(item);
 		}else{ //edit
 			List<SurveyQuestion> rList = new ArrayList<SurveyQuestion>(surveyList);
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
===================================================================
diff -u -r5fa6d8af9d03be39b6f5f4c33b75a853af5f6064 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision 5fa6d8af9d03be39b6f5f4c33b75a853af5f6064)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -27,11 +27,16 @@
 import java.io.IOException;
 import java.sql.Timestamp;
 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;
@@ -52,13 +57,17 @@
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.survey.SurveyConstants;
 import org.lamsfoundation.lams.tool.survey.model.Survey;
+import org.lamsfoundation.lams.tool.survey.model.SurveyAnswer;
 import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion;
 import org.lamsfoundation.lams.tool.survey.model.SurveySession;
 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;
@@ -68,6 +77,7 @@
 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
@@ -86,6 +96,15 @@
 		if(param.equals("start")){
 			return start(mapping, form, request, response);
 		}
+		if(param.equals("previousQuestion")){
+			return previousQuestion(mapping, form, request, response);
+		}
+		if(param.equals("nextQuestion")){
+			return nextQuestion(mapping, form, request, response);
+		}
+		if(param.equals("doSurvey")){
+			return doSurvey(mapping, form, request, response);
+		}
 		if(param.equals("finish")){
 			return finish(mapping, form, request, response);
 		}
@@ -101,6 +120,8 @@
 		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. 
@@ -110,26 +131,24 @@
 	 */
 	private ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		
+		AnswerForm answerForm = (AnswerForm) form;
 		//initial Session Map 
-		SessionMap sessionMap = new SessionMap();
+		SessionMap<String,Object> sessionMap = new SessionMap<String,Object>();
 		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+		answerForm.setSessionMapID(sessionMap.getSessionID());
 		
 		//save toolContentID into HTTPSession
 		ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, true);
-		
 		Long sessionId =  new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
 		
-		request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-		request.setAttribute(AttributeNames.ATTR_MODE,mode);
-		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionId);
 		
-//		get back the survey and item list and display them on page
+//		get back the survey and question list and display them on page
 		ISurveyService service = getSurveyService();
 		SurveyUser surveyUser = getCurrentUser(service,sessionId);
 
-		List<SurveyQuestion> items = null;
+		List<SurveyQuestion> questions = null;
 		Survey survey;
-		items = service.getQuestionsBySessionId(sessionId);
+		questions = service.getQuestionAnswer(sessionId,surveyUser.getUid());
 		survey = service.getSurveyBySessionId(sessionId);
 
 		//check whehter finish lock is on/off
@@ -139,6 +158,7 @@
 		sessionMap.put(SurveyConstants.ATTR_TITLE,survey.getTitle());
 		sessionMap.put(SurveyConstants.ATTR_SURVEY_INSTRUCTION,survey.getInstructions());
 		sessionMap.put(SurveyConstants.ATTR_FINISH_LOCK,lock);
+		sessionMap.put(SurveyConstants.ATTR_SHOW_ON_ONE_PAGE,survey.isShowOnePage());
 		
 		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID,sessionId);
 		sessionMap.put(AttributeNames.ATTR_MODE,mode);
@@ -164,23 +184,124 @@
 			sessionMap.put(SurveyConstants.PARAM_RUN_OFFLINE, false);
 				
 		//init survey item list
-		SortedSet<SurveyQuestion> surveyItemList = getSurveyItemList(sessionMap);
+		SortedMap<Integer, SurveyQuestion> surveyItemList = getQuestionList(sessionMap);
 		surveyItemList.clear();
-		if(items != null){
+		if(questions != null){
 			//remove hidden items.
-			for(SurveyQuestion item : items){
-				//becuase in webpage will use this login name. Here is just 
-				//initial it to avoid session close error in proxy object. 
-				item.getCreateBy().getLoginName();
-				surveyItemList.add(item);
+			for(SurveyQuestion question : questions){
+				surveyItemList.put(question.getSequenceId(),question);
 			}
 		}
+		if(survey.isShowOnePage()){
+			answerForm.setQuestionSeqID(null);
+		}else{
+			if(surveyItemList.size() > 0){
+				answerForm.setQuestionSeqID(surveyItemList.firstKey());
+			}
+		}
+		if(surveyItemList.size() < 2)
+			answerForm.setPosition(SurveyConstants.POSITION_ONLY_ONE);
+		else
+			answerForm.setPosition(SurveyConstants.POSITION_FIRST);
+		return mapping.findForward(SurveyConstants.SUCCESS);
+	}
+
+	private ActionForward nextQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		AnswerForm answerForm = (AnswerForm) form;
+		Integer questionSeqID = answerForm.getQuestionSeqID();
+		String sessionMapID = answerForm.getSessionMapID();
 		
-		sessionMap.put(SurveyConstants.ATTR_SURVEY,survey);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		SortedMap<Integer, SurveyQuestion> surveyItemMap = getQuestionList(sessionMap);
 		
+		ActionErrors errors = getAnswer(request, surveyItemMap.get(questionSeqID));
+		if(!errors.isEmpty()){
+			return mapping.getInputForward();
+		}
+		
+		//go to next question
+		boolean next = false;
+		for(Map.Entry<Integer, SurveyQuestion> entry: surveyItemMap.entrySet()){
+			if(entry.getKey().equals(questionSeqID)){
+				next = true;
+				//failure tolerance: if arrive last one
+				questionSeqID = entry.getKey();
+				continue;
+			}
+			if(next){
+				questionSeqID = entry.getKey();
+				break;
+			}
+		}
+		//failure tolerance
+		if(questionSeqID.equals(surveyItemMap.lastKey()))
+			answerForm.setPosition(SurveyConstants.POSITION_LAST);
+		else
+			answerForm.setPosition(SurveyConstants.POSITION_INSIDE);
+		answerForm.setQuestionSeqID(questionSeqID);
 		return mapping.findForward(SurveyConstants.SUCCESS);
 	}
 
+
+	private ActionForward previousQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		AnswerForm answerForm = (AnswerForm) form;
+		Integer questionSeqID = answerForm.getQuestionSeqID();
+		String sessionMapID = answerForm.getSessionMapID();
+		
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		SortedMap<Integer, SurveyQuestion> surveyItemMap = getQuestionList(sessionMap);
+		
+		ActionErrors errors = getAnswer(request, surveyItemMap.get(questionSeqID));
+		if(!errors.isEmpty()){
+			return mapping.getInputForward();
+		}
+		
+		SortedMap<Integer, SurveyQuestion> subMap = surveyItemMap.headMap(questionSeqID);
+		if(subMap.isEmpty())
+			questionSeqID = surveyItemMap.firstKey();
+		else
+			questionSeqID = subMap.lastKey();
+		if(questionSeqID.equals(surveyItemMap.firstKey())){
+			answerForm.setPosition(SurveyConstants.POSITION_FIRST);
+		}else{
+			answerForm.setPosition(SurveyConstants.POSITION_INSIDE);
+		}
+		answerForm.setQuestionSeqID(questionSeqID);
+		return mapping.findForward(SurveyConstants.SUCCESS);
+	}
+
+	private ActionForward doSurvey(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		AnswerForm answerForm = (AnswerForm) form;
+		Integer questionSeqID = answerForm.getQuestionSeqID();
+		String sessionMapID = answerForm.getSessionMapID();
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		
+		//validate
+		SortedMap<Integer, SurveyQuestion> surveyItemMap = getQuestionList(sessionMap);
+		Collection<SurveyQuestion> surveyItemList = surveyItemMap.values();
+		
+		ActionErrors errors;
+		if(questionSeqID == null || questionSeqID.equals(0))
+			errors = getAnswers(request);
+		else
+			errors = getAnswer(request, surveyItemMap.get(questionSeqID));
+		if(!errors.isEmpty()){
+			return mapping.getInputForward();
+		}
+		
+		List<SurveyAnswer> answerList = new ArrayList<SurveyAnswer>();
+		for(SurveyQuestion question : surveyItemList){
+			if(question.getAnswer() != null)
+				answerList.add(question.getAnswer());
+		}
+		
+		ISurveyService service = getSurveyService();
+		service.updateAnswerList(answerList);
+		return mapping.findForward(SurveyConstants.SUCCESS);
+	}
+
+
+
 	/**
 	 * Finish learning session. 
 	 * @param mapping
@@ -196,12 +317,8 @@
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 		
 		//get mode and ToolSessionID from sessionMAP
-		ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
 		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 		
-		if(!validateBeforeFinish(request, sessionMapID))
-			return mapping.getInputForward();
-		
 		ISurveyService service = getSurveyService();
 		// get sessionId from HttpServletRequest
 		String nextActivityUrl = null ;
@@ -234,8 +351,6 @@
 		
 		//get session value
 		String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
-		if(!validateBeforeFinish(request, sessionMapID))
-			return mapping.getInputForward();
 
 		ReflectionForm refForm = (ReflectionForm) form;
 		HttpSession ss = SessionManager.getSession();
@@ -277,17 +392,79 @@
 	//*************************************************************************************
 	// Private method 
 	//*************************************************************************************
-	private boolean validateBeforeFinish(HttpServletRequest request, String sessionMapID) {
+	/**
+	 * Get answer by special question.
+	 */
+	private ActionErrors getAnswer(HttpServletRequest request,SurveyQuestion question) {
+		ActionErrors errors = new ActionErrors();
+		//get sessionMap
+		String sessionMapID = request.getParameter(SurveyConstants.ATTR_SESSION_MAP_ID);
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+		Long sessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 		
-		HttpSession ss = SessionManager.getSession();
-		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		Long userID = new Long(user.getUserID().longValue());
+		SurveyAnswer answer = getAnswerFromPage(request,question, sessionID);
+		question.setAnswer(answer);
+		//for mandatory questions, answer can not be null.
+		if(!question.isOptional() && answer == null){
+			errors.add(SurveyConstants.ERROR_MSG_KEY,new ActionMessage(SurveyConstants.ERROR_MSG_MANDATORY_QUESTION));
+			addErrors(request, errors);
+		}
+
+		return errors;
+	}
+	/**
+	 * Get all answer for all questions in this page
+	 * @param request
+	 * @return
+	 */
+	private ActionErrors getAnswers(HttpServletRequest request) {
+		ActionErrors errors = new ActionErrors();
+		//get sessionMap
+		String sessionMapID = request.getParameter(SurveyConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		Long sessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+		Collection<SurveyQuestion> questionList = getQuestionList(sessionMap).values();
 		
+		for(SurveyQuestion question :questionList){
+			SurveyAnswer answer = getAnswerFromPage(request,question, sessionID);
+			question.setAnswer(answer);
+			//for mandatory questions, answer can not be null.
+			if(!question.isOptional() && answer == null){
+				errors.add(SurveyConstants.ERROR_MSG_KEY,new ActionMessage(SurveyConstants.ERROR_MSG_MANDATORY_QUESTION));
+				addErrors(request, errors);
+			}
+		}
+		return errors;
+	}
+
+
+	private SurveyAnswer getAnswerFromPage(HttpServletRequest request, SurveyQuestion question, Long sessionID) {
+		
+		String[] choiceList = request.getParameterValues(SurveyConstants.PREFIX_QUESTION_CHOICE+question.getUid());
+		String textEntry = request.getParameter(SurveyConstants.PREFIX_QUESTION_TEXT+question.getUid());
+		if(choiceList == null && textEntry == null)
+			return null;
+		
+		
+		SurveyAnswer answer = question.getAnswer();
+		if(answer == null)
+			answer = new SurveyAnswer();
+		answer.setAnswerChoices(SurveyWebUtils.getChoicesStr(choiceList));
+		answer.setChoices(choiceList);
+		
+		answer.setAnswerText(textEntry);
+		
 		ISurveyService service = getSurveyService();
-		return true;
+		answer.setUser(getCurrentUser(service, sessionID));
+		answer.setUpdateDate(new Timestamp(new Date().getTime()));
+		answer.setSurveyQuestion(question);
+		return answer;
 	}
+
+
+
+	
+
 	private ISurveyService getSurveyService() {
 	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
 	      return (ISurveyService) wac.getBean(SurveyConstants.SURVEY_SERVICE);
@@ -297,31 +474,15 @@
 	 * @param request
 	 * @return
 	 */
-	private SortedSet<SurveyQuestion> getSurveyItemList(SessionMap sessionMap) {
-		SortedSet<SurveyQuestion> list = (SortedSet<SurveyQuestion>) sessionMap.get(SurveyConstants.ATTR_QUESTION_LIST);
+	private SortedMap<Integer, SurveyQuestion> getQuestionList(SessionMap sessionMap) {
+		SortedMap<Integer, SurveyQuestion> list = (SortedMap<Integer, SurveyQuestion>) sessionMap.get(SurveyConstants.ATTR_QUESTION_LIST);
 		if(list == null){
-			list = new TreeSet<SurveyQuestion>(new QuestionsComparator());
+			list = new TreeMap<Integer,SurveyQuestion>(new IntegerComparator());
 			sessionMap.put(SurveyConstants.ATTR_QUESTION_LIST,list);
 		}
 		return list;
 	}	
-	/**
-	 * Get <code>java.util.List</code> from HttpSession by given name.
-	 * 
-	 * @param request
-	 * @param name
-	 * @return
-	 */
-	private List getListFromSession(SessionMap sessionMap,String name) {
-		List list = (List) sessionMap.get(name);
-		if(list == null){
-			list = new ArrayList();
-			sessionMap.put(name,list);
-		}
-		return list;
-	}
 
-
 	private SurveyUser getCurrentUser(ISurveyService service, Long sessionId) {
 		//try to get form system session
 		HttpSession ss = SessionManager.getSession();
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/AnswerForm.java
===================================================================
diff -u
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/AnswerForm.java	(revision 0)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/AnswerForm.java	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -0,0 +1,59 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+/* $$Id$$ */
+package org.lamsfoundation.lams.tool.survey.web.form;
+
+import org.apache.struts.action.ActionForm;
+/**
+ *  Survey Item  Form.
+ *	@struts.form name="answerForm"
+ * @author Steve.Ni
+ * 
+ * @version $Revision$
+ */
+public class AnswerForm extends ActionForm {
+	private String sessionMapID;
+	private Integer questionSeqID;
+	private int position;
+	
+	public int getPosition() {
+		return position;
+	}
+	public void setPosition(int position) {
+		this.position = position;
+	}
+	public Integer getQuestionSeqID() {
+		return questionSeqID;
+	}
+	public void setQuestionSeqID(Integer questionSeqID) {
+		this.questionSeqID = questionSeqID;
+	}
+	public String getSessionMapID() {
+		return sessionMapID;
+	}
+	public void setSessionMapID(String sessionMapID) {
+		this.sessionMapID = sessionMapID;
+	}
+	
+
+}
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/QuestionForm.java
===================================================================
diff -u -rc4a429ad90657aa55fb72fccf49cf717a3e7fd12 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/QuestionForm.java	(.../QuestionForm.java)	(revision c4a429ad90657aa55fb72fccf49cf717a3e7fd12)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/QuestionForm.java	(.../QuestionForm.java)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -27,11 +27,10 @@
 
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.tool.survey.model.Survey;
 import org.lamsfoundation.lams.tool.survey.model.SurveyQuestion;
 /**
  *  Survey Item  Form.
- *	@struts.form name="surveyItemForm"
+ *	@struts.form name="questionForm"
  * @author Steve.Ni
  * 
  * @version $Revision$
Index: lams_tool_survey/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -rec918a1f6fa717d59f8074f508fe798eb3cbdf41 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision ec918a1f6fa717d59f8074f508fe798eb3cbdf41)
+++ lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -7,29 +7,29 @@
 <table id="itemTable" style="align:left;width:650px" >
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 
-<c:forEach var="survey" items="${sessionMap.questionList}" varStatus="status">
+<c:forEach var="question" items="${sessionMap.questionList}" varStatus="status">
 	<tr>
 		<td width="20px" align="center">
 			<c:choose>
-				<c:when test="${survey.type == 1}">
+				<c:when test="${question.type == 1}">
 					<img src="${ctxPath}/includes/images/icon_single.gif"/>
 				</c:when>
-				<c:when test="${survey.type == 2}">
+				<c:when test="${question.type == 2}">
 					<img src="${ctxPath}/includes/images/icon_multiple.gif"/>
 				</c:when>
-				<c:when test="${survey.type == 3}">
+				<c:when test="${question.type == 3}">
 					<img src="${ctxPath}/includes/images/icon_text.gif"/>
 				</c:when>
 			</c:choose>
 		</td>
-		<td>${survey.shortTitle}</td>
+		<td>${question.shortTitle}</td>
 		<td width="80px" align="center">
-			<c:if test="${survey.optional}">
+			<c:if test="${question.optional}">
 				<fmt:message key="label.optional"/>
 			</c:if>
 		</td>
 		<td width="80px" align="center">
-			<a href="#" onclick="editItem(${status.index},${survey.type},'${sessionMapID}')" class="button">
+			<a href="#" onclick="editItem(${status.index},${question.type},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.survey.edit" />
 			</a>
 		</td>
Index: lams_tool_survey/web/pages/learning/learning.jsp
===================================================================
diff -u -r0b9b61d67c2dcf6f83c513325afca117cb1967f2 -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0b9b61d67c2dcf6f83c513325afca117cb1967f2)
+++ lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -7,142 +7,102 @@
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 
-	<%-- param has higher level for request attribute --%>
-	<c:if test="${not empty param.sessionMapID}">
-		<c:set var="sessionMapID" value="${param.sessionMapID}" />
-	</c:if>
-
-	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-	
-	<c:set var="mode" value="${sessionMap.mode}" />
-	<c:set var="toolSessionID" value="${sessionMap.toolSessionID}"/>
-	<c:set var="survey" value="${sessionMap.survey}"/>
-	<c:set var="finishedLock" value="${sessionMap.finishedLock}"/>
-	
 	<script type="text/javascript">
 	<!--
-
-		function checkNew(){
- 		    var reqIDVar = new Date();
-			document.location.href = "<c:url value="/learning/start.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();
- 		    return false;
+		
+		function previousQuestion(sessionMapID){
+			$("surveyForm").action = '<c:url value="/learning/previousQuestion.do"/>';
+			$("surveyForm").submit();
 		}
-		function viewItem(itemUid){
-			var myUrl = "<c:url value="/reviewItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemUid=" + itemUid;
-			launchPopup(myUrl,"LearnerView");
+		function nextQuestion(sessionMapID){
+			$("surveyForm").action = '<c:url value="/learning/nextQuestion.do"/>';
+			$("surveyForm").submit();
 		}
-		function completeItem(itemUid){
-			document.location.href = "<c:url value="/learning/completeItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=" + itemUid;
-			return false;
-		}
-		function finishSession(){
-			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
-			return false;
-		}
-		function continueReflect(){
-			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
-		}
 		
 	-->        
     </script>
 </head>
 <body>
+	<html:form action="/learning/doSurvey" method="post" styleId="surveyForm">
+	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+	<html:hidden property="questionSeqID"/>
+	<html:hidden property="sessionMapID"/>
+	<html:hidden property="position"/>
+	<c:set var="sessionMapID" value="${formBean.sessionMapID}"/>
+	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+	<c:set var="position" value="${formBean.position}"/>
+	<c:set var="questionSeqID" value="${formBean.questionSeqID}"/>
 	<div id="page-learner">
 		<h1 class="no-tabs-below">
-			${survey.title}
+			${sessionMap.title}
 		</h1>
 		<div id="header-no-tabs-learner">
 		</div>
 		<!--closes header-->
 
 		<div id="content-learner">
 			<h2>
-				${survey.instructions}
+				${sessionMap.instructions}
 			</h2>
-
+			<BR><BR>
 			<%@ include file="/common/messages.jsp"%>
-			<table cellpadding="0" cellspacing="0" class="alternative-color">
-				<tr>
-					<th width="255px">
-						<fmt:message key="label.resoruce.to.review" />
-					</th>
-					<th width="75px">
-						<fmt:message key="label.completed" />
-					</th>
-					<th align="center">
-
-					</th>
-				</tr>
-				<c:forEach var="item" items="${sessionMap.surveyList}">
-					<tr>
-						<td align="center">
-							${item.title}
-							<c:if test="${!item.createByAuthor}">
-								[${item.createBy.loginName}]
-							</c:if>
-						</td>
-						<td align="center">
-							<c:if test="${item.complete}">
-								<img src="<html:rewrite page='/includes/images/tick.gif'/>" border="0">
-							</c:if>
-
-						</td>
-
-						<td>
-							<c:if test="${mode != 'teacher' && (not finishedLock)}">
-								<a href="javascript:;" onclick="return completeItem(${item.uid})" class="button">
-									<fmt:message key="label.completed"/>
-								</a>
-							</c:if>
-							&nbsp;
-							<c:if test="${not finishedLock}">
-								<a href="javascript:;"  onclick="viewItem(${item.uid})" class="button">
-									<fmt:message key="label.view"/>
-								</a>
-							</c:if>
-						</td>
-					</tr>
-				</c:forEach>
-				<c:if test="${survey.miniViewSurveyNumber > 0}">
-					<tr>
-						<td colspan="3" align="left">
-							<b>${survey.miniViewNumberStr}</b>
-						</td>
-					</tr>
-				</c:if>
-			</table>
-			<div class="left-buttons">
-				<html:button property="checkNewButton" onclick="return checkNew()" disabled="${finishedLock}" styleClass="button">
-					<fmt:message key="label.check.for.new" />
-				</html:button>
-			</div>
-			<c:if test="${mode != 'teacher'}">
-				<div class="right-buttons">
+				
+				<table cellpadding="0" cellspacing="0" class="alternative-color">
 					<c:choose>
-						<c:when test="${sessionMap.reflectOn}">
-							<html:button property="FinishButton"  onclick="return continueReflect()" disabled="${finishedLock}"  styleClass="button">
-								<fmt:message key="label.continue" />
-							</html:button>
+						<%-- Show on one page or when learner does not choose edit one question --%>
+						<c:when test="${sessionMap.showOnOnePage && empty questionSeqID}">
+						<c:forEach var="element" items="${sessionMap.questionList}">
+							<c:set var="question" value="${element.value}" />
+							<%@ include file="/pages/learning/question.jsp"%>
+						</c:forEach>
 						</c:when>
 						<c:otherwise>
-							<html:button property="FinishButton"  onclick="return finishSession()" disabled="${finishedLock}"  styleClass="button">
-								<fmt:message key="label.finished" />
-							</html:button>
+							
+							<c:set var="question" value="${sessionMap.questionList[questionSeqID]}"/>
+							<%@ include file="/pages/learning/question.jsp"%>
 						</c:otherwise>
 					</c:choose>
-				</div>
-			</c:if>
-			<div style="height: 70px"></div> 
-			
-				<%-- end mode != teacher --%>
-			</c:if>
+				</table>
+				<%-- Display button according to different situation --%>
+				<c:if test="${sessionMap.mode != 'teacher'}">
+					<div class="right-buttons">
+						<c:choose>
+							<c:when test="${(sessionMap.showOnOnePage && empty questionSeqID) or position == 3}">
+								<html:submit property="doSurvey"  disabled="${sessionMap.finishedLock}"  styleClass="button">
+									<fmt:message key="label.submit.survey" />
+								</html:submit>
+							</c:when>
+							<c:otherwise>
+								<c:if test="${position == 1 || position == 0}">
+									<html:button property="NextButton"  onclick="nextQuestion()" styleClass="button">
+										<fmt:message key="label.next" />
+									</html:button>
+								</c:if>
+								&nbsp;&nbsp;
+								<c:if test="${position == 2 || position == 0}">
+									<html:button property="PreviousButton"  onclick="previousQuestion()" styleClass="button">
+										<fmt:message key="label.previous" />
+									</html:button> 
+								</c:if>
+								<c:if test="${position == 2}">
+									<html:submit property="doSurvey"  disabled="${sessionMap.finishedLock}"  styleClass="button">
+										<fmt:message key="label.submit.survey" />
+									</html:submit>										
+								</c:if>
+							</c:otherwise>
+						</c:choose>
+					</div>
+					<%-- end mode != teacher --%>
+				</c:if>
+		
 		</div>  <!--closes content-->
 		
 		<div id="footer-learner">
 		</div>
 		<!--closes footer-->
 
 	</div><!--closes page-->
+</html:form>	
 </body>
 </html:html>
 
Index: lams_tool_survey/web/pages/learning/question.jsp
===================================================================
diff -u
--- lams_tool_survey/web/pages/learning/question.jsp	(revision 0)
+++ lams_tool_survey/web/pages/learning/question.jsp	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -0,0 +1,44 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<tr>
+	<th class="first">
+		<c:if test="${not question.optional}">
+			<span style="color: #FF0000">*</span>
+		</c:if>
+		<c:out value="${question.description}" escapeXml="false"/>
+	</th>
+</tr>
+<tr>
+	<td>
+		<c:set var="answerText" value=""/>
+		<c:if test="${not empty question.answer}">
+			<c:set var="answerText" value="${question.answer.answerText}"/>
+		</c:if>
+		<c:forEach var="option" items="${question.options}">
+			<c:set var="checked" value=""/>
+			<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="checked=\"checked=\""/>
+					</c:if>
+				</c:forEach>
+			</c:if>
+			<c:choose>
+				<c:when test="${question.type == 1}">
+					<input type="radio" name="optionChoice${question.uid}" value="${option.uid}"  ${checked} />
+					${option.description}<BR><BR>
+				</c:when>
+				<c:when test="${question.type == 2}">
+					<input type="checkbox" name="optionChoice${question.uid}" value="${option.uid}" ${checked}/>
+					${option.description}<BR><BR>
+				</c:when>
+			</c:choose>
+		</c:forEach>
+		<c:if test="${question.type == 3}">
+			<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">${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
--- lams_tool_survey/web/pages/learning/result.jsp	(revision 0)
+++ lams_tool_survey/web/pages/learning/result.jsp	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -0,0 +1,30 @@
+	<script type="text/javascript">
+	<!--
+		
+		function finishSession(){
+			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
+			return false;
+		}
+		function continueReflect(){
+			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
+		}
+		
+	-->        
+    </script>
+
+		<c:if test="${mode != 'teacher'}">
+			<div class="right-buttons">
+				<c:choose>
+					<c:when test="${sessionMap.reflectOn}">
+						<html:button property="FinishButton"  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>
Index: lams_tool_survey/web/pages/learning/start.jsp
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -ra2c091a27056e7b41531ca140012603bf027d5b8
--- lams_tool_survey/web/pages/learning/start.jsp	(.../start.jsp)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/web/pages/learning/start.jsp	(.../start.jsp)	(revision a2c091a27056e7b41531ca140012603bf027d5b8)
@@ -4,14 +4,14 @@
 	<body>
 
 		<c:choose>
-			<c:when test="${sessionMap.runAuto}">
+			<c:when test="${sessionMap.showOnOnePage}">
 				<script type="text/javascript">
-					document.location = "<c:url value="/reviewItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemUid=${itemUid}";
+					document.location = "<c:url value="/learning/allonpage.do"/>?sessionMapID=${sessionMapID}";
 				</script>
 			</c:when>
 			<c:otherwise>
 				<script type="text/javascript">
-					document.location = "<c:url value="/pages/learning/learning.jsp?sessionMapID=${sessionMapID}&mode=${mode}"/>"
+					document.location = "<c:url value="/learning/oneonpage.do"/>?sessionMapID=${sessionMapID}";
 				</script>
 			</c:otherwise>
 		</c:choose>
Fisheye: Tag a2c091a27056e7b41531ca140012603bf027d5b8 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/learning/success.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?