--- loncom/interface/lonpickstudent.pm 2006/01/09 20:38:52 1.10 +++ loncom/interface/lonpickstudent.pm 2006/03/16 22:01:44 1.15 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a student from the classlist # -# $Id: lonpickstudent.pm,v 1.10 2006/01/09 20:38:52 albertel Exp $ +# $Id: lonpickstudent.pm,v 1.15 2006/03/16 22:01:44 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,15 +42,8 @@ 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 @@ -67,7 +60,8 @@ ENDDOCUMENT unless (($env{'form.roles'}) || (($env{'request.course.id'}) && ($allowed))) { - $r->print('No context.'); + $r->print(&mt('No context.'). + &Apache::loncommon::end_page()); return OK; } @@ -77,11 +71,16 @@ ENDDOCUMENT $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; + &Apache::loncommon::coursegroups(\%allgroups,$cdom,$cnum); + # --------------------------------------- There is such a user, get environment - $r->print(&Apache::loncommon::bodytag("Selecting a User")); $r->print(< function gochoose(uname,udom) { @@ -119,7 +118,7 @@ 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. @@ -132,6 +131,16 @@ ENDSCRIPT 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/,$//; $r->print(''. @@ -140,7 +149,7 @@ ENDSCRIPT &Apache::loncommon::aboutmewrapper( $fullname, $uname,$udom).''); + ''); } } } @@ -176,7 +185,7 @@ ENDSCRIPT } $r->print('
 usernamedomainNameIDsectionactive group(s)
'. ''.$id.''.$section. - '
'.$grouplist.'

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