--- loncom/interface/lonhelper.pm	2006/05/05 10:59:51	1.139
+++ loncom/interface/lonhelper.pm	2006/05/08 22:01:11	1.141
@@ -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.141 2006/05/08 22:01:11 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2308,7 +2308,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 +2323,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
@@ -2370,7 +2370,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";
@@ -2464,41 +2465,48 @@ sub render {
 	    return "";
 	}
     }
+    function rightSubForm(element, which) {
+	if (element.value.indexOf(which) != -1) {
+	    return true;
+	} else {
+	    return false;
+	}
+    }
 
-    function setAllStudents(value) {
+    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)) {
+	    if(isStudent(ele) && rightSubForm(ele, which)) {
 		ele.checked=value;
 	    }
 	}
     }
-    function setAllCoursePersonnel(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)) {
+	    if(!isStudent(ele) && rightSubForm(ele, which)) {
 		ele.checked = value;
 	    }
 	}
     }
-    function setSection(which, 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) {
+		if ((section(ele) == which) && rightSubForm(ele, subform)) {
 		    ele.checked = value;
 		}
 	    }
 	}
     }
 
-    function setCheckboxes(listbox, value) {
+    function setCheckboxes(listbox, which, value) {
 	var k;
 	var elem;
 	var what;
@@ -2508,103 +2516,26 @@ sub render {
 		if (elem.options[k].selected) {
 		    what = elem.options[k].text;
 		    if (what == 'All Students') {
-			setAllStudents(value);
+			setAllStudents(value, which);
 		    } else if (what == 'All Course Personnel') {
-			setAllCoursePersonnel(value);
+			setAllCoursePersonnel(value, which);
 		    } else if (what == 'No Section') {
-			setSection('',value);
+			setSection('',value, which);
 		    } else {
-			setSection(what, value);
+			setSection(what, value, which);
 		    }
 		}
 	    }
 	}
     }
-    function selectSections(listbox) {
-	setCheckboxes(listbox, true);
+    function selectSections(listbox, which) {
+	setCheckboxes(listbox, which, 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 unselectSections(listbox, which) {
+	setCheckboxes(listbox, which, false);
     }
 
-    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
@@ -2776,19 +2707,18 @@ BUTTONS
     #
     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,
 					      $future_members,
 					      "future",
 					      \%defaultUsers);
+	# Past 
+
+	$result .= $self->render_student_list(\%sections,
+					      $expired_members,
+					      "past",
+					      \%defaultUsers);
     }