Index: openacs-4/packages/assessment/tcl/item-form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/Attic/item-form-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/assessment/tcl/item-form-procs.tcl 23 Sep 2004 14:20:55 -0000 1.4 +++ openacs-4/packages/assessment/tcl/item-form-procs.tcl 28 Sep 2004 14:39:46 -0000 1.5 @@ -13,7 +13,7 @@ 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"] 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" set presentation_type "checkbox" ;# DEFAULT - if {[info exists as_item_display_rbx__item_id]} {set presentation_type "radiobutton"} + if {[info exists as_item_display_rbx__item_id]} {set presentation_type "radio"} #Add the items depending on the type (as_item_display_types) switch -- $presentation_type { @@ -38,7 +38,7 @@ -required_p $required_p } - "radiobutton" { + "radio" { set widget "text(radio)" set item_item_id [db_string cr_item_from_revision "select item_id from cr_revisions where revision_id=: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"] Index: openacs-4/packages/assessment/www/assessment.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/assessment/www/assessment.adp 24 Sep 2004 13:27:55 -0000 1.5 +++ openacs-4/packages/assessment/www/assessment.adp 28 Sep 2004 14:39:48 -0000 1.6 @@ -20,7 +20,7 @@ #assessment.Question# @items.rownum@:@items.title@
- + @formgroup.widget;noquote@ @formgroup.label;noquote@ Index: openacs-4/packages/assessment/www/assessment.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/Attic/assessment.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/assessment/www/assessment.xql 22 Sep 2004 15:27:08 -0000 1.2 +++ openacs-4/packages/assessment/www/assessment.xql 28 Sep 2004 14:39:48 -0000 1.3 @@ -4,7 +4,7 @@ - SELECT as_itemsx.as_item_id, as_itemsx.name, as_itemsx.title, 'radiobutton' as presentation_type + SELECT as_itemsx.as_item_id, as_itemsx.name, as_itemsx.title FROM (as_sectionsx INNER JOIN (as_assessmentsx INNER JOIN as_assessment_section_map ON as_assessmentsx.assessment_id=as_assessment_section_map.assessment_id) ON as_sectionsx.section_id=as_assessment_section_map.section_id) INNER JOIN (as_itemsx INNER JOIN as_item_section_map ON as_itemsx.as_item_id=as_item_section_map.as_item_id) ON as_sectionsx.section_id=as_item_section_map.section_id WHERE as_assessmentsx.assessment_id=:assessment_id Index: openacs-4/packages/assessment/www/admin/show-items.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/show-items.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/show-items.adp 21 Sep 2004 17:35:40 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/show-items.adp 28 Sep 2004 14:39:49 -0000 1.2 @@ -11,7 +11,7 @@ @items.rownum@.-
@items.title@ - +

Index: openacs-4/packages/assessment/www/admin/show-items.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/show-items.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/show-items.xql 21 Sep 2004 17:35:40 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/show-items.xql 28 Sep 2004 14:39:49 -0000 1.2 @@ -4,7 +4,7 @@ - SELECT as_itemsx.as_item_id, as_itemsx.name, as_itemsx.title, 'radiobutton' AS presentation_type + SELECT as_itemsx.as_item_id, as_itemsx.name, as_itemsx.title FROM as_itemsx