Index: openacs-4/packages/assessment/lib/assessment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/assessment.tcl,v diff -u -r1.19 -r1.20 --- openacs-4/packages/assessment/lib/assessment.tcl 15 May 2007 20:14:15 -0000 1.19 +++ openacs-4/packages/assessment/lib/assessment.tcl 7 Oct 2007 22:36:53 -0000 1.20 @@ -1,5 +1,5 @@ ad_page_contract { -e + This page allows to display an assessment with sections and items @author Eduardo Pérez Ureta (eperez@it.uc3m.es) @@ -34,7 +34,6 @@ if { [info exists return_url] } { set url $return_url -# ns_log notice "$return_url" } set return_url "$url" @@ -66,10 +65,11 @@ db_transaction { if {[empty_string_p $session_id]} { - + # Check if there is an unfinished session lying around set session_id [db_string unfinished_session_id {}] - if {[empty_string_p $session_id]} { + } + if {[empty_string_p $session_id]} { # start new session set session_id [as::session::new -assessment_id $assessment_rev_id -subject_id $user_id -package_id $assessment_package_id] if {[empty_string_p $assessment_data(consent_page)]} { @@ -80,27 +80,25 @@ } } else { # pick up old session - db_1row unfinished_section_order {} - if {[empty_string_p $section_order]} { -# set consent_url [export_vars -base assessment-consent {assessment_id session_id password return_url next_asm single_section_id}] - } else { - db_1row unfinished_section_id {} - db_1row unfinished_item_order {} - if {[empty_string_p $item_order]} { - db_1row unfinished_last_item {} - } - incr section_order -1 - if {$item_order eq ""} { - set item_order 0 + if {$section_order eq ""} { + db_1row unfinished_section_order {} + if {[empty_string_p $section_order]} { + # set consent_url [export_vars -base assessment-consent {assessment_id session_id password return_url next_asm single_section_id}] } else { - incr item_order -1 + db_1row unfinished_section_id {} + db_1row unfinished_item_order {} + if {![empty_string_p $item_order]} { + incr section_order -1 + if {$item_order eq ""} { + set item_order 0 + } else { + incr item_order -1 + } } + } + } } - } else { - # set time the subject initiated the assessment, if not already done - db_dml session_start {} - } if {![info exists consent_url]} { db_1row session_time {} @@ -149,7 +147,6 @@ } as::section_data::new -section_id $section_id -session_id $session_id -subject_id $user_id -package_id $assessment_package_id -# ns_log notice "Assessment section_id='${section_id}' session_id='${session_id}' assessnent='${assessment_rev_id}'" db_1row section_data {} -column_array section set display_type_id $section(display_type_id) if {![empty_string_p $display_type_id]} { @@ -192,7 +189,6 @@ if { ![exists_and_not_null item_order] } { set item_order 0 } # add 1 because we want to compare the 1 indexed display number # to the current page -# ns_log notice "page_display_per_page = '${page_display_per_page}'" set current_page [expr {$item_order == 0 ? 0 : $item_order / $page_display_per_page + 1}] # strip away items on previous section pages @@ -356,17 +352,14 @@ set default_value "" set submitted_p f -# ns_log notice "ASSESSMENT.TCL display(submit_answer_p)='${display(submit_answer_p)}'" if {$display(submit_answer_p) != "t"} { -# ns_log notice "ASSESSMENT.TCL NO seperate submit" # no seperate submit of each item if {$assessment_data(reuse_responses_p) == "t"} { set default_value [as::item_data::get -subject_id $user_id -as_item_id $as_item_id] } set presentation_type [as::item_form::add_item_to_form -name show_item_form -session_id $session_id -section_id $section_id -item_id $as_item_id -default_value $default_value -required_p $required_p -random_p $assessment_data(random_p)] } else { -# ns_log notice "ASSESSMENT.TCL YES seperate submit" # submit each item seperately set default_value [as::item_data::get -subject_id $user_id -as_item_id $as_item_id -session_id $session_id] if {![empty_string_p $default_value]} { @@ -397,7 +390,6 @@ set on_submit "{ db_transaction { db_dml session_updated {} - # save answer set response_item_id \$item_id @@ -477,8 +469,11 @@ set on_submit "{ db_transaction { - db_dml session_updated {} + \# check if we already submitted this section! + if {\[db_string count_submitted_session \"select count(*) from as_section_data where session_id = :session_id and section_id = :section_id and completed_datetime is not null\" -default 0\] == 0} { +\# ad_return_complaint 1 \"Double click detected\" + db_dml session_updated {} # save answers foreach one_response \$item_list { util_unlist \$one_response response_item_id @@ -504,6 +499,7 @@ as::item_type_\$item_type\\::process -type_id \$item_type_id -session_id \$session_id -as_item_id \$response_item_id -section_id \$section_id -subject_id \$user_id -response \$response -max_points \$points -allow_overwrite_p \$display(back_button_p) -package_id \$assessment_package_id } + } 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 @@ -520,7 +516,10 @@ }" set after_submit "{ - if {!\[empty_string_p \$new_section_order\]} { +\# NOTE the code just incrementes section order so when the section order +\# is greate than the number of items in the list of sections +\# we know we are done and should finish the assessment + if {!\[empty_string_p \$new_section_order\] && \$new_section_order <= \[llength \$section_list\]} { # go to next section if { \$section_to != \"\"} { set section_order \$section_to @@ -529,7 +528,7 @@ } set item_order \$new_item_order \# ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id}\] - ad_returnredirect \[export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple nxt_url total_pages current_page}\] + ad_returnredirect \[export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple next_url total_pages current_page}\] ad_script_abort } else { # calculate session points at end of session @@ -614,5 +613,6 @@ set form_is_submit [template::form::is_submission show_item_form] set form_is_valid [template::form::is_valid show_item_form] + ad_return_template $template