version 1.57, 2005/09/30 20:34:53
|
version 1.58, 2005/10/01 02:06:06
|
Line 835 sub check_queue_for_key {
|
Line 835 sub check_queue_for_key {
|
if (defined($results{"$todo\0locked"})) { |
if (defined($results{"$todo\0locked"})) { |
return 'locked'; |
return 'locked'; |
} |
} |
|
my $slot=$results{$todo}->[0]; |
|
my %slot_data=&Apache::lonnet::get_slot($slot); |
|
if ($slot_data{'endtime'} > time) { |
|
return 'in_progress'; |
|
} |
return 'enqueued'; |
return 'enqueued'; |
} |
} |
return undef; |
return undef; |
Line 1119 sub select_user {
|
Line 1124 sub select_user {
|
my ($uname,$udom) = split(/:/,$student); |
my ($uname,$udom) = split(/:/,$student); |
my %status = &get_student_status($symb,$cid,$udom,$uname); |
my %status = &get_student_status($symb,$cid,$udom,$uname); |
my $queue = 'none'; |
my $queue = 'none'; |
if ($status{'reviewqueue'} eq 'enqueued') { |
my $cannot_grade; |
|
if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) { |
$queue = 'reviewqueue'; |
$queue = 'reviewqueue'; |
} elsif ($status{'gradingqueue'} eq 'enqueued') { |
if ($status{'reviewqueue'} eq 'in_progress') { |
|
$cannot_grade=1; |
|
} |
|
} elsif ($status{'gradingqueue'} =~ /^(in_progress|enqueue)$/) { |
$queue = 'gradingqueue'; |
$queue = 'gradingqueue'; |
|
if ($status{'gradingqueue'} eq 'in_progress') { |
|
$cannot_grade=1; |
|
} |
} |
} |
my $todo = |
my $todo = |
&Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname)); |
&Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname)); |
$result.=<<RESULT; |
if ($cannot_grade) { |
|
$result.='<tr><td> </td><td>'.$fullname->{$student}. |
|
'</td><td>'; |
|
} else { |
|
$result.=<<RESULT; |
<tr> |
<tr> |
<td> |
<td> |
<form method="POST"> |
<form method="POST"> |
Line 1139 sub select_user {
|
Line 1155 sub select_user {
|
<td>$fullname->{$student}</td> |
<td>$fullname->{$student}</td> |
<td> |
<td> |
RESULT |
RESULT |
|
} |
if ($status{'status'} eq 'pass') { |
if ($status{'status'} eq 'pass') { |
$result .= '<font color="green">'.&mt('Passed').'</font>'; |
$result .= '<font color="green">'.&mt('Passed').'</font>'; |
} elsif ($status{'status'} eq 'fail') { |
} elsif ($status{'status'} eq 'fail') { |
Line 1161 RESULT
|
Line 1177 RESULT
|
$result .= &mt('Awaiting Review'); |
$result .= &mt('Awaiting Review'); |
} elsif ($status{'reviewqueue'} eq 'locked') { |
} elsif ($status{'reviewqueue'} eq 'locked') { |
$result .= &mt('Under Review'); |
$result .= &mt('Under Review'); |
|
} elsif ($status{'reviewqueue'} eq 'in_progress') { |
|
$result .= &mt('Still being worked on.'); |
} elsif ($status{'gradingqueue'} eq 'enqueued') { |
} elsif ($status{'gradingqueue'} eq 'enqueued') { |
$result .= &mt('Awaiting Grading'); |
$result .= &mt('Awaiting Grading'); |
} elsif ($status{'gradingqueue'} eq 'locked') { |
} elsif ($status{'gradingqueue'} eq 'locked') { |
$result .= &mt('Being Graded'); |
$result .= &mt('Being Graded'); |
|
} elsif ($status{'gradingqueue'} eq 'in_progress') { |
|
$result .= &mt('Still being worked on.'); |
} else { |
} else { |
$result.=" "; |
$result.=" "; |
} |
} |