Index: openacs-4/packages/assessment/tcl/as-checks-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs.tcl,v diff -u -r1.24 -r1.25 --- openacs-4/packages/assessment/tcl/as-checks-procs.tcl 3 Mar 2005 22:46:41 -0000 1.24 +++ openacs-4/packages/assessment/tcl/as-checks-procs.tcl 10 Jun 2005 16:11:45 -0000 1.25 @@ -580,3 +580,34 @@ } } } + + +ad_proc -public as::assessment::check::eval_single_check { + {-session_id} + {-assessment_id} + {-inter_item_check_id} +} { + +} { + db_1row get_check_info {} + + set perform [db_string check_sql $check_sql -default 0] + ns_log notice "$check_sql $perform" + if {$perform == 1} { + set failed "" + as::assessment::check::manual_action_log -check_id $inter_item_check_id -session_id $session_id + } +} + + +ad_proc -public as::assessment::check::add_manual_check { + {-assessment_id:required} + {-inter_item_check_id:required} +} { + +} { + set sessions [db_list_of_lists get_sessions {select session_id from as_sessions where assessment_id=:assessment_id}] + foreach session_id $sessions { + as::assessment::check::eval_single_check -session_id $session_id -assessment_id $assessment_id -inter_item_check_id $inter_item_check_id + } +} \ No newline at end of file Index: openacs-4/packages/assessment/tcl/as-checks-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs.xql,v diff -u -r1.19 -r1.20 --- openacs-4/packages/assessment/tcl/as-checks-procs.xql 3 Mar 2005 22:46:41 -0000 1.19 +++ openacs-4/packages/assessment/tcl/as-checks-procs.xql 10 Jun 2005 16:11:45 -0000 1.20 @@ -343,6 +343,11 @@ + + + select * from as_inter_item_checks where inter_item_check_id=:inter_item_check_id + + Index: openacs-4/packages/assessment/www/asm-admin/action-select.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/action-select.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/assessment/www/asm-admin/action-select.tcl 7 Apr 2005 23:06:01 -0000 1.5 +++ openacs-4/packages/assessment/www/asm-admin/action-select.tcl 10 Jun 2005 16:11:46 -0000 1.6 @@ -22,6 +22,8 @@ permission::require_permission -object_id $assessment_id -privilege admin as::assessment::data -assessment_id $assessment_id +set assessment_rev_id $assessment_data(assessment_rev_id) + if {![info exists assessment_data(assessment_id)]} { ad_return_complaint 1 "[_ assessment.Requested_assess_does]" ad_script_abort @@ -64,12 +66,12 @@ {help_text "[_ assessment.action_that_will]"} {$action_value} } - {action_perform:text(select) - {label "[_ assessment.when_this_will]"} - {options $options} - {help_text "[_ assessment.when_this_action]"} - {$action_perform_value} - } + {action_perform:text(select) + {label "[_ assessment.when_this_will]"} + {options $options} + {help_text "[_ assessment.when_this_action]"} + {$action_perform_value} + } {user_message:text(textarea),optional {label "[_ assessment.message]"} {html {cols 50} {rows 15}} @@ -90,9 +92,9 @@ set perform [db_string action_perform {}] if { $perform==$action_perform} { db_dml edit_action {} - + } else { - + #re-order the other group as::assessment::check::re_order_actions -check_id $inter_item_check_id -section_id $section_id -action_perform $perform set order_value [as::assessment::check::get_max_order -section_id $section_id -action_perform $action_perform] @@ -101,15 +103,20 @@ } else { db_dml delete_action_map {} db_dml delete_param_map {} - + set order_value [as::assessment::check::get_max_order -section_id $section_id -action_perform $action_perform] db_dml select_action {} } } } -on_submit { - set url "action-params?assessment_id=$assessment_id&inter_item_check_id=$inter_item_check_id&action_id=$action_id§ion_id=$section_id" ad_returnredirect "${url}$return_url" + +} -after_submit { + if { $action_perform == "m" } { + as::assessment::check::add_manual_check -assessment_id $assessment_rev_id -inter_item_check_id $inter_item_check_id + } + } \ No newline at end of file