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.2 -r1.3
--- openacs-4/packages/assessment/www/admin/section-form.tcl	15 Nov 2004 17:17:16 -0000	1.2
+++ openacs-4/packages/assessment/www/admin/section-form.tcl	5 Dec 2004 17:15:23 -0000	1.3
@@ -24,37 +24,38 @@
 
 if {[info exists section_id]} {
     set page_title [_ assessment.edit_section]
+    set _section_id $section_id
 } else {
     set page_title [_ assessment.add_new_section]
+    set _section_id 0
 }
 
 set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] $page_title]
+set package_id [ad_conn package_id]
 
 set display_types [db_list_of_lists section_display_types {}]
 set display_types [concat [list [list "" ""]] $display_types]
 
 
+set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]]
+
 ad_form -name section_form -action section-form -export { assessment_id after } -form {
     {section_id:key}
+    {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]"}}
 }
 
-if {[exists_and_not_null after]} {
-    ad_form -extend -name section_form -form {
-	{name:text {label "[_ assessment.Name]"} {html {size 40 maxlength 400}}}
-    }
+if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} {
+    category::ad_form::add_widgets -container_object_id $package_id -categorized_object_id $_section_id -form_name section_form
 }
 
-set boolean_options [list [list "[_ assessment.yes]" t] [list "[_ assessment.no]" f]]
-
 ad_form -extend -name section_form -form {
-    {title:text {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}}}
-    {description:text(textarea) {label "[_ assessment.Description]"} {html {rows 5 cols 80}}}
-    {definition:text(textarea),optional {label "[_ assessment.Definition]"} {html {rows 5 cols 80}}}
-    {instructions:text(textarea),optional {label "[_ assessment.Instructions]"} {html {rows 5 cols 80}}}
-    {feedback_text:text(textarea),optional {label "[_ assessment.Feedback]"} {html {rows 5 cols 80}}}
-    {max_time_to_complete:integer,optional {label "[_ assessment.time_for_completion]"} {html {size 10 maxlength 10}}}
-    {section_display_type_id:text(select),optional {label "[_ assessment.Display_Type]"} {options $display_types}}
-    {required_p:text(select) {label "[_ assessment.Required]"} {options $boolean_options}}
+    {definition:text(textarea),optional {label "[_ assessment.Definition]"} {html {rows 5 cols 80}} {help_text "[_ assessment.section_Definition_help]"}}
+    {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]"}}
+    {section_display_type_id:text(select),optional {label "[_ assessment.Display_Type]"} {options $display_types} {help_text "[_ assessment.section_Display_Type_help]"}}
+    {required_p:text(select) {label "[_ assessment.Required]"} {options $boolean_options} {help_text "[_ assessment.section_Required_help]"}}
 } -new_request {
     set title ""
     set description ""
@@ -66,6 +67,8 @@
     set required_p t
 } -edit_request {
     db_1row section_data {}
+} -on_submit {
+    set category_ids [category::ad_form::get_categories -container_object_id $package_id]
 } -new_data {
     db_transaction {
 	set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id]
@@ -83,6 +86,10 @@
 	db_dml move_down_sections {}
 	set sort_order [expr $after + 1]
 	db_dml add_section_to_assessment {}
+
+	if {[exists_and_not_null category_ids]} {
+	    category::map_object -object_id $section_id $category_ids
+	}
     }
 } -edit_data {
     db_transaction {
@@ -100,6 +107,10 @@
 				-section_display_type_id $section_display_type_id]
 
 	db_dml update_section_of_assessment {}
+
+	if {[exists_and_not_null category_ids]} {
+	    category::map_object -object_id $new_section_id $category_ids
+	}
     }
 } -after_submit {
     ad_returnredirect [export_vars -base one-a {assessment_id}]