Index: lams_tool_assessment/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/build.properties,v
diff -u -r1.2.2.1 -r1.2.2.1.2.1
--- lams_tool_assessment/build.properties	19 Jun 2009 06:41:15 -0000	1.2.2.1
+++ lams_tool_assessment/build.properties	17 Dec 2009 22:05:34 -0000	1.2.2.1.2.1
@@ -13,7 +13,7 @@
 weblib=lib
 
 #project version
-tool.version=20090612
+tool.version=20091215
 
 # hide tool option
 hideTool=false
Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/create_lams_tool_assessment.sql,v
diff -u -r1.12.2.2 -r1.12.2.2.2.1
--- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	19 Jun 2009 04:33:01 -0000	1.12.2.2
+++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	17 Dec 2009 22:05:33 -0000	1.12.2.2.2.1
@@ -62,6 +62,7 @@
    shuffle tinyint,
    case_sensitive tinyint,
    correct_answer tinyint DEFAULT 0,
+   allow_rich_editor tinyint DEFAULT 0,
    create_date datetime,
    create_by bigint,
    assessment_uid bigint,
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20091215_updateFrom233.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Attic/AssessmentQuestion.hbm.xml,v
diff -u -r1.6 -r1.6.6.1
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml	25 Mar 2009 22:46:28 -0000	1.6
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml	17 Dec 2009 22:05:33 -0000	1.6.6.1
@@ -147,6 +147,14 @@
         />
 
         <property
+            name="allowRichEditor"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_rich_editor"
+        />
+
+        <property
             name="createDate"
             type="java.util.Date"
             update="true"
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java,v
diff -u -r1.11 -r1.11.6.1
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	25 Mar 2009 22:46:28 -0000	1.11
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	17 Dec 2009 22:05:33 -0000	1.11.6.1
@@ -74,6 +74,8 @@
     private boolean caseSensitive;
     
     private boolean correctAnswer;
+    
+    private boolean allowRichEditor;
 
     private Date createDate;
     private AssessmentUser createBy;
@@ -356,7 +358,19 @@
     public void setCorrectAnswer(boolean correctAnswer) {
 	this.correctAnswer = correctAnswer;
     }
+    
+    /**
+     * @hibernate.property column="allow_rich_editor"
+     * @return
+     */
+    public boolean isAllowRichEditor() {
+	return allowRichEditor;
+    }
 
+    public void setAllowRichEditor(boolean allowRichEditor) {
+	this.allowRichEditor = allowRichEditor;
+    }
+
     /**
      * @hibernate.property column="create_date"
      * @return
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java,v
diff -u -r1.16 -r1.16.6.1
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	1 Apr 2009 13:05:12 -0000	1.16
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	17 Dec 2009 22:05:33 -0000	1.16.6.1
@@ -1140,6 +1140,7 @@
 	form.setShuffle(question.isShuffle());
 	form.setCaseSensitive(question.isCaseSensitive());
 	form.setCorrectAnswer(question.getCorrectAnswer());
+	form.setAllowRichEditor(question.isAllowRichEditor());
 	if (questionIdx >= 0) {
 	    form.setQuestionIndex(new Integer(questionIdx).toString());
 	}
@@ -1223,7 +1224,7 @@
 	    question.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
 	    question.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());	    
 	} else if ((type == AssessmentConstants.QUESTION_TYPE_ESSAY)) {
-	    
+	    question.setAllowRichEditor(questionForm.isAllowRichEditor());
 	} else if (type == AssessmentConstants.QUESTION_TYPE_ORDERING) {
 	    question.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
 	    question.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java,v
diff -u -r1.4 -r1.4.8.1
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java	25 Feb 2009 22:16:34 -0000	1.4
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java	17 Dec 2009 22:05:34 -0000	1.4.8.1
@@ -55,6 +55,7 @@
     private boolean shuffle;
     private boolean caseSensitive;
     private boolean correctAnswer;
+    private boolean allowRichEditor;
 
     public String getSessionMapID() {
 	return sessionMapID;
@@ -199,5 +200,13 @@
     public void setCorrectAnswer(boolean correctAnswer) {
 	this.correctAnswer = correctAnswer;
     }
+    
+    public boolean isAllowRichEditor() {
+	return allowRichEditor;
+    }
 
+    public void setAllowRichEditor(boolean allowRichEditor) {
+	this.allowRichEditor = allowRichEditor;
+    }
+
 }
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addessay.jsp,v
diff -u -r1.7.6.1 -r1.7.6.2
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	5 Aug 2009 09:13:37 -0000	1.7.6.1
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	17 Dec 2009 22:05:33 -0000	1.7.6.2
@@ -107,6 +107,11 @@
 					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
 				</div>
 				<html:text property="defaultGrade" size="3" />
+				
+				<div class="field-name space-top" >
+					<fmt:message key="label.authoring.basic.allow.learners.rich.editor" />
+				</div>
+				<html:checkbox property="allowRichEditor" styleClass="noBorder" />
 					
 				<div class="field-name space-top">
 					<fmt:message key="label.authoring.basic.general.feedback" />
Index: lams_tool_assessment/web/pages/learning/parts/essay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/essay.jsp,v
diff -u -r1.3 -r1.3.8.1
--- lams_tool_assessment/web/pages/learning/parts/essay.jsp	5 Mar 2009 15:37:31 -0000	1.3
+++ lams_tool_assessment/web/pages/learning/parts/essay.jsp	17 Dec 2009 22:05:33 -0000	1.3.8.1
@@ -7,7 +7,17 @@
 <table cellspacing="0" style="padding-bottom: 10px;">
 	<tr>
 		<td style="padding:5px 0px 2px 15px; vertical-align:middle; background:none; border-bottom:0px; ">
-			<lams:STRUTS-textarea property="question${status.index}" rows="7" cols="60" value="${question.answerString}" disabled="${finishedLock}"/>
+			<c:choose>
+				<c:when test="${question.allowRichEditor && !finishedLock}">
+					<lams:FCKEditor id="question${status.index}" value="${question.answerString}" toolbarSet="Default-Learner"></lams:FCKEditor>
+				</c:when>
+				<c:when test="${question.allowRichEditor && finishedLock}">
+					${question.answerString}
+				</c:when>				
+				<c:otherwise>
+					<lams:STRUTS-textarea property="question${status.index}" rows="7" cols="60" value="${question.answerString}" disabled="${finishedLock}" />
+				</c:otherwise>
+			</c:choose>
 		</td>
 	</tr>
 </table>