--- loncom/homework/bridgetask.pm 2005/09/29 19:15:47 1.54
+++ loncom/homework/bridgetask.pm 2005/10/01 02:06:06 1.58
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.54 2005/09/29 19:15:47 albertel Exp $
+# $Id: bridgetask.pm,v 1.58 2005/10/01 02:06:06 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -367,10 +367,10 @@ sub start_Task {
$result.="$head_tag_start
$name
$body_tag_start \n".&style();
- $result.=$form_tag_start.
- '';
$result.=&preserve_grade_info();
$result.=&internal_location();
+ $result.=$form_tag_start.
+ '';
&Apache::lonxml::startredirection();
}
} elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
@@ -564,22 +564,24 @@ sub end_Task {
"";
$result.=&Apache::inputtags::gradestatus('0');
}
- if (&show_task($status,$previous)) {
+ if (&show_task($status,$previous) &&
+ $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {
my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};
my $title=&Apache::lonnet::gettitle();
my %slot=&Apache::lonnet::get_slot($Apache::inputtags::slot_name);
- my $description=&Apache::slotrequest::get_description($Apache::inputtags::slot_name,\%slot);
+ my $start_time=
+ &Apache::lonlocal::locallocaltime($slot{'starttime'});
my $status;
$status.="\n\n";
if ($bt_status eq 'pass') {
$status.='
You passed the '.$title.' given on '.
- $description.'.
';
+ $start_time.'.';
}
if ($bt_status eq 'fail') {
$status.='You did not pass the '.$title.' given on '.
- $description.'.
';
+ $start_time.'.';
if (!$previous) {
$status.=&add_request_another_attempt_button();
}
@@ -833,6 +835,11 @@ sub check_queue_for_key {
if (defined($results{"$todo\0locked"})) {
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 undef;
@@ -1117,14 +1124,25 @@ sub select_user {
my ($uname,$udom) = split(/:/,$student);
my %status = &get_student_status($symb,$cid,$udom,$uname);
my $queue = 'none';
- if ($status{'reviewqueue'} eq 'enqueued') {
+ my $cannot_grade;
+ if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) {
$queue = 'reviewqueue';
- } elsif ($status{'gradingqueue'} eq 'enqueued') {
+ if ($status{'reviewqueue'} eq 'in_progress') {
+ $cannot_grade=1;
+ }
+ } elsif ($status{'gradingqueue'} =~ /^(in_progress|enqueue)$/) {
$queue = 'gradingqueue';
+ if ($status{'gradingqueue'} eq 'in_progress') {
+ $cannot_grade=1;
+ }
}
my $todo =
&Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
- $result.=< | '.$fullname->{$student}.
+ ' | ';
+ } else {
+ $result.=<
| |