--- loncom/interface/lonhelper.pm	2003/09/29 16:33:09	1.48
+++ loncom/interface/lonhelper.pm	2003/10/09 14:37:48	1.54
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.48 2003/09/29 16:33:09 bowersj2 Exp $
+# $Id: lonhelper.pm,v 1.54 2003/10/09 14:37:48 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1873,7 +1873,7 @@ BUTTONS
 
     # Evaluate the map url as needed
     my $mapUrl;
-    if ($self->{EVALUATE_MAP_URL}) {
+    if ($self->{EVAL_MAP_URL}) {
 	my $mapUrlFunc = eval('sub { my $helper = shift; my $state = shift; ' . 
 	    $self->{MAP_URL} . '}');
 	$mapUrl = &$mapUrlFunc($helper, $self);
@@ -2044,13 +2044,34 @@ sub render {
             }
         }
     }
+    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) {
+                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;
+            }
+        }
+    }
 </script>
 SCRIPT
         $buttons = <<BUTTONS;
 <br />
+<input type="button" onclick="checkactive()" value="Select Only Current Students" />
 <input type="button" onclick="checkall(true, '$var')" value="Select All Students" />
 <input type="button" onclick="checkall(false, '$var')" value="Unselect All Students" />
 <br />
+<input type="button" onclick="checksec(true)" value="Select for Section/Group">
+<input type="text" size="5" name="chksec">&nbsp;
+<input type="button" onclick="checksec(false)" value="Unselect for Section/Group">
+
+<br />
 BUTTONS
     }
 
@@ -2103,7 +2124,8 @@ BUTTONS
 	if (!$self->{'activeonly'} || $classlist->{$_}->[$status] eq
 	    'Active') {
 	    push @$choices, [$_, $classlist->{$_}->[$fullname], 
-			     $classlist->{$_}->[$section], 'Student'];
+			     $classlist->{$_}->[$section],
+			     $classlist->{$_}->[$status], 'Student'];
 	}
     }
 
@@ -2113,7 +2135,9 @@ BUTTONS
     $result .= "<table cellspacing='2' cellpadding='2' border='0'>\n";
     $result .= "<tr><td></td><td align='center'><b>$name</b></td>".
         "<td align='center'><b>Section</b></td>" . 
-	"<td align='center'><b>Role</b></td></tr>";
+	"<td align='center'><b>Status</b></td>" . 
+	"<td align='center'><b>Role</b></td>" .
+	"<td align='center'><b>Username:Domain</b></td></tr>";
 
     my $checked = 0;
     for my $choice (@$choices) {
@@ -2125,13 +2149,18 @@ BUTTONS
             $checked = 1;
         }
         $result .=
-            " value='" . HTML::Entities::encode($choice->[0] . ':' . $choice->[2])
+            " value='" . HTML::Entities::encode($choice->[0] . ':' . $choice->[2] . ':' . $choice->[1] . ':' . $choice->[3])
             . "' /></td><td>"
             . HTML::Entities::encode($choice->[1])
             . "</td><td align='center'>" 
             . HTML::Entities::encode($choice->[2])
             . "</td>\n<td>" 
-	    . HTML::Entities::encode($choice->[3]) . "</td></tr>\n";
+	    . HTML::Entities::encode($choice->[3])
+            . "</td>\n<td>" 
+	    . HTML::Entities::encode($choice->[4])
+            . "</td>\n<td>" 
+	    . HTML::Entities::encode($choice->[0])
+	    . "</td></tr>\n";
     }
 
     $result .= "</table>\n\n";