--- loncom/homework/bridgetask.pm	2005/10/04 19:41:02	1.67
+++ loncom/homework/bridgetask.pm	2005/10/14 20:00:23	1.72
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.67 2005/10/04 19:41:02 albertel Exp $
+# $Id: bridgetask.pm,v 1.72 2005/10/14 20:00:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,8 +68,18 @@ sub proctor_check_auth {
     foreach my $possible (@allowed) {
 	my ($puser,$pdom)=(split('@',$possible));
 	if ($puser eq $user && $pdom eq $domain) {
-	    my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
-	    if ($authhost ne 'no_host') {
+	    my $authenticated=0;
+	    if ( $slot->{'secret'} =~ /\S/ &&
+		 $env{'form.proctorpassword'} eq $slot->{'secret'} ) {
+		$authenticated=1;
+	    } else {
+		
+		my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
+		if ($authhost ne 'no_host') {
+		    $authenticated=1;
+		}
+	    }
+	    if ($authenticated) {
 		my $version=
 		    $Apache::lonhomework::results{'resource.version'}=
 		    ++$Apache::lonhomework::history{'resource.version'};
@@ -317,8 +327,8 @@ sub submission_time_stamp {
 	my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.checkedin.slot'};
 	my %slot=&Apache::lonnet::get_slot($slot_name);
 	my $diff = $slot{'endtime'} - $submissiontime;
-	my ($color,$when)=('red','after');
-	if ($diff > 0) { ($color,$when)=('green','before'); }
+	my ($color,$when)=('#FF6666','after');
+	if ($diff > 0) { ($color,$when)=('#336600','before'); }
 	my $info;
 	if ($diff%60) { $info=($diff%60).' seconds'; }
 	$diff=int($diff/60);
@@ -335,11 +345,41 @@ sub submission_time_stamp {
     return $result;
 }
 
+sub webgrade_standard_info {
+    my ($version)=&get_version();
+    my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
+    my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
+    my $file_list="<ul>\n";
+    foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
+	my $file=$file_url.$partial_file;
+	$file=~s|/+|/|g;
+	&Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
+	$file_list.='<li><nobr><a href="'.$file.'" target="lonGRDs"><img src="'.
+	    &Apache::loncommon::icon($file).'" border=0"> '.$file.
+	    '</a></nobr></li>'."\n";
+    }
+    $file_list.="</ul>\n";
+
+    my %lt=&Apache::lonlocal::texthash('done' => 'Done',
+				       'stop' => 'Stop',
+				       );
+				       
+    my $result=<<INFO;
+<div class="handininfo">
+  <input type="submit" name="next" value="$lt{'done'}" />
+  <input type="submit" name="stop" value="$lt{'stop'}" />
+  $file_list
+</div>
+INFO
+    return $result;
+}
+
 sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
     my ($status,$accessmsg,$slot);
     if ($target ne 'webgrade') {
+	&Apache::structuretags::init_problem_globals('Task');
 	&Apache::structuretags::initialize_storage();
 	&Apache::lonhomework::showhash(%Apache::lonhomework::history);
     } 
@@ -511,6 +551,7 @@ DONESCREEN
                                value="'.$sec.'" />';
 		}
 	    }
+	    if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
 	}
     } else {
 	# page_start returned a starting result, delete it if we don't need it
@@ -618,10 +659,7 @@ sub end_Task {
     my ($version,$previous)=&get_version();
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex') {
-	if (
-	    (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
-	    ($target eq 'answer') || ($target eq 'tex')
-	   ) {
+	if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') {
 	    if ($target eq 'web') {
 		if (&show_task($status,$previous)) {
 		    $result.=&Apache::lonxml::endredirection();
@@ -827,9 +865,14 @@ DONEBUTTON
 	#    &mt('Save Partial Grade and Continue Grading').'" /> ';
 	$result.='</form>'.&Apache::loncommon::endbodytag().'</html>';
     } elsif ($target eq 'meta') {
-	$result.='<parameter part="0" package="Task"></parameter>'."\n";
-	#$result.=&Apache::response::meta_part_order();
-	#$result.=&Apache::response::meta_response_order();
+	$result.=&Apache::response::meta_package_write('Task');
+        $result.=&meta_stores_write('solved','string','Problem Status');
+	$result.=&meta_stores_write('tries','int_zeropos',
+				    'Number of Attempts');
+	$result.=&meta_stores_write('awarded','float',
+				    'Partial Credit Factor');
+	$result.=&meta_stores_write('status','string',
+				    'Bridge Task Status');
     }
     undef($Apache::lonhomework::parsing_a_task);
     return $result;
@@ -1089,6 +1132,8 @@ sub queue_key_locked {
 sub pick_from_queue_data {
     my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
     foreach my $key (keys(%$queuedata)) {
+	if ($key =~ /\0locked$/) { next; }
+	if ($key =~ /\0timestamp$/) { next; }
 	my ($symb,$uname,$udom)=&decode_queue_key($key);
 	if ($check_section) {
 	    my $section=&Apache::lonnet::getsection($uname,$udom);
@@ -1486,23 +1531,7 @@ sub get_instance {
 		    '<td>'.
 		    '<a href="#'.$last_link.'">Prev</a><br />'.
 		    '<a href="#next_'.$link.'">Next</a><br /><br /><br />'.
-		    '<input type="submit" name="next" value="'.
-		    &mt('Done').'" /> '.
-		    '<input type="submit" name="stop" value="'.
-		    &mt('Stop').'" /> '.
 		    '</td></tr>';
-		$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.0.bridgetask.portfiles"})) {
-		    my $file=$file_url.$partial_file;
-		    $file=~s|/+|/|g;
-		    &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
-		    $result.='<nobr><a href="'.$file.'" target="lonGRDs"><img src="'.
-			&Apache::loncommon::icon($file).'" border=0"> '.$file.
-			'</a></nobr> ';
-		}
-		$result.='</td></tr>';
 		$last_link=$link;
 	    }
 	} elsif ($target eq 'grade' && $env{'form.webgrade'}) {
@@ -1543,6 +1572,9 @@ sub get_instance {
 		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
 		    'pass';
 	    }
+	} else {
+	    # any other targets no output
+	    undef($result);
 	}
 	return $result;
     }