Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.tcl,v diff -u -N -r1.10 -r1.10.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.tcl 29 Jun 2018 17:27:18 -0000 1.10 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-cb.tcl 30 Mar 2019 20:19:52 -0000 1.10.2.1 @@ -20,12 +20,16 @@ as::assessment::data -assessment_id $assessment_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 } set page_title [_ assessment.edit_item_display_cb] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context [list \ + [list index [_ assessment.admin]] \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set choice_or_types [list] foreach choice_or_type [list horizontal vertical] { @@ -59,53 +63,53 @@ } -edit_request { db_1row last_used_display_type {} if {$as_item_display_id ne ""} { - db_1row display_type_data {} + db_1row display_type_data {} } else { - # default data if display newly mapped - set html_display_options "" - set choice_orientation "vertical" - set choice_label_orientation "top" - set sort_order_type "order_of_entry" - set item_answer_alignment "besideright" - set as_item_display_id 0 + # default data if display newly mapped + set html_display_options "" + set choice_orientation "vertical" + set choice_label_orientation "top" + set sort_order_type "order_of_entry" + set item_answer_alignment "besideright" + set as_item_display_id 0 } } -validate { {html_display_options {[as::assessment::check_html_options -options $html_display_options]} "[_ assessment.error_html_options]"} } -edit_data { db_transaction { - set new_item_id [as::item::new_revision -as_item_id $as_item_id] + set new_item_id [as::item::new_revision -as_item_id $as_item_id] - if {$as_item_display_id} { - # edit existing display type - set new_item_display_id [as::item_display_cb::edit \ - -as_item_display_id $as_item_display_id \ - -html_display_options $html_display_options \ - -choice_orientation $choice_orientation \ - -choice_label_orientation $choice_label_orientation \ - -sort_order_type $sort_order_type \ - -item_answer_alignment $item_answer_alignment] - } else { - # create new display type - set new_item_display_id [as::item_display_cb::new \ - -html_display_options $html_display_options \ - -choice_orientation $choice_orientation \ - -choice_label_orientation $choice_label_orientation \ - -sort_order_type $sort_order_type \ - -item_answer_alignment $item_answer_alignment] - } + if {$as_item_display_id} { + # edit existing display type + set new_item_display_id [as::item_display_cb::edit \ + -as_item_display_id $as_item_display_id \ + -html_display_options $html_display_options \ + -choice_orientation $choice_orientation \ + -choice_label_orientation $choice_label_orientation \ + -sort_order_type $sort_order_type \ + -item_answer_alignment $item_answer_alignment] + } else { + # create new display type + set new_item_display_id [as::item_display_cb::new \ + -html_display_options $html_display_options \ + -choice_orientation $choice_orientation \ + -choice_label_orientation $choice_label_orientation \ + -sort_order_type $sort_order_type \ + -item_answer_alignment $item_answer_alignment] + } - set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] - set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] - set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] - set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] - as::assessment::check::copy_item_checks -assessment_id $assessment_id -section_id $new_section_id -as_item_id $as_item_id -new_item_id $new_item_id + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] + as::assessment::check::copy_item_checks -assessment_id $assessment_id -section_id $new_section_id -as_item_id $as_item_id -new_item_id $new_item_id - as::section::update_section_in_assessment\ + as::section::update_section_in_assessment\ -old_section_id $section_id \ -new_section_id $new_section_id \ -new_assessment_rev_id $new_assessment_rev_id - db_dml update_item_in_section {} - db_dml update_display_of_item {} + db_dml update_item_in_section {} + db_dml update_display_of_item {} } set as_item_id $new_item_id set section_id $new_section_id Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.tcl,v diff -u -N -r1.6 -r1.6.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.tcl 29 Jun 2018 17:27:18 -0000 1.6 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-f.tcl 30 Mar 2019 20:19:52 -0000 1.6.2.1 @@ -20,12 +20,15 @@ as::assessment::data -assessment_id $assessment_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 } set page_title [_ assessment.edit_item_display_f] -set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context_bar [ad_context_bar \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set orientation_types [list] foreach orientation_type [list horizontal vertical] { @@ -42,45 +45,45 @@ } -edit_request { db_1row last_used_display_type {} if {$as_item_display_id ne ""} { - db_1row display_type_data {} + db_1row display_type_data {} } else { - # default data if display newly mapped - set html_display_options "" - set abs_size 5 - set box_orientation "vertical" - set as_item_display_id 0 + # default data if display newly mapped + set html_display_options "" + set abs_size 5 + set box_orientation "vertical" + set as_item_display_id 0 } } -validate { {html_display_options {[as::assessment::check_html_options -options $html_display_options]} "[_ assessment.error_html_options]"} } -edit_data { db_transaction { - set new_item_id [as::item::new_revision -as_item_id $as_item_id] + set new_item_id [as::item::new_revision -as_item_id $as_item_id] - if {$as_item_display_id} { - # edit existing display type - set new_item_display_id [as::item_display_f::edit \ - -as_item_display_id $as_item_display_id \ - -html_display_options $html_display_options \ - -abs_size $abs_size \ - -box_orientation $box_orientation] - } else { - # create new display type - set new_item_display_id [as::item_display_f::new \ - -html_display_options $html_display_options \ - -abs_size $abs_size \ - -box_orientation $box_orientation] - } + if {$as_item_display_id} { + # edit existing display type + set new_item_display_id [as::item_display_f::edit \ + -as_item_display_id $as_item_display_id \ + -html_display_options $html_display_options \ + -abs_size $abs_size \ + -box_orientation $box_orientation] + } else { + # create new display type + set new_item_display_id [as::item_display_f::new \ + -html_display_options $html_display_options \ + -abs_size $abs_size \ + -box_orientation $box_orientation] + } - set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] - set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] - set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] - set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] - as::section::update_section_in_assessment\ + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] + as::section::update_section_in_assessment\ -old_section_id $section_id \ -new_section_id $new_section_id \ -new_assessment_rev_id $new_assessment_rev_id - db_dml update_item_in_section {} - db_dml update_display_of_item {} + db_dml update_item_in_section {} + db_dml update_display_of_item {} } set as_item_id $new_item_id set section_id $new_section_id Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.tcl,v diff -u -N -r1.10 -r1.10.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.tcl 29 Jun 2018 17:27:18 -0000 1.10 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-rb.tcl 30 Mar 2019 20:19:52 -0000 1.10.2.1 @@ -25,7 +25,11 @@ } set page_title [_ assessment.edit_item_display_rb] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context [list \ + [list index [_ assessment.admin]] \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set choice_or_types [list] foreach choice_or_type [list horizontal vertical] { @@ -59,53 +63,53 @@ } -edit_request { db_1row last_used_display_type {} if {$as_item_display_id ne ""} { - db_1row display_type_data {} + db_1row display_type_data {} } else { - # default data if display newly mapped - set html_display_options "" - set choice_orientation "vertical" - set choice_label_orientation "top" - set sort_order_type "order_of_entry" - set item_answer_alignment "besideright" - set as_item_display_id 0 + # default data if display newly mapped + set html_display_options "" + set choice_orientation "vertical" + set choice_label_orientation "top" + set sort_order_type "order_of_entry" + set item_answer_alignment "besideright" + set as_item_display_id 0 } } -validate { {html_display_options {[as::assessment::check_html_options -options $html_display_options]} "[_ assessment.error_html_options]"} } -edit_data { db_transaction { - set new_item_id [as::item::new_revision -as_item_id $as_item_id] + set new_item_id [as::item::new_revision -as_item_id $as_item_id] - if {$as_item_display_id} { - # edit existing display type - set new_item_display_id [as::item_display_rb::edit \ - -as_item_display_id $as_item_display_id \ - -html_display_options $html_display_options \ - -choice_orientation $choice_orientation \ - -choice_label_orientation $choice_label_orientation \ - -sort_order_type $sort_order_type \ - -item_answer_alignment $item_answer_alignment] - } else { - # create new display type - set new_item_display_id [as::item_display_rb::new \ - -html_display_options $html_display_options \ - -choice_orientation $choice_orientation \ - -choice_label_orientation $choice_label_orientation \ - -sort_order_type $sort_order_type \ - -item_answer_alignment $item_answer_alignment] - } + if {$as_item_display_id} { + # edit existing display type + set new_item_display_id [as::item_display_rb::edit \ + -as_item_display_id $as_item_display_id \ + -html_display_options $html_display_options \ + -choice_orientation $choice_orientation \ + -choice_label_orientation $choice_label_orientation \ + -sort_order_type $sort_order_type \ + -item_answer_alignment $item_answer_alignment] + } else { + # create new display type + set new_item_display_id [as::item_display_rb::new \ + -html_display_options $html_display_options \ + -choice_orientation $choice_orientation \ + -choice_label_orientation $choice_label_orientation \ + -sort_order_type $sort_order_type \ + -item_answer_alignment $item_answer_alignment] + } - set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] - set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] - set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] - set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] - as::assessment::check::copy_item_checks -assessment_id $assessment_id -section_id $new_section_id -as_item_id $as_item_id -new_item_id $new_item_id + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] + as::assessment::check::copy_item_checks -assessment_id $assessment_id -section_id $new_section_id -as_item_id $as_item_id -new_item_id $new_item_id - as::section::update_section_in_assessment\ + as::section::update_section_in_assessment\ -old_section_id $section_id \ -new_section_id $new_section_id \ -new_assessment_rev_id $new_assessment_rev_id - db_dml update_item_in_section {} - db_dml update_display_of_item {} + db_dml update_item_in_section {} + db_dml update_display_of_item {} } set as_item_id $new_item_id set section_id $new_section_id Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.tcl,v diff -u -N -r1.8 -r1.8.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.tcl 29 Jun 2018 17:27:18 -0000 1.8 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-sa.tcl 30 Mar 2019 20:19:52 -0000 1.8.2.1 @@ -20,12 +20,15 @@ as::assessment::data -assessment_id $assessment_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 } set page_title [_ assessment.edit_item_display_sa] -set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context_bar [ad_context_bar \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set orientation_types [list] foreach orientation_type [list horizontal vertical] { @@ -42,45 +45,45 @@ } -edit_request { db_1row last_used_display_type {} if {$as_item_display_id ne ""} { - db_1row display_type_data {} + db_1row display_type_data {} } else { - # default data if display newly mapped - set html_display_options "" - set abs_size 5 - set box_orientation "vertical" - set as_item_display_id 0 + # default data if display newly mapped + set html_display_options "" + set abs_size 5 + set box_orientation "vertical" + set as_item_display_id 0 } } -validate { {html_display_options {[as::assessment::check_html_options -options $html_display_options]} "[_ assessment.error_html_options]"} } -edit_data { db_transaction { - set new_item_id [as::item::new_revision -as_item_id $as_item_id] + set new_item_id [as::item::new_revision -as_item_id $as_item_id] - if {$as_item_display_id} { - # edit existing display type - set new_item_display_id [as::item_display_sa::edit \ - -as_item_display_id $as_item_display_id \ - -html_display_options $html_display_options \ - -abs_size $abs_size \ - -box_orientation $box_orientation] - } else { - # create new display type - set new_item_display_id [as::item_display_sa::new \ - -html_display_options $html_display_options \ - -abs_size $abs_size \ - -box_orientation $box_orientation] - } + if {$as_item_display_id} { + # edit existing display type + set new_item_display_id [as::item_display_sa::edit \ + -as_item_display_id $as_item_display_id \ + -html_display_options $html_display_options \ + -abs_size $abs_size \ + -box_orientation $box_orientation] + } else { + # create new display type + set new_item_display_id [as::item_display_sa::new \ + -html_display_options $html_display_options \ + -abs_size $abs_size \ + -box_orientation $box_orientation] + } - set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] - set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] - set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] - set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] - as::section::update_section_in_assessment\ + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] + as::section::update_section_in_assessment\ -old_section_id $section_id \ -new_section_id $new_section_id \ -new_assessment_rev_id $new_assessment_rev_id - db_dml update_item_in_section {} - db_dml update_display_of_item {} + db_dml update_item_in_section {} + db_dml update_display_of_item {} } set as_item_id $new_item_id set section_id $new_section_id Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.tcl,v diff -u -N -r1.13 -r1.13.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.tcl 29 Jun 2018 17:27:18 -0000 1.13 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-sb.tcl 30 Mar 2019 20:19:52 -0000 1.13.2.1 @@ -20,12 +20,16 @@ as::assessment::data -assessment_id $assessment_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 } set page_title [_ assessment.edit_item_display_sb] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context [list \ + [list index [_ assessment.admin]] \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]] @@ -56,56 +60,56 @@ } -edit_request { db_1row last_used_display_type {} if {$as_item_display_id ne ""} { - db_1row display_type_data {} + db_1row display_type_data {} } else { - # default data if display newly mapped - set html_display_options "" - set multiple_p f - set choice_label_orientation "top" - set sort_order_type "order_of_entry" - set item_answer_alignment "besideright" - set as_item_display_id 0 - set prepend_empty_p t + # default data if display newly mapped + set html_display_options "" + set multiple_p f + set choice_label_orientation "top" + set sort_order_type "order_of_entry" + set item_answer_alignment "besideright" + set as_item_display_id 0 + set prepend_empty_p t } } -validate { {html_display_options {[as::assessment::check_html_options -options $html_display_options]} "[_ assessment.error_html_options]"} } -edit_data { db_transaction { - set new_item_id [as::item::new_revision -as_item_id $as_item_id] + set new_item_id [as::item::new_revision -as_item_id $as_item_id] - if {$as_item_display_id} { - # edit existing display type - set new_item_display_id [as::item_display_sb::edit \ - -as_item_display_id $as_item_display_id \ - -html_display_options $html_display_options \ - -multiple_p $multiple_p \ - -choice_label_orientation $choice_label_orientation \ - -sort_order_type $sort_order_type \ - -item_answer_alignment $item_answer_alignment \ - -prepend_empty_p t] - } else { - # create new display type - set new_item_display_id [as::item_display_sb::new \ - -html_display_options $html_display_options \ - -multiple_p $multiple_p \ - -choice_label_orientation $choice_label_orientation \ - -sort_order_type $sort_order_type \ - -item_answer_alignment $item_answer_alignment \ - -prepend_empty_p t] - } + if {$as_item_display_id} { + # edit existing display type + set new_item_display_id [as::item_display_sb::edit \ + -as_item_display_id $as_item_display_id \ + -html_display_options $html_display_options \ + -multiple_p $multiple_p \ + -choice_label_orientation $choice_label_orientation \ + -sort_order_type $sort_order_type \ + -item_answer_alignment $item_answer_alignment \ + -prepend_empty_p t] + } else { + # create new display type + set new_item_display_id [as::item_display_sb::new \ + -html_display_options $html_display_options \ + -multiple_p $multiple_p \ + -choice_label_orientation $choice_label_orientation \ + -sort_order_type $sort_order_type \ + -item_answer_alignment $item_answer_alignment \ + -prepend_empty_p t] + } - set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] - set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] - set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] - set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] - as::assessment::check::copy_item_checks -assessment_id $assessment_id -section_id $new_section_id -as_item_id $as_item_id -new_item_id $new_item_id + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] + as::assessment::check::copy_item_checks -assessment_id $assessment_id -section_id $new_section_id -as_item_id $as_item_id -new_item_id $new_item_id - as::section::update_section_in_assessment\ + as::section::update_section_in_assessment\ -old_section_id $section_id \ -new_section_id $new_section_id \ -new_assessment_rev_id $new_assessment_rev_id - db_dml update_item_in_section {} - db_dml update_display_of_item {} + db_dml update_item_in_section {} + db_dml update_display_of_item {} } set as_item_id $new_item_id set section_id $new_section_id Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.tcl,v diff -u -N -r1.9 -r1.9.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.tcl 29 Jun 2018 17:27:18 -0000 1.9 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-ta.tcl 30 Mar 2019 20:19:52 -0000 1.9.2.1 @@ -20,12 +20,15 @@ as::assessment::data -assessment_id $assessment_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 } set page_title [_ assessment.edit_item_display_ta] -set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context_bar [ad_context_bar \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set alignment_types [list] foreach alignment_type [list besideleft besideright below above] { @@ -42,47 +45,47 @@ } -edit_request { db_1row last_used_display_type {} if {$as_item_display_id ne ""} { - db_1row display_type_data {} + db_1row display_type_data {} } else { - # default data if display newly mapped - set html_display_options "" - set abs_size 1000 - set item_answer_alignment "besideright" - set as_item_display_id 0 + # default data if display newly mapped + set html_display_options "" + set abs_size 1000 + set item_answer_alignment "besideright" + set as_item_display_id 0 } } -validate { {html_display_options {[as::assessment::check_html_options -options $html_display_options]} "[_ assessment.error_html_options]"} } -edit_data { db_transaction { - set new_item_id [as::item::new_revision -as_item_id $as_item_id] + set new_item_id [as::item::new_revision -as_item_id $as_item_id] - if {$as_item_display_id} { - # edit existing display type - set new_item_display_id [as::item_display_ta::edit \ - -as_item_display_id $as_item_display_id \ - -html_display_options $html_display_options \ - -abs_size $abs_size \ - -acs_widget "" \ - -item_answer_alignment $item_answer_alignment] - } else { - # create new display type - set new_item_display_id [as::item_display_ta::new \ - -html_display_options $html_display_options \ - -abs_size $abs_size \ - -acs_widget "" \ - -item_answer_alignment $item_answer_alignment] - } + if {$as_item_display_id} { + # edit existing display type + set new_item_display_id [as::item_display_ta::edit \ + -as_item_display_id $as_item_display_id \ + -html_display_options $html_display_options \ + -abs_size $abs_size \ + -acs_widget "" \ + -item_answer_alignment $item_answer_alignment] + } else { + # create new display type + set new_item_display_id [as::item_display_ta::new \ + -html_display_options $html_display_options \ + -abs_size $abs_size \ + -acs_widget "" \ + -item_answer_alignment $item_answer_alignment] + } - set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] - set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] - set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] - set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] - as::section::update_section_in_assessment\ + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] + as::section::update_section_in_assessment\ -old_section_id $section_id \ -new_section_id $new_section_id \ -new_assessment_rev_id $new_assessment_rev_id - db_dml update_item_in_section {} - db_dml update_display_of_item {} + db_dml update_item_in_section {} + db_dml update_display_of_item {} } set as_item_id $new_item_id set section_id $new_section_id Index: openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.tcl,v diff -u -N -r1.9 -r1.9.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.tcl 29 Jun 2018 17:27:18 -0000 1.9 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-display-tb.tcl 30 Mar 2019 20:19:52 -0000 1.9.2.1 @@ -20,12 +20,16 @@ as::assessment::data -assessment_id $assessment_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 } set page_title [_ assessment.edit_item_display_tb] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context [list \ + [list index [_ assessment.admin]] \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set alignment_types [list] foreach alignment_type [list besideleft besideright below above] { @@ -42,45 +46,45 @@ } -edit_request { db_1row last_used_display_type {} if {$as_item_display_id ne ""} { - db_1row display_type_data {} + db_1row display_type_data {} } else { - # default data if display newly mapped - set html_display_options "" - set abs_size 20 - set item_answer_alignment "besideright" - set as_item_display_id 0 + # default data if display newly mapped + set html_display_options "" + set abs_size 20 + set item_answer_alignment "besideright" + set as_item_display_id 0 } } -validate { {html_display_options {[as::assessment::check_html_options -options $html_display_options]} "[_ assessment.error_html_options]"} } -edit_data { db_transaction { - set new_item_id [as::item::new_revision -as_item_id $as_item_id] + set new_item_id [as::item::new_revision -as_item_id $as_item_id] - if {$as_item_display_id} { - # edit existing display type - set new_item_display_id [as::item_display_tb::edit \ - -as_item_display_id $as_item_display_id \ - -html_display_options $html_display_options \ - -abs_size $abs_size \ - -item_answer_alignment $item_answer_alignment] - } else { - # create new display type - set new_item_display_id [as::item_display_tb::new \ - -html_display_options $html_display_options \ - -abs_size $abs_size \ - -item_answer_alignment $item_answer_alignment] - } + if {$as_item_display_id} { + # edit existing display type + set new_item_display_id [as::item_display_tb::edit \ + -as_item_display_id $as_item_display_id \ + -html_display_options $html_display_options \ + -abs_size $abs_size \ + -item_answer_alignment $item_answer_alignment] + } else { + # create new display type + set new_item_display_id [as::item_display_tb::new \ + -html_display_options $html_display_options \ + -abs_size $abs_size \ + -item_answer_alignment $item_answer_alignment] + } - set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] - set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] - set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] - set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] - as::section::update_section_in_assessment\ + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] + as::section::update_section_in_assessment\ -old_section_id $section_id \ -new_section_id $new_section_id \ -new_assessment_rev_id $new_assessment_rev_id - db_dml update_item_in_section {} - db_dml update_display_of_item {} + db_dml update_item_in_section {} + db_dml update_display_of_item {} } set as_item_id $new_item_id set section_id $new_section_id Index: openacs-4/packages/assessment/www/asm-admin/item-edit-fu.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-fu.tcl,v diff -u -N -r1.5 -r1.5.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-fu.tcl 7 Aug 2017 23:48:04 -0000 1.5 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-fu.tcl 30 Mar 2019 20:19:52 -0000 1.5.2.1 @@ -20,12 +20,16 @@ as::assessment::data -assessment_id $assessment_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 } set page_title [_ assessment.edit_item_type_fu] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context [list \ + [list index [_ assessment.admin]] \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]] @@ -37,22 +41,22 @@ db_1row item_type_data {} } -edit_data { db_transaction { - set new_item_id [as::item::new_revision -as_item_id $as_item_id] - set as_item_type_id [db_string item_type_id {}] - set new_item_type_id [as::item_type_fu::edit \ - -as_item_type_id $as_item_type_id \ - -title $title] + set new_item_id [as::item::new_revision -as_item_id $as_item_id] + set as_item_type_id [db_string item_type_id {}] + set new_item_type_id [as::item_type_fu::edit \ + -as_item_type_id $as_item_type_id \ + -title $title] - set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] - set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] - set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] - set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] - as::section::update_section_in_assessment\ + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] + as::section::update_section_in_assessment\ -old_section_id $section_id \ -new_section_id $new_section_id \ -new_assessment_rev_id $new_assessment_rev_id - db_dml update_item_in_section {} - db_dml update_item_type {} + db_dml update_item_in_section {} + db_dml update_item_type {} } set as_item_id $new_item_id set section_id $new_section_id Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl,v diff -u -N -r1.26 -r1.26.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl 29 Jun 2018 17:27:18 -0000 1.26 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl 30 Mar 2019 20:19:52 -0000 1.26.2.1 @@ -30,7 +30,11 @@ } set page_title [_ assessment.edit_item_general] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context [list \ + [list index [_ assessment.admin]] \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set package_id [ad_conn package_id] set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]] Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.tcl,v diff -u -N -r1.13 -r1.13.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.tcl 29 Jun 2018 17:27:18 -0000 1.13 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.tcl 30 Mar 2019 20:19:52 -0000 1.13.2.1 @@ -27,13 +27,17 @@ as::assessment::data -assessment_id $assessment_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 } set package_id [ad_conn package_id] set page_title [_ assessment.edit_item_type_mc_choices] -set context [list [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base questions {assessment_id}] Questions] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context [list \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base questions {assessment_id}] Questions] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set selected_options [list [list "[_ assessment.yes]" t]] Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl,v diff -u -N -r1.16 -r1.16.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl 29 Jun 2018 17:27:18 -0000 1.16 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc.tcl 30 Mar 2019 20:19:52 -0000 1.16.2.1 @@ -23,7 +23,7 @@ as::assessment::data -assessment_id $assessment_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 } @@ -33,7 +33,11 @@ } set page_title [_ assessment.edit_item_type_mc] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context [list \ + [list index [_ assessment.admin]] \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]] set correct_options [list [list "[_ assessment.yes]" t]] @@ -53,9 +57,9 @@ } } else { ad_form -extend -name item_edit_mc -form { - {increasing_p:text(hidden) {value ""}} - {negative_p:text(hidden) {value ""}} - {num_correct_answers:text(hidden) {value ""}} + {increasing_p:text(hidden) {value ""}} + {negative_p:text(hidden) {value ""}} + {num_correct_answers:text(hidden) {value ""}} } } ad_form -extend -name item_edit_mc -form { @@ -73,18 +77,18 @@ lassign $one_choice choice_title choice_id choice_correct_p incr count if {![info exists choice($choice_id)]} { - set choice($choice_id) $choice_title - if {$choice_correct_p == "t"} { - set correct($choice_id) t - } + set choice($choice_id) $choice_title + if {$choice_correct_p == "t"} { + set correct($choice_id) t + } } append ad_form_code "\{choice.$choice_id:text,optional,nospell \{label \"[_ assessment.Choice] $count\"\} \{html \{size 80 maxlength 1000\}\} \{value \"\$choice($choice_id)\"\} \}\n" if { $type > 1} { if {[info exists correct($choice_id)]} { - append ad_form_code "\{correct.$choice_id:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $count\"\} \{options \$correct_options\} \{values t\} \}\n" + append ad_form_code "\{correct.$choice_id:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $count\"\} \{options \$correct_options\} \{values t\} \}\n" } else { - append ad_form_code "\{correct.$choice_id:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $count\"\} \{options \$correct_options\} \}\n" + append ad_form_code "\{correct.$choice_id:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $count\"\} \{options \$correct_options\} \}\n" } # lappend validate_list "correct.$choice_id {\$count_correct > 0} \"\[_ assessment.one_correct_choice_req\]\"" } @@ -94,15 +98,15 @@ for {set i 1} {$i <= $num_choices} {incr i} { incr count if {[info exists choice(_$i)]} { - append ad_form_code "\{choice._$i:text,optional,nospell \{label \"[_ assessment.Choice] $count\"\} \{html \{size 80 maxlength 1000\}\} \{value \"\$choice(_$i)\"\} \}\n" + append ad_form_code "\{choice._$i:text,optional,nospell \{label \"[_ assessment.Choice] $count\"\} \{html \{size 80 maxlength 1000\}\} \{value \"\$choice(_$i)\"\} \}\n" } else { - append ad_form_code "\{choice._$i:text,optional,nospell \{label \"[_ assessment.Choice] $count\"\} \{html \{size 80 maxlength 1000\}\}\}\n" + append ad_form_code "\{choice._$i:text,optional,nospell \{label \"[_ assessment.Choice] $count\"\} \{html \{size 80 maxlength 1000\}\}\}\n" } if { $type > 1} { if {[info exists correct(_$i)]} { - append ad_form_code "\{correct._$i:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $count\"\} \{options \$correct_options\} \{values t\}\}\n" + append ad_form_code "\{correct._$i:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $count\"\} \{options \$correct_options\} \{values t\}\}\n" } else { - append ad_form_code "\{correct._$i:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $count\"\} \{options \$correct_options\} \}\n" + append ad_form_code "\{correct._$i:text(checkbox),optional \{label \"[_ assessment.Correct_Answer_Choice] $count\"\} \{options \$correct_options\} \}\n" } } } @@ -116,68 +120,68 @@ set on_submit "{ if {\[template::form get_action item_add_mc\] == \"more\"} { - # add 5 more choice entries and redirect to this form - incr num_choices 5 - ad_returnredirect \[export_vars -base \"item-edit-mc\" {assessment_id section_id as_item_id title increasing_p negative_p num_correct_answers num_answers display_type num_choices choice:array correct:array}\] - ad_script_abort + # add 5 more choice entries and redirect to this form + incr num_choices 5 + ad_returnredirect \[export_vars -base \"item-edit-mc\" {assessment_id section_id as_item_id title increasing_p negative_p num_correct_answers num_answers display_type num_choices choice:array correct:array}\] + ad_script_abort } }" set edit_data "{ db_transaction { - set new_item_id \[as::item::new_revision -as_item_id \$as_item_id\] - set as_item_type_id \[db_string item_type_id {}\] - set new_item_type_id \[as::item_type_mc::edit \\ - -as_item_type_id \$as_item_type_id \\ - -title \$title \\ - -increasing_p \$increasing_p \\ - -allow_negative_p \$negative_p \\ - -num_correct_answers \$num_correct_answers \\ - -num_answers \$num_answers\] + set new_item_id \[as::item::new_revision -as_item_id \$as_item_id\] + set as_item_type_id \[db_string item_type_id {}\] + set new_item_type_id \[as::item_type_mc::edit \\ + -as_item_type_id \$as_item_type_id \\ + -title \$title \\ + -increasing_p \$increasing_p \\ + -allow_negative_p \$negative_p \\ + -num_correct_answers \$num_correct_answers \\ + -num_answers \$num_answers\] - set new_assessment_rev_id \[as::assessment::new_revision -assessment_id \$assessment_id\] - set section_id \[as::section::latest -section_id \$section_id -assessment_rev_id \$new_assessment_rev_id\] - set new_section_id \[as::section::new_revision -section_id \$section_id -assessment_id \$assessment_id\] - set as_item_id \[as::item::latest -as_item_id \$as_item_id -section_id \$new_section_id\] - as::assessment::check::copy_item_checks -assessment_id \$assessment_id -section_id \$new_section_id -as_item_id \$as_item_id -new_item_id \$new_item_id + set new_assessment_rev_id \[as::assessment::new_revision -assessment_id \$assessment_id\] + set section_id \[as::section::latest -section_id \$section_id -assessment_rev_id \$new_assessment_rev_id\] + set new_section_id \[as::section::new_revision -section_id \$section_id -assessment_id \$assessment_id\] + set as_item_id \[as::item::latest -as_item_id \$as_item_id -section_id \$new_section_id\] + as::assessment::check::copy_item_checks -assessment_id \$assessment_id -section_id \$new_section_id -as_item_id \$as_item_id -new_item_id \$new_item_id - as::section::update_section_in_assessment\ + as::section::update_section_in_assessment\ -old_section_id \$section_id \ -new_section_id \$new_section_id \ -new_assessment_rev_id \$new_assessment_rev_id - db_dml update_item_in_section {} - db_dml update_item_type {} + db_dml update_item_in_section {} + db_dml update_item_type {} - # edit existing choices - set count 0 - foreach i \[lsort \[array names choice\]\] { + # edit existing choices + set count 0 + foreach i \[lsort \[array names choice\]\] { if {\[string index \$i 0\] != \"_\" && \$choice(\$i) ne \"\"} { - incr count - set new_choice_id \[as::item_choice::new_revision -choice_id \$i -mc_id \$new_item_type_id\] - set title \$choice(\$i) - set correct_answer_p \[ad_decode \[info exists correct(\$i)\] 0 f t\] - db_dml update_title {} - db_dml update_correct_and_sort_order {} - } - } + incr count + set new_choice_id \[as::item_choice::new_revision -choice_id \$i -mc_id \$new_item_type_id\] + set title \$choice(\$i) + set correct_answer_p \[ad_decode \[info exists correct(\$i)\] 0 f t\] + db_dml update_title {} + db_dml update_correct_and_sort_order {} + } + } - # add new choices - foreach i \[lsort \[array names choice\]\] { + # add new choices + foreach i \[lsort \[array names choice\]\] { - if {\[string index \$i 0\] == \"_\" && \$choice(\$i) ne \"\"} { - incr count - set new_choice_id \[as::item_choice::new -mc_id \$new_item_type_id \\ - -title \$choice(\$i) \\ - -numeric_value \"\" \\ - -text_value \"\" \\ - -content_value \"\" \\ - -feedback_text \"\" \\ - -selected_p \"\" \\ - -correct_answer_p \[ad_decode \[info exists correct(\$i)\] 0 f t\] \\ - -sort_order \$count \\ - -percent_score \"\"\] - } - } + if {\[string index \$i 0\] == \"_\" && \$choice(\$i) ne \"\"} { + incr count + set new_choice_id \[as::item_choice::new -mc_id \$new_item_type_id \\ + -title \$choice(\$i) \\ + -numeric_value \"\" \\ + -text_value \"\" \\ + -content_value \"\" \\ + -feedback_text \"\" \\ + -selected_p \"\" \\ + -correct_answer_p \[ad_decode \[info exists correct(\$i)\] 0 f t\] \\ + -sort_order \$count \\ + -percent_score \"\"\] + } + } } set mc_id \$new_item_type_id set as_item_id \$new_item_id Index: openacs-4/packages/assessment/www/asm-admin/item-edit-oq.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-oq.tcl,v diff -u -N -r1.10 -r1.10.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-oq.tcl 29 Jun 2018 17:27:18 -0000 1.10 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-oq.tcl 30 Mar 2019 20:19:52 -0000 1.10.2.1 @@ -20,17 +20,19 @@ as::assessment::data -assessment_id $assessment_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 } set page_title [_ assessment.edit_item_type_oq] -set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context_bar [ad_context_bar \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set type $assessment_data(type) - ad_form -name item_edit_oq -action item-edit-oq -export { assessment_id section_id } -form { {as_item_id:key} {title:text {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.oq_Title_help]"}} @@ -45,7 +47,7 @@ } } else { ad_form -extend -name item_edit_oq -form { - {default_value:text(hidden) {value ""}} + {default_value:text(hidden) {value ""}} {feedback_text:text(hidden) {value ""}} {reference_answer:text(hidden) {value ""}} {keywords:text(hidden) {value ""}} @@ -59,30 +61,30 @@ } -on_submit { set keyword_list [list] foreach line [split $keywords "\n"] { - lappend keyword_list [string trim $line] + lappend keyword_list [string trim $line] } } -edit_data { db_transaction { - set new_item_id [as::item::new_revision -as_item_id $as_item_id] - set as_item_type_id [db_string item_type_id {}] - set new_item_type_id [as::item_type_oq::edit \ - -as_item_type_id $as_item_type_id \ - -title $title \ - -default_value $default_value \ - -feedback_text $feedback_text \ - -reference_answer $reference_answer \ - -keywords $keyword_list] + set new_item_id [as::item::new_revision -as_item_id $as_item_id] + set as_item_type_id [db_string item_type_id {}] + set new_item_type_id [as::item_type_oq::edit \ + -as_item_type_id $as_item_type_id \ + -title $title \ + -default_value $default_value \ + -feedback_text $feedback_text \ + -reference_answer $reference_answer \ + -keywords $keyword_list] - set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] - set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] - set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] - set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] - as::section::update_section_in_assessment\ + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] + as::section::update_section_in_assessment\ -old_section_id $section_id \ -new_section_id $new_section_id \ -new_assessment_rev_id $new_assessment_rev_id - db_dml update_item_in_section {} - db_dml update_item_type {} + db_dml update_item_in_section {} + db_dml update_item_type {} } set as_item_id $new_item_id set section_id $new_section_id Index: openacs-4/packages/assessment/www/asm-admin/item-edit-sa.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-sa.tcl,v diff -u -N -r1.9 -r1.9.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit-sa.tcl 29 Jun 2018 17:27:18 -0000 1.9 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-sa.tcl 30 Mar 2019 20:19:52 -0000 1.9.2.1 @@ -20,12 +20,16 @@ as::assessment::data -assessment_id $assessment_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 } set page_title [_ assessment.edit_item_type_sa] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] $page_title] +set context [list \ + [list index [_ assessment.admin]] \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list [export_vars -base item-edit {assessment_id section_id as_item_id}] [_ assessment.edit_item]] \ + $page_title] set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]] set type $assessment_data(type) @@ -37,13 +41,13 @@ } if { $type > 1} { ad_form -extend -name item_edit_sa -form { - {increasing_p:text(select) {label "[_ assessment.Increasing]"} {options $boolean_options} {help_text "[_ assessment.Increasing_help]"}} - {allow_negative_p:text(select) {label "[_ assessment.Allow_Negative]"} {options $boolean_options} {help_text "[_ assessment.Allow_Negative_help]"}} + {increasing_p:text(select) {label "[_ assessment.Increasing]"} {options $boolean_options} {help_text "[_ assessment.Increasing_help]"}} + {allow_negative_p:text(select) {label "[_ assessment.Allow_Negative]"} {options $boolean_options} {help_text "[_ assessment.Allow_Negative_help]"}} } } else { ad_form -extend -name item_edit_sa -form { - {increasing_p:text(hidden) {value ""}} - {allow_negative_p:text(hidden) {value ""}} + {increasing_p:text(hidden) {value ""}} + {allow_negative_p:text(hidden) {value ""}} } } @@ -52,24 +56,24 @@ db_1row item_type_data {} } -edit_data { db_transaction { - set new_item_id [as::item::new_revision -as_item_id $as_item_id] - set as_item_type_id [db_string item_type_id {}] - set new_item_type_id [as::item_type_sa::edit \ - -as_item_type_id $as_item_type_id \ - -title $title \ - -increasing_p $increasing_p \ - -allow_negative_p $allow_negative_p] + set new_item_id [as::item::new_revision -as_item_id $as_item_id] + set as_item_type_id [db_string item_type_id {}] + set new_item_type_id [as::item_type_sa::edit \ + -as_item_type_id $as_item_type_id \ + -title $title \ + -increasing_p $increasing_p \ + -allow_negative_p $allow_negative_p] - set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] - set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] - set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] - set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] - as::section::update_section_in_assessment\ + set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id] + set section_id [as::section::latest -section_id $section_id -assessment_rev_id $new_assessment_rev_id] + set new_section_id [as::section::new_revision -section_id $section_id -assessment_id $assessment_id] + set as_item_id [as::item::latest -as_item_id $as_item_id -section_id $new_section_id] + as::section::update_section_in_assessment\ -old_section_id $section_id \ -new_section_id $new_section_id \ -new_assessment_rev_id $new_assessment_rev_id - db_dml update_item_in_section {} - db_dml update_item_type {} + db_dml update_item_in_section {} + db_dml update_item_type {} } set as_item_id $new_item_id set section_id $new_section_id Index: openacs-4/packages/assessment/www/asm-admin/item-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit.tcl,v diff -u -N -r1.16 -r1.16.2.1 --- openacs-4/packages/assessment/www/asm-admin/item-edit.tcl 29 Jun 2018 17:27:18 -0000 1.16 +++ openacs-4/packages/assessment/www/asm-admin/item-edit.tcl 30 Mar 2019 20:19:52 -0000 1.16.2.1 @@ -20,12 +20,17 @@ as::assessment::data -assessment_id $assessment_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 } set page_title [_ assessment.edit_item] -set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] [list index [_ assessment.admin]] [list [export_vars -base questions {assessment_id}] Questions] $page_title] +set context [list \ + [list index [_ assessment.admin]] \ + [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] \ + [list index [_ assessment.admin]] \ + [list [export_vars -base questions {assessment_id}] Questions] \ + $page_title] set package_id [ad_conn package_id] set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]] @@ -47,21 +52,21 @@ set linked_objects [application_data_link::get_links_from -object_id $as_item_id] if {[llength $linked_objects]} { foreach l $linked_objects { - acs_object::get -object_id $l -array object - if {$object(object_type) eq "content_item"} { - set object(object_type) [content::item::get_content_type -item_id $l] - } - set link_type o - if {$object(object_type) eq "image"} { - set link_type image - } - if {$object(object_type) eq "content_revision"} { - set link_type file - } - append links "$object(title)
" + acs_object::get -object_id $l -array object + if {$object(object_type) eq "content_item"} { + set object(object_type) [content::item::get_content_type -item_id $l] + } + set link_type o + if {$object(object_type) eq "image"} { + set link_type image + } + if {$object(object_type) eq "content_revision"} { + set link_type file + } + append links "$object(title)
" } ad_form -extend -name item_edit -form { - {content:text(inform),optional {label "[_ assessment.item_display_Content]"} {value {$links}} {help_text "[_ assessment.item_Content_help]"}} + {content:text(inform),optional {label "[_ assessment.item_display_Content]"} {value {$links}} {help_text "[_ assessment.item_Content_help]"}} } } @@ -70,7 +75,7 @@ if {[db_0or1row get_item_content {}]} { set remove_url [export_vars -base remove-content {as_item_id content_rev_id {return_url [ad_return_url]}}] ad_form -extend -name item_edit -form { - {content2:text(inform),optional {label "OLD UI [_ assessment.item_display_Content]"} {value {$content_name \[Remove File\]}} {help_text "[_ assessment.item_Content_help]"}} + {content2:text(inform),optional {label "OLD UI [_ assessment.item_display_Content]"} {value {$content_name \[Remove File\]}} {help_text "[_ assessment.item_Content_help]"}} } } 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 -N -r1.7 -r1.7.2.1 --- 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 30 Mar 2019 20:19:52 -0000 1.7.2.1 @@ -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 { Index: openacs-4/packages/assessment/www/asm-admin/results-session.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-session.tcl,v diff -u -N -r1.11 -r1.11.2.1 --- openacs-4/packages/assessment/www/asm-admin/results-session.tcl 29 Jun 2018 17:27:18 -0000 1.11 +++ openacs-4/packages/assessment/www/asm-admin/results-session.tcl 30 Mar 2019 20:19:52 -0000 1.11.2.1 @@ -4,7 +4,7 @@ @author timo@timohentschel.de @creation-date 2005-02-16 - @cvs-id $Id$ + @cvs-id $Id$ } { session_id:naturalnum,notnull } -properties { @@ -32,7 +32,11 @@ } set page_title "[_ assessment.View_Results]" -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]] $page_title] +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]] \ + $page_title] template::head::add_css -href "/resources/assessment/assessment.css" set format "[lc_get d_fmt], [lc_get t_fmt]" set session_user_url [acs_community_member_url -user_id $subject_id]