--- loncom/interface/lonpickstudent.pm 2006/03/15 22:11:04 1.11
+++ loncom/interface/lonpickstudent.pm 2006/03/16 21:15:16 1.12
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Pick a student from the classlist
#
-# $Id: lonpickstudent.pm,v 1.11 2006/03/15 22:11:04 albertel Exp $
+# $Id: lonpickstudent.pm,v 1.12 2006/03/16 21:15:16 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -70,8 +70,17 @@ sub handler {
$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(<
'.&mt('Name starting with').' "'.$filter.'"
');
}
- $r->print('
username | domain | Name | ID | section | active group(s) | '); # ------------------------------------------------------------------ Students foreach (sort keys %$classlist) { # the following undefs are for 'domain', and 'username' respectively. @@ -124,6 +133,16 @@ ENDSCRIPT 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 +151,7 @@ ENDSCRIPT &Apache::loncommon::aboutmewrapper( $fullname, $uname,$udom).''.$id.' | '.$section. - ' | '.$grouplist.' | '); } } }