--- loncom/interface/lonpickstudent.pm	2006/03/15 22:11:04	1.11
+++ loncom/interface/lonpickstudent.pm	2006/06/02 13:58:31	1.19
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a student from the classlist
 #
-# $Id: lonpickstudent.pm,v 1.11 2006/03/15 22:11:04 albertel Exp $
+# $Id: lonpickstudent.pm,v 1.19 2006/06/02 13:58:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,7 @@ use Apache::loncommon;
 use Apache::loncoursedata;
 use Apache::lonnet;
 use Apache::lonlocal;
+use Apache::longroup;
 
 sub handler {
     my $r = shift;
@@ -42,7 +43,8 @@ sub handler {
     return OK if $r->header_only;
 
 # ------------------------------------------------------------ Print the screen
-    $r->print(&Apache::loncommon::start_page("Selecting a User"));
+    $r->print(&Apache::loncommon::start_page("Selecting a User",undef,
+					     {'no_nav_bar' => 1}));
 
 
     &Apache::loncommon::get_unprocessed_cgi
@@ -70,8 +72,13 @@ sub handler {
     $filter=~s/\W//g;
     unless ($filter) { $filter='.'; }
 
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $classlist=&Apache::loncoursedata::get_classlist();
-       
+    my %grouplist=&Apache::lonnet::get_group_membership($cdom,$cnum);
+    my $now = time;
+    my %allgroups = &Apache::longroup::coursegroups($cdom,$cnum);
+
 # --------------------------------------- There is such a user, get environment
 
     $r->print(<<ENDSCRIPT);
@@ -99,6 +106,8 @@ ENDSCRIPT
     foreach my $role (sort keys %coursepersonnel) {
        foreach (split(/\,/,$coursepersonnel{$role})) {
 	   my ($puname,$pudom)=split(/\:/,$_);
+           $role = &Apache::lonnet::plaintext($role,
+                                            &Apache::loncommon::course_type());
 	   $r->print('<tr><td>'.
              '<input type="button" value="Select" onClick="gochoose('.
              "'".$puname."','".$pudom."')".'" /></td><td>'.$role.'</td><td>'.
@@ -111,7 +120,7 @@ ENDSCRIPT
     if ($filter ne '.') {
        $r->print('<br/ >'.&mt('Name starting with').' "'.$filter.'"<br />');
     }
-    $r->print('</p><p><table>');
+    $r->print('</p><p><table><tr><th>&nbsp;</th><th>username</th><th>domain</th><th>Name</th><th>ID</th><th>section</th><th>active group(s)</th></tr>');
   # ------------------------------------------------------------------ Students
     foreach (sort keys %$classlist) {
         # the following undefs are for 'domain', and 'username' respectively.
@@ -124,6 +133,16 @@ ENDSCRIPT
 	    my ($uname,$udom)=($1,$2);
 	    if (($uname=~/^$filter/) || 
                 ($fullname=~/^$filter/i)) {
+               my $grouplist = '';
+               foreach my $group (sort(keys(%allgroups))) {
+                   if (exists($grouplist{$group.':'.$uname.':'.$udom})) {
+                       my ($end,$start) = split(/:/,$grouplist{$group.':'.$uname.':'.$udom});
+                       if (($end!=0) && ($end<$now)) { next; }
+                       if (($start!=0) && ($start>$now)) {next; }
+                       $grouplist .= " $group,"; 
+                   }
+               }
+               $grouplist =~ s/,$//;
 	       $r->print('<tr><td>'.
                       '<input type="button" value="'.&mt('Select').'" onClick="gochoose('.
                       "'".$uname."','".$udom."')".'" /></td>'.
@@ -132,7 +151,7 @@ ENDSCRIPT
                          &Apache::loncommon::aboutmewrapper(
                          $fullname,
                          $uname,$udom).'</td><td>'.$id.'</td><td>'.$section.
-                                       '</td></tr>');
+                                       '</td><td>'.$grouplist.'</td></tr>');
 	   }
         }
     }