--- loncom/homework/bridgetask.pm	2005/09/30 20:34:53	1.57
+++ loncom/homework/bridgetask.pm	2006/01/30 21:01:46	1.99
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.57 2005/09/30 20:34:53 albertel Exp $
+# $Id: bridgetask.pm,v 1.99 2006/01/30 21:01:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,7 +60,7 @@ sub initialize_bridgetask {
 }
 
 sub proctor_check_auth {
-    my ($slot_name,$slot)=@_;
+    my ($slot_name,$slot,$type)=@_;
     my $user=$env{'form.proctorname'};
     my $domain=$env{'form.proctordomain'};
     
@@ -68,21 +68,44 @@ 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 && $type eq 'Task') {
+		# increment version
 		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;
+		    $Apache::lonhomework::history{'resource.0.version'};
+		$version++;
+
+		#clean out all current results
 		foreach my $key (keys(%Apache::lonhomework::history)) {
 		    if ($key=~/^resource\.0\./) {
 			$Apache::lonhomework::results{$key}='';
 		    }
 		}
+		
+		#setup new version and who did it
+		$Apache::lonhomework::results{'resource.0.version'}=$version;
+		$Apache::lonhomework::results{"resource.$version.0.checkedin"}=
+		    $user.'@'.$domain;
+		$Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
+		    $slot_name;
+
 		return 1;
+	    } elsif ($authenticated && $type eq 'problem') {
+		&Apache::lonxml::debug("authed $slot_name");
+		$Apache::lonhomework::results{"resource.0.checkedin"}=
+		    $user.'@'.$domain;
+		$Apache::lonhomework::results{"resource.0.checkedin.slot"}=
+		    $slot_name;
 	    }
 	}
     }
