Index: openacs-4/packages/assessment/www/session.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/assessment/www/session.tcl 8 Oct 2004 11:52:40 -0000 1.11 +++ openacs-4/packages/assessment/www/session.tcl 14 Oct 2004 14:15:04 -0000 1.12 @@ -25,22 +25,37 @@ set as_item_display_rbx__item_id {} unset as_item_display_rbx__item_id set as_item_display_tbx__item_id {} - unset as_item_display_tbx__item_id + unset as_item_display_tbx__item_id + set as_item_display_tax__item_id {} + unset as_item_display_tax__item_id set item_item_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=:as_item_id"] set item_mc_id [db_string item_item_type "SELECT related_object_id FROM cr_item_rels WHERE relation_tag = 'as_item_type_rel' AND item_id=:item_item_id"] set mc_id [db_string item_to_rev "SELECT revision_id FROM cr_revisions WHERE item_id=:item_mc_id"] set item_display_id [db_string item_item_type "SELECT related_object_id FROM cr_item_rels WHERE relation_tag = 'as_item_display_rel' AND item_id=:item_item_id"] + set items_as_item_id [db_string items_items_as_item_id "SELECT as_itemsx.as_item_id FROM as_itemsx WHERE as_itemsx.item_id = :item_item_id"] db_0or1row as_item_display_rbx "SELECT item_id AS as_item_display_rbx__item_id FROM as_item_display_rbx WHERE item_id=:item_display_id" db_0or1row as_item_display_tbx "SELECT item_id AS as_item_display_tbx__item_id FROM as_item_display_tbx WHERE item_id=:item_display_id" + db_0or1row as_item_display_tax "SELECT item_id AS as_item_display_tax__item_id FROM as_item_display_tax WHERE item_id=:item_display_id" set presentation_type "checkbox" ;# DEFAULT if {[info exists as_item_display_rbx__item_id]} {set presentation_type "radio"} if {[info exists as_item_display_tbx__item_id]} {set presentation_type "fitb"} + if {[info exists as_item_display_tax__item_id]} {set presentation_type "textarea"} set notanswered 1 set maxscore $itemmaxscore set score 0 set item_correct 1 set choice_html "" + + if {[string compare $presentation_type "textarea"] == 0} { + set text_answer {} + db_0or1row shortanswer {} + set choice_answer "" + set correct_answer {} + append choice_html "" + set item_correct 0 + } + db_foreach choices {} { if {[string length "$choice_id_answer"]} {set notanswered 0} set choice_correct 0
$correct_answer$choice_answer