Index: openacs-4/packages/survey/tcl/survey-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/tcl/survey-procs.tcl,v
diff -u -N -r1.14.2.2 -r1.14.2.3
--- openacs-4/packages/survey/tcl/survey-procs.tcl	17 Dec 2019 16:28:44 -0000	1.14.2.2
+++ openacs-4/packages/survey/tcl/survey-procs.tcl	9 Feb 2020 16:10:31 -0000	1.14.2.3
@@ -1,5 +1,3 @@
-# /tcl/survey-procs.tcl
-
 ad_library {
 
   Support procs for simple survey module, most important being
@@ -49,28 +47,28 @@
     upvar survey_info survey_info
 
     if {$survey_id eq ""} {
-	db_1row lookup_survey_id ""
+        db_1row lookup_survey_id ""
     }
 
     db_1row get_info_by_survey_id "" -column_array survey_info
 
     if {![info exists survey_info(survey_id)]} {
-	# survey doesn't exist, caller has to handle this in their
-	# own way
-	return
+        # survey doesn't exist, caller has to handle this in their
+        # own way
+        return
     }
     # If it's a single-section survey, look up the section_id
     if {$section_id eq "" && $survey_info(single_section_p) == "t"} {
-	db_1row lookup_single_section_id ""
-	set survey_info(section_id) $section_id
+        db_1row lookup_single_section_id ""
+        set survey_info(section_id) $section_id
     }
 
     # some useful stats about the survey, dotLRN specific for sloanspace
     if {[apm_package_installed_p dotlrn]} {
-	set community_id [dotlrn_community::get_community_id_from_url]
-	set survey_info(eligible) [db_string n_eligible {}]
-	set survey_info(completed) [db_string n_completed {}]
-	set survey_info(not_completed) [expr {$survey_info(eligible) - $survey_info(completed)}]
+        set community_id [dotlrn_community::get_community_id_from_url]
+        set survey_info(eligible) [db_string n_eligible {}]
+        set survey_info(completed) [db_string n_completed {}]
+        set survey_info(not_completed) [expr {$survey_info(eligible) - $survey_info(completed)}]
     }
 }
 
