Index: openacs-4/packages/assessment/tcl/as-section-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-section-procs-postgresql.xql,v diff -u -r1.8 -r1.9 --- openacs-4/packages/assessment/tcl/as-section-procs-postgresql.xql 4 Aug 2006 19:06:03 -0000 1.8 +++ openacs-4/packages/assessment/tcl/as-section-procs-postgresql.xql 7 Aug 2006 01:19:34 -0000 1.9 @@ -5,11 +5,12 @@ - select s.as_item_id, ci.name, r.title, r.content as - question_text, r.description, i.subtext, m.required_p, + select s.as_item_id, ci.name, r.title, + r.description, i.subtext, m.required_p, m.max_time_to_complete, r2.revision_id as content_rev_id, r2.title as content_filename, ci2.content_type, - ir.target_rev_id as as_item_type_id, i.validate_block + ir.target_rev_id as as_item_type_id, i.validate_block, + r.content as question_text from cr_items ci, as_items i, as_item_section_map m, cr_revisions r, as_item_rels ir, as_session_items s left outer join as_item_rels ar on (ar.item_rev_id = s.as_item_id and ar.rel_type = 'as_item_content_rel') @@ -32,10 +33,11 @@ - select i.as_item_id, ci.name, cr.content as question_text, cr.title, cr.description, i.subtext, + select i.as_item_id, ci.name, cr.title, cr.description, i.subtext, m.required_p, m.max_time_to_complete, r2.revision_id as content_rev_id, r2.title as content_filename, ci2.content_type, m.fixed_position, - ir.target_rev_id as as_item_type_id, i.validate_block + ir.target_rev_id as as_item_type_id, i.validate_block, + cr.content as question_text from as_item_section_map m, cr_revisions cr, cr_items ci, as_item_rels ir, as_items i left outer join as_item_rels ar on (ar.item_rev_id = i.as_item_id and ar.rel_type = 'as_item_content_rel') Index: openacs-4/packages/assessment/tcl/as-section-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-section-procs.tcl,v diff -u -r1.28 -r1.29 --- openacs-4/packages/assessment/tcl/as-section-procs.tcl 4 Aug 2006 19:06:03 -0000 1.28 +++ openacs-4/packages/assessment/tcl/as-section-procs.tcl 7 Aug 2006 01:19:34 -0000 1.29 @@ -217,6 +217,7 @@ set item_list [db_list_of_lists get_sorted_items {}] if {[llength $item_list] > 0} { + ns_log notice "as::section::items returning item_list from get_sorted_items \n $item_list \n" return $item_list } Index: openacs-4/packages/assessment/www/assessment-section-submit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-section-submit.adp,v diff -u -r1.16 -r1.17 --- openacs-4/packages/assessment/www/assessment-section-submit.adp 6 Aug 2006 17:27:45 -0000 1.16 +++ openacs-4/packages/assessment/www/assessment-section-submit.adp 7 Aug 2006 01:19:35 -0000 1.17 @@ -34,7 +34,7 @@

@items.description;noquote@

@items.content;noquote@

 - *question text* @items.question_text;noquote@ * + @items.question_text;noquote@ *
Index: openacs-4/packages/assessment/www/asm-admin/item-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/assessment/www/asm-admin/item-add.tcl 12 Jun 2006 02:49:51 -0000 1.8 +++ openacs-4/packages/assessment/www/asm-admin/item-add.tcl 7 Aug 2006 01:19:35 -0000 1.9 @@ -44,7 +44,7 @@ ad_form -name item_add -action item-add -export { assessment_id section_id after type} -html {enctype multipart/form-data} -form { {as_item_id:key} - {title:text(textarea) {label "[_ assessment.item_Title]"} {html {rows 3 cols 80 maxlength 1000}} {help_text "[_ assessment.item_Title_help]"}} + {question_text:richtext {label "[_ assessment.item_Question"} {html {rows 5 cols 80 style {width: 100%}}} {help_text "[_ assessment.item_Question_help]"}} } if { $type > 1} { ad_form -extend -name item_add -form {{description:text(textarea),optional {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {help_text "[_ assessment.item_Description_help]"}} @@ -98,7 +98,7 @@ {validate_block:text(textarea),optional {label "[_ assessment.Validation_Block]"} {help_text "[_ assessment.lt_This_field_is_used_to]"} {html {cols 70 rows 6}}} } -new_request { set name "" - set title "" + set question_text "" set description "" set subtext "" set field_name "" @@ -129,12 +129,12 @@ } elseif {[string eq $item_type "fu"]} { set data_type "file" } - + set question_text [template::util::richtext::get_property content $question_text] db_transaction { if {![db_0or1row item_exists {}]} { set as_item_id [as::item::new \ -item_item_id $as_item_id \ - -title $title \ + -title $question_text \ -description $description \ -subtext $subtext \ -field_name $field_name \ @@ -149,7 +149,7 @@ } else { set as_item_id [as::item::edit \ -as_item_id $as_item_id \ - -title $title \ + -title $question_text \ -description $description \ -subtext $subtext \ -field_name $field_name \ 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 -r1.11 -r1.12 --- openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl 14 Jul 2006 08:03:30 -0000 1.11 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl 7 Aug 2006 01:19:35 -0000 1.12 @@ -63,7 +63,7 @@ } ad_form -extend -name item_edit_general -form { - {title:text(textarea) {label "[_ assessment.Title]"} {html {rows 3 cols 80}} {help_text "[_ assessment.item_Title_help]"}} + {question_text:richtext {label "[_ assessment.Question]"} {html {rows 3 cols 80 style {width:100%}}} {help_text "[_ assessment.item_Question_help]"}} } if { $type > 1} { @@ -109,17 +109,19 @@ } set data_type_disp "[_ assessment.data_type_$data_type]" set display_type [string range [db_string get_display_type {}] end-1 end] + set question_text [template::util::richtext::create $question_text $mime_type] } -on_submit { set category_ids [category::ad_form::get_categories -container_object_id $package_id] if {[empty_string_p $points]} { set points 0 } } -edit_data { + set question_text [template::util::richtext::get_property contents $question_text] db_transaction { set old_display_type [string range [db_string get_display_type {}] end-1 end] set new_item_id [as::item::edit \ -as_item_id $as_item_id \ - -title $title \ + -title $question_text \ -description $description \ -subtext $subtext \ -field_name $field_name \ Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/assessment/www/asm-admin/item-edit-general.xql 12 Jun 2006 02:49:51 -0000 1.3 +++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.xql 7 Aug 2006 01:19:35 -0000 1.4 @@ -40,7 +40,7 @@ select r.title, r.description, i.subtext, i.field_name, i.field_code, i.required_p, - i.feedback_right, i.feedback_wrong, i.max_time_to_complete, i.data_type, i.points, i.validate_block + i.feedback_right, i.feedback_wrong, i.max_time_to_complete, i.data_type, i.points, i.validate_block, r.content as question_text, r.mime_type from cr_revisions r, as_items i where r.revision_id = i.as_item_id and i.as_item_id = :as_item_id