Index: lams_tool_assessment/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/build.properties,v
diff -u -r1.4 -r1.5
--- lams_tool_assessment/build.properties	15 Dec 2009 13:58:57 -0000	1.4
+++ lams_tool_assessment/build.properties	2 Mar 2010 13:10:00 -0000	1.5
@@ -13,7 +13,7 @@
 weblib=lib
 
 #project version
-tool.version=20091215
+tool.version=20100225
 
 # 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.16 -r1.17
--- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	1 Mar 2010 20:04:18 -0000	1.16
+++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	2 Mar 2010 13:10:00 -0000	1.17
@@ -37,7 +37,8 @@
    content_id bigint unique,
    allow_question_feedback tinyint,
    allow_overall_feedback tinyint,
-   allow_right_wrong_answers tinyint,
+   allow_right_answers tinyint,
+   allow_wrong_answers tinyint,
    allow_grades_after_attempt tinyint,
    allow_history_responses tinyint,
    questions_per_page integer DEFAULT 0,
@@ -169,7 +170,7 @@
 
 INSERT INTO `tl_laasse10_assessment` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, 
  `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_question_feedback`, 
- `allow_overall_feedback`, `allow_right_wrong_answers`, `allow_grades_after_attempt`, `allow_history_responses`, `shuffled`) VALUES
-  (1,NULL,NULL,NULL,'Assessment','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0);
-  
+ `allow_overall_feedback`, `allow_right_answers`, `allow_wrong_answers`, `allow_grades_after_attempt`, `allow_history_responses`, `shuffled`) VALUES
+  (1,NULL,NULL,NULL,'Assessment','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0,0);
+
 SET FOREIGN_KEY_CHECKS=1;
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20100225_updateTo234.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Attic/Assessment.hbm.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	17 Mar 2009 22:40:48 -0000	1.4
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	2 Mar 2010 13:10:00 -0000	1.5
@@ -200,14 +200,22 @@
         />
 
         <property
-            name="allowRightWrongAnswersAfterQuestion"
+            name="allowRightAnswersAfterQuestion"
             type="boolean"
             update="true"
             insert="true"
-            column="allow_right_wrong_answers"
+            column="allow_right_answers"
         />
 
         <property
+            name="allowWrongAnswersAfterQuestion"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_wrong_answers"
+        />
+
+        <property
             name="allowGradesAfterAttempt"
             type="boolean"
             update="true"
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java,v
diff -u -r1.5 -r1.6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	17 Mar 2009 22:40:48 -0000	1.5
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	2 Mar 2010 13:10:00 -0000	1.6
@@ -75,8 +75,10 @@
 
     private boolean allowOverallFeedbackAfterQuestion;
     
-    private boolean allowRightWrongAnswersAfterQuestion;
+    private boolean allowRightAnswersAfterQuestion;
     
+    private boolean allowWrongAnswersAfterQuestion;
+    
     private boolean allowGradesAfterAttempt;
     
     private boolean allowHistoryResponses;
@@ -525,18 +527,32 @@
     }
     
     /**
-     * @hibernate.property column="allow_right_wrong_answers"
+     * @hibernate.property column="allow_right_answers"
      * @return
      */
-    public boolean isAllowRightWrongAnswersAfterQuestion() {
-	return allowRightWrongAnswersAfterQuestion;
+    public boolean isAllowRightAnswersAfterQuestion() {
+	return allowRightAnswersAfterQuestion;
     }
 
-    public void setAllowRightWrongAnswersAfterQuestion(boolean allowRightWrongAnswersAfterQuestion) {
-	this.allowRightWrongAnswersAfterQuestion = allowRightWrongAnswersAfterQuestion;
+    public void setAllowRightAnswersAfterQuestion(boolean allowRightAnswersAfterQuestion) {
+	this.allowRightAnswersAfterQuestion = allowRightAnswersAfterQuestion;
     }
     
     /**
+     * @hibernate.property column="allow_wrong_answers"
+     * @return
+     */
+    public boolean isAllowWrongAnswersAfterQuestion() {
+	return allowWrongAnswersAfterQuestion;
+    }
+
+    public void setAllowWrongAnswersAfterQuestion(boolean allowWrongAnswersAfterQuestion) {
+	this.allowWrongAnswersAfterQuestion = allowWrongAnswersAfterQuestion;
+    }
+    
+    
+    
+    /**
      * @hibernate.property column="allow_grades_after_attempt"
      * @return
      */
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java,v
diff -u -r1.14 -r1.15
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	3 Apr 2009 18:38:47 -0000	1.14
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	2 Mar 2010 13:10:00 -0000	1.15
@@ -545,7 +545,7 @@
 		String answerString = request.getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i);
 		if (answerString != null) {
 		    question.setAnswerBoolean(Boolean.parseBoolean(answerString));
-		    question.setAnswerString("not null");
+		    question.setAnswerString("answered");
 		}
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_ESSAY) {
 		String answerString = request.getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i);
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java,v
diff -u -r1.2 -r1.3
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java	10 Mar 2009 21:39:14 -0000	1.2
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java	2 Mar 2010 13:10:00 -0000	1.3
@@ -76,7 +76,8 @@
 	    assessment.setAllowGradesAfterAttempt(false);
 	    assessment.setAllowOverallFeedbackAfterQuestion(false);
 	    assessment.setAllowQuestionFeedback(false);
