Index: openacs-4/packages/assessment/lib/session-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/lib/session-items.adp	21 Feb 2005 14:32:55 -0000	1.4
+++ openacs-4/packages/assessment/lib/session-items.adp	2 Mar 2005 17:18:25 -0000	1.5
@@ -25,7 +25,11 @@
 
 <td>
 <if @survey_p@ ne t>
-    <if @items.result_points@ not nil><b>@items.result_points@ / @items.points@ #assessment.points#<if @items.feedback@ not nil>: @items.feedback;noquote@</b></if></b>
+    <if @items.result_points@ not nil><b>@items.result_points@ / @items.points@ #assessment.points#
+    <if @show_feedback@ ne none>
+        <if @items.feedback@ not nil>: @items.feedback;noquote@</b></if>
+    </if>	
+    </b>
     </if>
     <else>
       <if @items.answered_p@ eq t><b>#assessment.not_yet_reviewed#</b> </if>
Index: openacs-4/packages/assessment/lib/session-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/lib/session-items.tcl	21 Feb 2005 14:32:55 -0000	1.4
+++ openacs-4/packages/assessment/lib/session-items.tcl	2 Mar 2005 17:18:25 -0000	1.5
@@ -27,10 +27,14 @@
 	set answered_p t
 
 	if {$result_points < $points} {
-	    set feedback "<font color=red>$feedback_wrong</font>"
+	    if {$show_feedback != "correct"} {
+	        set feedback "<font color=red>$feedback_wrong</font>"
+	    }	
 	} else {
-	    set feedback "<font color=green>$feedback_right</font>"
-	}
+	    if {$show_feedback != "incorrect"} {
+	        set feedback "<font color=green>$feedback_right</font>"
+	    }
+	}	
     } else {
 	set result_points ""
 	set feedback ""
Index: openacs-4/packages/assessment/www/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.adp,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/assessment/www/session.adp	21 Feb 2005 14:32:56 -0000	1.24
+++ openacs-4/packages/assessment/www/session.adp	2 Mar 2005 17:18:26 -0000	1.25
@@ -32,7 +32,7 @@
 </td></tr>
 
 <tr><td><i> @sections.description@ </i><br></td></tr>
-<tr><td>@sections.feedback_text@</td></tr>
+<tr><td><if @assessment_data.show_feedback@ ne none>@sections.feedback_text@</if></td></tr>
 </table>      
 
 <blockquote>