@@ -93,11 +116,11 @@ sub get_version {
     my ($version,$previous);
     if ($env{'form.previousversion'} && 
 	$env{'form.previousversion'} ne 'current' &&
-	defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {
+	defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.0.status'})) {
 	$version=$env{'form.previousversion'};
 	$previous=1;
     } else {
-	$version=$Apache::lonhomework::history{'resource.version'};
+	$version=$Apache::lonhomework::history{'resource.0.version'};
 	$previous=0;
     }
     if (wantarray) {
@@ -109,10 +132,10 @@ sub get_version {
 sub add_previous_version_button {
     my ($status)=@_;
     my $result;
-    if ($Apache::lonhomework::history{'resource.version'} eq '') {
+    if ($Apache::lonhomework::history{'resource.0.version'} eq '') {
 	return '';
     }
-    if ($Apache::lonhomework::history{'resource.version'} < 2 &&
+    if ($Apache::lonhomework::history{'resource.0.version'} < 2 &&
 	$status ne 'NEEDS_CHECKIN') {
 	return '';
     }
@@ -123,8 +146,8 @@ sub add_previous_version_button {
 	    "</h3>\n";
     }
     my @to_show;
-    foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) {
-	if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) {
+    foreach my $test_version (1..$Apache::lonhomework::history{'resource.0.version'}) {
+	if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.0.status'})) {
 	    push(@to_show,$test_version);
 	}
     }
@@ -144,11 +167,28 @@ sub add_previous_version_button {
 }
 
 sub add_grading_button {
+    my (undef,$cid)=&Apache::lonxml::whichuser();
+    my $cnum=$env{'course.'.$cid.'.num'};
+    my $cdom=$env{'course.'.$cid.'.domain'};
+    my %sections;
+    my $numsections=&Apache::loncommon::get_sections($cdom,$cnum,\%sections);
+    my $size=5;
+    if (scalar(keys(%sections)) < 3) {
+	$size=scalar(keys(%sections))+2;
+    }
+    my $sec_select = '<select multiple name="chosensections" size="'.$size.'">'."\n";
+    $sec_select .= "<option value='all' selected='selected'>all</option>\n";
+    foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
+	$sec_select .= "<option name=\"$sec\">$sec</option>\n";
+    }
+    $sec_select .= "<option value='none'>none</option></select>\n";
+    
     my $result=' <input type="submit" name="gradeasubmission" value="'.
 	&mt("Get a submission to grade").'" />';
     $result.='<input type="hidden" name="grade_target" value="webgrade" />';
     if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
 	my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
+	$result.='<p>Specify a section: '.$sec_select.'</p>';
 	$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);
 
 	$result.=' <input type="submit" name="reviewagrading" value="'.
@@ -277,6 +317,7 @@ sub show_task {
 		       ( $status eq 'INVALID_ACCESS') )) {
 	return 0;
     }
+    if ($env{'form.donescreen'}) { return 0; }
     return 1;
 }
 
@@ -285,13 +326,78 @@ sub internal_location {
     return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->';
 }
 
+sub submission_time_stamp {
+    my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+    my $submissiontime;
+    my $version=$Apache::lonhomework::history{'resource.0.version'};
+    for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {
+	if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) {
+	    $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};
+	}
+    }
+    my $result;
+    if ($submissiontime) {
+	my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.0.checkedin.slot'};
+	my %slot=&Apache::lonnet::get_slot($slot_name);
+	my $diff = $slot{'endtime'} - $submissiontime;
+	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);
+	if ($diff%60) { $info=($diff%60).' minutes '.$info; }
+	$diff=int($diff/60);
+	if ($diff) {    $info=$diff.' hours '.$info; }
+	$result='<p><font color="'.$color.'">'.
+	    &mt('Student submitted [_1] [_2] the deadline. 
+                 (Submission was at [_3], end of period was [_4].)',
+		$info,$when,scalar(localtime($submissiontime)),
+		scalar(localtime($slot{'endtime'}))).
+		'</font></p>';
+    }
+    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.'?rawmode=1" 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 ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
     my ($status,$accessmsg,$slot);
     if ($target ne 'webgrade') {
+	&Apache::structuretags::init_problem_globals('Task');
 	&Apache::structuretags::initialize_storage();
 	&Apache::lonhomework::showhash(%Apache::lonhomework::history);
+	if ($env{'request.state'} eq 'construct') {
+	    &Apache::structuretags::setup_rndseed($safeeval);
+	}
     } 
 
     $Apache::lonhomework::parsing_a_task=1;
@@ -299,7 +405,7 @@ sub start_Task {
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
 	&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
     
-    if ($target eq 'web') {
+    if ($target eq 'web' && $env{'request.state'} ne 'construct') {
 	if ($Apache::lonhomework::modifygrades) {
 	    $body_tag_start.='<form name="gradesubmission" method="POST" action="';
 	    my $uri=$env{'request.uri'};
@@ -316,22 +422,28 @@ sub start_Task {
 	    }
 	}
     }
+    if ($target eq 'web' && $env{'request.state'} eq 'construct') {
+	$form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});
+    }
     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');
+	    &Apache::lonhomework::check_slot_access('0','Task');
 	push(@Apache::inputtags::status,$status);
 	$Apache::inputtags::slot_name=$slot_name;
 	my $expression='$external::datestatus="'.$status.'";';
-	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';
+	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.0.solved"}.'";';
 	&Apache::run::run($expression,$safeeval);
 	&Apache::lonxml::debug("Got $status");
 	$body_tag_start.=&add_previous_version_button($status);
 	if (!&show_task($status,$previous)) {
-	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
+	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
 	    if ( $target eq "web" ) {
 		$result.= $head_tag_start.'</head>'.$body_tag_start;
+		if ($env{'request.state'} eq 'construct') {
+		    $result.=$form_tag_start;
+		}
 		my $msg;
 		if ($status eq 'UNAVAILABLE') {
 		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
@@ -343,6 +455,18 @@ sub start_Task {
 			'</h1>'.&proctor_validation_screen($slot);
 		} elsif ($status eq 'WAITING_FOR_GRADE') {
 		    $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
+		} elsif ($env{'form.donescreen'}) {
+		    my $title=&Apache::lonnet::gettitle();
+		    my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
+		    my $files='<ul><li>'.join('</li><li>',@files).'</li></ul>';
+		    $result.=<<DONESCREEN;
+<h2>$title</h2>
+<p> Files submitted: $files </p>
+<p> You are now done with this Bridge Task </p>
+<hr />
+<p> <a href="/adm/logout">Logout</a> </p>
+<p> <a href="/adm/roles">Change to a different course</a> </p>
+DONESCREEN
 		} elsif ($status ne 'NOT_YET_VIEWED') {
 		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
 		}
@@ -359,7 +483,12 @@ sub start_Task {
 		}
 	    } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {
 		if ($status eq 'NEEDS_CHECKIN') {
-		    &proctor_check_auth($slot_name,$slot);
+		    if(&proctor_check_auth($slot_name,$slot,'Task')
+		       && defined($Apache::inputtags::slot_name)) {
+			my $result=&add_to_queue('gradingqueue',
+						 [$Apache::inputtags::slot_name]);
+			&Apache::lonxml::debug("add_to_queue said $result");
+		    }
 		}
 	    }
 	} elsif ($target eq 'web') {
@@ -410,25 +539,34 @@ sub start_Task {
 	} else {
 	    if ($target eq 'webgrade') {
 		$result.="\n";
+		my $back='<p><a href="/adm/flip?postdata=return:">'.
+		    &mt('Return to resource').'</a></p>';
 		if      ($status_code eq 'stop') {
-		    $result.='<b>'.&mt("Stopped grading.").'</b>';
+		    $result.='<b>'.&mt("Stopped grading.").'</b>'.$back;
 		} elsif ($status_code eq 'lock_failed') {
-		    $result.='<b>'.&mt("Failed to lock the request record.").'</b>';
+		    $result.='<b>'.&mt("Failed to lock the request record.")
+			.'</b>'.$back;
 		} elsif ($status_code eq 'unlock') {
-		    $result.='<b>'.&mt("Unlocked the requested record.").'</b>';
+		    $result.='<b>'.&mt("Unlocked the requested record.")
+			.'</b>'.$back;
 		    $result.=&show_queue($env{'form.queue'},1);
 		} elsif ($status_code eq 'show_list') {
 		    $result.=&show_queue($env{'form.queue'},1);
 		} elsif ($status_code eq 'select_user') {
 		    $result.=&select_user();
+		} elsif ($status_code eq 'unable') {
+		    $result.='<b>'.&mt("Unable to aqcuire a user to grade.").'</b>'.$back;
 		} else {
-		    $result.='<b>'.&mt("No user to be graded.").'</b>';
+		    $result.='<b>'.&mt("No user to be graded.").'</b>'.$back;
 		}
 	    }
 	    $webgrade='no';
-	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
+	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
 	}
 	if ($target eq 'webgrade' && defined($env{'form.queue'})) {
+	    if ($webgrade eq 'yes') {
+		$result.=&submission_time_stamp();
+	    }
 	    $result.=$form_tag_start;
 	    $result.='<input type="hidden" name="webgrade" value="'.
 		$webgrade.'" />';
@@ -438,7 +576,23 @@ sub start_Task {
 		$result.='<input type="hidden" name="regrade" value="'.
 		    $env{'form.regrade'}.'" />';
 	    }
-	}
+	    if ($env{'form.chosensections'}) {
+		my @chosen_sections=
+		    &Apache::loncommon::get_env_multiple('form.chosensections');
+		foreach my $sec (@chosen_sections) {
+		    $result.='<input type="hidden" name="chosensections" 
+                               value="'.$sec.'" />';
+		}
+	    }
+	    if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
+	}
+    } elsif ($target eq 'edit') {
+	$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
+	    &Apache::structuretags::problem_edit_header();
+	$Apache::lonxml::warnings_error_header=
+	    &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />";
+	my $temp=&Apache::edit::insertlist($target,$token);
+	$result.=$temp;
     } else {
 	# page_start returned a starting result, delete it if we don't need it
 	$result = '';
@@ -482,12 +636,12 @@ sub get_key_todo {
 		if ($env{'form.stop'}) {
 		    return (undef,'stop');
 		} elsif ($env{'form.next'}) {
-		    return (undef,'show_list');
+		    return (undef,'select_user');
 		}
 	    }
 	    return ($gradingkey,'selected');
 	} else {
-	    return (undef,'show_list');
+	    return (undef,'select_user');
 	}
     }
     if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})
