Diff for /loncom/interface/lonpickstudent.pm between versions 1.22 and 1.23

version 1.22, 2007/08/02 01:39:26 version 1.23, 2007/08/10 23:20:09
Line 122  ENDSCRIPT Line 122  ENDSCRIPT
     &Apache::lonnet::get_course_adv_roles();      &Apache::lonnet::get_course_adv_roles();
  $r->print(&Apache::loncommon::start_data_table());   $r->print(&Apache::loncommon::start_data_table());
  foreach my $role (sort(keys(%coursepersonnel))) {   foreach my $role (sort(keys(%coursepersonnel))) {
     foreach (split(/\,/,$coursepersonnel{$role})) {      foreach my $user (split(/\,/,$coursepersonnel{$role})) {
  my ($puname,$pudom)=split(/\:/,$_);   my ($puname,$pudom)=split(/\:/,$user);
  $role = &Apache::lonnet::plaintext($role,   $role = &Apache::lonnet::plaintext($role,
    &Apache::loncommon::course_type());     &Apache::loncommon::course_type());
  $r->print(&Apache::loncommon::start_data_table_row().   $r->print(&Apache::loncommon::start_data_table_row().
Line 201  ENDSCRIPT Line 201  ENDSCRIPT
  $r->print($filtermsg);   $r->print($filtermsg);
   
  $r->print('<p>'.&Apache::loncommon::start_data_table());   $r->print('<p>'.&Apache::loncommon::start_data_table());
  my %users=&Apache::lonnet::get_my_roles();   my %user_role=&Apache::lonnet::get_my_roles();
  foreach my $user (sort(keys(%users))) {   my %users;
     if ($user =~   foreach my $user_role (keys(%user_role)) {
  /^($LONCAPA::username_re)\:($LONCAPA::domain_re)\:(\w+)$/) {      next if ($user_role !~
  my ($uname,$udom,$urole)=($1,$2,$3);       /^($LONCAPA::username_re):($LONCAPA::domain_re):(\w+)$/);
  my $fullname=&Apache::loncommon::plainname($uname,$udom);      my ($uname,$udom,$urole)=($1,$2,$3);
  if (($uname=~/^$filter/) ||       my $fullname=&Apache::loncommon::plainname($uname,$udom);
     ($fullname=~/^$filter/i)) {      next if (($uname!~/^$filter/i) && ($fullname=~/^$filter/i));
     $r->print(&Apache::loncommon::start_data_table_row().      
       '<td>'.      if (!exists($users{"$uname:$udom"})) {
       '<input type="button" value="Select" onClick="gochoose('.   $users{"$uname:$udom"} = {'fullname' => $fullname };
       "'".$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());  
  }  
     }      }
       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>');   $r->print(&Apache::loncommon::end_data_table().'</p>');
     }      }

Removed from v.1.22  
changed lines
  Added in v.1.23


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>