-	    assessment.setAllowRightWrongAnswersAfterQuestion(false);
+	    assessment.setAllowRightAnswersAfterQuestion(false);
+	    assessment.setAllowWrongAnswersAfterQuestion(false);
 	    assessment.setDefineLater(false);
 	    assessment.setShuffled(false);
 	    assessment.setRunOffline(false);
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/advance.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_assessment/web/pages/authoring/advance.jsp	11 Mar 2009 16:07:01 -0000	1.2
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	2 Mar 2010 13:10:00 -0000	1.3
@@ -64,14 +64,22 @@
 </p>
 
 <p>
-	<html:checkbox property="assessment.allowRightWrongAnswersAfterQuestion" styleClass="noBorder" styleId="allowRightWrongAnswersAfterQuestion">
+	<html:checkbox property="assessment.allowRightAnswersAfterQuestion" styleClass="noBorder" styleId="allowRightAnswersAfterQuestion">
 	</html:checkbox>
-	<label for="allowRightWrongAnswersAfterQuestion">
-		<fmt:message key="label.authoring.advance.allow.students.right.wrong.answers" />
+	<label for="allowRightAnswersAfterQuestion">
+		<fmt:message key="label.authoring.advance.allow.students.right.answers" />
 	</label>
 </p>
 
 <p>
+	<html:checkbox property="assessment.allowWrongAnswersAfterQuestion" styleClass="noBorder" styleId="allowWrongAnswersAfterQuestion">
+	</html:checkbox>
+	<label for="allowWrongAnswersAfterQuestion">
+		<fmt:message key="label.authoring.advance.allow.students.wrong.answers" />
+	</label>
+</p>
+
+<p>
 	<html:checkbox property="assessment.allowGradesAfterAttempt" styleClass="noBorder" styleId="allowGradesAfterAttempt">
 	</html:checkbox>
 	<label for="allowGradesAfterAttempt">
Index: lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp	10 Mar 2009 21:39:14 -0000	1.6
+++ lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp	2 Mar 2010 13:10:00 -0000	1.7
@@ -7,14 +7,16 @@
 <table cellspacing="0" style="padding-bottom: 10px;">
 	<c:forEach var="option" items="${question.questionOptions}">
 		<tr>
-			<c:if test="${finishedLock && assessment.allowRightWrongAnswersAfterQuestion}">
+			<c:if test="${finishedLock}">
 				<td style="padding:5px 0px 2px 15px; vertical-align:middle; background:none; border-bottom:0px; width: 7px;">
-					<c:if test="${(option.answerInt == option.uid)}">
+				
+					<c:if test="${assessment.allowRightAnswersAfterQuestion && (option.answerInt == option.uid)}">
 						<img src="<html:rewrite page='/includes/images/completeitem.gif'/>"	border="0">	
 					</c:if>
-					<c:if test="${(option.answerInt != -1) && (option.answerInt != option.uid)}">
-						<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"	border="0">	
-					</c:if>	
+					<c:if test="${assessment.allowWrongAnswersAfterQuestion && (option.answerInt != -1) && (option.answerInt != option.uid)}">
+						<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>" border="0">	
+					</c:if>
+						
 				</td>		
 			</c:if>			
 			<td style="padding:5px 15px 2px; vertical-align:middle; background:none; border-bottom:0px; width: 40%;">
Index: lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp	13 Jan 2010 22:16:57 -0000	1.5
+++ lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp	2 Mar 2010 13:10:00 -0000	1.6
@@ -14,14 +14,16 @@
 <table cellspacing="0" style="padding-bottom: 10px;">
 	<c:forEach var="option" items="${question.questionOptions}">
 		<tr>
-			<c:if test="${finishedLock && assessment.allowRightWrongAnswersAfterQuestion}">
+			<c:if test="${finishedLock}">
 				<td style="padding:5px 0px 2px 15px; vertical-align:middle; background:none; border-bottom:0px; width: 7px;">
