--- loncom/interface/lonpickstudent.pm	2002/12/30 14:10:58	1.2
+++ loncom/interface/lonpickstudent.pm	2003/03/28 01:53:55	1.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a student from the classlist
 #
-# $Id: lonpickstudent.pm,v 1.2 2002/12/30 14:10:58 www Exp $
+# $Id: lonpickstudent.pm,v 1.4 2003/03/28 01:53:55 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,9 +67,7 @@ ENDDOCUMENT
     $filter=~s/\W//g;
     unless ($filter) { $filter='.'; }
 
-    my $classlist=&Apache::loncoursedata::DownloadClasslist
-                                        ($ENV{'request.course.id'},
-                                         'Not downloaded',$r->connection);
+    my $classlist=&Apache::loncoursedata::get_classlist();
        
 # --------------------------------------- There is such a user, get environment
 
@@ -81,7 +79,7 @@ function gochoose(uname,udom) {
     var slct=opener.document.$ENV{'form.form'}.$ENV{'form.udomelement'};
     var i;
     for (i=0;i<slct.length;i++) {
-        if (slct[i]==udom) { slct.selectedIndex=i; }
+        if (slct.options[i].value==udom) { slct.selectedIndex=i; }
     }
     self.close();
 }
@@ -89,27 +87,45 @@ function gochoose(uname,udom) {
 ENDSCRIPT
     
     $r->print('<h3>'.$ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
-              '</h3>');
+              '</h3><form>');
+# -------------------------------------------------------- Get course personnel
+    my %coursepersonnel=
+       &Apache::lonnet::get_course_adv_roles();
+    $r->print('<table border="2">');
+    foreach my $role (keys %coursepersonnel) {
+       foreach (split(/\,/,$coursepersonnel{$role})) {
+	   my ($puname,$pudom)=split(/\:/,$_);
+	   $r->print('<tr><td>'.
+             '<input type="button" value="Select" onClick="gochoose('.
+             "'".$puname."','".$pudom."')".'" /></td><td>'.$role.'</td><td>'.
+		     &Apache::loncommon::aboutmewrapper(
+                          &Apache::loncommon::plainname($puname,
+                          $pudom),$puname,$pudom).'</td></tr>');
+	}
+    }
+    $r->print('</table><p>&nbsp;');
     if ($filter ne '.') {
-       $r->print('Name starting with "'.$filter.'"<br />');
+       $r->print('<br/ >Name starting with "'.$filter.'"<br />');
     }
-    $r->print('<form><table>');  
+    $r->print('</p><table>');
+  # ------------------------------------------------------------------ Students
     foreach (sort keys %$classlist) {
-        if ($_=~/^(\w+)\:(\w+)\:studentInformation$/) {
+        # the following undefs are for 'domain', and 'username' respectively.
+	my (undef,undef,$end,$start,$id,$section,$fullname,$status)=
+            @{$classlist->{$_}};
+        if ($_=~/^(\w+)\:(\w+)$/) {
 	    my ($uname,$udom)=($1,$2);
 	    if (($uname=~/^$filter/) || 
-                ($classlist->{$_}->{'lastname'}=~/^$filter/i)) {
+                ($fullname=~/^$filter/i)) {
 	       $r->print('<tr><td>'.
                       '<input type="button" value="Select" onClick="gochoose('.
                       "'".$uname."','".$udom."')".'" /></td>'.
                          '<td><tt>'.$uname.'</tt></td><td><tt>'.$udom.
                          '</tt></td><td>'.
                          &Apache::loncommon::aboutmewrapper(
-                         $classlist->{$_}->{'lastname'}.', '.
-                         $classlist->{$_}->{'firstname'}.' '.
-                         $classlist->{$_}->{'middlename'}.' '.
-                         $classlist->{$_}->{'generation'},
-                         $uname,$udom).'</td></tr>');
+                         $fullname,
+                         $uname,$udom).'</td><td>'.$id.'</td><td>'.$section.
+                                       '</td></tr>');
 	   }
         }
     }