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.7 -r1.8
--- openacs-4/packages/assessment/lib/session-items.adp	15 Mar 2005 22:46:15 -0000	1.7
+++ openacs-4/packages/assessment/lib/session-items.adp	8 Dec 2005 11:20:45 -0000	1.8
@@ -66,18 +66,20 @@
       <td valign=top>@items.description;noquote@
         <if @survey_p@ ne t>
           <if @items.title@ eq @items.next_title@ or @items.groupnum@ gt 1>
-            <if @items.result_points@ not nil><br><b>@items.result_points@ / @items.points@ #assessment.points#
-              <if @show_feedback@ ne none>
-                <if @items.feedback@ not nil>:<br>@items.feedback;noquote@</if>
+            <if @items.presentation_type@ eq @items.next_pr_type@ or @items.choice_orientation@ eq horizontal>
+              <if @items.result_points@ not nil><br><b>@items.result_points@ / @items.points@ #assessment.points#
+                <if @show_feedback@ ne none>
+                  <if @items.feedback@ not nil>:<br>@items.feedback;noquote@</if>
+                </if>
+                </b>
               </if>
-              </b>
+              <else>
+                <if @items.answered_p@ eq t><br><b>#assessment.not_yet_reviewed#</b> </if>
+                <else><br><b>#assessment.not_answered#</b> </else>
+              </else>
+              <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="results-edit?session_id=@session_id@&section_id=@section_id@&as_item_id=@items.as_item_id@">#assessment.Edit#</a></if>
+              <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@">
             </if>
-            <else>
-              <if @items.answered_p@ eq t><br><b>#assessment.not_yet_reviewed#</b> </if>
-              <else><br><b>#assessment.not_answered#</b> </else>
-            </else>
-            <if @edit_p@ eq 1 and @items.answered_p@ eq t><a href="results-edit?session_id=@session_id@&section_id=@section_id@&as_item_id=@items.as_item_id@">#assessment.Edit#</a></if>
-            <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@">
           </if>
         </if>
       </td>
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.7 -r1.8
--- openacs-4/packages/assessment/lib/session-items.tcl	15 Apr 2005 17:26:45 -0000	1.7
+++ openacs-4/packages/assessment/lib/session-items.tcl	8 Dec 2005 11:20:45 -0000	1.8
@@ -7,7 +7,7 @@
 }
 
 # todo: display feedback text
-db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_title num } items session_items {} {
+db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_title next_pr_type num } items session_items {} {
     set default_value [as::item_data::get -subject_id $subject_id -as_item_id $as_item_id -session_id $session_id]
 
     set presentation_type [as::item_form::add_item_to_form -name session_results_$section_id -section_id $section_id -item_id $as_item_id -session_id $session_id -default_value $default_value -show_feedback $show_feedback]
@@ -58,10 +58,12 @@
     if {$i < ${items:rowcount}} {
 	upvar 0 items:$j next
 	set this(next_title) $next(title)
+	set this(next_pr_type) $next(presentation_type)
 	if {$this(title) != $next(title)} {
 	    incr counter
 	}
     } else {
 	set this(next_title) ""
+	set this(next_pr_type) ""
     }
 }
Index: openacs-4/packages/assessment/www/assessment-section-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-section-submit.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/assessment/www/assessment-section-submit.adp	30 May 2005 10:53:27 -0000	1.9
+++ openacs-4/packages/assessment/www/assessment-section-submit.adp	8 Dec 2005 11:20:44 -0000	1.10
@@ -45,11 +45,13 @@
           <tr class="form-widget">
           <if @items.presentation_type@ eq rb or @items.presentation_type@ eq cb>
             <if @items.title@ eq @items.next_title@ and @items.groupnum@ eq 1>
-              <td></td>
-              <formgroup id="response_to_item.@items.as_item_id@">
-                <td align=center>@formgroup.label;noquote@</td>
-              </formgroup>
-              </tr><tr class="form-widget">
+              <if @items.presentation_type@ eq @items.next_pr_type@ or @items.choice_orientation@ eq horizontal>
+                <td></td>
+                <formgroup id="response_to_item.@items.as_item_id@">
+                  <td align=center>@formgroup.label;noquote@</td>
+                </formgroup>
+                </tr><tr class="form-widget">
+              </if>
             </if>
           </if>
           <td valign=top>@items.description;noquote@</td>
Index: openacs-4/packages/assessment/www/assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment.tcl,v
diff -u -N -r1.47 -r1.48
--- openacs-4/packages/assessment/www/assessment.tcl	9 May 2005 21:58:24 -0000	1.47
+++ openacs-4/packages/assessment/www/assessment.tcl	8 Dec 2005 11:20:44 -0000	1.48
@@ -253,7 +253,7 @@
     {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 as_item_type_id choice_orientation next_title
+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 next_pr_type
 
 set unsubmitted_list [list]
 set validate_list [list]
@@ -352,16 +352,18 @@
 	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 ""
+    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)
+	set this(next_pr_type) $next(presentation_type)
     } else {
 	set this(next_title) ""
+	set this(next_pr_type) ""
     }
 }
 
@@ -395,7 +397,7 @@
 
 	    if {\$section_order != \$new_section_order} {
 		# calculate section points at end of section
-		as::section::calculate -section_id \$section_id -assessment_id \$assessment_rev_id -session_id \$session_id
+		# as::section::calculate -section_id \$section_id -assessment_id \$assessment_rev_id -session_id \$session_id
 		# immediate checks execution
 		as::assessment::check::eval_i_checks -session_id $session_id -section_id $section_id 
                 set section_to_tmp \[as::assessment::check::branch_checks -session_id $session_id -assessment_id $assessment_id\ -section_id $section_id]
@@ -455,7 +457,7 @@
 
 	    if {$section_order != $new_section_order} {
 		# calculate section points at end of section
-		as::section::calculate -section_id $section_id -assessment_id $assessment_rev_id -session_id $session_id
+		# as::section::calculate -section_id $section_id -assessment_id $assessment_rev_id -session_id $session_id
 		# immediate checks execution
 		as::assessment::check::eval_i_checks -session_id $session_id -section_id $section_id 
 	    }