--- loncom/interface/lonpickstudent.pm	2007/07/21 00:48:55	1.21
+++ loncom/interface/lonpickstudent.pm	2007/09/02 01:30:34	1.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a student from the classlist
 #
-# $Id: lonpickstudent.pm,v 1.21 2007/07/21 00:48:55 albertel Exp $
+# $Id: lonpickstudent.pm,v 1.24 2007/09/02 01:30:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,25 +70,24 @@ sub handler {
 # See if filter present
     my $filter=$env{'form.filter'};
     my $filtermsg;
-    if ($filter eq '') {
-	$filter = '.'
-    } else {
-	my $encoded_filter = &HTML::Entities::encode($filter,'<>&"');
-	$filter = quotemeta($filter);
-	my $change = &mt('Change');
-	my $filterbutton =<<FILTER;
+    my $encoded_filter = &HTML::Entities::encode($filter,'<>&"');
+    $filter = quotemeta($filter);
+    my $change = &mt('Change');
+    my $filterbutton =<<FILTER;
   <input type="text" name="filter" value="$encoded_filter" />
   <input type="submit" name="Change" value="$change" />
 FILTER
-	foreach my $name ('form','unameelement','udomelement','roles') {
-	    my $value = &HTML::Entities::encode($env{"form.$name"},'<>&"');
-	    $filterbutton .= <<HIDDEN;
+    foreach my $name ('form','unameelement','udomelement','roles') {
+	my $value = &HTML::Entities::encode($env{"form.$name"},'<>&"');
+	$filterbutton .= <<HIDDEN;
    <input type="hidden" name="$name" value="$value" />
 HIDDEN
-	}
-        $filtermsg = '<br />'.
-	    &mt('Showing users with a name starting with [_1]',
-		$filterbutton).'<br />';
+    }
+    $filtermsg = '<br />'.
+	&mt('Showing users with a name starting with [_1]',
+	    $filterbutton).'<br />';
+    if ($filter eq '') {
+	$filter = '.'
     }
 
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -123,8 +122,8 @@ ENDSCRIPT
 	    &Apache::lonnet::get_course_adv_roles();
 	$r->print(&Apache::loncommon::start_data_table());
 	foreach my $role (sort(keys(%coursepersonnel))) {
-	    foreach (split(/\,/,$coursepersonnel{$role})) {
-		my ($puname,$pudom)=split(/\:/,$_);
+	    foreach my $user (split(/\,/,$coursepersonnel{$role})) {
+		my ($puname,$pudom)=split(/\:/,$user);
 		$role = &Apache::lonnet::plaintext($role,
 						   &Apache::loncommon::course_type());
 		$r->print(&Apache::loncommon::start_data_table_row().
@@ -139,19 +138,10 @@ ENDSCRIPT
 
 	$r->print($filtermsg);
 
-	$r->print('</p><p>'.
-		  &Apache::loncommon::start_data_table().
-		  &Apache::loncommon::start_data_table_header_row().
-		  &Apache::loncommon::end_data_table_header_row().
-		  '<th>&nbsp;</th>'.
-		  '<th>'.&mt('username').'</th>'.
-		  '<th>'.&mt('domain').'</th>'.
-		  '<th>'.&mt('Name').'</th>'.
-		  '<th>'.&mt('ID').'</th>'.
-		  '<th>'.&mt('section').'</th>'.
-		  '<th>'.&mt('active group(s)').'</th>'.
-		  &Apache::loncommon::end_data_table_header_row());
+	$r->print('</p>');
+
 # ------------------------------------------------------------------ Students
+	my $result;
 	foreach my $user (sort(keys(%$classlist))) {
 	    # the following undefs are for 'domain', and 'username' respectively.
 	    my (undef,undef,$end,$start,$id,$section,$fullname,$status)=
@@ -173,7 +163,7 @@ ENDSCRIPT
 			}
 		    }
 		    $grouplist =~ s/,$//;
-		    $r->print(&Apache::loncommon::start_data_table_row().
+		    $result .=&Apache::loncommon::start_data_table_row().
 			      '<td>'.
 			      '<input type="button" value="'.&mt('Select').'" onClick="gochoose('.
 			      "'".$uname."','".$udom."')".'" /></td>'.
@@ -183,12 +173,27 @@ ENDSCRIPT
 								 $uname,$udom).
 			      '</td><td>'.$id.'</td><td>'.$section.
 			      '</td><td>'.$grouplist.'</td>'.
-			      &Apache::loncommon::end_data_table_row());
+			      &Apache::loncommon::end_data_table_row();
 		}
 	    }
 	}
