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.2 -r1.3
--- openacs-4/packages/assessment/lib/session-items.adp	25 Dec 2004 13:11:54 -0000	1.2
+++ openacs-4/packages/assessment/lib/session-items.adp	1 Feb 2005 14:18:09 -0000	1.3
@@ -24,12 +24,14 @@
   </else>
 
 <td>
-<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 @assessment_data.survey_p@ in f>
+    <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>
+    <else>
+      <if @items.answered_p@ eq t><b>#assessment.not_yet_reviewed#</b></if>
+      <else><b>#assessment.not_answered#</b></else>
+    </else>
 </if>
-<else>
-  <if @items.answered_p@ eq t><b>#assessment.not_yet_reviewed#</b></if>
-  <else><b>#assessment.not_answered#</b></else>
-</else>
 </td></tr>
 
   <if @items.rownum@ odd>
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.2 -r1.3
--- openacs-4/packages/assessment/lib/session-items.tcl	25 Dec 2004 13:11:54 -0000	1.2
+++ openacs-4/packages/assessment/lib/session-items.tcl	1 Feb 2005 14:18:09 -0000	1.3
@@ -31,5 +31,8 @@
 	set result_points ""
 	set feedback ""
 	set answered_p f
-    }
+    }    
 }
+db_1row assessment_id_section {}
+# Get the assessment data
+as::assessment::data -assessment_id $assessment_id        
Index: openacs-4/packages/assessment/lib/session-items.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/session-items.xql	25 Dec 2004 13:11:54 -0000	1.2
+++ openacs-4/packages/assessment/lib/session-items.xql	1 Feb 2005 14:18:09 -0000	1.3
@@ -21,5 +21,17 @@
       </querytext>
 </fullquery>
 
+<fullquery name="assessment_id_section">
+      <querytext>      
+    select cr.item_id as assessment_id
+	from as_assessments a, cr_revisions cr, cr_items ci
+	where a.assessment_id = cr.revision_id
+	and cr.revision_id = ci.latest_revision	
+	and exists (select 1
+		from as_assessment_section_map asm
+		where asm.assessment_id = a.assessment_id
+		and asm.section_id = :section_id)
+      </querytext>
+</fullquery>
  
 </queryset>
Index: openacs-4/packages/assessment/tcl/as-qti-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-qti-procs.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/assessment/tcl/as-qti-procs.tcl	18 Jan 2005 14:17:45 -0000	1.20
+++ openacs-4/packages/assessment/tcl/as-qti-procs.tcl	1 Feb 2005 14:18:09 -0000	1.21
@@ -61,13 +61,16 @@
 						}
 					}
 				}
+				set show_feedback "all"
 				set resprocessNodes [$root selectNodes {/questestinterop/assessment/section/item/resprocessing}]
 				set as_assessments__survey_p {f}				
 				if { [llength $resprocessNodes] == 0 } {				     
-				     set as_assessments__survey_p {t}				     
+				     set as_assessments__survey_p {t}
+				     #if it's a survey don't show feedback
+				     set show_feedback "none"				     
 				}				
 				# Insert assessment in the CR (and as_assessments table) getting the revision_id (assessment_id)
-				set as_assessments__assessment_id [as::assessment::new -title $as_assessments__title -description $as_assessments__definition -instructions $as_assessments__instructions -survey_p $as_assessments__survey_p]
+				set as_assessments__assessment_id [as::assessment::new -title $as_assessments__title -description $as_assessments__definition -instructions $as_assessments__instructions -survey_p $as_assessments__survey_p -show_feedback $show_feedback]
 				
 				# Section
 				set sectionNodes [$assessment selectNodes {section}]
Index: openacs-4/packages/assessment/www/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/assessment/www/session.adp	26 Jan 2005 18:59:49 -0000	1.21
+++ openacs-4/packages/assessment/www/session.adp	1 Feb 2005 14:18:09 -0000	1.22
@@ -28,7 +28,7 @@
 <table cellspacing=0>
 <tr><td valign="top">#assessment.section# @sections.title@
 <if @sections.max_time_to_complete@ not nil> (#assessment.max_time# @sections.max_time_to_complete@) </if>
-(@sections.points@ / @sections.max_points@ #assessment.points#)
+<if @assessment_data.survey_p@ eq f> (@sections.points@ / @sections.max_points@ #assessment.points#) </if>
 </td></tr>
 
 <tr><td><i> @sections.description@ </i><br></td></tr>