--- loncom/homework/bridgetask.pm	2005/08/09 07:34:51	1.38
+++ loncom/homework/bridgetask.pm	2005/09/07 22:20:33	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.38 2005/08/09 07:34:51 albertel Exp $
+# $Id: bridgetask.pm,v 1.44 2005/09/07 22:20:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -147,9 +147,7 @@ sub add_grading_button {
     my $result=' <input type="submit" name="gradeasubmission" value="'.
 	&mt("Get a submission to grade").'" />';
     $result.='<input type="hidden" name="grade_target" value="webgrade" />';
-    if ( 1) {
-	#need a permissions for limitng this to 'powerful users'
-
+    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
 	my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
 	$result.='<p>'.&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);
 
@@ -225,13 +223,14 @@ sub start_Task {
 	    if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
 	    $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
 	    my $symb=&Apache::lonnet::symbread();
-	    $body_tag_start.='<form method="POST" action="/adm/slotrequest">'.
-		'<input type="hidden" name="symb" value="'.$symb.'" />'.
-		'<input type="hidden" name="command" value="showslots" />'.
-		'<input type="submit" name="requestattempt" value="'.
-		&mt('Show Slot list').'" />'.
-		'</form>';
-
+	    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
+		$body_tag_start.='<form method="POST" action="/adm/slotrequest">'.
+		    '<input type="hidden" name="symb" value="'.$symb.'" />'.
+		    '<input type="hidden" name="command" value="showslots" />'.
+		    '<input type="submit" name="requestattempt" value="'.
+		    &mt('Show Slot list').'" />'.
+		    '</form>';
+	    }
 	}
     }
     if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
@@ -284,14 +283,7 @@ sub start_Task {
 		}
 	    } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {
 		if ($status eq 'NEEDS_CHECKIN') {
-		    if (&proctor_check_auth($slot_name,$slot)) {
-			#FIXME immeadiatly add this to the grading queue
-                        #      with slot->{'endtime'} for when grading can 
-                        #      begin on this resource
-			# FIXME I think the above is done by default,
-                        #        need to check that
-                        #        failure doesn't do this.
- 		    }
+		    &proctor_check_auth($slot_name,$slot);
 		}
 	    }
 	} elsif ($target eq 'web') {
@@ -539,7 +531,6 @@ sub end_Task {
 		}
 	    } elsif ($ungraded) {
 		$Apache::lonhomework::results{"resource.$version.status"}='ungraded';
-		# FIXME if in review queue need to move back to grading queue
 		if ($env{'form.queue'} eq 'reviewqueue') {
 		    &Apache::lonxml::debug("moving back.");
 		    &move_between_queues('reviewqueue','gradingqueue');
@@ -551,13 +542,31 @@ sub end_Task {
 		$Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';
 		$Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';
 		$Apache::lonhomework::results{"resource.$version.0.awarded"}='0';
-		&remove_from_queue($env{'form.queue'});
+		&remove_from_queue($env{'form.queue'}); 
+
+		my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+		$Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
+		    $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
+		&Apache::grades::version_portfiles(
+					\%Apache::lonhomework::results,
+					 ["$version.0.bridgetask"],$courseid,
+					 $symb,$udom,$uname,
+					 ["$version.0.bridgetask"]);
 	    } else {
 		$Apache::lonhomework::results{"resource.$version.status"}='pass';
 		$Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
 		$Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';
 		$Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
 		&remove_from_queue($env{'form.queue'});
+
+		my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+		$Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
+		    $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
+		&Apache::grades::version_portfiles(
+					\%Apache::lonhomework::results,
+					 ["$version.0.bridgetask"],$courseid,
+					 $symb,$udom,$uname,
+					 ["$version.0.bridgetask"]);
 	    }
 	    $Apache::lonhomework::results{"resource.status"}=
 		$Apache::lonhomework::results{"resource.$version.status"};
@@ -1027,7 +1036,7 @@ sub get_instance {
 		$result.='<tr><td colspan="4">';
 		my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
 		my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
-		foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.bridgetask.portfiles"})) {
+		foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
 		    my $file=$file_url.$partial_file;
 		    &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
 		    $result.='<a href="'.$file.'" target="lonGRDs"><img src="'.
@@ -1161,7 +1170,8 @@ sub proctor_validation_screen {
     my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
     my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
-    $user=$env{'form.proctorname'};
+    my $name=&Apache::loncommon::plainname($user,$domain);
+    
     if ($env{'form.proctordomain'}) { $domain=$env{'form.proctordomain'}; }
     my $msg;
     if ($env{'form.proctorpassword'}) {
@@ -1176,13 +1186,22 @@ sub proctor_validation_screen {
 <input type="hidden" name="validate" value="yes" />
 <input type="hidden" name="submitted" value="yes" />
 <table>
-  <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$user" /></td></tr>
+  <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>
   <tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
   <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$domain" /></td></tr>
 </table>
 <input type="submit" name="checkoutbutton" value="Validate"  /><br />
-Student who should be logged in is:<br />
-<img src="$url" /><br />
+<table border="1">
+  <tr><td>
+    <table>
+      <tr><td colspan="2">Student who should be logged in is:</td></tr>
+      <tr><td>Name:</td><td>$name</td></tr>
+      <tr><td>Studnet ID:</td><td>$env{'environment.id'}</td></tr>
+      <tr><td>Usename</td><td>$user\@$domain</td></tr>
+      <tr><td colspan="2"><img src="$url" /></td></tr>
+    </table>
+  </tr></td>
+</table>
 </form>
 ENDCHECKOUT
     return $result;