-					<c:if test="${option.answerBoolean && (option.grade > 0)}">
+				
+					<c:if test="${assessment.allowRightAnswersAfterQuestion && option.answerBoolean && (option.grade > 0)}">
 						<img src="<html:rewrite page='/includes/images/completeitem.gif'/>"	border="0">	
 					</c:if>
-					<c:if test="${option.answerBoolean && (option.grade <= 0)}">
-						<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"	border="0">	
-					</c:if>	
+					<c:if test="${assessment.allowWrongAnswersAfterQuestion && option.answerBoolean && (option.grade <= 0)}">
+						<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>" border="0">	
+					</c:if>
+						
 				</td>		
 			</c:if>		
 			<td style="padding:5px 0px 2px 15px; vertical-align:middle; background:none; width: 5px; border-bottom:0px; ">
@@ -46,14 +48,14 @@
 			</td>
 			<c:if test="${finishedLock && option.answerBoolean && assessment.allowQuestionFeedback}">
 
-			      	<c:choose>
-                                 <c:when test="${option.grade <= 0}">
-                                  <c:set var="color" scope="page" value="red" />
-        			 </c:when>
-				 <c:otherwise>
-                                  <c:set var="color" scope="page" value="blue" />
-        			 </c:otherwise>
-                                </c:choose>
+				<c:choose>
+                	<c:when test="${option.grade <= 0}">
+                    	<c:set var="color" scope="page" value="red" />
+        			</c:when>
+					<c:otherwise>
+                    	<c:set var="color" scope="page" value="blue" />
+        			</c:otherwise>
+        		</c:choose>
 
 				<td style="padding:5px 10px 2px; vertical-align:middle; background:none; border-bottom:0px; font-style: italic; color:${color};" width="30%">
 					<c:out value="${option.feedback}" escapeXml="false" />
Index: lams_tool_assessment/web/pages/learning/parts/numerical.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/numerical.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_assessment/web/pages/learning/parts/numerical.jsp	6 Mar 2009 16:15:09 -0000	1.5
+++ lams_tool_assessment/web/pages/learning/parts/numerical.jsp	2 Mar 2010 13:10:00 -0000	1.6
@@ -6,16 +6,16 @@
 
 <table cellspacing="0" style="padding-bottom: 10px;">
 	<tr>
-		<c:if test="${finishedLock && assessment.allowRightWrongAnswersAfterQuestion}">
+		<c:if test="${finishedLock}">
 			<td style="padding:5px 0px 2px 15px; vertical-align:middle; background:none; border-bottom:0px; width: 7px;">
-				<c:choose>
-					<c:when	test="${question.mark > 0}">
-						<img src="<html:rewrite page='/includes/images/completeitem.gif'/>"	border="0">
-					</c:when>
-					<c:otherwise>
-						<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>" border="0">
-					</c:otherwise>
-				</c:choose>				
+			
+				<c:if test="${assessment.allowRightAnswersAfterQuestion && (question.mark > 0)}">
+					<img src="<html:rewrite page='/includes/images/completeitem.gif'/>"	border="0">	
+				</c:if>			
+				<c:if test="${assessment.allowWrongAnswersAfterQuestion && !(question.mark > 0)}">
+					<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>" border="0">
+				</c:if>
+				
 			</td>		
 		</c:if>		
 		<td style="padding:5px 0px 2px 15px; vertical-align:middle; background:none; border-bottom:0px; ">
Index: lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp	6 Mar 2009 16:15:09 -0000	1.5
+++ lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp	2 Mar 2010 13:10:00 -0000	1.6
@@ -6,16 +6,16 @@
 
 <table cellspacing="0" style="padding-bottom: 10px;">
 	<tr>
-		<c:if test="${finishedLock && assessment.allowRightWrongAnswersAfterQuestion}">
+		<c:if test="${finishedLock}">
 			<td style="padding:5px 0px 2px 15px; vertical-align:middle; background:none; border-bottom:0px; width: 7px;">
-				<c:choose>
-					<c:when	test="${question.mark > 0}">
-						<img src="<html:rewrite page='/includes/images/completeitem.gif'/>"	border="0">
-					</c:when>
-					<c:otherwise>
-						<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>" border="0">
-					</c:otherwise>
-				</c:choose>				
+			
+				<c:if test="${assessment.allowRightAnswersAfterQuestion && (question.mark > 0)}">
+					<img src="<html:rewrite page='/includes/images/completeitem.gif'/>"	border="0">	
+				</c:if>			
+				<c:if test="${assessment.allowWrongAnswersAfterQuestion && !(question.mark > 0)}">
+					<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>" border="0">
+				</c:if>			
+		
 			</td>		
 		</c:if>	
 		<td style="padding:5px 0px 2px 15px; vertical-align:middle; background:none; border-bottom:0px; ">