@@ -538,6 +692,16 @@ sub get_key_todo {
     return (undef,undef)
 }
 
+sub minimize_storage {
+    foreach my $key (keys(%Apache::lonhomework::results)) {
+	if ($key =~ /regrader$/) { next; }
+	if ($Apache::lonhomework::results{$key} eq
+	    $Apache::lonhomework::history{$key}) {
+	    delete($Apache::lonhomework::results{$key});
+	}
+    }
+}
+
 sub end_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
@@ -545,15 +709,13 @@ 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();
 		}
-		if ($status eq 'CAN_ANSWER' && !$previous) {
+		if ($status eq 'CAN_ANSWER' && !$previous && 
+		    !$env{'form.donescreen'}) {
 		    $result.="\n".'<table border="1">'.
 			&Apache::inputtags::file_selector("$version.0",
 							  "bridgetask","*",
@@ -562,26 +724,38 @@ sub end_Task {
 <h2>'.&mt('Submit Portfolio Files for Grading').'</h2>
 <p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').
 							  "</table>";
-		    $result.=&Apache::inputtags::gradestatus('0');
 		}
+		if (!$previous && $status ne 'SHOW_ANSWER' &&
+		    &show_task($status,$previous)) {
+		    $result.=&Apache::inputtags::gradestatus('0');
+		    $result.='</form>';
+		    $result.=<<DONEBUTTON;
+<form method="POST">
+   <input type="hidden" name="donescreen" value="1" />
+   <input type="submit" value="Done" />
+</form>
+DONEBUTTON
+                }
 		if (&show_task($status,$previous) &&
-		    $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {
-		    my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};
+		    $Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass|fail)$/) {
+		    my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};
 		    my $title=&Apache::lonnet::gettitle();
-		    my %slot=&Apache::lonnet::get_slot($Apache::inputtags::slot_name);
+
+		    my $slot_name=
+			$Apache::lonhomework::history{"resource.$version.0.checkedin.slot"};
+		    my %slot=&Apache::lonnet::get_slot($slot_name);
 		    my $start_time=
 			&Apache::lonlocal::locallocaltime($slot{'starttime'});
 
-		    my $status;
-		    $status.="\n<div class='$bt_status'>\n";
+		    my $status = "\n<div class='$bt_status'>\n";
 		    
 		    if ($bt_status eq 'pass')  {
 			$status.='<h2>You passed the '.$title.' given on '.
-			    $start_time.'.</h2>';
+			    $start_time.'</h2>';
 		    }
 		    if ($bt_status eq 'fail')  {
 			$status.='<h2>You did not pass the '.$title.' given on '.
-			    $start_time.'.</h2>';
+			    $start_time.'</h2>';
 			if (!$previous) {
 			    $status.=&add_request_another_attempt_button();
 			}
@@ -593,7 +767,7 @@ sub end_Task {
 			if ($Apache::bridgetask::dimensionmandatory{$dim_id}
 			    eq 'N') {
 			    $opt_count++;
-			    if ($Apache::lonhomework::history{"resource.$version.$dim_id.status"} eq 'pass') {
+			    if ($Apache::lonhomework::history{"resource.$version.0.$dim_id.status"} eq 'pass') {
 				$opt_passed++;
 			    }
 			} else {
@@ -603,7 +777,7 @@ sub end_Task {
 		    my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
 							 $parstack,$safeeval);
 		    if ($opt_req !~ /\S/) { $opt_req='0'; }
-		    $status.="\n<p>".&mt('You needed to pass all of the [_1]  mandatory components and [_2] of the [_3] optional components on the bridge task.',$man_count,$opt_req,$opt_count)."</p></div>\n";
+		    $status.="\n<p>".&mt('You needed to pass all of the [_1]  mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."</p></div>\n";
 
 		    my $internal_location=&internal_location();
 		    $result=~s/\Q$internal_location\E/$status/;
@@ -628,12 +802,18 @@ sub end_Task {
 		    $award;
 		$Apache::lonhomework::results{"resource.0.submission"}=
 		    $Apache::lonhomework::results{"resource.$version.0.submission"}='';
+	    } else {
+		delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});
+		$award = '';
 	    }
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &Apache::structuretags::finalize_storage();
-	    if ($award eq 'SUBMITTED') {
-		&add_to_queue('gradingqueue',$Apache::inputtags::slot_name);
+	    if ($award eq 'SUBMITTED'
+		&& defined($Apache::inputtags::slot_name)) {
+		&add_to_queue('gradingqueue',[$Apache::inputtags::slot_name]);
 	    }
+	} elsif ($Apache::lonhomework::results{'INTERNAL_store'}) {
+	    &Apache::structuretags::finalize_storage();
 	}
 	if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') {
 	    my $optional_required=
@@ -646,7 +826,7 @@ sub end_Task {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
 		my $status=
-		    $Apache::lonhomework::results{"resource.$version.$dim_id.status"};
+		    $Apache::lonhomework::results{"resource.$version.0.$dim_id.status"};
 		my $mandatory=
 		    ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
 		if ($status eq 'pass') {
@@ -665,10 +845,10 @@ sub end_Task {
 		$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'}=
+	    $Apache::lonhomework::results{'resource.0.regrader'}=
 		$env{'user.name'}.'@'.$env{'user.domain'};
 	    if ($review) {
-		$Apache::lonhomework::results{"resource.$version.status"}='review';
+		$Apache::lonhomework::results{"resource.$version.0.status"}='review';
 		if ($env{'form.queue'} eq 'reviewqueue') {
 		    &check_queue_unlock($env{'form.queue'});
 		    &Apache::lonxml::debug(" still needs review not changing status.");
@@ -676,7 +856,7 @@ sub end_Task {
 		    &move_between_queues($env{'form.queue'},'reviewqueue');
 		}
 	    } elsif ($ungraded) {
-		$Apache::lonhomework::results{"resource.$version.status"}='ungraded';
+		$Apache::lonhomework::results{"resource.$version.0.status"}='ungraded';
 		if ($env{'form.queue'} eq 'reviewqueue' ||
 		    $env{'form.queue'} eq 'none' ) {
 		    &Apache::lonxml::debug("moving back.");
@@ -685,7 +865,7 @@ sub end_Task {
 		    &check_queue_unlock($env{'form.queue'});
 		}
 	    } elsif ($mandatory_failed) {
-		$Apache::lonhomework::results{"resource.$version.status"}='fail';
+		$Apache::lonhomework::results{"resource.$version.0.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';
@@ -703,7 +883,7 @@ sub end_Task {
 						       ["$version.0.bridgetask"]);
 		}
 	    } else {
-		$Apache::lonhomework::results{"resource.$version.status"}='pass';
+		$Apache::lonhomework::results{"resource.$version.0.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';
@@ -720,8 +900,8 @@ sub end_Task {
 						       ["$version.0.bridgetask"]);
 		}
 	    }
-	    $Apache::lonhomework::results{"resource.status"}=
-		$Apache::lonhomework::results{"resource.$version.status"};
+	    $Apache::lonhomework::results{"resource.0.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.status"};
 	    if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) {
 		$Apache::lonhomework::results{"resource.0.award"}=
 		    $Apache::lonhomework::results{"resource.$version.0.award"};
@@ -730,6 +910,7 @@ sub end_Task {
 		$Apache::lonhomework::results{"resource.0.solved"}=
 		    $Apache::lonhomework::results{"resource.$version.0.solved"};
 	    }
+	    &minimize_storage();
 	    &Apache::structuretags::finalize_storage();
 	}
     } elsif ($target eq 'webgrade') {
@@ -744,9 +925,15 @@ sub end_Task {
 	#    &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.=&Apache::response::meta_stores_write('solved','string',
+						      'Problem Status');
+	$result.=&Apache::response::meta_stores_write('tries','int_zeropos',
+						      'Number of Attempts');
+	$result.=&Apache::response::meta_stores_write('awarded','float',
+						      'Partial Credit Factor');
+	$result.=&Apache::response::meta_stores_write('status','string',
+						      'Bridge Task Status');
     }
     undef($Apache::lonhomework::parsing_a_task);
     return $result;
@@ -761,7 +948,7 @@ sub move_between_queues {
     } else {
 	$cur_data = ['none'];
     }
-    my $result=&add_to_queue($dest_queue,$cur_data->[0]);
+    my $result=&add_to_queue($dest_queue,[$cur_data->[0]]);
     if ($result ne 'ok') {
 	return $result;
     }
@@ -789,13 +976,38 @@ sub check_queue_unlock {
     return 'not_owner';
 }
 
+sub in_queue {
+    my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
+    if ($queue eq 'none') { return 0; }
+    if (!defined($symb) || !defined($cdom) || !defined($cnum)
+	|| !defined($udom) || !defined($uname)) {
+	($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();
+	$cnum=$env{'course.'.$cid.'.num'};
+	$cdom=$env{'course.'.$cid.'.domain'};
+    }
+
+    my $key=&encode_queue_key($symb,$udom,$uname);
+    my %results = &Apache::lonnet::get($queue,[$key],$cdom,$cnum);
+
+    if (defined($results{$key})) {
+	return 1;
+    }
+    return 0;
+}
+
 sub remove_from_queue {
-    my ($queue)=@_;
+    my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
     if ($queue eq 'none') { return 'ok'; }
-    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";
+    if (!defined($symb) || !defined($cdom) || !defined($cnum)
+	|| !defined($udom) || !defined($uname)) {
+	($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();
+	$cnum=$env{'course.'.$cid.'.num'};
+	$cdom=$env{'course.'.$cid.'.domain'};
+    }
+    if (!&in_queue($queue,$symb,$cdom,$cnum,$udom,$uname)) {
+	return 'ok';
+    }
+    my $key=&encode_queue_key($symb,$udom,$uname);
     my @keys=($key,"$key\0locked");
     return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);
 }
@@ -824,10 +1036,10 @@ sub get_queue_data {
     return undef;
 }
 
+
 sub check_queue_for_key {
-    my ($cid,$queue,$todo)=@_;
-    my $cnum=$env{'course.'.$cid.'.num'};
-    my $cdom=$env{'course.'.$cid.'.domain'};
+    my ($cdom,$cnum,$queue,$todo)=@_;
+
     my %results=
 	&Apache::lonnet::get($queue,[$todo,"$todo\0locked"],$cdom,$cnum);
     
@@ -835,20 +1047,35 @@ sub check_queue_for_key {
 	if (defined($results{"$todo\0locked"})) {
 	    return 'locked';
 	}
+	my $slot;
+	if (ref($results{$todo}) eq 'ARRAY')  {
+	    $slot = $results{$todo}[0];
+	} elsif (ref($results{$todo}) eq 'HASH')  {
+	    $slot = $results{$todo}{'slot'};
+	}
+	if (defined($slot)) {
+	    my %slot_data=&Apache::lonnet::get_slot($slot);
+	    if ($slot_data{'endtime'} > time) { 
+		return 'in_progress';
+	    }
+	}
 	return 'enqueued';
     }
     return undef;
 }
 
 sub add_to_queue {
-    my ($queue,$slot_name)=@_;
+    my ($queue,$user_data)=@_;
     if ($queue eq 'none') { return 'ok'; }
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+    if (!$cid || $env{'request.state'} eq 'construct') {
+	return 'no_queue';
+    }
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
     my %data;
-    $data{"$symb\0queue\0$uname\@$udom"}=[$slot_name];
-    return &Apache::lonnet::put($queue,\%data,$cdom,$cnum);
+    $data{"$symb\0queue\0$uname\@$udom"}=$user_data;
+    return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);
 }
 
 sub show_queue {
@@ -857,18 +1084,30 @@ sub show_queue {
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
+
+    my @chosen_sections=
+	&Apache::loncommon::get_env_multiple('form.chosensections');
+    &Apache::grades::init_perm();
+    my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
+    &Apache::grades::reset_perm();
+    if (!(grep(/^all$/,@chosen_sections))) {
+	$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
+	    '</tt>.</p> '."\n";
+    }
+
     my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     my ($tmp)=%queue;
     if ($tmp=~/^error: 2 /) {
 	return "\n<h3>Current Queue - $queue</h3><table border='1'><tr><td>Empty</td></tr></table>";
     }
-    $result.="\n<h3>Current Queue - $queue </h3><table border='1'><tr>";
+    $result.="\n<h3>Current Queue - $symb $queue </h3><table border='1'><tr>";
     if ($with_selects) { $result.="<th></th>"; }
     $result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";
     foreach my $key (sort(keys(%queue))) {
+	my ($symb,$uname,$udom) = &decode_queue_key($key);
+	if (!defined($classlist->{$uname.':'.$udom})) { next; }
 	if ($key=~/locked$/ && !$with_selects) {
-	    my ($symb,$uname,$udom) = &decode_queue_key($key);
 	    my $title=&Apache::lonnet::gettitle($symb);
 	    $result.="<tr><td>$title</td><td>$uname</td>";
 	    $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
@@ -879,7 +1118,6 @@ sub show_queue {
 	    $result.='<td>last queue modification time</td><td>'.
 		&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
 	} elsif ($key!~/(timestamp|locked)$/) {
-	    my ($symb,$uname,$udom) = &decode_queue_key($key);
 	    my $title=&Apache::lonnet::gettitle($symb);
 	    $result.="<tr>";
 	    my $slot=$queue{$key}->[0];
@@ -895,6 +1133,11 @@ sub show_queue {
 			($action,$description)=('unlock',&mt('Unlock'));
 		    }
 		}
+		my $seclist;
+		foreach my $sec (@chosen_sections) {
+		    $seclist.='<input type="hidden" name="chosensections" 
+                               value="'.$sec.'" />';
+		}
 		if (time > $slot_data{'endtime'}) {
 		    $result.=(<<FORM);
 <td>
@@ -905,6 +1148,7 @@ sub show_queue {
  <input type="hidden" name="webgrade" value="no" />
  <input type="hidden" name="queuemode" value="selected" />
  <input type="submit" name="submit" value="$description" />
+ $seclist
 </form>
 </td>
 FORM
@@ -936,6 +1180,7 @@ sub get_queue_counts {
 	return (0,0,0);
     }
     my ($entries,$ready_to_grade,$locks)=(0,0,0);
+    my %slot_cache;
     foreach my $key (sort(keys(%queue))) {
 	if ($key=~/locked$/) {
 	    $locks++;
@@ -945,8 +1190,11 @@ sub get_queue_counts {
 	    my ($symb,$uname,$udom) = &decode_queue_key($key);
 	    $entries++;
 	    my $slot=$queue{$key}->[0];
-	    my %slot_data=&Apache::lonnet::get_slot($slot);
-	    if (time > $slot_data{'endtime'}) {
+	    if (!exists($slot_cache{$slot})) {
+		my %slot_data=&Apache::lonnet::get_slot($slot);
+		$slot_cache{$slot} = \%slot_data;
+	    }
+	    if (time > $slot_cache{$slot}{'endtime'}) {
 		$ready_to_grade++;
 	    }
 	}
@@ -983,7 +1231,10 @@ sub queue_key_locked {
 
 sub pick_from_queue_data {
     my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
+    my @possible; # will hold queue entries that are valid to be selected
     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);
@@ -998,11 +1249,18 @@ sub pick_from_queue_data {
 	    &Apache::lonxml::debug("not time");
 	    next;
 	}
-	if (&queue_key_locked($queue,$key,$cdom,$cnum)) {
+	if (exists($queuedata->{"$key\0locked"})) {
 	    &Apache::lonxml::debug("someone already has um.");
 	    next;
 	}
-	return $key;
+	push(@possible,[$key,$slot_data{'endtime'}]);
+    }
+    if (@possible) {
+        # sort entries in order by slot end time
+	@possible = sort { $a->[1] <=> $b->[1] } @possible;
+	# pick one of the first ten entries
+	my $max=($#possible < 10) ? $#possible : 10;
+	return $possible[int(rand($max))][0];
     }
     return undef;
 }
@@ -1043,6 +1301,27 @@ sub lock_key {
     return 0;
 }
 
+sub get_queue_symb_status {
+    my ($queue,$symb,$cdom,$cnum) = @_;
+    if (!defined($cdom) || !defined($cnum)) {
+	my (undef,$cid)=&Apache::lonxml::whichuser();
+	$cnum=$env{'course.'.$cid.'.num'};
+	$cdom=$env{'course.'.$cid.'.domain'};
+    }
+    my $regexp="^$symb\0";
+    my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
+    my ($tmp)=%queue;
+    if ($tmp=~/^error: 2 /) { return; }
+    my @users;
+    foreach my $key (sort(keys(%queue))) {
+	next if ($key=~/locked$/);
+	next if ($key=~/timestamp$/);
+	my ($symb,$uname,$udom) = &decode_queue_key($key);
+	push(@users,"$uname:$udom");
+    }
+    return @users;
+}
+
 sub get_from_queue {
     my ($queue)=@_;
     my $result;
@@ -1052,12 +1331,19 @@ sub get_from_queue {
     my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);
     &Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo)));
     if ($todo) { return $todo; }
+    my $attempts=0;
     while (1) {
+	if ($attempts > 2) {
+	    # tried twice to get a queue entry, giving up
+	    return (undef,'unable');
+	}
 	my $starttime=time;
-	&Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime},
-			     $cdom,$cnum);
+	&Apache::lonnet::cput($queue,{"$symb\0timestamp"=>$starttime},
+			      $cdom,$cnum);
 	&Apache::lonxml::debug("$starttime");
 	my $regexp="^$symb\0queue\0";
+	my $range= ($attempts < 1 ) ? '0-100' : '0-400';
+
 	my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
 	#make a pass looking for a user _not_ in my section
 	if ($env{'request.course.sec'}) {
@@ -1070,8 +1356,7 @@ sub get_from_queue {
 	# ready for grading
 	if (!$todo) {
 	    &Apache::lonxml::debug("no sce");
-	    $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
-					\%queue,$cdom,$cnum);
+	    $todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum);
 	    &Apache::lonxml::debug("no sce $todo");
 	}
 	# no user to grade 
@@ -1079,7 +1364,10 @@ sub get_from_queue {
 	&Apache::lonxml::debug("got $todo");
 	# otherwise found someone so lets try to lock them
 	# unless someone else already picked them
-	if (!&lock_key($queue,$todo)) { next; }
+	if (!&lock_key($queue,$todo)) {
+	    $attempts++;
+	    next;
+	}
 	my (undef,$endtime)=
 	    &Apache::lonnet::get($queue,["$symb\0timestamp"],
 				 $cdom,$cnum);
@@ -1098,6 +1386,7 @@ sub get_from_queue {
 		&Apache::lonnet::del($queue,["$todo\0locked"],
 				     $cdom,$cnum);
 		&Apache::lonxml::debug("del");
+		$attempts++;
 		next;
 	    }
 	}
@@ -1109,24 +1398,52 @@ sub get_from_queue {
 
 sub select_user {
     my ($symb,$cid)=&Apache::lonxml::whichuser();
-    my $result.='<table border="1">';
 
+    my @chosen_sections=
+	&Apache::loncommon::get_env_multiple('form.chosensections');
     &Apache::grades::init_perm();
-    my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all',);
+    my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
     &Apache::grades::reset_perm();
+    
+    my $result;
+    if (!(grep(/^all$/,@chosen_sections))) {
+	$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
+	    '</tt>.</p> '."\n";
+    }
+    $result.='<table border="1">';
 
     foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
 	my ($uname,$udom) = split(/:/,$student);
-	my %status = &get_student_status($symb,$cid,$udom,$uname);
+	
+	my $cnum=$env{'course.'.$cid.'.num'};
+	my $cdom=$env{'course.'.$cid.'.domain'};
+	my %status = &get_student_status($symb,$cdom,$cnum,$udom,$uname,
+					 'Task');
 	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 {
+	    my $seclist;
+	    foreach my $sec (@chosen_sections) {
+		$seclist.='<input type="hidden" name="chosensections" 
+                               value="'.$sec.'" />';
+	    }
+	    $result.=<<RESULT;
 <tr>
   <td>
     <form method="POST">
@@ -1134,12 +1451,13 @@ sub select_user {
       <input type="hidden" name="queue" value="$queue" />
       <input type="hidden" name="webgrade" value="no" />
       <input type="hidden" name="regrade" value="yes" />
-     <input type="submit" name="submit" value="Regrade" />
+      <input type="submit" name="submit" value="Regrade" />
+      $seclist
     </form>
   <td>$fullname->{$student}</td>
   <td>
 RESULT
-
+        }
         if ($status{'status'} eq 'pass') {
 	    $result .= '<font color="green">'.&mt('Passed').'</font>';
 	} elsif ($status{'status'} eq 'fail') {
@@ -1161,10 +1479,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;";
 	}
@@ -1175,17 +1497,23 @@ RESULT
 }
 
 sub get_student_status {
-    my ($symb,$cid,$udom,$uname)=@_;
-    my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
-					  $udom,$uname);
+    my ($symb,$cdom,$cnum,$udom,$uname,$type)=@_;
+
     my %status;
-    $status{'status'}=$record{'resource.status'};
-    $status{'version'}=$record{'resource.version'};
-    $status{'grader'}=$record{'resource.grader'};
-    $status{'reviewqueue'}=&check_queue_for_key($cid,'reviewqueue',
-				       &encode_queue_key($symb,$udom,$uname));
-    $status{'gradingqueue'}=&check_queue_for_key($cid,'gradingqueue',
-				       &encode_queue_key($symb,$udom,$uname));
+
+    if ($type eq 'Task') {
+	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
+					  $udom,$uname);
+	$status{'status'}=$record{'resource.0.status'};
+	$status{'version'}=$record{'resource.0.version'};
+	$status{'grader'}=$record{'resource.0.regrader'};
+    }
+    $status{'reviewqueue'}=
+	&check_queue_for_key($cdom,$cnum,'reviewqueue',
+			     &encode_queue_key($symb,$udom,$uname));
+    $status{'gradingqueue'}=
+	&check_queue_for_key($cdom,$cnum,'gradingqueue',
+			     &encode_queue_key($symb,$udom,$uname));
     return %status;
 }
 
@@ -1231,12 +1559,40 @@ sub start_Dimension {
 }
 
 sub get_instance {
-    &Apache::response::pushrandomnumber();
-    my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
-    my $num=@order;
-    my $version=&get_version();
-    my $which=($version-1)%$num;
-    return $order[$which];
+    my ($dim)=@_;
+    my $rand_alg=&Apache::lonnet::get_rand_alg();
+    if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
+	$rand_alg eq '64bit2' || $rand_alg eq '64bit3' ||
+	$rand_alg eq '64bit4' ) {
+	&Apache::response::pushrandomnumber();
+	my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
+	my $num=@order;
+	my $version=&get_version();
+	my $which=($version-1)%$num;
+	return $order[$which];
+    } else {
+	my ($version,$previous) = &get_version();
+	my $instance = 
+	    $Apache::lonhomework::history{"resource.$version.0.$dim.instance"};
+	if (defined($instance)) { return $instance; }
+
+	&Apache::response::pushrandomnumber();
+	my @instances = @{$dimension{'instances'}};
+	# remove disabled instances
+	for (my $i=0; $i < $#instances; $i++) {
+	    if ($dimension{$instances[$i].'.disabled'}) {
+		splice(@instances,$i,1);
+		$i--;
+	    }
+	}
+	@instances = &Math::Random::random_permutation(@instances);
+	$instance  = $instances[($version-1)%scalar(@instances)];
+	$Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = 
+	    $instance;
+	$Apache::lonhomework::results{'INTERNAL_store'} = 1; 
+	&Apache::response::poprandomnumber();
+	return $instance;
+    }
 }
 
 {
@@ -1245,76 +1601,86 @@ sub get_instance {
 	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 	my $result=&Apache::lonxml::endredirection();
 	my $dim=&get_id($parstack,$safeeval);
-	my $instance=&get_instance();
+	my $instance=&get_instance($dim);
 	my $version=&get_version();
 	if ($target eq 'web') {
 	    @Apache::scripttag::parser_env = @_;
 	    $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
-	    @Apache::scripttag::parser_env = @_;
-	    $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
-	    if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||
-		$Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
-
-		my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"};
-		my $mandatory='Mandatory';
-		if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
-		    $mandatory='Optional';
-		}
-		my $dim_info="<div class='$dim_status'>\n";
-		if ($dim_status eq 'pass') {
-		    $dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';
-		}
-		if ($dim_status eq 'fail') {
-		    $dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>';
-		}
-		my $man_count=0;
-		my $opt_count=0;
-		my $opt_passed=0;
-		foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-		    if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} 
-			eq 'N') {
-			$opt_count++;
-			if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
-			    $opt_passed++;
-			}
-		    } else {
-			$man_count++;
-		    }
-		}
-		my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
-						       $parstack,$safeeval);
-		if ($opt_req !~ /\S/) { $opt_req='0'; }
-		$dim_info.="\n<p>".&mt('You passed all of the mandatory components and [_1] of the [_2] optional components, of which you were required to pass [_3].',$opt_passed,$opt_count,$opt_req)."</p>\n</div>";
-
-		my $internal_location=&internal_location($dim);
-		$result=~s/\Q$internal_location\E/$dim_info/;
-
-		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"};
-		    my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
-		    if ($mandatory) {
-			$mandatory='Mandatory';
-		    } else {
+	    my @instances = $instance;
+	    if (&Apache::response::showallfoils()) {
+		@instances = @{$dimension{'instances'}};
+	    }
+	    foreach my $instance (@instances) {
+		@Apache::scripttag::parser_env = @_;
+		$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
+		if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' ||
+		    $Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') {
+
+		    my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
+		    my $mandatory='Mandatory';
+		    if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
 			$mandatory='Optional';
 		    }
-		    if ($status eq 'fail') {
-		    } elsif ($status eq 'pass') {
-		    } else {
-			&Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");
+		    my $dim_info="<div class='$dim_status'>\n";
+		    if ($dim_status eq 'pass') {
+			$dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';
+		    }
+		    if ($dim_status eq 'fail') {
+			$dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>';
+		    }
+		    my $man_count=0;
+		    my $man_passed=0;
+		    my $opt_count=0;
+		    my $opt_passed=0;
+		    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+			if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} 
+			    eq 'N') {
+			    $opt_count++;
+			    if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
+				$opt_passed++;
+			    }
+			} else {
+			    $man_count++;
+			    if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
+				$man_passed++;
+			    }
+			}
 		    }
-		    my $status_display=$status;
-		    $status_display=~s/^([a-z])/uc($1)/e;
-		    @Apache::scripttag::parser_env = @_;
-		    $result.='<div class="'.$status.'"><h4>'.$mandatory.
-			' Criteria</h4><p>';
-		    @Apache::scripttag::parser_env = @_;
-		    $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
-		    $result.='</p><p class="grade">'.$status_display.'</p>';
-		    if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
-			$result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</p>';
+		    if ($man_passed eq $man_count) { $man_passed='all'; }
+		    my $opt_req=$dimension{$instance.'.optionalrequired'};
+		    if ($opt_req !~ /\S/) { $opt_req='0'; }
+		    $dim_info.="\n<p>".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."</p>\n</div>";
+
+		    my $internal_location=&internal_location($dim);
+		    $result=~s/\Q$internal_location\E/$dim_info/;
+
+		    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+			my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
+			my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"};
+			my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
+			if ($mandatory) {
+			    $mandatory='Mandatory';
+			} else {
+			    $mandatory='Optional';
+			}
+			if ($status eq 'fail') {
+			} elsif ($status eq 'pass') {
+			} else {
+			    &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");
+			}
+			my $status_display=$status;
+			$status_display=~s/^([a-z])/uc($1)/e;
+			@Apache::scripttag::parser_env = @_;
+			$result.='<div class="'.$status.'"><h4>'.$mandatory.
+			    ' Criteria</h4><p>';
+			@Apache::scripttag::parser_env = @_;
+			$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
+			$result.='</p><p class="grade">'.$status_display.'</p>';
+			if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}) {
+			    $result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}.'</p>';
+			}
+			$result.='</div>';
 		    }
-		    $result.='</div>';
 		}
 	    }
 	} elsif ($target eq 'webgrade') {
@@ -1325,7 +1691,7 @@ sub get_instance {
 	    &Apache::scripttag::xmlparse($dimension{$instance.'.text'});
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
 		my $link='criteria_'.$instance.'_'.$id;
-		my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
+		my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
 		$result.='<tr><td width="100%" valign="top">'.
 		    '<a name="'.$link.'" />'.
 		    '<a name="next_'.$last_link.'" />'.
@@ -1336,7 +1702,7 @@ 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.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'.
+		    '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'.
 		    '</td>'.
 		    '<td>'.
 		    '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label></nobr><br />'.
@@ -1347,23 +1713,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'}) {
@@ -1372,8 +1722,8 @@ sub get_instance {
 	    my $ungraded=0;
 	    my $review=0;
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-		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 $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
+		$Apache::lonhomework::results{"resource.$version.0.$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++; }
@@ -1392,32 +1742,35 @@ sub get_instance {
 	    }
 	    &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"}=
+		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
 		    'review';
 	    } elsif ($ungraded) {
-		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
 		    'ungraded';
 	    } elsif ($mandatory_failed) {
-		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
 		    'fail';
 	    } else {
-		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
 		    'pass';
 	    }
+	} else {
+	    # any other targets no output
+	    undef($result);
 	}
 	return $result;
     }
 }
 
 sub start_IntroParagraph {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'web' || $target eq 'webgrade') {
 	if ($tagstack->[-2] eq 'Dimension') {
-	    $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser);
+	    $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
 	
 	} elsif ($target eq 'webgrade') {
-	    &Apache::lonxml::get_all_text('/introparagraph',$parser);
+	    &Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
 	}
 	
     }
@@ -1435,6 +1788,10 @@ sub start_Instance {
     push(@Apache::bridgetask::instancelist,$id);
     $dimension{$id.'.optionalrequired'}=
 	&Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
+    my $disabled = &Apache::lonxml::get_param('Disabled',$parstack,$safeeval);
+    if (lc($disabled) eq 'yes') {
+	$dimension{$id.'.disabled'}='1';
+    }
     return '';
 }
 
@@ -1442,9 +1799,9 @@ sub end_Instance {
 }
 
 sub start_InstanceText {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];
-    my $text=&Apache::lonxml::get_all_text('/instancetext',$parser);
+    my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
     if ($target eq 'web' || $target eq 'webgrade') {
 	$dimension{$instance_id.'.text'}=$text;
     }
@@ -1456,9 +1813,9 @@ sub end_InstanceText {
 }
 
 sub start_Criteria {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];
-    my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser);
+    my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
 	my $id=&get_id($parstack,$safeeval);
 	$dimension{$instance_id.'.criteria.'.$id}=$criteria;