--- loncom/homework/bridgetask.pm	2005/05/09 21:55:01	1.19
+++ loncom/homework/bridgetask.pm	2005/05/24 19:33:28	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.19 2005/05/09 21:55:01 albertel Exp $
+# $Id: bridgetask.pm,v 1.30 2005/05/24 19:33:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,8 @@ sub initialize_bridgetask {
     $Apache::bridgetask::dimension='';
     # list of all Dimension ids seen
     @Apache::bridgetask::dimensionlist=();
+    # mandatory attribute of all Dimensions seen
+    %Apache::bridgetask::dimensionmandatory=();
     # list of all current Instance ids
     @Apache::bridgetask::instance=();
     # list of all Instance ids seen in this problem
@@ -57,7 +59,7 @@ sub initialize_bridgetask {
 }
 
 sub proctor_check_auth {
-    my ($slot)=@_;
+    my ($slot_name,$slot)=@_;
     my $user=$env{'form.proctorname'};
     my $domain=$env{'form.proctordomain'};
     
@@ -67,8 +69,18 @@ sub proctor_check_auth {
 	if ($puser eq $user && $pdom eq $domain) {
 	    my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
 	    if ($authhost ne 'no_host') {
-		$Apache::lonhomework::results{'resource.checkedin'}=
+		my $version=
+		    $Apache::lonhomework::results{'resource.version'}=
+		    ++$Apache::lonhomework::history{'resource.version'};
+		$Apache::lonhomework::results{"resource.$version.checkedin"}=
 		    $user.'@'.$domain;
+		$Apache::lonhomework::results{"resource.$version.checkedin.slot"}=
+		    $slot_name;
+		foreach my $key (keys(%Apache::lonhomework::history)) {
+		    if ($key=~/^resource\.0\./) {
+			$Apache::lonhomework::results{$key}='';
+		    }
+		}
 		return 1;
 	    }
 	}
@@ -76,22 +88,84 @@ sub proctor_check_auth {
     return 0;
 }
 
+sub get_version {
+    my ($version,$previous);
+    if ($env{'form.previousversion'} && 
+	defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {
+	$version=$env{'form.previousversion'};
+	$previous=1;
+    } else {
+	$version=$Apache::lonhomework::history{'resource.version'};
+	$previous=0;
+    }
+    if (wantarray) {
+	return ($version,$previous);
+    }
+    return $version;
+}
+
 sub add_previous_version_button {
+    my ($status)=@_;
     my $result;
-    $result.=&mt(' Show a previously done version: [_1]','<select name="previousversion">
-<option>Pick one</option>
-</select>');
+    if ($Apache::lonhomework::history{'resource.version'} eq '') {
+	return '';
+    }
+    if ($Apache::lonhomework::history{'resource.version'} < 2 &&
+	$status ne 'NEEDS_CHECKIN') {
+	return '';
+    }
+    my $version=&get_version();
+    if ($env{'form.previousversion'} ne '' &&
+	$env{'form.previousversion'} eq $version) {
+	$result.="<h3>".&mt("Showing previous version [_1]",$version).
+	    "</h3>\n";
+    }
+    my @to_show;
+    foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) {
+	if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) {
+	    push(@to_show,$test_version);
+	}
+    }
+    my $list='<option>'.
+	join("</option>\n<option>",@to_show).
+	     "</option>\n";
+    $result.='<form name="getprevious" method="POST" action="';
+    my $uri=$env{'request.uri'};
+    if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
+    $result.=$uri.'">'.
+	&mt(' Show a previously done version: [_1]','<select onchange="this.form.submit()" name="previousversion">
+<option>'.&mt('Pick one').'</option>
+'.$list.'
+</select>')."</form>";
     return $result;
 }
 
 sub add_grading_button {
-    my $result;
-    $result.=' <input type="submit" name="gradeasubmission" value="'.
+    my $result=' <input type="submit" name="gradeasubmission" value="'.
 	&mt("Get a submission to grade").'" />';
     $result.='<input type="hidden" name="grade_target" value="webgrade" />';
     return $result;
 }
 
+sub add_request_another_attempt_button {
+    my $result;
+    $result.=' <input type="submit" name="requestattempt" value="'.
+	&mt("Request another attempt").'" />';
+    return $result;
+}
+
+sub preserve_grade_info {
+    my $result;
+    # if we are viewing someone else preserve that info
+    if (defined $env{'form.grade_symb'}) {
+	foreach my $field ('symb','courseid','domain','username') {
+	    $result .= '<input type="hidden" name="grade_'.$field.
+		'" value="'.$env{"form.grade_$field"}.'" />'."\n";
+	}
+    }
+    return $result;
+}
+
 sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
@@ -107,7 +181,6 @@ sub start_Task {
 	&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
     
     if ($target eq 'web') {
-	$body_tag_start.=&add_previous_version_button();
 	if ($Apache::lonhomework::modifygrades) {
 	    $body_tag_start.='<form name="gradesubmission" method="POST" action="';
 	    my $uri=$env{'request.uri'};
@@ -115,22 +188,26 @@ sub start_Task {
 	    $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
 	}
     }
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+    if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
 	$target eq 'tex') {
+	my ($version,$previous)=&get_version();
 	($status,$accessmsg,my $slot_name,$slot) = 
 	    &Apache::lonhomework::check_task_access('0');
 	push(@Apache::inputtags::status,$status);
 	$Apache::inputtags::slot_name=$slot_name;
 	my $expression='$external::datestatus="'.$status.'";';
-	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
+	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';
 	&Apache::run::run($expression,$safeeval);
 	&Apache::lonxml::debug("Got $status");
-	if (( $status eq 'CLOSED' ) ||
-	    ( $status eq 'BANNED') ||
-	    ( $status eq 'UNAVAILABLE') ||
-	    ( $status eq 'NOT_IN_A_SLOT') ||
-	    ( $status eq 'NEEDS_CHECKIN') ||
-	    ( $status eq 'INVALID_ACCESS')) {
+	$body_tag_start.=&add_previous_version_button($status);
+	if (!$previous && (
+			   ( $status eq 'CLOSED' ) ||
+			   ( $status eq 'BANNED') ||
+			   ( $status eq 'UNAVAILABLE') ||
+			   ( $status eq 'NOT_IN_A_SLOT') ||
+			   ( $status eq 'NEEDS_CHECKIN') ||
+			   ( $status eq 'WAITING_FOR_GRADE') ||
+			   ( $status eq 'INVALID_ACCESS') )) {
 	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
 	    if ( $target eq "web" ) {
 		$result.= $head_tag_start.'</head>'.$body_tag_start;
@@ -142,6 +219,8 @@ sub start_Task {
 		} elsif ($status eq 'NEEDS_CHECKIN') {
 		    $msg.='<h1>'.&mt('You need the Proctor to validate you.').
 			'</h1>'.&proctor_validation_screen($slot);
+		} elsif ($status eq 'WAITING_FOR_GRADE') {
+		    $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
 		} elsif ($status ne 'NOT_YET_VIEWED') {
 		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
 		}
@@ -156,12 +235,15 @@ sub start_Task {
 		} else {
 		    $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
 		}
-	    } elsif ($target eq 'grade') {
+	    } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {
 		if ($status eq 'NEEDS_CHECKIN') {
-		    if (&proctor_check_auth($slot)) {
+		    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.
  		    }
 		}
 	    }
@@ -170,20 +252,30 @@ sub start_Task {
 	    $result.="$head_tag_start<title>$name</title></head>
               $body_tag_start \n $form_tag_start".	
 	      '<input type="hidden" name="submitted" value="yes" />';
-	    # if we are viewing someone else preserve that info
-	    if (defined $env{'form.grade_symb'}) {
-		foreach my $field ('symb','courseid','domain','username') {
-		    $result .= '<input type="hidden" name="grade_'.$field.
-			'" value="'.$env{"form.grade_$field"}.'" />'."\n";
+	    $result.=&preserve_grade_info();
+	    my ($version,$previous)=&get_version();
+	    if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+		$result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';
+		if (!$previous) {
+		    $result.=&add_request_another_attempt_button();
 		}
 	    }
+	    if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
+		$result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';
+	    }
+	}
+    } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
+	      $target eq 'webgrade') {
+	if ($target eq 'webgrade') {
+	    $result.=$head_tag_start.$body_tag_start.$form_tag_start;
+	    $result.='<input type="hidden" name="webgrade" value="yes" />';
+	    $result.='<br />Before'.&show_queue('gradingqueue');
+	}
+	my $todo;
+	# don't get something new from the queue if they hit the stop button
+	if (!($env{'form.stop'} && $target eq 'webgrade')) {
+	    $todo=&get_from_queue('gradingqueue');
 	}
-    } elsif ($target eq 'webgrade') {
-	$result.=$head_tag_start.$body_tag_start.$form_tag_start;
-	$result.=
-	    '<input type="hidden" name="grade_target" value="webgrade" />';
-	$result.=&show_queue();
-	my $todo=&get_from_queue();
 	if ($todo) {
 	    &setup_env_for_other_user($todo,$safeeval);
 	    my ($symb,$uname,$udom)=&decode_queue_key($todo);
@@ -194,13 +286,22 @@ sub start_Task {
 	    $Apache::bridgetask::queue_key=$todo;
 	    &Apache::structuretags::initialize_storage();
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
-	    $result.="\n".'<table width="100%" style="width:100%" border="1">';
+	    if ($target eq 'webgrade') {
+		$result.='<br />After'.&show_queue('gradingqueue');
+		$result.="\n".'<table width="100%" style="width:100%" border="1">';
+	    }
 	} else {
-	    $result.="\n".
-		'<table><tr><td>No user to be graded.</td></tr></table>';
+	    if ($target eq 'webgrade') {
+		$result.="\n".'<table><tr><td><b>';
+		if ($env{'form.stop'}) {
+		    $result.=&mt("Stopped grading.");
+		} else {
+		    $result.=&mt("No user to be graded.");
+		}
+		$result.='</b></td></tr></table>';
+	    }
 	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
 	}
-	
     } else {
 	# page_start returned a starting result, delete it if we don't need it
 	$result = '';
@@ -212,6 +313,7 @@ sub end_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
     my $status=$Apache::inputtags::status['-1'];
+    my ($version,$previous)=&get_version();
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex') {
 	if (
@@ -219,9 +321,10 @@ sub end_Task {
 	    ($target eq 'answer') || ($target eq 'tex')
 	   ) {
 	    if ($target eq 'web') {
-		if ($status eq 'CAN_ANSWER') {
+		if ($status eq 'CAN_ANSWER' && !$previous) {
 		    $result.="\n".'<table border="1">'.
-			&Apache::inputtags::file_selector('0',"bridgetask","*",
+			&Apache::inputtags::file_selector("$version.0",
+							  "bridgetask","*",
 							  'portfolioonly').
 							  "</table>";
 		    $result.=&Apache::inputtags::gradestatus('0');
@@ -231,29 +334,97 @@ sub end_Task {
 		$result.=&Apache::lonxml::xmlend().'</html>';
 	    }
 	}
-	if ($target eq 'grade') {
+	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
 	    my $award='SUBMITTED';
-	    &Apache::essayresponse::file_submission('0','bridgetask','portfiles',\$award);
+	    &Apache::essayresponse::file_submission("$version.0",'bridgetask',
+						    'portfiles',\$award);
 	    if ($award eq 'SUBMITTED' &&
-		$Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) {
+		$Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}) {
 		$Apache::lonhomework::results{"resource.0.tries"}=
-		    1+$Apache::lonhomework::history{"resource.0.tries"};
+		    $Apache::lonhomework::results{"resource.$version.0.tries"}=
+		    1+$Apache::lonhomework::history{"resource.$version.0.tries"};
+
+		$Apache::lonhomework::results{"resource.0.award"}=
+		    $Apache::lonhomework::results{"resource.$version.0.award"}=
+		    $award;
 	    }
-	    $Apache::lonhomework::results{"resource.0.award"}=$award;
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &Apache::structuretags::finalize_storage();
 	    if ($award eq 'SUBMITTED') {
-		&add_to_queue();
+		&add_to_queue('gradingqueue');
 	    }
 	}
+	if ($target eq 'grade' && $env{'form.webgrade'}) {
+	    my $optional_required=
+		&Apache::lonxml::get_param('OptionalRequired',$parstack,
+					   $safeeval);
+	    my $optional_passed=0;
+	    my $mandatory_failed=0;
+	    my $ungraded=0;
+	    my $review=0;   
+	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
+	    foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
+		my $status=
+		    $Apache::lonhomework::results{"resource.$version.$dim_id.status"};
+		my $mandatory=
+		    ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
+		if ($status eq 'pass') {
+		    if (!$mandatory) { $optional_passed++; }
+		} elsif ($status eq 'fail') {
+		    if ($mandatory) { $mandatory_failed++; }
+		} elsif ($status eq 'ungraded') {
+		    $ungraded++;
+		} elsif ($status eq 'review') {
+		    $review++;
+		}	
+	    }
+	    if ($optional_passed < $optional_required) {
+		$mandatory_failed++;
+	    }
+	    &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
+	    $Apache::lonhomework::results{'resource.grader'}=
+		$env{'user.name'}.'@'.$env{'user.domain'};
+	    if ($review) {
+		$Apache::lonhomework::results{"resource.$version.status"}='review';
+		&move_to_review_queue();
+	    } elsif ($ungraded) {
+		$Apache::lonhomework::results{"resource.$version.status"}='ungraded';
+		&check_queue_unlock('gradingqueue');
+	    } elsif ($mandatory_failed) {
+		$Apache::lonhomework::results{"resource.$version.status"}='fail';
+		$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('gradingqueue');
+	    } 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();
+	    }
+	    $Apache::lonhomework::results{"resource.status"}=
+		$Apache::lonhomework::results{"resource.$version.status"};
+	    if (defined($Apache::lonhomework::results{"resource.$version.0.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();
+	}
     } elsif ($target eq 'webgrade') {
 	$result.="</table>\n<hr />";
-	$result.='<input type="submit" name="next" value="'.
-	    &mt('Save & Next').'" /> ';
-	$result.='<input type="submit" name="end" value="'.
-	    &mt('Save & Stop Grading').'" /> ';
-	$result.='<input type="submit" name="end" value="'.
-	    &mt('Throw Away & Stop Grading').'" /> ';
+	#$result.='<input type="submit" name="next" value="'.
+	#    &mt('Save &amp; Next').'" /> ';
+	#$result.='<input type="submit" name="end" value="'.
+	#    &mt('Save &amp; Stop Grading').'" /> ';
+	#$result.='<input type="submit" name="throwaway" value="'.
+	#    &mt('Throw Away &amp; Stop Grading').'" /> ';
+	#$result.='<input type="submit" name="save" value="'.
+	#    &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";
@@ -264,9 +435,38 @@ sub end_Task {
     return $result;
 }
 
+sub move_to_review_queue {
+
+    &Apache::lonxml::debug("Want to move");
+}
+
+sub check_queue_unlock {
+    my ($queue)=@_;
+    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 $me=$env{'user.name'}.'@'.$env{'user.domain'};
+    my $who=&queue_key_locked($queue,$key,$cdom,$cnum);
+    if  ($who eq $me) {
+	&Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
+    }
+}
+
+sub remove_from_queue {
+    my ($queue)=@_;
+    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($queue,\@keys,$cdom,$cnum);
+}
+
 sub setup_env_for_other_user {
     my ($queue_key,$safeeval)=@_;
     my ($symb,$uname,$udom)=&decode_queue_key($queue_key);
+    &Apache::lonxml::debug("setup_env for $queue_key");
     $env{'form.grade_symb'}=$symb;
     $env{'form.grade_domain'}=$udom;
     $env{'form.grade_username'}=$uname;
@@ -275,41 +475,46 @@ sub setup_env_for_other_user {
 }
 
 sub add_to_queue {
+    my ($queue)=@_;
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
     my %data;
     $data{"$symb\0queue\0$uname\@$udom"}=[$Apache::inputtags::slot_name];
-    &Apache::lonnet::put('gradingqueue',\%data,$cdom,$cnum);
+    &Apache::lonnet::put($queue,\%data,$cdom,$cnum);
 }
 
 sub show_queue {
+    my ($queue)=@_;
     my $result;
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};
     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><th>user</th><th>type</th><th>data</th></tr>";
+    my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
+    $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: '.&Apache::lonlocal::locallocaltime($slot_data{'endtime'})."</td></tr>";
+	    $result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '.
+		&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
+		"</td></tr>";
 	}
     }
     $result.="</table><hr />\n";
@@ -324,9 +529,9 @@ sub decode_queue_key {
 }
 
 sub queue_key_locked {
-    my ($key,$cdom,$cnum)=@_;
+    my ($queue,$key,$cdom,$cnum)=@_;
     my ($key_locked,$value)=
-	&Apache::lonnet::get('gradingqueue',["$key\0locked"],$cdom,$cnum);
+	&Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum);
     if ($key_locked eq "$key\0locked") {
 	return $value;
     }
@@ -334,8 +539,8 @@ sub queue_key_locked {
 }
 
 sub pick_from_queue_data {
-    my ($check_section,$queue,$cdom,$cnum)=@_;
-    foreach my $key (keys(%$queue)) {
+    my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
+    foreach my $key (keys(%$queuedata)) {
 	my ($symb,$uname,$udom)=&decode_queue_key($key);
 	if ($check_section) {
 	    my $section=&Apache::lonnet::getsection($uname,$udom);
@@ -344,13 +549,13 @@ sub pick_from_queue_data {
 		next;
 	    }
 	}
-	my $slot=$queue->{$key}[0];
+	my $slot=$queuedata->{$key}[0];
 	my %slot_data=&Apache::lonnet::get_slot($slot);
 	if ($slot_data{'endtime'} > time) { 
 	    &Apache::lonnet::logthis("not time");
 	    next;
 	}
-	if (&queue_key_locked($key,$cdom,$cnum)) {
+	if (&queue_key_locked($queue,$key,$cdom,$cnum)) {
 	    &Apache::lonnet::logthis("someone already has um.");
 	    next;
 	}
@@ -360,15 +565,15 @@ sub pick_from_queue_data {
 }
 
 sub find_mid_grade {
-    my ($symb,$cdom,$cnum)=@_;
+    my ($queue,$symb,$cdom,$cnum)=@_;
     my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
     my $me=$env{'user.name'}.'@'.$env{'user.domain'};
     if ($todo) {
-	my $who=&queue_key_locked($todo,$cdom,$cnum);
+	my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
 	if ($who eq $me) { return $todo; }
     }
     my $regexp="^$symb\0.*\0locked\$";
-    my %locks=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);
+    my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     foreach my $key (keys(%locks)) {
 	my $who=$locks{$key};
 	if ($who eq $me) {
@@ -381,27 +586,28 @@ sub find_mid_grade {
 }
 
 sub get_from_queue {
+    my ($queue)=@_;
     my $result;
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
     my $todo;
     # FIXME need to find if I am 'mid grading'
-    $todo=&find_mid_grade($symb,$cdom,$cnum);
+    $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);
     &Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo)));
     if ($todo) { return $todo; }
     while (1) {
 	my $starttime=time;
-	&Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime},
+	&Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime},
 			     $cdom,$cnum);
 	&Apache::lonnet::logthis("$starttime");
 	my $regexp="^$symb\0queue\0";
-	my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);
+	my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
 	#make a pass looking for a user in my section
 	if ($env{'request.course.sec'}) {
 	    &Apache::lonnet::logthis("sce");
-	    $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue,
-					$cdom,$cnum);
+	    $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
+					\%queue,$cdom,$cnum);
 	    &Apache::lonnet::logthis("sce $todo");
 	}
 	# no one in our section so look for any user that is ready for grading
@@ -415,7 +621,7 @@ sub get_from_queue {
 	if (!$todo) { last; }
 	&Apache::lonnet::logthis("got $todo");
 	# otherwise found someone so lets try to lock them
-	my $success=&Apache::lonnet::newput('gradingqueue',
+	my $success=&Apache::lonnet::newput($queue,
 					    {"$todo\0locked"=>
 						 $env{'user.name'}.'@'.$env{'user.domain'}},
 					   $cdom,$cnum);
@@ -423,7 +629,7 @@ sub get_from_queue {
 	&Apache::lonnet::logthis("success $todo");
 	if ($success ne 'ok') { next; }
 	my (undef,$endtime)=
-	    &Apache::lonnet::get('gradingqueue',["$symb\0timestamp"],
+	    &Apache::lonnet::get($queue,["$symb\0timestamp"],
 				 $cdom,$cnum);
 	&Apache::lonnet::logthis("emd  $endtime");
 	# someone else already modified the queue, 
@@ -432,12 +638,12 @@ sub get_from_queue {
 	# double check.
 	if ($endtime != $starttime) {
 	    my ($key,$value)=
-		&Apache::lonnet::get('gradingqueue',["$todo"],
+		&Apache::lonnet::get($queue,["$todo"],
 				     $cdom,$cnum);
 	    &Apache::lonnet::logthis("check  $key .. $value");
 	    if ($key eq $todo && ref($value)) {
 	    } else {
-		&Apache::lonnet::del('gradingqueue',["$todo\0locked"],
+		&Apache::lonnet::del($queue,["$todo\0locked"],
 				     $cdom,$cnum);
 		&Apache::lonnet::logthis("del");
 		next;
@@ -484,6 +690,8 @@ sub start_Dimension {
     $Apache::bridgetask::dimension=$dim_id;
     push(@Apache::bridgetask::dimensionlist,$dim_id);
     undef(@Apache::bridgetask::instance);
+    $Apache::bridgetask::dimensionmandatory{$dim_id}=
+	&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
     return '';
 }
 
@@ -493,7 +701,10 @@ sub get_instance {
     #then start repicking
     &Apache::response::pushrandomnumber();
     my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
-    return $order[0];
+    my $num=@order;
+    my $version=&get_version();
+    my $which=($version-1)%$num;
+    return $order[$which];
 }
 
 {
@@ -501,12 +712,36 @@ sub get_instance {
     sub end_Dimension {
 	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 	my $result;
+	my $dim=&get_id($parstack,$safeeval);
 	my $instance=&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') {
+		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"};
+		    $result.='<table border="1"><tr><td>';
+		    if ($status eq 'fail') {
+			$result.='<font color="red">'.&mt('Did not pass').'</font>';
+		    } elsif ($status eq 'pass') {
+			$result.='<font color="green">'.&mt('Passed').'</font>';
+		    } else {
+			&Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status");
+		    }
+		    $result.='</td></tr><tr><td>';
+		    if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
+			$result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</td></tr><tr><td>';
+		    }
+		    $result.=$dimension{$instance.'.criteria.'.$id}.
+			'</td></tr></table>';
+		}
+	    }
 	} elsif ($target eq 'webgrade') {
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
 		my $link='criteria_'.$instance.'_'.$id;
+		my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
 		$result.='<tr><td width="100%" valign="top">'.
 		    '<a name="'.$link.'" />'.
 		    '<a name="next_'.$last_link.'" />'.
@@ -514,29 +749,73 @@ sub get_instance {
 		    #$dimension{$instance.'.criteria.'.$id}.
 		    '</td>'.
 		    '<td><nobr>Additional Comment for Student</nobr> <br />'.
-		    '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'"></textarea>'.
+		    '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'.
 		    '</td>'.
 		    '<td>'.
-		    '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" />Ungraded</label></nobr><br />'.
-		    '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" />Pass</label><br />'.
-		    '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" />Fail</label><br />'.
-		    '<label><input type="radio" name="HWVAL_'.$link.'" value="review" />Review</label><br />'.
+		    '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>'.&mt('Ungraded').'</label></nobr><br />'.
+		    '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'.
+		    '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'.
+		    '<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label><br />'.
 		    '</td>'.
 		    '<td>'.
 		    '<a href="#'.$last_link.'">Prev</a><br />'.
-		    '<a href="#next_'.$link.'">Next</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.bridgetask.portfiles"})) {
+		    my $file=$file_url.$partial_file;
+		    &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
+		    $result.='<a href="'.$file.'" target="lonGRDs"><img src="'.
+			&Apache::loncommon::icon($file).'" border=0"> '.$file.
+			'</a>';
+		}
+		$result.='</td></tr>';
 		$last_link=$link;
 	    }
-	} elsif ($target eq 'grade') {
+	} elsif ($target eq 'grade' && $env{'form.webgrade'}) {
 	    my $optional_passed=0;
+	    my $mandatory_failed=0;
+	    my $ungraded=0;
+	    my $review=0;
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-		if ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'pass') {
-		} elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'fail') {
-		} elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'ungraded') {
-		} elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'review') {
+		my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
+		$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
+		my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
+		if ($status eq 'pass') {
+		    if (!$mandatory) { $optional_passed++; }
+		} elsif ($status eq 'fail') {
+		    if ($mandatory) { $mandatory_failed++; }
+		} elsif ($status eq 'review') {
+		    $review++;
+		} elsif ($status eq 'ungraded') {
+		    $ungraded++;
+		} else {
+		    &Apache::lonxml::error("got weird status --$status--");
 		}
 	    }
+	    if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
+		$mandatory_failed++;
+	    }
+	    &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
+	    if ($review) {
+		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		    'review';
+	    } elsif ($ungraded) {
+		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		    'ungraded';
+	    } elsif ($mandatory_failed) {
+		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		    'fail';
+	    } else {
+		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		    'pass';
+	    }
 	}
 	return $result;
     }
@@ -570,7 +849,7 @@ sub start_Instance {
     push(@{$dimension{'instances'}},$id);
     push(@Apache::bridgetask::instance,$id);
     push(@Apache::bridgetask::instancelist,$id);
-    $dimension{$instance_id.'.optionalrequired'}=
+    $dimension{$id.'.optionalrequired'}=
 	&Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
     return '';
 }
@@ -599,7 +878,7 @@ sub end_InstanceText {
 
 sub start_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    if ($target eq 'web' || $target eq 'webgrade') {
+    if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
 	&Apache::lonxml::startredirection();
     }
     return '';
@@ -608,7 +887,7 @@ sub start_Criteria {
 sub end_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];
-    if ($target eq 'web' || $target eq 'webgrade') {
+    if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
 	my $criteria=&Apache::lonxml::endredirection();
 	my $id=&get_id($parstack,$safeeval);
 	$dimension{$instance_id.'.criteria.'.$id}=$criteria;