--- loncom/interface/lonpickstudent.pm	2002/12/30 14:10:58	1.2
+++ loncom/interface/lonpickstudent.pm	2003/09/22 00:48:32	1.7
@@ -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.7 2003/09/22 00:48:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,10 +33,11 @@ use Apache::Constants qw(:common);
 use Apache::loncommon;
 use Apache::loncoursedata;
 use Apache::lonnet;
+use Apache::lonlocal;
 
 sub handler {
     my $r = shift;
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
 
@@ -48,28 +49,28 @@ sub handler {
 </head>
 ENDDOCUMENT
 
-# Is this even in a course?
-    unless ($ENV{'request.course.id'}) {
-	$r->print('<body>Not in a course</body>');
-        return OK;
-    }
-	  
-    unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
-	$r->print('<body>No course listing</body>');
-        return OK;
-    }
 
 
 
     &Apache::loncommon::get_unprocessed_cgi
-        ($ENV{'QUERY_STRING'},['filter','form','unameelement','udomelement']);
+        ($ENV{'QUERY_STRING'},['filter','form','unameelement','udomelement',
+			       'roles']);
+# Allowed?
+
+    unless (($ENV{'form.roles'}) ||
+            (($ENV{'request.course.id'}) && 
+             (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})))) {
+	$r->print('<body>No context.</body>');
+        return OK;
+    }
+
+# See if filter present
+
     my $filter=$ENV{'form.filter'};
     $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,41 +82,93 @@ 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();
 }
 </script>
 ENDSCRIPT
     
+  $r->print('<form>');
+  if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) &&
+      (!$ENV{'form.roles'})) {
+# -------------------------------------------------------- Get course personnel
     $r->print('<h3>'.$ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
               '</h3>');
+    my %coursepersonnel=
+       &Apache::lonnet::get_course_adv_roles();
+    $r->print('<table border="2">');
+    foreach my $role (sort 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/ >'.&mt('Name starting with').' "'.$filter.'"<br />');
     }
-    $r->print('<form><table>');  
+    $r->print('</p><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="'.&mt('Select').'" onClick="gochoose('.
+                      "'".$uname."','".$udom."')".'" /></td>'.
+                         '<td><tt>'.$uname.'</tt></td><td> <tt>'.$udom.
+                         '</tt></td><td>'.
+                         &Apache::loncommon::aboutmewrapper(
+                         $fullname,
+                         $uname,$udom).'</td><td>'.$id.'</td><td>'.$section.
+                                       '</td></tr>');
+	   }
+        }
+    }
+
+    $r->print('</table></p>');
+  } else {
+    $r->print('<h3>'.&mt('Users with Roles Assigned by').' '.
+	      &Apache::loncommon::plainname($ENV{'user.name'},
+					    $ENV{'user.domain'}).'</h3>');
+    if ($filter ne '.') {
+       $r->print('<br/ >'.&mt('Name starting with').' "'.$filter.'"<br />');
+    }
+    $r->print('<p><table>');
+    my %users=&Apache::lonnet::get_my_roles();
+    foreach (sort keys %users) {
+        if ($_=~/^(\w+)\:(\w+)\:(\w+)$/) {
+	    my ($uname,$udom,$urole)=($1,$2,$3);
+	    my $fullname=&Apache::loncommon::plainname($uname,$udom);
+	    if (($uname=~/^$filter/) || 
+                ($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><td>'.
+			 &Apache::lonnet::plaintext($urole).
+                                       '</td></tr>');
 	   }
         }
     }
-
-    $r->print('</table></form></body></html>');
-    return OK;
+    $r->print('</table></p>');
+  }
+  $r->print('</form></body></html>');
+  return OK;
 } 
 
 1;

'. '	`'.$uname.'`	`'.$udom. '`	'. &Apache::loncommon::aboutmewrapper( - $classlist->{$_}->{'lastname'}.', '. - $classlist->{$_}->{'firstname'}.' '. - $classlist->{$_}->{'middlename'}.' '. - $classlist->{$_}->{'generation'}, - $uname,$udom).'
	'. + &Apache::lonnet::plaintext($urole). + '