--- loncom/homework/bridgetask.pm 2005/09/30 20:34:53 1.57 +++ loncom/homework/bridgetask.pm 2005/10/01 03:27:44 1.59 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.57 2005/09/30 20:34:53 albertel Exp $ +# $Id: bridgetask.pm,v 1.59 2005/10/01 03:27:44 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -144,11 +144,28 @@ sub add_previous_version_button { } sub add_grading_button { + my (undef,$cid)=&Apache::lonxml::whichuser(); + my $cnum=$env{'course.'.$cid.'.num'}; + my $cdom=$env{'course.'.$cid.'.domain'}; + my %sections; + my $numsections=&Apache::loncommon::get_sections($cdom,$cnum,\%sections); + my $size=5; + if (scalar(keys(%sections)) < 3) { + $size=scalar(keys(%sections))+2; + } + my $sec_select = '\n"; + my $result=' '; $result.=''; if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); + $result.='
Specify a section: '.$sec_select.'
'; $result.=''.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks); $result.=' [0]; + my %slot_data=&Apache::lonnet::get_slot($slot); + if ($slot_data{'endtime'} > time) { + return 'in_progress'; + } return 'enqueued'; } return undef; @@ -857,6 +879,13 @@ sub show_queue { my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; + + my @chosen_sections= + &Apache::loncommon::get_env_multiple('form.chosensections'); + &Apache::grades::init_perm(); + my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,); + &Apache::grades::reset_perm(); + my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); my ($tmp)=%queue; @@ -867,8 +896,9 @@ sub show_queue { if ($with_selects) { $result.="
'.$fullname->{$student}. + ' | ';
+ } else {
+ $result.=<
| |