--- loncom/homework/bridgetask.pm 2005/10/01 02:06:06 1.58
+++ 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.58 2005/10/01 02:06:06 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.=' "; }
$result.="
resource
user
type
data
";
foreach my $key (sort(keys(%queue))) {
+ my ($symb,$uname,$udom) = &decode_queue_key($key);
+ if (!defined($classlist->{$uname.':'.$udom})) { next; }
if ($key=~/locked$/ && !$with_selects) {
- my ($symb,$uname,$udom) = &decode_queue_key($key);
my $title=&Apache::lonnet::gettitle($symb);
$result.="
$title
$uname
";
$result.='
lock
'.$queue{$key}.'
';
@@ -884,7 +909,6 @@ sub show_queue {
$result.='
";
} elsif ($key!~/(timestamp|locked)$/) {
- my ($symb,$uname,$udom) = &decode_queue_key($key);
my $title=&Apache::lonnet::gettitle($symb);
$result.="
";
my $slot=$queue{$key}->[0];
@@ -1116,12 +1140,15 @@ sub select_user {
my ($symb,$cid)=&Apache::lonxml::whichuser();
my $result.='
';
+ my @chosen_sections=
+ &Apache::loncommon::get_env_multiple('form.chosensections');
&Apache::grades::init_perm();
- my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all',);
+ my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
&Apache::grades::reset_perm();
foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
my ($uname,$udom) = split(/:/,$student);
+
my %status = &get_student_status($symb,$cid,$udom,$uname);
my $queue = 'none';
my $cannot_grade;