Index: openacs-4/packages/assessment/www/admin/section-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/section-form.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/assessment/www/admin/section-form.tcl 29 Dec 2004 09:07:39 -0000 1.6 +++ openacs-4/packages/assessment/www/admin/section-form.tcl 7 Jan 2005 16:10:45 -0000 1.7 @@ -7,6 +7,7 @@ assessment_id:integer section_id:integer,optional after:integer,optional + {__new_p 0} } -properties { context_bar:onevalue page_title:onevalue @@ -22,12 +23,12 @@ ad_script_abort } -if {[info exists section_id]} { - set page_title [_ assessment.edit_section] - set _section_id $section_id -} else { +if {![info exists section_id] || $__new_p} { set page_title [_ assessment.add_new_section] set _section_id 0 +} else { + set page_title [_ assessment.edit_section] + set _section_id $section_id } set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title] @@ -53,7 +54,7 @@ ad_form -extend -name section_form -form { {title:text {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.section_Title_help]"}} - {description:text(textarea) {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {help_text "[_ assessment.section_Description_help]"}} + {description:text(textarea),optional {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {help_text "[_ assessment.section_Description_help]"}} } if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} { @@ -64,6 +65,7 @@ {instructions:text(textarea),optional {label "[_ assessment.Instructions]"} {html {rows 5 cols 80}} {help_text "[_ assessment.section_Instructions_help]"}} {feedback_text:text(textarea),optional {label "[_ assessment.Feedback]"} {html {rows 5 cols 80}} {help_text "[_ assessment.section_Feedback_help]"}} {max_time_to_complete:integer,optional {label "[_ assessment.time_for_completion]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.section_time_help]"}} + {num_items:integer,optional {label "[_ assessment.num_items]"} {html {size 5 maxlength 5}} {help_text "[_ assessment.num_items_help]"}} {points:integer,optional {label "[_ assessment.points_section]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.points_item_help]"}} {display_type_id:text(select),optional {label "[_ assessment.Display_Type]"} {options $display_types} {help_text "[_ assessment.section_Display_Type_help]"}} } -new_request { @@ -73,10 +75,13 @@ set instructions "" set feedback_text "" set max_time_to_complete "" + set num_items "" set points "" set display_type_id "" } -edit_request { db_1row section_data {} +} -validate { + {name {[as::assessment::unique_name -name $name -new_p $__new_p]} "[_ assessment.name_used]"} } -on_submit { set category_ids [category::ad_form::get_categories -container_object_id $package_id] } -new_data { @@ -90,6 +95,7 @@ -instructions $instructions \ -feedback_text $feedback_text \ -max_time_to_complete $max_time_to_complete \ + -num_items $num_items \ -points $points \ -display_type_id $display_type_id] @@ -112,6 +118,7 @@ -instructions $instructions \ -feedback_text $feedback_text \ -max_time_to_complete $max_time_to_complete \ + -num_items $num_items \ -points $points \ -display_type_id $display_type_id]