Index: openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl	15 May 2007 20:14:17 -0000	1.13
+++ openacs-4/packages/assessment/www/asm-admin/assessment-form.tcl	2 Feb 2008 11:20:13 -0000	1.14
@@ -13,7 +13,7 @@
     context:onevalue
     page_title:onevalue
 }
-		
+
 set package_id [ad_conn package_id]
 permission::require_permission -object_id $package_id -privilege create
 set user_id [ad_conn user_id]
@@ -33,9 +33,9 @@
     set s_assessment_id 0
     db_0or1row rev_id_from_item_id {} ;# sets s_assessment_id
     if { $type eq "" } {
-	# Get the assessment data
-	as::assessment::data -assessment_id $assessment_id
-	set type $assessment_data(type)
+        # Get the assessment data
+        as::assessment::data -assessment_id $assessment_id
+        set type $assessment_data(type)
     }
 }
 
@@ -51,26 +51,39 @@
     -action assessment-form \
     -form {
         {assessment_id:key}
+        {title:text,nospell 
+            {label "[_ assessment.Title]"} 
+            {html {size 80 maxlength 1000}} 
+            {help_text "[_ assessment.as_Title_help]"}
+        }
+        {description:text(textarea),optional 
+            {label "[_ assessment.Description]"} 
+            {html {rows 5 cols 80}} 
+            {help_text "[_ assessment.as_Description_help]"}
+        }
     }
 