Index: lams_tool_assessment/web/pages/learning/parts/truefalse.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/parts/truefalse.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_assessment/web/pages/learning/parts/truefalse.jsp	6 Mar 2009 16:15:09 -0000	1.4
+++ lams_tool_assessment/web/pages/learning/parts/truefalse.jsp	2 Mar 2010 13:10:00 -0000	1.5
@@ -6,14 +6,24 @@
 
 <table cellspacing="0" style="padding-bottom: 10px;">
 		<tr>
-			<c:if test="${finishedLock && assessment.allowRightWrongAnswersAfterQuestion}">
+			<c:if test="${finishedLock}">
 				<td style="padding:5px 0px 2px 15px; vertical-align:middle; background:none; border-bottom:0px; width: 7px;">
-					<c:if test="${(question.correctAnswer) and (question.answerString != null)}">
-						<img src="<html:rewrite page='/includes/images/completeitem.gif'/>"	border="0">	
+				
+					<c:if test="${(question.answerString != null) 
+							&& (assessment.allowRightAnswersAfterQuestion && (question.answerBoolean == question.correctAnswer) 
+							|| assessment.allowWrongAnswersAfterQuestion && (question.answerBoolean != question.correctAnswer)) }">
+					
+						<c:choose>
+							<c:when test="${question.correctAnswer}">
+								<img src="<html:rewrite page='/includes/images/completeitem.gif'/>"	border="0">	
+							</c:when>
+							<c:otherwise>
+								<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>" border="0">	
+							</c:otherwise>		
+						</c:choose>					
+					
 					</c:if>
-					<c:if test="${(! question.correctAnswer) and (question.answerString != null)}">
-						<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"	border="0">	
-					</c:if>	
+						
 				</td>		
 			</c:if>			
 			<td style="padding:5px 0px 2px 15px; vertical-align:middle; background:none; width: 5px; border-bottom:0px; ">
@@ -27,14 +37,23 @@
 			</td>
 		</tr>
 		<tr>
-			<c:if test="${finishedLock && assessment.allowRightWrongAnswersAfterQuestion}">
+			<c:if test="${finishedLock}">
 				<td style="padding:5px 0px 2px 15px; vertical-align:middle; background:none; border-bottom:0px; width: 7px;">
-					<c:if test="${(!question.correctAnswer) and (question.answerString != null)}">
-						<img src="<html:rewrite page='/includes/images/completeitem.gif'/>"	border="0">	
-					</c:if>
-					<c:if test="${(question.correctAnswer) and (question.answerString != null)}">
-						<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>"	border="0">	
-					</c:if>	
+				
+					<c:if test="${(question.answerString != null) 
+							&& (assessment.allowRightAnswersAfterQuestion && (question.answerBoolean == question.correctAnswer) 
+							|| assessment.allowWrongAnswersAfterQuestion && (question.answerBoolean != question.correctAnswer)) }">
+					
+						<c:choose>
+							<c:when test="${!question.correctAnswer}">
+								<img src="<html:rewrite page='/includes/images/completeitem.gif'/>"	border="0">	
+							</c:when>
+							<c:otherwise>
+								<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>" border="0">	
+							</c:otherwise>		
+						</c:choose>					
+					</c:if>				
+						
 				</td>		
 			</c:if>			
 			<td style="padding:5px 0px 2px 15px; vertical-align:middle; background:none; width: 5px; border-bottom:0px; ">
Index: lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	17 Mar 2009 22:40:45 -0000	1.1
+++ lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	2 Mar 2010 13:10:00 -0000	1.2
@@ -91,12 +91,12 @@
 	
 	<tr>
 		<td>
-			<fmt:message key="label.authoring.advance.allow.students.right.wrong.answers" />
+			<fmt:message key="label.authoring.advance.allow.students.right.answers" />
 		</td>
 		
 		<td>
 			<c:choose>
-				<c:when test="${assessment.allowRightWrongAnswersAfterQuestion == true}">
+				<c:when test="${assessment.allowRightAnswersAfterQuestion == true}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
@@ -107,6 +107,22 @@
 	</tr>
 	<tr>
 		<td>
+			<fmt:message key="label.authoring.advance.allow.students.wrong.answers" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${assessment.allowWrongAnswersAfterQuestion == true}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>	
+	<tr>
+		<td>
 			<fmt:message key="label.authoring.advance.allow.students.grades" />
 		</td>