@@ -93,182 +91,182 @@
     The form variable is of the form \"response_to_question.\$question_id
 } {
     if {$response_id ne ""} {
-	set edit_previous_response_p "t"
+        set edit_previous_response_p "t"
     } else {
-	set edit_previous_response_p "f"
+        set edit_previous_response_p "f"
     }
 
     set element_name "response_to_question.$question_id"
 
     db_1row survey_question_properties ""
     if {$required_p == "t"} {
-	set html "<span style=\"color: #f00;\">*</span>"
+        set html "<span style=\"color: #f00;\">*</span>"
     } else {
-	set html "&nbsp;"
+        set html "&nbsp;"
     }
 
     append html $question_text
     if { $presentation_alignment eq "below" } {
-	append html "<br>"
+        append html "<br>"
     } else {
-	append html " "
+        append html " "
     }
 
     set user_value ""
 
     if {$edit_previous_response_p == "t"} {
- 	set user_id [ad_conn user_id]
+        set user_id [ad_conn user_id]
 
-	set count 0
-	db_foreach prev_response_query {} {
-	    incr count
+        set count 0
+        db_foreach prev_response_query {} {
+            incr count
 
-	    if {$presentation_type eq "checkbox"} {
-		set selected_choices($choice_id) "t"
-	    }
-	} if_no_rows {
-	    set choice_id 0
-	    set boolean_answer ""
-	    set clob_answer ""
-	    set number_answer ""
-	    set varchar_answer ""
-	    set date_answer ""
+            if {$presentation_type eq "checkbox"} {
+                set selected_choices($choice_id) "t"
+            }
+        } if_no_rows {
+            set choice_id 0
+            set boolean_answer ""
+            set clob_answer ""
+            set number_answer ""
+            set varchar_answer ""
+            set date_answer ""
             set attachment_answer ""
-	}
+        }
     }
 
     switch -- $presentation_type {
 
         "upload_file"  {
-	    if {$edit_previous_response_p == "t"} {
-		set user_value $attachment_answer
-	    }
-	    append html "<input type=file name=$element_name $presentation_options>"
-	}
+            if {$edit_previous_response_p == "t"} {
+                set user_value $attachment_answer
+            }
+            append html "<input type=file name=$element_name $presentation_options>"
+        }
 
-	"textbox" {
-	    if {$edit_previous_response_p == "t"} {
-		if {$abstract_data_type eq "number" || $abstract_data_type eq "integer"} {
-		    set user_value $number_answer
-		} else {
-		    set user_value $varchar_answer
-		}
-	    }
+        "textbox" {
+            if {$edit_previous_response_p == "t"} {
+                if {$abstract_data_type eq "number" || $abstract_data_type eq "integer"} {
+                    set user_value $number_answer
+                } else {
+                    set user_value $varchar_answer
+                }
+            }
 
-	    append html [subst {<input type=text name="$element_name" value="[ns_quotehtml $user_value]"
-		[ad_decode $presentation_options "large" "size=70" "medium" "size=40" "size=10"]>}]
-	}
+            append html [subst {<input type=text name="$element_name" value="[ns_quotehtml $user_value]"
+                [ad_decode $presentation_options "large" "size=70" "medium" "size=40" "size=10"]>}]
+        }
 
-	"textarea" {
-	    if {$edit_previous_response_p == "t"} {
-		    set user_value $clob_answer
-		}
+        "textarea" {
+            if {$edit_previous_response_p == "t"} {
+                    set user_value $clob_answer
+                }
 
-	    set presentation_options [ad_decode $presentation_options "large" "rows=20 cols=65" "medium" "rows=15 cols=55" "rows=8 cols=35"]
-	    append html "<textarea name=$element_name $presentation_options style=\"vertical-align: text-top\">$user_value</textarea>"
-	}
+            set presentation_options [ad_decode $presentation_options "large" "rows=20 cols=65" "medium" "rows=15 cols=55" "rows=8 cols=35"]
+            append html "<textarea name=$element_name $presentation_options style=\"vertical-align: text-top\">$user_value</textarea>"
+        }
 
-	"date" {
-	    if {$edit_previous_response_p == "t"} {
-		set user_value $date_answer
-	    }
-	    append html [ad_dateentrywidget $element_name $user_value]
-	}
+        "date" {
+            if {$edit_previous_response_p == "t"} {
+                set user_value $date_answer
+            }
+            append html [ad_dateentrywidget $element_name $user_value]
+        }
 
-	"select" {
-	    if { $abstract_data_type eq "boolean" } {
-		if {$edit_previous_response_p == "t"} {
-		    set user_value $boolean_answer
-		}
+        "select" {
+            if { $abstract_data_type eq "boolean" } {
+                if {$edit_previous_response_p == "t"} {
+                    set user_value $boolean_answer
+                }
 
-		if {$presentation_options ne ""} {
-		    set options_list [split $presentation_options "/"]
-		    set choice_t [lindex $options_list 0]
-		    set choice_f [lindex $options_list 1]
-		} else {
-		    set choice_t "True"
-		    set choice_f "False"
-		}
+                if {$presentation_options ne ""} {
+                    set options_list [split $presentation_options "/"]
+                    set choice_t [lindex $options_list 0]
+                    set choice_f [lindex $options_list 1]
+                } else {
+                    set choice_t "True"
+                    set choice_f "False"
+                }
 
-		append html "<select name=$element_name>
+                append html "<select name=$element_name>
  <option value=\"\">Select One</option>
  <option value=\"t\" [ad_decode $user_value "t" "selected" ""]>$choice_t</option>
  <option value=\"f\" [ad_decode $user_value "f" "selected" ""]>$choice_f</option>
 </select>
 "
-	    } else {
-		if {$edit_previous_response_p == "t"} {
-		    set user_value $choice_id
-		}
+            } else {
+                if {$edit_previous_response_p == "t"} {
+                    set user_value $choice_id
+                }
 
 # at some point, we may want to add a UI option for the admin
 # to specify multiple or not for select
-		append html "<select name=$element_name>
-		<option value=\"\">Select One</option>\n"
-		db_foreach question_choices "" {
+                append html "<select name=$element_name>
+                <option value=\"\">Select One</option>\n"
+                db_foreach question_choices "" {
 
-		    if { $user_value == $choice_id } {
-			append html "<option value=$choice_id selected>$label</option>\n"
-		    } else {
-			append html "<option value=$choice_id>$label</option>\n"
-		    }
-		}
-		append html "</select>"
-	    }
-	}
+                    if { $user_value == $choice_id } {
+                        append html "<option value=$choice_id selected>$label</option>\n"
+                    } else {
+                        append html "<option value=$choice_id>$label</option>\n"
+                    }
+                }
+                append html "</select>"
+            }
+        }
 
-	"radio" {
-	    if { $abstract_data_type eq "boolean" } {
-		if {$edit_previous_response_p == "t"} {
-		    set user_value $boolean_answer
-		}
-		if {$presentation_options ne ""} {
-		    set options_list [split $presentation_options "/"]
-		    set choice_t [lindex $options_list 0]
-		    set choice_f [lindex $options_list 1]
-		} else {
-		    set choice_t "True"
-		    set choice_f "False"
-		}
+        "radio" {
+            if { $abstract_data_type eq "boolean" } {
+                if {$edit_previous_response_p == "t"} {
+                    set user_value $boolean_answer
+                }
+                if {$presentation_options ne ""} {
+                    set options_list [split $presentation_options "/"]
+                    set choice_t [lindex $options_list 0]
+                    set choice_f [lindex $options_list 1]
+                } else {
+                    set choice_t "True"
+                    set choice_f "False"
+                }
 
-		set choices [list "<input type=radio name=$element_name value=t [ad_decode $user_value "t" "checked" ""]> $choice_t" \
-				 "<input type=radio name=$element_name value=f [ad_decode $user_value "f" "checked" ""]> $choice_f"]
-	    } else {
-		if {$edit_previous_response_p == "t"} {
-		    set user_value $choice_id
-		}
+                set choices [list "<input type=radio name=$element_name value=t [ad_decode $user_value "t" "checked" ""]> $choice_t" \
+                                 "<input type=radio name=$element_name value=f [ad_decode $user_value "f" "checked" ""]> $choice_f"]
+            } else {
+                if {$edit_previous_response_p == "t"} {
+                    set user_value $choice_id
+                }
 
-		set choices {}
-		db_foreach question_choices_2 "" {
-		    if { $user_value == $choice_id } {
-			lappend choices "<input type=radio name=$element_name value=$choice_id checked> $label"
-		    } else {
-			lappend choices "<input type=radio name=$element_name value=$choice_id> $label"
-		    }
-		}
-	    }
-	    if { $presentation_alignment eq "beside" } {
-		append html [join $choices " "]
-	    } else {
-		append html "<p>\n[join $choices "<br>\n"]\n</p>"
-	    }
-	}
+                set choices {}
+                db_foreach question_choices_2 "" {
+                    if { $user_value == $choice_id } {
+                        lappend choices "<input type=radio name=$element_name value=$choice_id checked> $label"
+                    } else {
+                        lappend choices "<input type=radio name=$element_name value=$choice_id> $label"
+                    }
+                }
+            }
+            if { $presentation_alignment eq "beside" } {
+                append html [join $choices " "]
+            } else {
+                append html "<p>\n[join $choices "<br>\n"]\n</p>"
+            }
+        }
 
-	"checkbox" {
-	    set choices {}
-	    db_foreach question_choices_3 "" {
-		if { [info exists selected_choices($choice_id)] } {
-		    lappend choices "<input type=checkbox name=$element_name value=$choice_id checked> $label"
-		} else {
-		    lappend choices "<input type=checkbox name=$element_name value=$choice_id> $label"
-		}
-	    }
-	    if { $presentation_alignment eq "beside" } {
-		append html [join $choices " "]
-	    } else {
-		append html "<p>\n[join $choices "<br>\n"]\n</p>"
-	    }
-	}
+        "checkbox" {
+            set choices {}
+            db_foreach question_choices_3 "" {
+                if { [info exists selected_choices($choice_id)] } {
+                    lappend choices "<input type=checkbox name=$element_name value=$choice_id checked> $label"
+                } else {
+                    lappend choices "<input type=checkbox name=$element_name value=$choice_id> $label"
+                }
+            }
+            if { $presentation_alignment eq "beside" } {
+                append html [join $choices " "]
+            } else {
+                append html "<p>\n[join $choices "<br>\n"]\n</p>"
+            }
+        }
     }
 
     return $html
