--- loncom/interface/lonpickstudent.pm 2005/02/17 08:29:43 1.8 +++ loncom/interface/lonpickstudent.pm 2006/03/16 21:34:04 1.13 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a student from the classlist # -# $Id: lonpickstudent.pm,v 1.8 2005/02/17 08:29:43 albertel Exp $ +# $Id: lonpickstudent.pm,v 1.13 2006/03/16 21:34:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,45 +42,53 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------ Print the screen - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA - -ENDDOCUMENT - - + $r->print(&Apache::loncommon::start_page("Selecting a User",undef, + {'no_nav_bar' => 1})); &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['filter','form','unameelement','udomelement', 'roles']); # Allowed? + my $allowed; + my $scope = $env{'request.course.id'}; + if (!($allowed = &Apache::lonnet::allowed('srm',$scope))) { + $scope .= '/'.$env{'request.course.sec'}; + $allowed = &Apache::lonnet::allowed('srm',$scope); + if ($allowed) { $allowed = 'section'; } + } - unless (($ENV{'form.roles'}) || - (($ENV{'request.course.id'}) && - (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})))) { - $r->print('No context.'); + unless (($env{'form.roles'}) || + (($env{'request.course.id'}) && ($allowed))) { + $r->print(&mt('No context.'). + &Apache::loncommon::end_page()); return OK; } # See if filter present - my $filter=$ENV{'form.filter'}; + my $filter=$env{'form.filter'}; $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; + my @coursegroups = (); + if (&Apache::loncommon::coursegroups(\%allgroups,$cdom,$cnum)) { + @coursegroups = keys(%allgroups); + } + # --------------------------------------- There is such a user, get environment - $r->print(&Apache::loncommon::bodytag("Selecting a User")); $r->print(< function gochoose(uname,udom) { - opener.document.$ENV{'form.form'}.$ENV{'form.unameelement'}.value=uname; - var slct=opener.document.$ENV{'form.form'}.$ENV{'form.udomelement'}; + opener.document.$env{'form.form'}.$env{'form.unameelement'}.value=uname; + var slct=opener.document.$env{'form.form'}.$env{'form.udomelement'}; var i; for (i=0;iprint('
'); - if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) && - (!$ENV{'form.roles'})) { + if ($allowed && (!$env{'form.roles'})) { # -------------------------------------------------------- Get course personnel - $r->print('

'.$ENV{'course.'.$ENV{'request.course.id'}.'.description'}. + $r->print('

'.$env{'course.'.$env{'request.course.id'}.'.description'}. '

'); my %coursepersonnel= &Apache::lonnet::get_course_adv_roles(); @@ -114,16 +121,29 @@ ENDSCRIPT if ($filter ne '.') { $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. my (undef,undef,$end,$start,$id,$section,$fullname,$status)= @{$classlist->{$_}}; + if ($allowed eq 'section' && $section ne $env{'request.course.sec'}) { + next; + } if ($_=~/^(\w+)\:(\w+)$/) { my ($uname,$udom)=($1,$2); if (($uname=~/^$filter/) || ($fullname=~/^$filter/i)) { + my $grouplist = ''; + foreach my $group (@coursegroups) { + 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(''. @@ -132,7 +152,7 @@ ENDSCRIPT &Apache::loncommon::aboutmewrapper( $fullname, $uname,$udom).''); + ''); } } } @@ -140,8 +160,8 @@ ENDSCRIPT $r->print('
 usernamedomainNameIDsectionactive group(s)
'. ''.$id.''.$section. - '
'.$grouplist.'

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

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

'); + &Apache::loncommon::plainname($env{'user.name'}, + $env{'user.domain'}).''); if ($filter ne '.') { $r->print('
'.&mt('Name starting with').' "'.$filter.'"
'); } @@ -168,7 +188,7 @@ ENDSCRIPT } $r->print('

'); } - $r->print('
'); + $r->print(''.&Apache::loncommon::end_page()); return OK; }