--- loncom/interface/lonpickstudent.pm 2003/05/10 23:01:56 1.5 +++ 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.5 2003/05/10 23:01:56 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,21 +49,23 @@ sub handler { ENDDOCUMENT -# Is this even in a course? - unless ($ENV{'request.course.id'}) { - $r->print('Not in a course'); - return OK; - } - - unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { - $r->print('No course listing'); - 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('No context.'); + return OK; + } + +# See if filter present + my $filter=$ENV{'form.filter'}; $filter=~s/\W//g; unless ($filter) { $filter='.'; } @@ -86,9 +89,12 @@ function gochoose(uname,udom) { ENDSCRIPT - $r->print('

'.$ENV{'course.'.$ENV{'request.course.id'}.'.description'}. - '

'); + $r->print(''); + if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) && + (!$ENV{'form.roles'})) { # -------------------------------------------------------- Get course personnel + $r->print('

'.$ENV{'course.'.$ENV{'request.course.id'}.'.description'}. + '

'); my %coursepersonnel= &Apache::lonnet::get_course_adv_roles(); $r->print(''); @@ -105,9 +111,9 @@ ENDSCRIPT } $r->print('

 '); if ($filter ne '.') { - $r->print('
Name starting with "'.$filter.'"
'); + $r->print('
'.&mt('Name starting with').' "'.$filter.'"
'); } - $r->print('

'); + $r->print('

'); # ------------------------------------------------------------------ Students foreach (sort keys %$classlist) { # the following undefs are for 'domain', and 'username' respectively. @@ -118,9 +124,9 @@ ENDSCRIPT if (($uname=~/^$filter/) || ($fullname=~/^$filter/i)) { $r->print(''. - '
'. - ''.$uname.''.$udom. + ''.$uname.' '.$udom. ''. &Apache::loncommon::aboutmewrapper( $fullname, @@ -130,8 +136,39 @@ ENDSCRIPT } } - $r->print('
'); - return OK; + $r->print('

'); + } else { + $r->print('

'.&mt('Users with Roles Assigned by').' '. + &Apache::loncommon::plainname($ENV{'user.name'}, + $ENV{'user.domain'}).'

'); + if ($filter ne '.') { + $r->print('
'.&mt('Name starting with').' "'.$filter.'"
'); + } + $r->print('

'); + 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(''. + ''); + } + } + } + $r->print('
'. + ''.$uname.''.$udom. + ''. + &Apache::loncommon::aboutmewrapper( + $fullname, + $uname,$udom).''. + &Apache::lonnet::plaintext($urole). + '

'); + } + $r->print(''); + return OK; } 1;