-ad_form -extend -name assessment_form -form {
-    {title:text,nospell {label "[_ assessment.Title]"} {html {size 80 maxlength 1000}} {help_text "[_ assessment.as_Title_help]"}}
-    {description:text(textarea),optional {label "[_ assessment.Description]"} {html {rows 5 cols 80}} {help_text "[_ assessment.as_Description_help]"}}
-}
-
 if {![empty_string_p [category_tree::get_mapped_trees $package_id]]} {
     category::ad_form::add_widgets -container_object_id $package_id -categorized_object_id $s_assessment_id -form_name assessment_form
 }
 
 if { $edit_p } {
-    ad_form -extend -name assessment_form -form {{instructions:text(textarea),optional {label "[_ assessment.Instructions]"} {html {rows 5 cols 80}}}}
+    ad_form -extend -name assessment_form -form {
+        {instructions:text(textarea),optional 
+            {label "[_ assessment.Instructions]"} {html {rows 5 cols 80}}
+        }
+        {run_mode:text(hidden) 
+            {value {}}
+        } 
+    }
 
-
-    ad_form -extend -name assessment_form -form { {run_mode:text(hidden) {value {}}} }
-
     if { !$permission_p } { 
         ad_form -extend -name assessment_form  -form {
-            {anonymous_p:text(select) {label "[_ assessment.Anonymous_Responses]"} {options $boolean_options} {help_text "[_ assessment.as_Anonymous_help]"} {value f}}
+            {anonymous_p:text(select) 
+                {label "[_ assessment.Anonymous_Responses]"} 
+                {options $boolean_options} 
+                {help_text "[_ assessment.as_Anonymous_help]"} {value f}
+            }
         } 
     } else {
         ad_form -extend -name assessment_form  -form {
@@ -79,33 +92,60 @@
     }
 
     ad_form -extend -name assessment_form -form {
-        {secure_access_p:text(select) {label "[_ assessment.Secure_Access_1]"} {options $boolean_options} {help_text "[_ assessment.as_Secure_Access_help]"}}
-        {reuse_responses_p:text(select) {label "[_ assessment.Reuse_Responses_1]"} {options $boolean_options} {help_text "[_ assessment.as_Reuse_Responses_help]"}}
+        {secure_access_p:text(select) 
+            {label "[_ assessment.Secure_Access_1]"} 
+            {options $boolean_options} 
+            {help_text "[_ assessment.as_Secure_Access_help]"}
+        }
+        {reuse_responses_p:text(select) 
+            {label "[_ assessment.Reuse_Responses_1]"} 
+            {options $boolean_options} 
+            {help_text "[_ assessment.as_Reuse_Responses_help]"}
+        }
+        {show_item_name_p:text(select) 
+            {label "[_ assessment.Show_Item_Name_1]"} 
+            {options $boolean_options} 
+            {help_text "[_ assessment.as_Show_Item_Name_help]"}
+        }
+        {random_p:text(select) 
+            {label "[_ assessment.Allow_Random]"} 
+            {options $boolean_options} 
+            {help_text "[_ assessment.as_Allow_Random_help]"}
+        }
+        {entry_page:richtext,optional 
+            {label "[_ assessment.Entry_Page]"}  
+            {html {rows 9 cols 80 style {width: 95%}}} 
+            {help_text "[_ assessment.Entry_Page_help]"}
+        }
+        {exit_page:richtext,optional 
+            {label "[_ assessment.Exit_Page]"}  
+            {html {rows 9 cols 80 style {width: 95%}}} 
+            {help_text "[_ assessment.Exit_Page_help]"}
+        }
+        {consent_page:text(textarea),optional,nospell 
+            {label "[_ assessment.Consent_Page]"} 
+            {html {rows 5 cols 80}} 
+            {help_text "[_ assessment.as_Consent_Page_help]"}
+        }
+        {return_url:text,optional,nospell 
+            {label "[_ assessment.Return_Url]"} 
+            {html {size 50}} 
+            {help_text "[_ assessment.as_Return_Url_help]"}
+        }
     }
-
-
-    ad_form -extend -name assessment_form -form {
-        {show_item_name_p:text(select) {label "[_ assessment.Show_Item_Name_1]"} {options $boolean_options} {help_text "[_ assessment.as_Show_Item_Name_help]"}}
-    }
-
-    ad_form -extend -name assessment_form -form {
-        {random_p:text(select) {label "[_ assessment.Allow_Random]"} {options $boolean_options} {help_text "[_ assessment.as_Allow_Random_help]"}}
-    }
-
-    ad_form -extend -name assessment_form -form {
-	{entry_page:richtext,optional {label "[_ assessment.Entry_Page]"}  {html {rows 9 cols 80 style {width: 95%}}} {help_text "[_ assessment.Entry_Page_help]"}}
-	{exit_page:richtext,optional {label "[_ assessment.Exit_Page]"}  {html {rows 9 cols 80 style {width: 95%}}} {help_text "[_ assessment.Exit_Page_help]"}}
-        {consent_page:text(textarea),optional,nospell {label "[_ assessment.Consent_Page]"} {html {rows 5 cols 80}} {help_text "[_ assessment.as_Consent_Page_help]"}}
-    }
-
-    ad_form -extend -name assessment_form -form {
-        {return_url:text,optional,nospell {label "[_ assessment.Return_Url]"} {html {size 50}} {help_text "[_ assessment.as_Return_Url_help]"}}
-    }
     
     if { $type eq "test" } {
         ad_form -extend -name assessment_form -form {
-            {start_time:date,to_sql(sql_date),to_html(display_date),optional {label "[_ assessment.Start_Time]"} {format $form_format} {help} {help_text "[_ assessment.as_Start_Time_help]"}}
-            {end_time:date,to_sql(sql_date),to_html(display_date),optional {label "[_ assessment.End_Time]"} {format $form_format} {help} {help_text "[_ assessment.as_End_Time_help]"}}
+            {start_time:date,to_sql(sql_date),to_html(display_date),optional 
+                {label "[_ assessment.Start_Time]"} 
+                {format $form_format} 
+                {help_text "[_ assessment.as_Start_Time_help]"}
+            }
+            {end_time:date,to_sql(sql_date),to_html(display_date),optional 
+                {label "[_ assessment.End_Time]"} 
+                {format $form_format} {help} 
+                {help_text "[_ assessment.as_End_Time_help]"}
+            }
         }
     } else  {
         ad_form -extend -name assessment_form -form {
@@ -114,46 +154,64 @@
         }
     }
     
-        ad_form -extend -name assessment_form -form {
-            {number_tries:integer,optional,nospell {label "[_ assessment.Number_of_Tries]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.as_Number_Tries_help]"}}
-            {wait_between_tries:integer,optional,nospell {label "[_ assessment.Minutes_for_Retry]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.as_Minutes_Retry_help]"}}
+    ad_form -extend -name assessment_form -form {
+        {number_tries:integer,optional,nospell 
+            {label "[_ assessment.Number_of_Tries]"} 
+            {html {size 10 maxlength 10}} 
+            {help_text "[_ assessment.as_Number_Tries_help]"}
         }
-
-        ad_form -extend -name assessment_form -form {
-            {time_for_response:integer,optional,nospell {label "[_ assessment.time_for_response]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.as_time_help]"}}
+        {wait_between_tries:integer,optional,nospell 
+            {label "[_ assessment.Minutes_for_Retry]"} 
+            {html {size 10 maxlength 10}} 
+            {help_text "[_ assessment.as_Minutes_Retry_help]"}
         }
-
-    if { $type eq "test" } {
-        ad_form -extend -name assessment_form -form {
-            {ip_mask:text,optional,nospell {label "[_ assessment.ip_mask]"} {html {size 20 maxlength 100}} {help_text "[_ assessment.as_ip_mask_help]"}}
-            {password:text,optional,nospell {label "[_ assessment.password]"} {html {size 20 maxlength 100}} {help_text "[_ assessment.as_password_help]"}}
+        {time_for_response:integer,optional,nospell 
+            {label "[_ assessment.time_for_response]"} 
+            {html {size 10 maxlength 10}} 
+            {help_text "[_ assessment.as_time_help]"}
         }
-    } else {
-        ad_form -extend -name assessment_form -form {
-            {ip_mask:text(hidden) {value ""}}
-            {password:text(hidden) {value ""}}
-        }
     }
-    
+
     if { $type eq "test" } {
         ad_form -extend -name assessment_form -form {
-            {show_feedback:text(select),optional {label "[_ assessment.Show_Feedback]"} {options $feedback_options} {help_text "[_ assessment.as_Feedback_help]"}}
+            {ip_mask:text,optional,nospell 
+                {label "[_ assessment.ip_mask]"} 
+                {html {size 20 maxlength 100}} 
+                {help_text "[_ assessment.as_ip_mask_help]"}
+            }
+            {password:text,optional,nospell 
+                {label "[_ assessment.password]"} 
+                {html {size 20 maxlength 100}} 
+                {help_text "[_ assessment.as_password_help]"}
+            }
+            {show_feedback:text(select),optional 
+                {label "[_ assessment.Show_Feedback]"} 
+                {options $feedback_options} 
+                {help_text "[_ assessment.as_Feedback_help]"}
+            }
+            {section_navigation:text(select),optional 
+                {label "[_ assessment.Section_Navigation]"} 
+                {options $navigation_options} 
+                {help_text "[_ assessment.as_Navigation_help]"}
+            }
         }
     } else {
         ad_form -extend -name assessment_form -form {
-            {show_feedback:text(hidden) {value ""}}
-        }
-    }
-    
-    if { $type eq "test" } {
-        ad_form -extend -name assessment_form -form {
-            {section_navigation:text(select),optional {label "[_ assessment.Section_Navigation]"} {options $navigation_options} {help_text "[_ assessment.as_Navigation_help]"}}
-        }
-    } else  {
-        ad_form -extend -name assessment_form -form {
-            {section_navigation:text(hidden) {value ""}}
+            {ip_mask:text(hidden) 
+                {value ""}
+            }
+            {password:text(hidden) 
+                {value ""}
+            }
+            {show_feedback:text(hidden) 
+                {value ""}
+            }
+            {section_navigation:text(hidden) 
+                {value ""}
+            }
         } 
     }
+    
 } else {
     # new
     ad_form -extend -name assessment_form -form { 
@@ -182,9 +240,7 @@
 
 ad_form -extend -name assessment_form -form {
     {type:text(hidden) {value $type}}
-}
-
-ad_form -extend -name assessment_form -new_request {
+} -new_request {
     set new ""
     set title ""
     set description ""
@@ -211,72 +267,72 @@
     db_1row assessment_data {}
     
     if {![empty_string_p $start_time]} {
-	set start_time [util::date::acquire ansi $start_time]
+        set start_time [util::date::acquire ansi $start_time]
     }
     if {![empty_string_p $end_time]} {
-	set end_time [util::date::acquire ansi $end_time]
+        set end_time [util::date::acquire ansi $end_time]
     }
 
     set entry_page [template::util::richtext::create $entry_page text/html]
     set exit_page [template::util::richtext::create $exit_page text/html]
 
 } -on_submit {
     if {$start_time == "NULL"} {
-	set start_time ""
+        set start_time ""
     }
     if {$end_time == "NULL"} {
-	set end_time ""
+        set end_time ""
     }
     if {[db_type] == "postgresql"} {
-	regsub -all -- {to_date} $start_time {to_timestamp} start_time
-	regsub -all -- {to_date} $end_time {to_timestamp} end_time
+        regsub -all -- {to_date} $start_time {to_timestamp} start_time
+        regsub -all -- {to_date} $end_time {to_timestamp} end_time
     }
 
     set category_ids [category::ad_form::get_categories -container_object_id $package_id]
 } -new_data {
     db_transaction {
-	set assessment_rev_id [as::assessment::new \
-				   -title $title \
+        set assessment_rev_id [as::assessment::new \
+                                   -title $title \
                                    -creator_id $user_id \
-				   -description $description \
-				   -instructions $instructions \
-				   -run_mode $run_mode \
-				   -anonymous_p $anonymous_p \
-				   -secure_access_p $secure_access_p \
-				   -reuse_responses_p $reuse_responses_p \
-				   -show_item_name_p $show_item_name_p \
-				   -random_p $random_p \
-				   -entry_page [template::util::richtext get_property content $entry_page] \
-				   -exit_page [template::util::richtext get_property content $exit_page] \
-				   -consent_page $consent_page \
-				   -return_url $return_url \
-				   -start_time "" \
-				   -end_time "" \
-				   -number_tries $number_tries \
-				   -wait_between_tries $wait_between_tries \
-				   -time_for_response $time_for_response \
-				   -ip_mask $ip_mask \
-				   -password $password \
-				   -show_feedback $show_feedback \
-				   -section_navigation $section_navigation \
-				   -type $type]
+                                   -description $description \
+                                   -instructions $instructions \
+                                   -run_mode $run_mode \
+                                   -anonymous_p $anonymous_p \
+                                   -secure_access_p $secure_access_p \
+                                   -reuse_responses_p $reuse_responses_p \
+                                   -show_item_name_p $show_item_name_p \
+                                   -random_p $random_p \
+                                   -entry_page [template::util::richtext get_property content $entry_page] \
+                                   -exit_page [template::util::richtext get_property content $exit_page] \
+                                   -consent_page $consent_page \
+                                   -return_url $return_url \
+                                   -start_time "" \
+                                   -end_time "" \
+                                   -number_tries $number_tries \
+                                   -wait_between_tries $wait_between_tries \
+                                   -time_for_response $time_for_response \
+                                   -ip_mask $ip_mask \
+                                   -password $password \
+                                   -show_feedback $show_feedback \
+                                   -section_navigation $section_navigation \
+                                   -type $type]
 
-	set assessment_id [db_string assessment_id_from_revision {}]
+        set assessment_id [db_string assessment_id_from_revision {}]
 
-	# grant permission for this assessment to the user
+        # grant permission for this assessment to the user
 
-	permission::grant -party_id $user_id -object_id $assessment_id -privilege "admin"
+        permission::grant -party_id $user_id -object_id $assessment_id -privilege "admin"
 
-	if {[exists_and_not_null category_ids]} {
-	    category::map_object -object_id $assessment_rev_id $category_ids
-	}
+        if {[exists_and_not_null category_ids]} {
+            category::map_object -object_id $assessment_rev_id $category_ids
+        }
 
-	if {![empty_string_p $start_time]} {
-	    db_dml update_start_time {}
-	}
-	if {![empty_string_p $end_time]} {
-	    db_dml update_end_time {}
-	}
+        if {![empty_string_p $start_time]} {
+            db_dml update_start_time {}
+        }
+        if {![empty_string_p $end_time]} {
+            db_dml update_end_time {}
+        }
 
         set new_assessment_rev_id [as::assessment::new_revision -assessment_id $assessment_id]
         
@@ -291,46 +347,46 @@
     }
 } -edit_data {
     db_transaction {
-	set assessment_rev_id [as::assessment::edit \
-				   -assessment_id $assessment_id \
-				   -title $title \
-				   -description $description \
-				   -instructions $instructions \
-				   -run_mode $run_mode \
-				   -anonymous_p $anonymous_p \
-				   -secure_access_p $secure_access_p \
-				   -reuse_responses_p $reuse_responses_p \
-				   -show_item_name_p $show_item_name_p \
-				   -random_p $random_p \
-				   -entry_page [template::util::richtext get_property content $entry_page] \
-				   -exit_page [template::util::richtext get_property content $exit_page] \
-				   -consent_page $consent_page \
-				   -return_url $return_url \
-				   -start_time "" \
-				   -end_time "" \
-				   -number_tries $number_tries \
-				   -wait_between_tries $wait_between_tries \
-				   -time_for_response $time_for_response \
-				   -ip_mask $ip_mask \
-				   -password $password \
-				   -show_feedback $show_feedback \
-				   -section_navigation $section_navigation \
-				   -type $type]
+        set assessment_rev_id [as::assessment::edit \
+                                   -assessment_id $assessment_id \
+                                   -title $title \
+                                   -description $description \
+                                   -instructions $instructions \
+                                   -run_mode $run_mode \
+                                   -anonymous_p $anonymous_p \
+                                   -secure_access_p $secure_access_p \
+                                   -reuse_responses_p $reuse_responses_p \
+                                   -show_item_name_p $show_item_name_p \
+                                   -random_p $random_p \
+                                   -entry_page [template::util::richtext get_property content $entry_page] \
+                                   -exit_page [template::util::richtext get_property content $exit_page] \
+                                   -consent_page $consent_page \
+                                   -return_url $return_url \
+                                   -start_time "" \
+                                   -end_time "" \
+                                   -number_tries $number_tries \
+                                   -wait_between_tries $wait_between_tries \
+                                   -time_for_response $time_for_response \
+                                   -ip_mask $ip_mask \
+                                   -password $password \
+                                   -show_feedback $show_feedback \
+                                   -section_navigation $section_navigation \
+                                   -type $type]
 
-	if {[exists_and_not_null category_ids]} {
-	    category::map_object -object_id $assessment_rev_id $category_ids
-	}
+        if {[exists_and_not_null category_ids]} {
+            category::map_object -object_id $assessment_rev_id $category_ids
+        }
 
-	if {![empty_string_p $start_time]} {
-	    db_dml update_start_time {}
-	}
-	if {![empty_string_p $end_time]} {
-	    db_dml update_end_time {}
-	}
+        if {![empty_string_p $start_time]} {
+            db_dml update_start_time {}
+        }
+        if {![empty_string_p $end_time]} {
+            db_dml update_end_time {}
+        }
     }
 } -after_submit {
     if {$permission_p} {
-	permission::grant -party_id "-1" -object_id $assessment_id -privilege read
+        permission::grant -party_id "-1" -object_id $assessment_id -privilege read
     }
     ad_returnredirect [export_vars -base one-a {assessment_id}]
     ad_script_abort