--- loncom/interface/lonhelper.pm	2006/05/05 10:59:51	1.139
+++ loncom/interface/lonhelper.pm	2006/05/09 21:44:18	1.145
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.139 2006/05/05 10:59:51 foxr Exp $
+# $Id: lonhelper.pm,v 1.145 2006/05/09 21:44:18 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2291,16 +2291,131 @@ use Apache::lonnet;
 #                    set of students won't collide.
 #     $defaultusers - reference to a hash containng
 #                     the set of users that should be on or off.
+#     $multiselect  - True if multiselect allowed.
+#     $resultname   - Name of result variable.
+#     $javascript   - If true, the javascript to run this is output
+#                     This should be true for the first call for a page
+#                     and false for all other calls... only matters if
+#                     multiselect is true.
 #  Returns:
 #     HTML  text to add to the rendering of the helper.
 #
 sub render_student_list {
-    my ($self,
-	$sections, $students, $formprefix, $defaultusers) = @_;
+    my (
+	$sections, $students, $formprefix, $defaultusers,
+	$multiselect, $resultname, $javascript) = @_;
 
-    my $multiselect = $self->{'multichoice'};
     my $result = "";
 
+    if ($javascript && $multiselect) {
+        $result .= <<SCRIPT;
+<script type="text/javascript">
+// <!--
+
+    function findElement(name) {
+	var i;
+	var ele;
+	for(i =0; i < document.forms.helpform.elements.length; i++) {
+	    ele = document.forms.helpform.elements[i];
+	    if(ele.name == name) {
+		return ele;
+	    }
+	}
+	return null;
+    }
+    function isStudent(element) {
+	if(element.value.indexOf(":Student") != -1) {
+	    return 1;
+	}
+	return 0;
+    }
+    function section(element) {
+	var i;
+	var info;
+	if (element.value.indexOf(':') != -1) {
+	    info = element.value.split(':');
+	    return info[2];
+	} else {
+	    return "";
+	}
+    }
+    function rightSubForm(element, which) {
+	if (element.value.indexOf(which) != -1) {
+	    return true;
+	} else {
+	    return false;
+	}
+    }
+
+    function setAllStudents(value, which) {
+	var i;
+	var ele;
+	for (i =0; i < document.forms.helpform.elements.length; i++) {
+	    ele = document.forms.helpform.elements[i];
+	    if(isStudent(ele) && rightSubForm(ele, which)) {
+		ele.checked=value;
+	    }
+	}
+    }
+    function setAllCoursePersonnel(value, which) {
+	var i;
+	var ele;
+	for (i =0; i < document.forms.helpform.elements.length; i++) {
+	    ele = document.forms.helpform.elements[i];
+	    if(!isStudent(ele) && rightSubForm(ele, which)) {
+		ele.checked = value;
+	    }
+	}
+    }
+    function setSection(which, value, subform) {
+	var i;
+	var ele;
+	for (i =0; i < document.forms.helpform.elements.length; i++) {
+	    ele = document.forms.helpform.elements[i];
+	    if (ele.value.indexOf(':') != -1) {
+		if ((section(ele) == which) && rightSubForm(ele, subform)) {
+		    ele.checked = value;
+		}
+	    }
+	}
+    }
+
+    function setCheckboxes(listbox, which, value) {
+	var k;
+	var elem;
+	var what;
+        elem = findElement(listbox);
+	if (elem != null) {
+	    for (k = 0; k < elem.length; k++) {
+		if (elem.options[k].selected) {
+		    what = elem.options[k].text;
+		    if (what == 'All Students') {
+			setAllStudents(value, which);
+		    } else if (what == 'All Course Personnel') {
+			setAllCoursePersonnel(value, which);
+		    } else if (what == 'No Section') {
+			setSection('',value, which);
+		    } else {
+			setSection(what, value, which);
+		    }
+		}
+	    }
+	}
+    }
+    function selectSections(listbox, which) {
+	setCheckboxes(listbox, which, true);
+
+    }
+    function unselectSections(listbox, which) {
+	setCheckboxes(listbox, which, false);
+    }
+
+// -->
+</script>
+SCRIPT
+
+    }
+
     # If multiple selections are allowed, we have a listbox
     # at the top which allows quick selections from each section
     # as well as from categories of personnel.
@@ -2308,7 +2423,7 @@ sub render_student_list {
     if ($multiselect) {
 	$result .= '<table><tr><td>';
 
-	my $size = scalar(keys %$sections);
+	my $size = scalar(keys(%$sections));
 	$size += 3;		# We have allstudents allpersonel nosection too.
 	if ($size > 5) { 
 	    $size = 5; 
@@ -2323,11 +2438,11 @@ sub render_student_list {
 	    $result .= '<option name="'.$sec.'">'.$sec.'</option>'."\n";
 	}
 	$result .= '</td><td valign="top">';
-	$result .= '<input type="button" name="'.$formprefix.'.select" value="Select" onClick='
-	    ."'selectSections(\"$formprefix.chosensections\")'".' /></td>';
+	$result .= '<input type="button" name="'.$formprefix.'.select" value="Select" onclick='
+	    ."'selectSections(\"$formprefix.chosensections\", \"$formprefix\")'".' /></td>';
 	$result .= '<td valign="top"><input type="button" name="'.$formprefix
-	    .'.unselect" value="Unselect"  onClick='.
-	    "'unselectSections(\"$formprefix.chosensections\")' ".' /></td></tr></table>';
+	    .'.unselect" value="Unselect"  onclick='.
+	    "'unselectSections(\"$formprefix.chosensections\", \"$formprefix\")' ".' /></td></tr></table>';
     }
 
     #  Now we list the students, but the form element type
@@ -2352,7 +2467,7 @@ sub render_student_list {
     my $checked = 0;
     for my $student (@$students) {
 	$result .= '<tr><td><input type="'.$input_type.'"  name="'.
-	    $self->{'variable'}.".forminput".'"';
+	    $resultname.".forminput".'"';
 	my $user    = $student->[0];
 
 	# Figure out which students are checked by default...
@@ -2362,7 +2477,7 @@ sub render_student_list {
 		$result .= ' checked ="checked" ';
 		$checked = 1;
 	    }
-	} elsif (!$self->{'multichoice'} && !$checked) {
+	} elsif (!$multiselect  && !$checked) {
 	    $result .= ' checked="checked" ';
 	    $checked = 1;	# First one for radio if no default specified.
 	}
@@ -2370,7 +2485,8 @@ sub render_student_list {
 						      .$student->[2] . ':'
 						      .$student->[1] . ':'
 						      .$student->[3] . ':'
-						      .$student->[4], "<>&\"'")
+						      .$student->[4] . ":"
+						      .$formprefix,   "<>&\"'")
 	    ."\" /></td><td>\n";
 	$result .= HTML::Entities::encode($student->[1], '<>&"')
 	        . '</td><td align="center" >'."\n";
@@ -2432,206 +2548,6 @@ sub render {
     my $buttons = '';
     my $var = $self->{'variable'};
 
-    if ($self->{'multichoice'}) {
-        $result = <<SCRIPT;
-<script type="text/javascript">
-// <!--
-
-    function findElement(name) {
-	var i;
-	var ele;
-	for(i =0; i < document.forms.helpform.elements.length; i++) {
-	    ele = document.forms.helpform.elements[i];
-	    if(ele.name == name) {
-		return ele;
-	    }
-	}
-	return null;
-    }
-    function isStudent(element) {
-	if(element.value.indexOf(":Student") != -1) {
-	    return 1;
-	}
-	return 0;
-    }
-    function section(element) {
-	var i;
-	var info;
-	if (element.value.indexOf(':') != -1) {
-	    info = element.value.split(':');
-	    return info[2];
-	} else {
-	    return "";
-	}
-    }
-
-    function setAllStudents(value) {
-	var i;
-	var ele;
-	for (i =0; i < document.forms.helpform.elements.length; i++) {
-	    ele = document.forms.helpform.elements[i];
-	    if(isStudent(ele)) {
-		ele.checked=value;
-	    }
-	}
-    }
-    function setAllCoursePersonnel(value) {
-	var i;
-	var ele;
-	for (i =0; i < document.forms.helpform.elements.length; i++) {
-	    ele = document.forms.helpform.elements[i];
-	    if(!isStudent(ele)) {
-		ele.checked = value;
-	    }
-	}
-    }
-    function setSection(which, value) {
-	var i;
-	var ele;
-	for (i =0; i < document.forms.helpform.elements.length; i++) {
-	    ele = document.forms.helpform.elements[i];
-	    if (ele.value.indexOf(':') != -1) {
-		if (section(ele) == which) {
-		    ele.checked = value;
-		}
-	    }
-	}
-    }
-
-    function setCheckboxes(listbox, value) {
-	var k;
-	var elem;
-	var what;
-        elem = findElement(listbox);
-	if (elem != null) {
-	    for (k = 0; k < elem.length; k++) {
-		if (elem.options[k].selected) {
-		    what = elem.options[k].text;
-		    if (what == 'All Students') {
-			setAllStudents(value);
-		    } else if (what == 'All Course Personnel') {
-			setAllCoursePersonnel(value);
-		    } else if (what == 'No Section') {
-			setSection('',value);
-		    } else {
-			setSection(what, value);
-		    }
-		}
-	    }
-	}
-    }
-    function selectSections(listbox) {
-	setCheckboxes(listbox, true);
-
-    }
-    function unselectSections(listbox) {
-	setCheckboxes(listbox, false);
-    }
-    /* ----------------------------- */
-    
-    function checkall(value, checkName) {
-	for (i=0; i<document.forms.helpform.elements.length; i++) {
-            ele = document.forms.helpform.elements[i];
-            if (ele.name == checkName + '.forminput') {
-                document.forms.helpform.elements[i].checked=value;
-            }
-        }
-    }
-    function checksec(value) {
-	for (i=0; i<document.forms.helpform.elements.length; i++) {
-	    comp = document.forms.helpform.elements.chksec.value;
-            if (document.forms.helpform.elements[i].value.indexOf(':'+comp+':') != -1) {
-		if (document.forms.helpform.elements[i].value.indexOf(':Active') != -1) {
-		    document.forms.helpform.elements[i].checked=value;
-		}
-            }
-        }
-    }
-    function checkactive() {
-	for (i=0; i<document.forms.helpform.elements.length; i++) {
-            if (document.forms.helpform.elements[i].value.indexOf(':Active') != -1) {
-                document.forms.helpform.elements[i].checked=true;
-            } 
-        }
-    }
-    function checkexpired()  {
-	for (i=0; i<document.forms.helpform.elements.length; i++) {
-            if (document.forms.helpform.elements[i].value.indexOf(':Expired') != -1) {
-                document.forms.helpform.elements[i].checked=true;
-            } 
-        }
-    }
-    function uncheckexpired() {
-	for (i=0; i<document.forms.helpform.elements.length; i++) {
-            if (document.forms.helpform.elements[i].value.indexOf(':Expired') != -1) {
-                document.forms.helpform.elements[i].checked=false;
-            } 
-        }
-    }
-    function getDesiredState() {     // Return desired person state radio value.
-        numRadio = document.forms.helpform.personstate.length;
-        for (i =0; i < numRadio; i++) {
-	    if (document.forms.helpform.personstate[i].checked) {
-                return document.forms.helpform.personstate[i].value;
-            }
-        }
-        return "";
-    }
-
-    function checksections(value) {    // Check selected sections.
-        numSections  = document.forms.helpform.chosensections.length;
-	desiredState = getDesiredState();
-
-	for (var option = 0; option < numSections; option++) {
-	    if(document.forms.helpform.chosensections.options[option].selected) {
-		section = document.forms.helpform.chosensections.options[option].text;
-		if (section == "none") {
-		    section ="";
-		}
-		for (i = 0; i < document.forms.helpform.elements.length; i++ ) {
-		    if (document.forms.helpform.elements[i].value.indexOf(':') != -1) {
-			info = document.forms.helpform.elements[i].value.split(':');
-			hisSection = info[2];
-			hisState   = info[4];
-			if (desiredState == hisState ||
-			    desiredState == "All") {
-			    if(hisSection == section ||
-			       section =="" ) {
-				document.forms.helpform.elements[i].checked = value;
-			    }
-			}
-		    }
-		}
-            }
-	}
-				   }
-// -->
-</script>
-SCRIPT
-
-        my %lt=&Apache::lonlocal::texthash(
-                    'ocs'  => "Select Only Current Students",
-                    'ues'  => "Unselect Expired Students",
-                    'sas'  => "Select All Students",
-                    'uas'  => "Unselect All Students",
-                    'sfsg' => "Select Current Students for Section/Group",
-		    'ufsg' => "Unselect for Section/Group");
- 
-        $buttons = <<BUTTONS;
-<br />
-<table>
-  
-  <tr>
-     <td><input type="button" onclick="checkall(true, '$var')" value="$lt{'sas'}" /></td>
-     <td> <input type="button" onclick="checkall(false, '$var')" value="$lt{'uas'}" /><br /></td>
-  </tr>
-  
-</table>
-<br />
-BUTTONS
-#    $result .= $buttons;   
-
-}
 
     if (defined $self->{ERROR_MSG}) {
         $result .= '<font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br /><br />';
@@ -2766,29 +2682,37 @@ BUTTONS
 
     #   Current personel
 
-    $result .= $self->render_student_list(\%sections,
+    $result .= &render_student_list(\%sections,
 					  $current_members,
 					  "current",
-					  \%defaultUsers);
+					  \%defaultUsers,
+				    $self->{'multichoice'},
+				    $self->{'variable'},
+				    1);
 
 
     # If activeonly is not set then we can also give the expired students:
     #
     if (!$self->{'activeonly'} && ((scalar @$expired_members) > 0)) {
 
-	# Past 
-
-	$result .= $self->render_student_list(\%sections,
-					      $expired_members,
-					      "past",
-					      \%defaultUsers);
-
 	# And future.
 
-	$result .= $self->render_student_list(\%sections,
+	$result .= &render_student_list(\%sections,
 					      $future_members,
 					      "future",
-					      \%defaultUsers);
+					      \%defaultUsers,
+					$self->{'multichoice'},
+					$self->{'variable'},
+					0);
+	# Past 
+
+	$result .= &render_student_list(\%sections,
+					      $expired_members,
+					      "past",
+					      \%defaultUsers,
+					$self->{'multichoice'},
+					$self->{'variable'},
+					0);
     }
 
 
@@ -3232,26 +3156,29 @@ sub start_section {
 
     my $section = Apache::loncoursedata::CL_SECTION();
     my $classlist = Apache::loncoursedata::get_classlist();
-    foreach (keys %$classlist) {
-        my $sectionName = $classlist->{$_}->[$section];
-        if (!$sectionName) {
+    foreach my $user (keys(%$classlist)) {
+        my $section_name = $classlist->{$user}[$section];
+        if (!$section_name) {
             $choices{"No section assigned"} = "";
         } else {
-            $choices{$sectionName} = $sectionName;
+            $choices{$section_name} = $section_name;
         }
     } 
    
-    for my $sectionName (sort(keys(%choices))) {
-	push @{$paramHash->{CHOICES}}, [$sectionName, $sectionName];
+    if (exists($choices{"No section assigned"})) {
+	push(@{$paramHash->{CHOICES}}, 
+	     ['No section assigned','No section assigned']);
+	delete($choices{"No section assigned"});
+    }
+    for my $section_name (sort {lc($a) cmp lc($b) } (keys(%choices))) {
+	push @{$paramHash->{CHOICES}}, [$section_name, $section_name];
     }
     return if ($token->[2]{'onlysections'});
 
     # add in groups to the end of the list
-    my %curr_groups;
-    if (&Apache::loncommon::coursegroups(\%curr_groups)) {
-	foreach my $group_name (sort(keys(%curr_groups))) {
-	    push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
-	}
+    my %curr_groups = &Apache::loncommon::coursegroups();
+    foreach my $group_name (sort(keys(%curr_groups))) {
+	push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
     }
 }    
 
@@ -3313,11 +3240,9 @@ sub start_group {
     # Populate the CHOICES element
     my %choices;
 
-    my %curr_groups;
-    if (&Apache::loncommon::coursegroups(\%curr_groups)) {
-	foreach my $group_name (sort(keys(%curr_groups))) {
-	    push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
-	}
+    my %curr_groups = &Apache::loncommon::coursegroups();
+    foreach my $group_name (sort {lc($a) cmp lc($b)} (keys(%curr_groups))) {
+	push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
     }
 }