--- loncom/homework/bridgetask.pm	2005/05/19 21:22:44	1.25
+++ loncom/homework/bridgetask.pm	2005/05/20 18:07:29	1.27
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.25 2005/05/19 21:22:44 albertel Exp $
+# $Id: bridgetask.pm,v 1.27 2005/05/20 18:07:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,7 +71,7 @@ sub proctor_check_auth {
 	    if ($authhost ne 'no_host') {
 		my $version=
 		    $Apache::lonhomework::results{'resource.version'}=
-		    $Apache::lonhomework::history{'resource.version'}++;
+		    ++$Apache::lonhomework::history{'resource.version'};
 		$Apache::lonhomework::results{"resource.$version.checkedin"}=
 		    $user.'@'.$domain;
 		$Apache::lonhomework::results{"resource.$version.checkedin.slot"}=
@@ -271,8 +271,7 @@ sub end_Task {
 	    if ($target eq 'web') {
 		if ($status eq 'CAN_ANSWER') {
 		    $result.="\n".'<table border="1">'.
-			&Apache::inputtags::file_selector($version,
-							  "bridgetask","*",
+			&Apache::inputtags::file_selector('0',"bridgetask","*",
 							  'portfolioonly').
 							  "</table>";
 		    $result.=&Apache::inputtags::gradestatus('0');
@@ -347,15 +346,15 @@ sub end_Task {
 		$Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
 		&remove_from_queue();
 	    }
-	    $Apache::lonhomework::results{'resource.status'}=
-		$Apache::lonhomework::results{'resource.$version.status'};
-	    if (defined($Apache::lonhomework::results{'resource.$version.awarded'})) {
-		$Apache::lonhomework::results{'resource.0.award'}=
-		    $Apache::lonhomework::results{'resource.$version.award'};
-		$Apache::lonhomework::results{'resource.0.awarded'}=
-		    $Apache::lonhomework::results{'resource.$version.awarded'};
-		$Apache::lonhomework::results{'resource.0.solved'}=
-		    $Apache::lonhomework::results{'resource.$version.solved'};
+	    $Apache::lonhomework::results{"resource.status"}=
+		$Apache::lonhomework::results{"resource.$version.status"};
+	    if (defined($Apache::lonhomework::results{"resource.$version.awarded"})) {
+		$Apache::lonhomework::results{"resource.0.award"}=
+		    $Apache::lonhomework::results{"resource.$version.award"};
+		$Apache::lonhomework::results{"resource.0.awarded"}=
+		    $Apache::lonhomework::results{"resource.$version.awarded"};
+		$Apache::lonhomework::results{"resource.0.solved"}=
+		    $Apache::lonhomework::results{"resource.$version.solved"};
 	    }
 	    &Apache::structuretags::finalize_storage();
 	}
@@ -388,7 +387,12 @@ sub check_queue_unlock {
 }
 
 sub remove_from_queue {
-    &Apache::lonxml::debug("Want to remove. Done?");
+    my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+    my $cnum=$env{'course.'.$cid.'.num'};
+    my $cdom=$env{'course.'.$cid.'.domain'};
+    my $key="$symb\0queue\0$uname\@$udom";
+    my @keys=($key,"$key\0locked");
+    &Apache::lonnet::del('gradingqueue',\@keys,$cdom,$cnum);
 }
 
 sub setup_env_for_other_user {
@@ -417,27 +421,27 @@ sub show_queue {
     my $cdom=$env{'course.'.$cid.'.domain'};
     my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);
-    $result.="\n<h3>Current Queue</h3><table><tr><th>resource</th>".
+    $result.="\n<h3>Current Queue</h3><table border='1'><tr><th>resource</th>".
 	"<th>user</th><th>type</th><th>data</th></tr>";
     foreach my $key (sort(keys(%queue))) {
 	if ($key=~/locked$/) {
 	    my ($symb,$uname,$udom) = &decode_queue_key($key);
 	    my $title=&Apache::lonnet::gettitle($symb);
-	    $result.="<tr><td>$title</td><td>$uname</td><td>";
+	    $result.="<tr><td>$title</td><td>$uname</td>";
 	    $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
 	} elsif ($key=~/timestamp$/) {
 	    my ($symb,undef) = split("\0",$key);
 	    my $title=&Apache::lonnet::gettitle($symb);
-	    $result.="<tr><td>$title</td><td></td><td>";
+	    $result.="<tr><td>$title</td><td></td>";
 	    $result.='<td>last queue modification time</td><td>'.
 		&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
 	} else {
 	    my ($symb,$uname,$udom) = &decode_queue_key($key);
 	    my $title=&Apache::lonnet::gettitle($symb);
-	    $result.="<tr><td>$title</td><td>$uname</td><td>";
+	    $result.="<tr><td>$title</td><td>$uname</td>";
 	    my $slot=$queue{$key}->[0];
 	    my %slot_data=&Apache::lonnet::get_slot($slot);
-	    $result.='<td>queue entry</td><td>End time: '.
+	    $result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '.
 		&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
 		"</td></tr>";
 	}
@@ -638,8 +642,8 @@ sub get_instance {
 	my $version=&get_version();
 	if ($target eq 'web') {
 	    $result=$dimension{'intro'}.$dimension{$instance.'.text'};
-	    if ($Apache::lonhomework::history{'resource.$version.status'} eq 'pass' ||
-		$Apache::lonhomework::history{'resource.$version.status'} eq 'fail') {
+	    if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||
+		$Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
 		foreach my $id (@{$dimension{$instance.'.criterias'}}) {
 		    my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
 		    my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};