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 -N -r1.24 -r1.25
--- openacs-4/packages/assessment/lib/session-items.adp	22 May 2018 15:59:45 -0000	1.24
+++ openacs-4/packages/assessment/lib/session-items.adp	22 May 2018 17:30:02 -0000	1.25
@@ -5,9 +5,9 @@
 
     <multiple name="items">
 <if @admin_p;literal@ true><p><a href="@items.item_edit_general_url@">Edit this question</a></p></if>
-<if @feedback_only_p;literal@ eq 0 or @items.has_feedback_p;literal@ eq 1>
+<if @feedback_only_p;literal@ false or @items.has_feedback_p;literal@ true>
      <if @show_item_name_p;literal@ true><p style="font-weight:bold;">@items.name@:</p></if>
-      <if @survey_p;literal@ ne t and @items.as_item_id@ ne @items.next_as_item_id@>
+      <if @survey_p;literal@ false and @items.as_item_id@ ne @items.next_as_item_id@>
 	<if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
       </if>
      </if>
@@ -20,7 +20,7 @@
 	</if>
 	    <group column=as_item_id>
 	      @items.description;noquote@
-		<if @survey_p;literal@ ne t>
+		<if @survey_p;literal@ false>
 		  <if @items.as_item_id@ eq @items.next_as_item_id@ or @items.groupnum@ gt 1>
 		    <if @items.presentation_type@ eq @items.next_pr_type@ or @items.choice_orientation@ eq horizontal>
 
@@ -32,14 +32,14 @@
 			<if @items.answered_p;literal@ true><p style="font-weight:bold;">#assessment.not_yet_reviewed#</p> </if>
 			<else><p style="font-weight:bold;">#assessment.not_answered#</p></else>
 		      </else>
-		      <if @edit_p;literal@ eq 1 and @items.answered_p;literal@ eq t><a href="@items.results_edit_url@">#assessment.Edit#</a></if>
+		      <if @edit_p;literal@ true and @items.answered_p;literal@ true><a href="@items.results_edit_url@">#assessment.Edit#</a></if>
 		      <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@">
 		    </if>
 		    <else>
 		      <if @items.answered_p;literal@ true><p style="font-weight:bold">#assessment.not_yet_reviewed#</p> </if>
 		      <else><p style="font-weight:bold">#assessment.not_answered#</p> </else>
 		    </else>
-		    <if @edit_p;literal@ eq 1 and @items.answered_p;literal@ eq t>
+		    <if @edit_p;literal@ true and @items.answered_p;literal@ true>
               <a href="@items.results_edit_url@">#assessment.Edit#</a>
             </if>
 		    <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@">
@@ -81,10 +81,10 @@
     </group>
 
   <include src="/packages/assessment/lib/results-messages" session_id="@session_id;literal@" section_id="@section_id;literal@" as_item_id="@items.as_item_id;literal@" &=assessment>
-  <if @edit_p;literal@ eq 1 and @items.answered_p;literal@ eq t>
+  <if @edit_p;literal@ true and @items.answered_p;literal@ true>
     <p><a href="@items.results_edit_url@" class="button">#assessment.Add_Comment#</a></p>
   </if>
-  <if @feedback_only_p;literal@ ne "t" and @assessment_data.type@ ne survey and @items.result_points@ not nil and @showpoints@ true and @items.points@ gt 0>
+  <if @feedback_only_p;literal@ false and @assessment_data.type@ ne survey and @items.result_points@ not nil and @showpoints@ true and @items.points@ gt 0>
     <p style="font-weight: bold">@items.result_points@ / @items.points@ #assessment.points#</p>
   </if>