@@ -313,49 +311,49 @@
 
     db_foreach summary "" {
 
-	if {$question_id == $question_id_previous} {
-	    continue
-	}
+        if {$question_id == $question_id_previous} {
+            continue
+        }
 
-	if {$html_p} {
-	    append return_string "# $sort_order: $question_text <p>"
-	    append return_string [ad_enhanced_text_to_html "$clob_answer $number_answer $varchar_answer $date_answer"]
-	} else {
-	    append return_string "$sort_order: "
-	    append return_string [ad_html_to_text -- $question_text]
-	    append return_string "\n\n"
-	    append return_string [ad_html_to_text -- [ad_enhanced_text_to_html "$clob_answer $number_answer $varchar_answer $date_answer"]]
-	}
+        if {$html_p} {
+            append return_string "# $sort_order: $question_text <p>"
+            append return_string [ad_enhanced_text_to_html "$clob_answer $number_answer $varchar_answer $date_answer"]
+        } else {
+            append return_string "$sort_order: "
+            append return_string [ad_html_to_text -- $question_text]
+            append return_string "\n\n"
+            append return_string [ad_html_to_text -- [ad_enhanced_text_to_html "$clob_answer $number_answer $varchar_answer $date_answer"]]
+        }
 
-	if {$attachment_answer ne ""} {
-	    set package_id [ad_conn package_id]
-	    set filename [db_string get_filename {}]
-	    set href [export_vars \
-			  -base [site_node::get_url_from_object_id -object_id $package_id]/view-attachment \
-			  {response_id question_id}]
-	    append return_string [subst {
-		[_ survey.Uploaded_file]
-		<a href="[ns_quotehtml $href]">"$filename"</a>
-	    }]
-	}
+        if {$attachment_answer ne ""} {
+            set package_id [ad_conn package_id]
+            set filename [db_string get_filename {}]
+            set href [export_vars \
+                          -base [site_node::get_url_from_object_id -object_id $package_id]/view-attachment \
+                          {response_id question_id}]
+            append return_string [subst {
+                [_ survey.Uploaded_file]
+                <a href="[ns_quotehtml $href]">"$filename"</a>
+            }]
+        }
 
-	if {$choice_id != 0 && $choice_id ne "" && $question_id != $question_id_previous} {
-	    set label_list [db_list survey_label_list ""]
-	    append return_string [join $label_list ", "]
-	}
+        if {$choice_id != 0 && $choice_id ne "" && $question_id != $question_id_previous} {
+            set label_list [db_list survey_label_list ""]
+            append return_string [join $label_list ", "]
+        }
 
-	if {$boolean_answer ne ""} {
-	    append return_string [survey::decode_boolean_answer -response $boolean_answer -question_id $question_id]
+        if {$boolean_answer ne ""} {
+            append return_string [survey::decode_boolean_answer -response $boolean_answer -question_id $question_id]
 
-	}
+        }
 
-	if {$html_p} {
-	    append return_string "<P>"
-	} else {
-	    append return_string "\n\n"
-	}
+        if {$html_p} {
+            append return_string "<P>"
+        } else {
+            append return_string "\n\n"
+        }
 
-	set question_id_previous $question_id
+        set question_id_previous $question_id
     }
 
     return $return_string
