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.24 -r1.25
--- openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl	30 Sep 2017 18:12:52 -0000	1.24
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl	25 Apr 2018 09:26:33 -0000	1.25
@@ -46,24 +46,24 @@
 set display_type [string range [db_string get_display_type {}] end-1 end]
 
 if { $item_type eq "mc"  } {
-	 ad_form -extend -name item_edit_general -form {
-	    {display_type:text(radio),optional
-	    	{label "[_ assessment.singleanswermultipleanswer]"} 
-	    	{options {{"[_ assessment.item_type_mc]" "rb"} {"[_ assessment.item_type_ms]" "cb"}}}
-	    }
+    ad_form -extend -name item_edit_general -form {
+        {display_type:text(radio),optional
+            {label "[_ assessment.singleanswermultipleanswer]"}
+            {options {{"[_ assessment.item_type_mc]" "rb"} {"[_ assessment.item_type_ms]" "cb"}}}
+        }
     }
 } else {
-	ad_form -extend -name item_edit_general -form { 
-		{display_type:text(hidden),optional}
-	}
+    ad_form -extend -name item_edit_general -form {
+        {display_type:text(hidden),optional}
+    }
 }
 
 set display_types [list]
 foreach display_type [db_list display_types {}] {
     lappend display_types [list "[_ assessment.item_display_$display_type]" $display_type]
 }
 
-if { $type ne "survey"} { 
+if { $type ne "survey"} {
     ad_form -extend -name item_edit_general -form {
         {points:float,optional,nospell {label "[_ assessment.points_item]"} {html {size 10 maxlength 10}} {help_text "[_ assessment.points_item_help]"}}
         {feedback_right:richtext,optional,nospell {label "[_ assessment.Feedback_right]"} {html {rows 12 cols 80 style {width:95%}}} {help_text "[_ assessment.Feedback_right_help]"}}
@@ -92,127 +92,127 @@
 
 switch -- $item_type {
     "mc" {
-	set folder_id [as::assessment::folder_id -package_id $package_id]
-	set choice_sets [list [list "--" ""]]
-db_foreach existing_choice_sets {} {
-    set set_title [string trim [regsub {\[.*?\]} [ad_html_to_text -- $title] {}]]
-    lappend choice_sets [list [expr {$set_title eq "" ? $section_title : $set_title}] $revision_id]
-}
-if {[llength $choice_sets]} {
-    ad_form -extend -name item_edit_general -form {
-    {add_existing_mc_id:text(select),optional {label "[_ assessment.Choice_Sets]"} {options $choice_sets} {help_text "[_ assessment.Choice_Sets_help]"}}
-    }
-} else {
-    ad_form -extend -name item_edit_general -form {
-	{add_existing_mc_id:text(hidden),optional}
-    }
-}
-    ad_form -extend -name item_edit_general -form {
-        {num_choices:text(hidden)}
-	{save_answer_set:text(checkbox),optional {label "[_ assessment.Save_this_set_of_answers_for_reuse_later]"} {options {{"" t}}}}
-        {add_another_choice:text(submit) {label "[_ assessment.Add_another_choice]"}}
-    }
-ns_log notice "Add Another = '[template::element::get_value item_edit_general add_another_choice]' == '[_ assessment.Add_another_choice]'"
-    if {[template::form::is_submission item_edit_general] \
+        set folder_id [as::assessment::folder_id -package_id $package_id]
+        set choice_sets [list [list "--" ""]]
+        db_foreach existing_choice_sets {} {
+            set set_title [string trim [regsub {\[.*?\]} [ad_html_to_text -- $title] {}]]
+            lappend choice_sets [list [expr {$set_title eq "" ? $section_title : $set_title}] $revision_id]
+        }
+        if {[llength $choice_sets]} {
+            ad_form -extend -name item_edit_general -form {
+                {add_existing_mc_id:text(select),optional {label "[_ assessment.Choice_Sets]"} {options $choice_sets} {help_text "[_ assessment.Choice_Sets_help]"}}
+            }
+        } else {
+            ad_form -extend -name item_edit_general -form {
+                {add_existing_mc_id:text(hidden),optional}
+            }
+        }
+        ad_form -extend -name item_edit_general -form {
+            {num_choices:text(hidden)}
+            {save_answer_set:text(checkbox),optional {label "[_ assessment.Save_this_set_of_answers_for_reuse_later]"} {options {{"" t}}}}
+            {add_another_choice:text(submit) {label "[_ assessment.Add_another_choice]"}}
+        }
+        ns_log notice "Add Another = '[template::element::get_value item_edit_general add_another_choice]' == '[_ assessment.Add_another_choice]'"
+        if {[template::form::is_submission item_edit_general] \
             && [template::element::get_value item_edit_general add_another_choice] eq [_ assessment.Add_another_choice]} {
-        set num_choices [element::get_value item_edit_general num_choices]
-        incr num_choices
-        element::set_value item_edit_general num_choices $num_choices
-    } 
+            set num_choices [element::get_value item_edit_general num_choices]
+            incr num_choices
+            element::set_value item_edit_general num_choices $num_choices
+        }
 
-#####
-	if {$display_type eq "cb"} {
-	    ad_form -extend -name item_edit_general -form {
-		{ms_label:text,optional {label "Multiple Selection Instruction"}}		
-	    }
-	}
-#####
-    set as_item_type_id [as::item::get_item_type_id -as_item_id $as_item_id]
-    if {[array exists move_up]} {
-        foreach n [array names move_up] {
-            array set new_array [as::item_type_mc::choices_swap \
-                -assessment_id $assessment_id \
-                -section_id $section_id \
-                -as_item_id $as_item_id \
-                -mc_id  $as_item_type_id \
-                -sort_order [db_string get_sort_order {}] \
-                                     -direction up]
-            foreach var {as_item_id section_id} {
-                set $var $new_array($var)
-                template::element::set_value item_edit_general $var [set $var]
+        #####
+        if {$display_type eq "cb"} {
+            ad_form -extend -name item_edit_general -form {
+                {ms_label:text,optional {label "Multiple Selection Instruction"}}
             }
         }
-    }
-    if {[array exists move_down]} {
-        foreach n [array names move_down] {
-            array set new_array [as::item_type_mc::choices_swap \
-                -assessment_id $assessment_id \
-                -section_id $section_id \
-                -as_item_id $as_item_id \
-                -mc_id $as_item_type_id \
-                -sort_order [db_string get_sort_order {}] \
-                                     -direction down]
+        #####
+        set as_item_type_id [as::item::get_item_type_id -as_item_id $as_item_id]
+        if {[array exists move_up]} {
+            foreach n [array names move_up] {
+                array set new_array [as::item_type_mc::choices_swap \
+                                            -assessment_id $assessment_id \
+                                            -section_id $section_id \
+                                            -as_item_id $as_item_id \
+                                            -mc_id  $as_item_type_id \
+                                            -sort_order [db_string get_sort_order {}] \
+                                            -direction up]
+                foreach var {as_item_id section_id} {
+                    set $var $new_array($var)
+                    template::element::set_value item_edit_general $var [set $var]
+                }
+            }
         }
+        if {[array exists move_down]} {
+            foreach n [array names move_down] {
+                array set new_array [as::item_type_mc::choices_swap \
+                                            -assessment_id $assessment_id \
+                                            -section_id $section_id \
+                                            -as_item_id $as_item_id \
+                                            -mc_id $as_item_type_id \
+                                            -sort_order [db_string get_sort_order {}] \
+                                            -direction down]
+            }
             foreach var {as_item_id section_id} {
                 set $var $new_array($var)
                 template::element::set_value item_edit_general $var [set $var]
             }
-    }
-    if {[array exists delete]} {
-        foreach n [array names delete] {
-            array set new_array [as::item_type_mc::choice_delete \
-                -assessment_id $assessment_id \
-                -section_id $section_id \
-                -as_item_id $as_item_id \
-                                     -choice_id $n]
         }
+        if {[array exists delete]} {
+            foreach n [array names delete] {
+                array set new_array [as::item_type_mc::choice_delete \
+                                            -assessment_id $assessment_id \
+                                            -section_id $section_id \
+                                            -as_item_id $as_item_id \
+                                            -choice_id $n]
+            }
             foreach var {as_item_id section_id} {
                 set $var $new_array($var)
             }
-    }
+        }
 
-#######
-#######
+        #######
+        #######
 
 
-    set existing_choices [as::item_type_mc::existing_choices $as_item_id]
-	if {[llength $existing_choices] && ![info exists num_choices]} {
-	    set num_choices [llength $existing_choices]
-	    template::element::set_value item_edit_general num_choices $num_choices
-	}	
-    if {![template::form::is_submission item_edit_general] \
+        set existing_choices [as::item_type_mc::existing_choices $as_item_id]
+        if {[llength $existing_choices] && ![info exists num_choices]} {
+            set num_choices [llength $existing_choices]
+            template::element::set_value item_edit_general num_choices $num_choices
+        }
+        if {![template::form::is_submission item_edit_general] \
             && ![info exists num_choices]} {
-        set num_choices 5
-    } elseif {![info exists num_choices]} {
+            set num_choices 5
+        } elseif {![info exists num_choices]} {
             set num_choices [expr {[set num_choices [template::element::get_value item_edit_general num_choices]] eq "" ? $num_choices : 5}]
-    }
+        }
 
-    template::multirow create choice_elements id new_p
-    foreach c $existing_choices {
-        set id [lindex $c 1]
-        template::multirow append choice_elements $id f
-        if {[lindex $c 2] == "t" && ![template::form::is_submission item_edit_general]} {
-            set correct($id) t
+        template::multirow create choice_elements id new_p
+        foreach c $existing_choices {
+            set id [lindex $c 1]
+            template::multirow append choice_elements $id f
+            if {[lindex $c 2] == "t" && ![template::form::is_submission item_edit_general]} {
+                set correct($id) t
+            }
         }
-    }
 
-    if {$num_choices > [llength $existing_choices]} {
-        set new_choices [expr {$num_choices - [llength $existing_choices] }]
-        for {set i 1} {$i <= $new_choices} {incr i} {
-            set id __new_${i}
-            set correct_p f
-            if {[info exists correct($id)]} {
-                set correct_p t
+        if {$num_choices > [llength $existing_choices]} {
+            set new_choices [expr {$num_choices - [llength $existing_choices] }]
+            for {set i 1} {$i <= $new_choices} {incr i} {
+                set id __new_${i}
+                set correct_p f
+                if {[info exists correct($id)]} {
+                    set correct_p t
+                }
+                lappend existing_choices [list "" $id $correct_p]
+                template::multirow append choice_elements $id t
             }
-            lappend existing_choices [list "" $id $correct_p]
-            template::multirow append choice_elements $id t
         }
-    }
-    as::item_type_mc::add_existing_choices_to_edit_form \
-        -form_id item_edit_general \
-        -existing_choices $existing_choices \
-        -choice_array_name choice \
-        -correct_choice_array_name correct
+        as::item_type_mc::add_existing_choices_to_edit_form \
+            -form_id item_edit_general \
+            -existing_choices $existing_choices \
+            -choice_array_name choice \
+            -correct_choice_array_name correct
 
     }
     "oq" {
@@ -223,45 +223,45 @@
     "sa" {
     }
 }
-    
+
 ad_form -extend -name item_edit_general -edit_request {
     db_1row general_item_data {}
     if {$data_type eq ""} {
-	set data_type varchar
+        set data_type varchar
     }
-    set data_type_disp "[_ assessment.data_type_$data_type]" 
+    set data_type_disp "[_ assessment.data_type_$data_type]"
     set question_text [template::util::richtext::create $question_text $mime_type]
 
     set feedback_right [template::util::richtext::create $feedback_right $mime_type]
     set feedback_wrong [template::util::richtext::create $feedback_wrong $mime_type]
-    # FIXME fill in reference answer 
+    # FIXME fill in reference answer
 } -on_request {
-	set display_type [string range [db_string get_display_type {}] end-1 end]
+    set display_type [string range [db_string get_display_type {}] end-1 end]
 } -on_submit {
     set category_ids [category::ad_form::get_categories -container_object_id $package_id]
     if {$points eq ""} {
-	set points 0
+        set points 0
     }
 } -edit_data {
     if {([info exists formbutton_ok] && $formbutton_ok ne "") || ([info exists formbutton_add_another_question] && $formbutton_add_another_question ne "")} {
         set question_text [template::util::richtext::get_property contents $question_text]
         set feedback_right [template::util::richtext::get_property content $feedback_right]
         set feedback_wrong [template::util::richtext::get_property content $feedback_wrong]
 
-	# strip full urls when saving, due to bug in Firefox and workaround
-	# in Xinha
-	# we want to make sure the URL is formatted EXACTLY as we want
-	# for the following regsub
-	# in case the ad_url is https we strip https and then we
-	# add it back in for the https url just in case
-	set site_url [string trimright [string map {https http} "[ad_url]"] /]
-	set site_https_url [string map {http https} $site_url]
-	foreach var {question_text feedback_right feedback_wrong} {
-	    # find leading quote so we can make sure its not in the
-	    # text, its in a tag href or src
-	    set $var [regsub -all "\"$site_url" [set $var] {"}]
-	    set $var [regsub -all "\"$site_https_url" [set $var] {"}]
-	}
+        # strip full urls when saving, due to bug in Firefox and workaround
+        # in Xinha
+        # we want to make sure the URL is formatted EXACTLY as we want
+        # for the following regsub
+        # in case the ad_url is https we strip https and then we
+        # add it back in for the https url just in case
+        set site_url [string trimright [string map {https http} "[ad_url]"] /]
+        set site_https_url [string map {http https} $site_url]
+        foreach var {question_text feedback_right feedback_wrong} {
+            # find leading quote so we can make sure its not in the
+            # text, its in a tag href or src
+            set $var [regsub -all "\"$site_url" [set $var] {"}]
+            set $var [regsub -all "\"$site_https_url" [set $var] {"}]
+        }
 
         db_transaction {
             set old_display_type [string range [db_string get_display_type {}] end-1 end]
@@ -284,9 +284,7 @@
                 category::map_object -object_id $new_item_id $category_ids
             }
             if {$content ne ""} {
-                set filename [lindex $content 0]
-                set tmp_filename [lindex $content 1]
-                set file_mimetype [lindex $content 2]
+                lassign $content filename tmp_filename file_mimetype
                 set n_bytes [file size $tmp_filename]
                 set max_file_size 10000000
                 # [parameter::get -parameter MaxAttachmentSize]
@@ -320,125 +318,125 @@
                 -old_section_id $section_id \
                 -new_section_id $new_section_id \
                 -new_assessment_rev_id $new_assessment_rev_id
-                
-           ns_log notice "HAM : $old_display_type : $display_type **********"
-           if { ![string match $old_display_type $display_type] } {
-         	  as::item_display_${display_type}::set_item_display_type -assessment_id $assessment_id \
-           														 -section_id $section_id \
-           														 -as_item_id $as_item_id
-		   }
-	    
-	    set title [string range $question_text 0 999]	
 
+            ns_log notice "HAM : $old_display_type : $display_type **********"
+            if { ![string match $old_display_type $display_type] } {
+                as::item_display_${display_type}::set_item_display_type -assessment_id $assessment_id \
+                                                                     -section_id $section_id \
+                                                                     -as_item_id $as_item_id
+            }
+
+            set title [string range $question_text 0 999]
+
             db_dml update_item_in_section {}
             switch -- $item_type {
                 mc {
 
-		    if {[info exists add_existing_mc_id] && $add_existing_mc_id ne ""} {
-			set new_item_type_id [as::item_type_mc::copy -type_id $add_existing_mc_id -copy_correct_answer_p "f" -new_title ""]
-			if {![db_0or1row get_item_type {}] || $object_type ne "as_item_type_mc"} {
-			    if {![info exists object_type]} {
-				# first item type mapped
-				as::item_rels::new -item_rev_id $as_item_id -target_rev_id $add_existing_mc_id -type as_item_type_rel
-			    } else {
-				# old item type existing
-				db_dml update_item_type {}
-			    }
-			} else {
-			    # old mc item type existing
-			    db_dml update_item_type {}
-			}
-		    } else {
+                    if {[info exists add_existing_mc_id] && $add_existing_mc_id ne ""} {
+                        set new_item_type_id [as::item_type_mc::copy -type_id $add_existing_mc_id -copy_correct_answer_p "f" -new_title ""]
+                        if {![db_0or1row get_item_type {}] || $object_type ne "as_item_type_mc"} {
+                            if {![info exists object_type]} {
+                                # first item type mapped
+                                as::item_rels::new -item_rev_id $as_item_id -target_rev_id $add_existing_mc_id -type as_item_type_rel
+                            } else {
+                                # old item type existing
+                                db_dml update_item_type {}
+                            }
+                        } else {
+                            # old mc item type existing
+                            db_dml update_item_type {}
+                        }
+                    } else {
 
-			set num_answers 0
-			set num_correct_answers 0
-			foreach c [array names choice] {
-			    if {$choice($c) ne ""} {
-				incr num_answers
-			    }
-			}
-			foreach c [array names correct] {
-			    if {$correct($c) == "t"} {
-				incr num_correct_answers 
-			    }
-			}
-			# set title to blank for mc answer set
-			# if they unchecked save for reuse
-			# we don't ask for a title, if they did check it
-			# we set it on save-answer-set
-			# with each revision of the mc we decide if its
-			# reusable or not
+                        set num_answers 0
+                        set num_correct_answers 0
+                        foreach c [array names choice] {
+                            if {$choice($c) ne ""} {
+                                incr num_answers
+                            }
+                        }
+                        foreach c [array names correct] {
+                            if {$correct($c) == "t"} {
+                                incr num_correct_answers
+                            }
+                        }
+                        # set title to blank for mc answer set
+                        # if they unchecked save for reuse
+                        # we don't ask for a title, if they did check it
+                        # we set it on save-answer-set
+                        # with each revision of the mc we decide if its
+                        # reusable or not
 
-			set new_item_type_id [as::item_type_mc::edit \
-						  -as_item_type_id $as_item_type_id \
-						  -title "" \
-						  -increasing_p f \
-						  -allow_negative_p f \
-						  -num_correct_answers $num_correct_answers \
-						  -num_answers $num_answers]
-			db_dml update_item_type {}
-			# edit existing choices
-			set count 0
-			foreach i [lsort [array names choice]] {
-			    if {[string index $i 0] ne "_" && $choice($i) ne ""} {
-				incr count
-				set new_choice_id [as::item_choice::new_revision -choice_id $i -mc_id $new_item_type_id]
-				set title $choice($i)
-				set correct_answer_p [ad_decode [info exists correct($i)] 0 f t]
+                        set new_item_type_id [as::item_type_mc::edit \
+                                                  -as_item_type_id $as_item_type_id \
+                                                  -title "" \
+                                                  -increasing_p f \
+                                                  -allow_negative_p f \
+                                                  -num_correct_answers $num_correct_answers \
+                                                  -num_answers $num_answers]
+                        db_dml update_item_type {}
+                        # edit existing choices
+                        set count 0
+                        foreach i [lsort [array names choice]] {
+                            if {[string index $i 0] ne "_" && $choice($i) ne ""} {
+                                incr count
+                                set new_choice_id [as::item_choice::new_revision -choice_id $i -mc_id $new_item_type_id]
+                                set title $choice($i)
+                                set correct_answer_p [ad_decode [info exists correct($i)] 0 f t]
 
-				db_dml update_title {}
-				db_dml update_correct {}
-			    }
-			}
+                                db_dml update_title {}
+                                db_dml update_correct {}
+                            }
+                        }
 
-			# add new choices
-			foreach i [lsort [array names choice]] {
-			    
-			    if {[string index $i 0] eq "_" && $choice($i) ne ""} {
-				incr count
-				set new_choice_id [as::item_choice::new -mc_id $new_item_type_id \
-						       -title $choice($i) \
-						       -numeric_value "" \
-						       -text_value "" \
-						       -content_value "" \
-						       -feedback_text "" \
-						       -selected_p "" \
-						       -correct_answer_p [ad_decode [info exists correct($i)] 0 f t] \
-						       -sort_order $count \
-						       -percent_score ""]
-			    }
-			}
-		    }
-                } 
+                        # add new choices
+                        foreach i [lsort [array names choice]] {
+
+                            if {[string index $i 0] eq "_" && $choice($i) ne ""} {
+                                incr count
+                                set new_choice_id [as::item_choice::new -mc_id $new_item_type_id \
+                                                        -title $choice($i) \
+                                                        -numeric_value "" \
+                                                        -text_value "" \
+                                                        -content_value "" \
+                                                        -feedback_text "" \
+                                                        -selected_p "" \
+                                                        -correct_answer_p [ad_decode [info exists correct($i)] 0 f t] \
+                                                        -sort_order $count \
+                                                        -percent_score ""]
+                            }
+                        }
+                    }
+                }
                 "oq" {
                     set new_item_type_id [as::item_type_oq::edit \
-                                              -as_item_type_id $as_item_type_id \
-                                              -title $title \
-                                              -default_value "" \
-                                              -feedback_text "" \
-                                              -reference_answer $reference_answer \
-                                              -keywords ""]
+                                                -as_item_type_id $as_item_type_id \
+                                                -title $title \
+                                                -default_value "" \
+                                                -feedback_text "" \
+                                                -reference_answer $reference_answer \
+                                                -keywords ""]
                     db_dml update_item_type {}
 
                 }
                 "fu" {
                     set new_item_type_id [as::item_type_fu::edit \
-				  -as_item_type_id $as_item_type_id \
-				  -title $title]
+                                                -as_item_type_id $as_item_type_id \
+                                                -title $title]
                     db_dml update_item_type {}
                 }
                 "sa" {
                     set new_item_type_id [as::item_type_sa::edit \
-                                              -as_item_type_id $as_item_type_id \
-                                              -title $title \
-                                              -increasing_p f\
-                                              -allow_negative_p f]
+                                                -as_item_type_id $as_item_type_id \
+                                                -title $title \
+                                                -increasing_p f\
+                                                -allow_negative_p f]
                     db_dml update_item_type {}
                 }
             }
-            
+
         }
-        
+
         set as_item_id $new_item_id
         set section_id $new_section_id
 
@@ -448,12 +446,12 @@
     }
 } -after_submit {
     if {([info exists formbutton_ok] && $formbutton_ok ne "")} {
-	set return_url [export_vars -base "questions" {assessment_id section_id }]&\#${as_item_id}
-	if {[info exists save_answer_set] && $save_answer_set eq "on" && (![info exists add_existing_mc_id] || $add_existing_mc_id eq "")} {
-	    set return_url [export_vars -base save-answer-set {assessment_id as_item_id return_url {mc_id $new_item_type_id}}]
-	}
-	ad_returnredirect $return_url
-	ad_script_abort
+        set return_url [export_vars -base "questions" {assessment_id section_id }]&\#${as_item_id}
+        if {[info exists save_answer_set] && $save_answer_set eq "on" && (![info exists add_existing_mc_id] || $add_existing_mc_id eq "")} {
+            set return_url [export_vars -base save-answer-set {assessment_id as_item_id return_url {mc_id $new_item_type_id}}]
+        }
+        ad_returnredirect $return_url
+        ad_script_abort
     }
 }