Index: openacs-4/packages/assessment/www/asm-admin/results-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-edit.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/assessment/www/asm-admin/results-edit.tcl 29 Jun 2018 17:27:18 -0000 1.7 +++ openacs-4/packages/assessment/www/asm-admin/results-edit.tcl 3 Sep 2024 15:37:35 -0000 1.8 @@ -23,16 +23,21 @@ #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_return_complaint 1 [_ assessment.Requested_assess_does] ad_script_abort } db_1row get_item_data {} set item_type [string range $item_type end-1 end] set result_points [db_string result_points {} -default ""] -set page_title "[_ assessment.Results_edit]" -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base results-users {assessment_id}] [_ assessment.Results_by_user]] [list [export_vars -base results-session {session_id}] [_ assessment.View_Results]] $page_title] +set page_title [_ assessment.Results_edit] +set context [list \ + [list index [_ assessment.admin]] \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base results-users {assessment_id}] [_ assessment.Results_by_user]] \ + [list [export_vars -base results-session {session_id}] [_ assessment.View_Results]] \ + $page_title] # DAVEB removed title, doesn't make sense. ad_form -name results-edit -action results-edit -export { session_id section_id as_item_id } -form { @@ -43,23 +48,23 @@ # check for type to see if we set points if {0} { ad_form -extend -form { - {points:integer,nospell {label "[_ assessment.points_answer]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.points_answer_help]"}} + {points:integer,nospell {label "[_ assessment.points_answer]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.points_answer_help]"}} } } ad_form -extend -new_request { set description "" set points "" } -new_data { if {![info exists points]} { - set points "" + set points "" } db_transaction { - as::session_results::new -target_id $item_data_id -title "" -description $description -points $points - if {$points ne ""} { - db_dml update_item_points {} - as::section::calculate -section_id $section_id -assessment_id $assessment_rev_id -session_id $session_id - as::assessment::calculate -assessment_id $assessment_rev_id -session_id $session_id - } + as::session_results::new -target_id $item_data_id -title "" -description $description -points $points + if {$points ne ""} { + db_dml update_item_points {} + as::section::calculate -section_id $section_id -assessment_id $assessment_rev_id -session_id $session_id + as::assessment::calculate -assessment_id $assessment_rev_id -session_id $session_id + } } ns_log notice "DONE results edit new_data" } -after_submit {