--- loncom/homework/bridgetask.pm	2005/09/29 19:18:37	1.55
+++ 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.55 2005/09/29 19:18:37 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<title>$name</title></head>
               $body_tag_start \n".&style();
 	    
-	    $result.=$form_tag_start.
-		'<input type="hidden" name="submitted" value="yes" />';
 	    $result.=&preserve_grade_info();
 	    $result.=&internal_location();
+	    $result.=$form_tag_start.
+		'<input type="hidden" name="submitted" value="yes" />';
 	    &Apache::lonxml::startredirection();
 	}
     } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
@@ -564,7 +564,8 @@ sub end_Task {
 							  "</table>";
 		    $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);
@@ -834,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;
@@ -1118,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.=<<RESULT;
+	if ($cannot_grade) {
+	    $result.='<tr><td>&nbsp;</td><td>'.$fullname->{$student}.
+		'</td><td>';
+	} else {
+	    $result.=<<RESULT;
 <tr>
   <td>
     <form method="POST">
@@ -1138,7 +1155,7 @@ sub select_user {
   <td>$fullname->{$student}</td>
   <td>
 RESULT
-
+        }
         if ($status{'status'} eq 'pass') {
 	    $result .= '<font color="green">'.&mt('Passed').'</font>';
 	} elsif ($status{'status'} eq 'fail') {
@@ -1160,10 +1177,14 @@ RESULT
 	    $result .= &mt('Awaiting Review');
 	} elsif ($status{'reviewqueue'} eq 'locked') {
 	    $result .= &mt('Under Review');
+	} elsif ($status{'reviewqueue'} eq 'in_progress') {
+	    $result .= &mt('Still being worked on.');
 	} elsif ($status{'gradingqueue'} eq 'enqueued') {
 	    $result .= &mt('Awaiting Grading');
 	} elsif ($status{'gradingqueue'} eq 'locked') {
 	    $result .= &mt('Being Graded');
+	} elsif ($status{'gradingqueue'} eq 'in_progress') {
+	    $result .= &mt('Still being worked on.');
 	} else {
 	    $result.="&nbsp;";
 	}