-	
-	$r->print(&Apache::loncommon::end_data_table().'</p>');
+	if (!$result) {
+	    $r->print('<p>'.&mt('No students found.').'</p>');
+	} else {
+	    $r->print(&Apache::loncommon::start_data_table().
+		      &Apache::loncommon::start_data_table_header_row().
+		      &Apache::loncommon::end_data_table_header_row().
+		      '<th>&nbsp;</th>'.
+		      '<th>'.&mt('username').'</th>'.
+		      '<th>'.&mt('domain').'</th>'.
+		      '<th>'.&mt('Name').'</th>'.
+		      '<th>'.&mt('ID').'</th>'.
+		      '<th>'.&mt('section').'</th>'.
+		      '<th>'.&mt('active group(s)').'</th>'.
+		      &Apache::loncommon::end_data_table_header_row().
+		      $result.
+		      &Apache::loncommon::end_data_table());
+	}
     } else {
 	$r->print('<h3>'.&mt('Users with Roles Assigned by').' '.
 		  &Apache::loncommon::plainname($env{'user.name'},
@@ -196,28 +201,35 @@ ENDSCRIPT
 	$r->print($filtermsg);
 
 	$r->print('<p>'.&Apache::loncommon::start_data_table());
-	my %users=&Apache::lonnet::get_my_roles();
-	foreach my $user (sort(keys(%users))) {
-	    if ($user =~
-		/^($LONCAPA::username_re)\:($LONCAPA::domain_re)\:(\w+)$/) {
-		my ($uname,$udom,$urole)=($1,$2,$3);
-		my $fullname=&Apache::loncommon::plainname($uname,$udom);
-		if (($uname=~/^$filter/) || 
-		    ($fullname=~/^$filter/i)) {
-		    $r->print(&Apache::loncommon::start_data_table_row().
-			      '<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(
-								 $fullname,
-								 $uname,$udom).'</td><td><td>'.
-			      &Apache::lonnet::plaintext($urole).
-			      '</td>'.
-			      &Apache::loncommon::end_data_table_row());
-		}
+	my %user_role=&Apache::lonnet::get_my_roles();
+	my %users;
+	foreach my $user_role (keys(%user_role)) {
+	    next if ($user_role !~
+		     /^($LONCAPA::username_re):($LONCAPA::domain_re):(\w+)$/);
+	    my ($uname,$udom,$urole)=($1,$2,$3);
+	    my $fullname=&Apache::loncommon::plainname($uname,$udom);
+	    next if (($uname!~/^$filter/i) && ($fullname !~/^$filter/i));
+	    
+	    if (!exists($users{"$uname:$udom"})) {
+		$users{"$uname:$udom"} = {'fullname' => $fullname };
 	    }
+	    push(@{$users{"$uname:$udom"}{'roles'}},$urole);
+	}
+	foreach my $user (sort {lc($a) cmp lc($b)} (keys(%users))) {
+	    my ($uname,$udom) = split(':',$user);
+	    $r->print(&Apache::loncommon::start_data_table_row().
+		      '<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($users{$user}{'fullname'},
+							 $uname,$udom).'</td>'.
+		      '<td>'.
+		      join(', ',sort(map {&Apache::lonnet::plaintext($_)}
+				         (@{$users{$user}{'roles'}}))).
+		      '</td>'.
+		      &Apache::loncommon::end_data_table_row());
 	}
 	$r->print(&Apache::loncommon::end_data_table().'</p>');
     }