Index: openacs-4/packages/assessment/www/assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment.tcl,v
diff -u -r1.39 -r1.40
--- openacs-4/packages/assessment/www/assessment.tcl	2 Mar 2005 22:37:05 -0000	1.39
+++ openacs-4/packages/assessment/www/assessment.tcl	11 Mar 2005 18:54:12 -0000	1.40
@@ -249,15 +249,15 @@
     {session_id:text(hidden) {value $session_id}}
 }
 
-multirow create items as_item_id name title description subtext required_p max_time_to_complete presentation_type html submitted_p content
+multirow create items as_item_id name title description subtext required_p max_time_to_complete presentation_type html submitted_p content as_item_type_id choice_orientation next_title
 
 set unsubmitted_list [list]
 set validate_list [list]
 set required_count 0
 
 foreach one_item $item_list {
-    util_unlist $one_item as_item_id name title description subtext required_p max_time_to_complete content_rev_id content_filename content_type
-    
+    util_unlist $one_item as_item_id name title description subtext required_p max_time_to_complete content_rev_id content_filename content_type as_item_type_id
+
     if {$required_p == "t"} {
 	# make sure that mandatory items are answered
 	lappend validate_list "response_to_item.$as_item_id {\[exists_and_not_null response_to_item($as_item_id)\]} \"\[_ assessment.form_element_required\]\""
@@ -338,9 +338,25 @@
     }
     set max_time_to_complete [as::assessment::pretty_time -seconds $max_time_to_complete]
 
-    multirow append items $as_item_id $name $title $description $subtext $required_p $max_time_to_complete $presentation_type "" $submitted_p [as::assessment::display_content -content_id $content_rev_id -filename $content_filename -content_type $content_type]
+    if {$presentation_type == "rb" || $presentation_type == "cb"} {
+	db_1row choice_orientation {}
+    } else {
+	set choice_orientation ""
+    }
+
+    multirow append items $as_item_id $name $title $description $subtext $required_p $max_time_to_complete $presentation_type "" $submitted_p [as::assessment::display_content -content_id $content_rev_id -filename $content_filename -content_type $content_type] $as_item_type_id $choice_orientation ""
 }
 
+for {set i 1; set j 2} {$i <= ${items:rowcount}} {incr i; incr j} {
+    upvar 0 items:$i this
+    if {$i < ${items:rowcount}} {
+	upvar 0 items:$j next
+	set this(next_title) $next(title)
+    } else {
+	set this(next_title) ""
+    }
+}
+
 if {$display(submit_answer_p) != "t"} {
     # process multiple submit
     set template "assessment-section-submit"