print(&Apache::loncommon::start_data_table());
foreach my $role (sort(keys(%coursepersonnel))) {
- foreach (split(/\,/,$coursepersonnel{$role})) {
- my ($puname,$pudom)=split(/\:/,$_);
- $role = &Apache::lonnet::plaintext($role,
- &Apache::loncommon::course_type());
+ foreach my $user (split(/\,/,$coursepersonnel{$role})) {
+ my ($puname,$pudom)=split(/\:/,$user);
$r->print(&Apache::loncommon::start_data_table_row().
'| '.
- ' | '.$role.' | '.
&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($puname,$pudom),$puname,$pudom).' | '.
&Apache::loncommon::end_data_table_row());
@@ -140,60 +133,69 @@ ENDSCRIPT
$r->print('');
+ unless ($env{'form.courseadvonly'}) {
+
# ------------------------------------------------------------------ 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)=
- @{$classlist->{$user}};
- if ($allowed eq 'section' && $section ne $env{'request.course.sec'}) {
- next;
- }
- if ($user=~/^($LONCAPA::username_re)\:($LONCAPA::domain_re)$/) {
- 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,";
- }
+ my $result;
+ 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);
+
+ foreach my $user (sort(keys(%$classlist))) {
+ # the following undefs are for 'domain', and 'username' respectively.
+ my (undef,undef,$end,$start,$id,$section,$fullname,$status)=
+ @{$classlist->{$user}};
+ if ($allowed eq 'section' && $section ne $env{'request.course.sec'}) {
+ next;
+ }
+ if ($user=~/^($LONCAPA::username_re)\:($LONCAPA::domain_re)$/) {
+ 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/,$//;
+ $result .=&Apache::loncommon::start_data_table_row().
+ ''.
+ ' | '.
+ ''.$uname.' | '.$udom.
+ ' | '.
+ &Apache::loncommon::aboutmewrapper($fullname,
+ $uname,$udom).
+ ' | '.$id.' | '.$section.
+ ' | '.$grouplist.' | '.
+ &Apache::loncommon::end_data_table_row();
}
- $grouplist =~ s/,$//;
- $result .=&Apache::loncommon::start_data_table_row().
- ''.
- ' | '.
- ''.$uname.' | '.$udom.
- ' | '.
- &Apache::loncommon::aboutmewrapper($fullname,
- $uname,$udom).
- ' | '.$id.' | '.$section.
- ' | '.$grouplist.' | '.
- &Apache::loncommon::end_data_table_row();
- }
+ }
}
- }
- if (!$result) {
- $r->print(''.&mt('No students found.').'
');
- } else {
- $r->print(&Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row().
- &Apache::loncommon::end_data_table_header_row().
- ' | '.
- ''.&mt('username').' | '.
- ''.&mt('domain').' | '.
- ''.&mt('Name').' | '.
- ''.&mt('ID').' | '.
- ''.&mt('section').' | '.
- ''.&mt('active group(s)').' | '.
- &Apache::loncommon::end_data_table_header_row().
- $result.
- &Apache::loncommon::end_data_table());
- }
+ if (!$result) {
+ $r->print(''.&mt('No students found.').'
');
+ } else {
+ $r->print(&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ &Apache::loncommon::end_data_table_header_row().
+ ' | '.
+ ''.&mt('username').' | '.
+ ''.&mt('domain').' | '.
+ ''.&mt('Name').' | '.
+ ''.&mt('ID').' | '.
+ ''.&mt('section').' | '.
+ ''.&mt('active group(s)').' | '.
+ &Apache::loncommon::end_data_table_header_row().
+ $result.
+ &Apache::loncommon::end_data_table());
+ }
+ }
} else {
$r->print(''.&mt('Users with Roles Assigned by').' '.
&Apache::loncommon::plainname($env{'user.name'},
@@ -201,28 +203,35 @@ ENDSCRIPT
$r->print($filtermsg);
$r->print('
'.&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().
- '
'.
- ' | '.
- ''.$uname.' | '.$udom.
- ' | '.
- &Apache::loncommon::aboutmewrapper(
- $fullname,
- $uname,$udom).' | | '.
- &Apache::lonnet::plaintext($urole).
- ' | '.
- &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().
+ ''.
+ ' | '.
+ ''.$uname.' | '.
+ ''.$udom.' | '.
+ &Apache::loncommon::aboutmewrapper($users{$user}{'fullname'},
+ $uname,$udom).' | '.
+ ''.
+ join(', ',sort(map {&Apache::lonnet::plaintext($_)}
+ (@{$users{$user}{'roles'}}))).
+ ' | '.
+ &Apache::loncommon::end_data_table_row());
}
$r->print(&Apache::loncommon::end_data_table().'');
}