Index: openacs-4/packages/assessment/www/assessment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/Attic/assessment.tcl,v diff -u -r1.34 -r1.35 --- openacs-4/packages/assessment/www/assessment.tcl 29 Jan 2005 11:03:07 -0000 1.34 +++ openacs-4/packages/assessment/www/assessment.tcl 14 Feb 2005 17:14:40 -0000 1.35 @@ -178,7 +178,13 @@ as::section::close -section_id $section_id -assessment_id $assessment_rev_id -session_id $session_id -subject_id $user_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] + if { $section_to_tmp != "f" && $section_to_tmp != "f"} { + set section_to $section_to_tmp + } } + + } else { # skip entire session set new_section_order "" @@ -189,7 +195,12 @@ as::section::close -section_id $section_id -assessment_id $assessment_rev_id -session_id $session_id -subject_id $user_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] + if { $section_to_tmp != "f" && $section_to_tmp != "f"} { + set section_to $section_to_tmp + } + set section_list [lreplace $section_list 0 [expr $section_order]] foreach section_id $section_list { # skip remaining sections @@ -289,7 +300,7 @@ set response_to_item(\$response_item_id) \"\" } else { - set section_to_tmp \[as::assessment::check::branch_checks -item_id_to \$response_item_id -response \$response_to_item(\$response_item_id) -session_id $session_id -assessment_id $assessment_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] if { \$section_to_tmp != \"f\" && \$section_to_tmp != \"f\"} { set section_to \$section_to_tmp } @@ -335,7 +346,7 @@ } else { set item_to \$response_item_id - set section_to_tmp \[as::assessment::check::branch_checks -item_id_to \$item_to -response \$response_to_item(\$response_item_id) -session_id \$session_id -assessment_id \$assessment_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\] if { \$section_to_tmp != \"f\" && \$section_to_tmp != \"f\"} { set section_to \$section_to_tmp } @@ -350,6 +361,12 @@ 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] + if { \$section_to_tmp != \"f\" && \$section_to_tmp != \"f\"} { + set section_to \$section_to_tmp + } + + } } }"