--- loncom/homework/bridgetask.pm 2006/05/25 19:55:10 1.156 +++ loncom/homework/bridgetask.pm 2006/05/25 20:08:18 1.157 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.156 2006/05/25 19:55:10 albertel Exp $ +# $Id: bridgetask.pm,v 1.157 2006/05/25 20:08:18 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1202,8 +1202,14 @@ sub get_limited_classlist { my ($sections) = @_; my $classlist = &Apache::loncoursedata::get_classlist(); + foreach my $student (keys(%$classlist)) { + if ( $classlist->{$student}[&Apache::loncoursedata::CL_STATUS()] + ne 'Active') { + delete($classlist->{$student}); + } + } - if (!grep('all',@{ $sections })) { + if (ref($sections) && !grep('all',@{ $sections })) { foreach my $student (keys(%$classlist)) { my $section = $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()]; @@ -1341,7 +1347,7 @@ sub get_queue_counts { my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; - my $classlist=&Apache::loncoursedata::get_classlist(); + my $classlist=&get_limited_classlist(); my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); @@ -1526,7 +1532,7 @@ sub get_queue_symb_status { $cnum=$env{'course.'.$cid.'.num'}; $cdom=$env{'course.'.$cid.'.domain'}; } - my $classlist=&Apache::loncoursedata::get_classlist(); + my $classlist=&get_limited_classlist(); my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); @@ -1554,7 +1560,7 @@ sub get_from_queue { if ($todo) { return $todo; } my $attempts=0; - my $classlist=&Apache::loncoursedata::get_classlist(); + my $classlist=&get_limited_classlist(); while (1) { if ($attempts > 2) {