@@ -424,23 +422,23 @@
     set user_id [ad_conn user_id]
     db_1row get_question_details {}
     if {$new_section_id ne ""} {
-	set section_id $new_section_id
+        set section_id $new_section_id
     }
 
     set old_question_id $question_id
     if {$new_section_id eq ""} {
-	set after $sort_order
-	set new_sort_order [expr {$after + 1}]
-	    db_dml renumber_sort_orders {}
+        set after $sort_order
+        set new_sort_order [expr {$after + 1}]
+            db_dml renumber_sort_orders {}
     } else {
-	set new_sort_order $sort_order
+        set new_sort_order $sort_order
     }
 
     set new_question_id [db_exec_plsql create_question {}]
     db_dml insert_question_text {}
     db_foreach get_survey_question_choices {} {
-	set new_choice_id [db_string get_choice_id {}]
-	db_dml insert_survey_question_choice {}
+        set new_choice_id [db_string get_choice_id {}]
+        db_dml insert_survey_question_choice {}
 
     }
 
@@ -473,12 +471,12 @@
 } {
 
     if {$package_id eq ""} {
-	set package_id [ad_conn package_id]
+        set package_id [ad_conn package_id]
     }
 
     db_1row get_survey_info {}
     if {$new_name ne ""} {
-	set name $new_name
+        set name $new_name
     }
     set user_id [ad_conn user_id]
     set new_survey_id [db_exec_plsql survey_create {} ]
@@ -487,15 +485,15 @@
 
     foreach section_id $sections_list {
 
-	set new_section_id [db_exec_plsql section_create {}]
-	set new_section_ids($section_id) $new_section_id
-	if {$description ne ""} {
-	    db_dml set_section_description {}
-	}
+        set new_section_id [db_exec_plsql section_create {}]
+        set new_section_ids($section_id) $new_section_id
+        if {$description ne ""} {
+            db_dml set_section_description {}
+        }
     }
    db_foreach get_questions {} {
 
-	survey::copy_question -new_section_id $new_section_ids($section_id) -question_id $question_id
+        survey::copy_question -new_section_id $new_section_ids($section_id) -question_id $question_id
     }
 return $new_survey_id
 
@@ -536,19 +534,19 @@
     }
 
     if {$dotlrn_installed_p} {
-	set package_id [ad_conn package_id]
-	set community_id [dotlrn_community::get_community_id]
-	set segment_id [dotlrn_community::get_rel_segment_id -community_id $community_id -rel_type "dotlrn_member_rel"]
-	set community_name [dotlrn_community::get_community_name $community_id]
-	set community_url "[parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL][dotlrn_community::get_community_url $community_id]"
+        set package_id [ad_conn package_id]
+        set community_id [dotlrn_community::get_community_id]
+        set segment_id [dotlrn_community::get_rel_segment_id -community_id $community_id -rel_type "dotlrn_member_rel"]
+        set community_name [dotlrn_community::get_community_name $community_id]
+        set community_url "[parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL][dotlrn_community::get_community_url $community_id]"
     }
     db_1row get_response_info {}
 
     set notif_text ""
     set notif_html ""
 
     if {$dotlrn_installed_p} {
-	append notif_text "\nGroup: $community_name"
+        append notif_text "\nGroup: $community_name"
         append notif_html "Group: <a href=\"[ns_quotehtml $community_url]\">$community_name</a><br>"
 
     }
