Index: openacs-4/packages/assessment/lib/assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/assessment.tcl,v
diff -u -N -r1.18 -r1.18.2.1
--- openacs-4/packages/assessment/lib/assessment.tcl	2 Dec 2006 21:17:28 -0000	1.18
+++ openacs-4/packages/assessment/lib/assessment.tcl	26 Jan 2007 00:33:57 -0000	1.18.2.1
@@ -149,7 +149,7 @@
 	}
 
 	as::section_data::new -section_id $section_id -session_id $session_id -subject_id $user_id -package_id $assessment_package_id
-	ns_log notice "Assessment section_id='${section_id}' session_id='${session_id}' assessnent='${assessment_rev_id}'"
+#	ns_log notice "Assessment section_id='${section_id}' session_id='${session_id}' assessnent='${assessment_rev_id}'"
 	db_1row section_data {} -column_array section
 	set display_type_id $section(display_type_id)
 	if {![empty_string_p $display_type_id]} {
@@ -192,7 +192,7 @@
 	if { ![exists_and_not_null item_order] } { set item_order 0 }
 	# add 1 because we want to compare the 1 indexed display number
 	# to the current page
-	ns_log notice "page_display_per_page = '${page_display_per_page}'"
+#	ns_log notice "page_display_per_page = '${page_display_per_page}'"
 	set current_page [expr {$item_order / $page_display_per_page + 1}]
 
 	# strip away items on previous section pages
Index: openacs-4/packages/assessment/lib/results-messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/results-messages.adp,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/assessment/lib/results-messages.adp	26 Sep 2006 00:22:44 -0000	1.2
+++ openacs-4/packages/assessment/lib/results-messages.adp	26 Jan 2007 00:33:57 -0000	1.2.2.1
@@ -1,5 +1,5 @@
 <if @results:rowcount@ gt 0>
     <multiple name="results">
-      <li>@results.description@ #assessment.Results_change_display#</li>
+      <li>@results.description@ <if @results.session_id@ eq @session_id@>#assessment.Results_change_display#</if><else>#assessment.Results_change_display_previous#</else></li>
       </multiple>
 </if>
Index: openacs-4/packages/assessment/lib/results-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/results-messages.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/assessment/lib/results-messages.tcl	26 Sep 2006 00:22:44 -0000	1.2
+++ openacs-4/packages/assessment/lib/results-messages.tcl	26 Jan 2007 00:33:57 -0000	1.2.2.1
@@ -3,8 +3,9 @@
 
 set format "[lc_get d_fmt], [lc_get t_fmt]"
 
-db_multirow -extend {user_url} results result_changes {
+db_multirow -unclobber -extend {session_url user_url} results result_changes {
 } {
     set creation_date [lc_time_fmt $creation_date $format]
     set user_url [acs_community_member_url -user_id $creation_user]
+    set session_url [export_vars -base results-session {session_id}]
 }
Index: openacs-4/packages/assessment/lib/results-messages.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/results-messages.xql,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/assessment/lib/results-messages.xql	26 Sep 2006 00:22:44 -0000	1.3
+++ openacs-4/packages/assessment/lib/results-messages.xql	26 Jan 2007 00:33:57 -0000	1.3.2.1
@@ -5,20 +5,19 @@
 <querytext>
 
     select cr.title, cr.description, sr.points, p.first_names, p.last_name,
-           o.creation_date, o.creation_user
+           o.creation_date, o.creation_user, d.session_id
     from as_session_results sr, cr_revisions cr, acs_objects o, persons p,
          as_item_data d, as_session_item_map m
     where cr.revision_id = sr.result_id
     and o.object_id = cr.revision_id
     and cr.description is not null
     and p.person_id = o.creation_user
     and sr.target_id = d.item_data_id
-    and d.session_id = :session_id
     and d.section_id = :section_id
     and d.as_item_id = :as_item_id
     and m.item_data_id = d.item_data_id
     and m.session_id = d.session_id
-    order by o.creation_date
+    order by d.session_id desc, o.creation_date desc
 
 </querytext>
 </fullquery>
Index: openacs-4/packages/assessment/lib/section-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/section-items.tcl,v
diff -u -N -r1.11 -r1.11.2.1
--- openacs-4/packages/assessment/lib/section-items.tcl	12 Jun 2006 02:49:50 -0000	1.11
+++ openacs-4/packages/assessment/lib/section-items.tcl	26 Jan 2007 00:33:57 -0000	1.11.2.1
@@ -28,7 +28,7 @@
     
     set checks [as::section::checks_list -assessment_id $assessment_id -section_id $section_id] 
     set checks_related 0
-    ns_log notice "[llength $checks]"
+#    ns_log notice "[llength $checks]"
     foreach  check_sql $checks {
 	set cond_list  [split $check_sql "="]
 	set item_id [lindex [split [lindex $cond_list 2] ")"] 0]
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.12 -r1.12.2.1
--- openacs-4/packages/assessment/lib/session-items.adp	26 Sep 2006 00:22:44 -0000	1.12
+++ openacs-4/packages/assessment/lib/session-items.adp	26 Jan 2007 00:33:57 -0000	1.12.2.1
@@ -14,7 +14,7 @@
 
 	  <if @items.presentation_type@ ne fitb>
 	    <b>@items.title;noquote@</b>
-	    @items.content;noquote@
+	     @items.content;noquote@
 <br />
 	</if>
 	    <group column=title>
@@ -81,7 +81,8 @@
 	  </if>
     </group>
 </if>
-	    <if @items.correct_p eq 1><if @show_feedback@ eq correct or @show_feedback@ eq all>@items.feedback_right;noquote@</if></if>
+
+	    <if @items.correct_p@ eq 1><if @show_feedback@ eq correct or @show_feedback@ eq all>@items.feedback_right;noquote@</if></if>
 	    <if @items.correct_p@ eq 0><if @show_feedback@ eq all or @show_feedback@ eq incorrect>@items.feedback_wrong;noquote@</if></if>
 <ul> <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@" &=assessment>	    <if @edit_p@ eq 1 and @items.answered_p@ eq t><li><a href="results-edit?session_id=@session_id@&section_id=@section_id@&as_item_id=@items.as_item_id@">#assessment.Add_Comment#</a></li></if>
 <!-- FIXME TODO move points to indented block with comments -->
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 -N -r1.16 -r1.16.2.1
--- openacs-4/packages/assessment/lib/session-items.tcl	8 Nov 2006 19:15:15 -0000	1.16
+++ openacs-4/packages/assessment/lib/session-items.tcl	26 Jan 2007 00:33:57 -0000	1.16.2.1
@@ -26,8 +26,7 @@
 ad_form -name session_results_$section_id -mode display -form {
     {section_id:text(hidden) {value $section_id}}
 }
-ns_log notice "assessment session-items.tcl show_feedback = '${show_feedback}'"
-# todo: display feedback text
+
 set feedback_count 0
 db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_title next_pr_type num content has_feedback_p correct_p view} items session_items {} {
     set default_value [as::item_data::get -subject_id $subject_id -as_item_id $as_item_id -session_id $session_id]
@@ -61,7 +60,7 @@
 	set item_data_id $values(item_data_id)
 	array unset values
 	set answered_p t
-
+#ns_log notice "points = $points result_points= $result_points"
 	if { $points != 0 } {
 	    if {$result_points < $points} {
 		set correct_p 0
@@ -75,7 +74,7 @@
 		}	
 	    } else {
 		set correct_p 1
-		if {$show_feedback != "incorrect"} {
+		if {$show_feedback ne "incorrect"} {
 		    if { $feedback_right ne "" } {
 			set feedback "<font color=green>$feedback_right</font>"
 			set has_feedback_p 1