@@ -564,8 +562,8 @@
 
 
     if {$edit_p} {
-	append notif_text "\n[_ survey.Edited] "
-	append notif_html "<br>[_ survey.Edited]&nbsp; "
+        append notif_text "\n[_ survey.Edited] "
+        append notif_html "<br>[_ survey.Edited]&nbsp; "
     }
 
     append notif_text "[_ survey.lt_Response_on_response_]\n\n"
@@ -577,26 +575,26 @@
     # add summary info for sloanspace
     if {$dotlrn_installed_p} {
         db_foreach get_questions {} {
-	    # only doing the summary for HTML version because
-	    # all the links make the text version a mess
-	    set href [export_vars -base $community_url/survey/admin/view-text-responses {question_id}]
-	    append notif_html [subst {
-		$sort_order.
-		$question_text -
-		<a href="[ns_quotehtml $href]">[_ survey.View_responses_1]</a><br>
-	    }]
+            # only doing the summary for HTML version because
+            # all the links make the text version a mess
+            set href [export_vars -base $community_url/survey/admin/view-text-responses {question_id}]
+            append notif_html [subst {
+                $sort_order.
+                $question_text -
+                <a href="[ns_quotehtml $href]">[_ survey.View_responses_1]</a><br>
+            }]
         }
     }
 
     append notif_html "<p>"
 
     notification::new \
-	-type_id [notification::type::get_type_id \
-		      -short_name survey_response_notif] \
-	-object_id $survey_id \
-	-response_id $survey_id \
-	-notif_subject $subject \
-	-notif_text $notif_text \
+        -type_id [notification::type::get_type_id \
+                      -short_name survey_response_notif] \
+        -object_id $survey_id \
+        -response_id $survey_id \
+        -notif_subject $subject \
+        -notif_text $notif_text \
         -notif_html $notif_html
 }
 
@@ -631,18 +629,24 @@
 } {
     set presentation_options [db_string get_presentation_options {}]
     if {$presentation_options eq ""} {
-	set presentation_options "True/False"
+        set presentation_options "True/False"
     }
 
 
     if {$response ne ""} {
-	set options_list [split $presentation_options "/"]
+        set options_list [split $presentation_options "/"]
 
-	if {$response=="t"} {
-	    set response [lindex $options_list 0]
-	} else {
-	    set response [lindex $options_list 1]
-	}
+        if {$response=="t"} {
+            set response [lindex $options_list 0]
+        } else {
+            set response [lindex $options_list 1]
+        }
     }
     return $response
 }
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: