--- loncom/homework/bridgetask.pm	2006/03/19 21:38:55	1.119
+++ loncom/homework/bridgetask.pm	2006/05/12 06:55:46	1.150
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.119 2006/03/19 21:38:55 albertel Exp $
+# $Id: bridgetask.pm,v 1.150 2006/05/12 06:55:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,7 +66,7 @@ sub proctor_check_auth {
     
     my @allowed=split(",",$slot->{'proctor'});
     foreach my $possible (@allowed) {
-	my ($puser,$pdom)=(split('@',$possible));
+	my ($puser,$pdom)=(split(':',$possible));
 	if ($puser eq $user && $pdom eq $domain) {
 	    my $authenticated=0;
 	    if ( $slot->{'secret'} =~ /\S/ &&
@@ -79,39 +79,53 @@ sub proctor_check_auth {
 		    $authenticated=1;
 		}
 	    }
-	    if ($authenticated && $type eq 'Task') {
-		# increment version
-		my $version=
-		    $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;
-
+	    if ($authenticated) {
+		&create_new_version($type,$user,$domain,$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;
 	    }
 	}
     }
     return 0;
 }
 
+sub create_new_version {
+    my ($type,$user,$domain,$slot_name) = @_;
+    if ($type eq 'Task') {
+	# increment version
+	my $version=
+	    $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;
+	if (defined($user) && defined($domain)) {
+	    $Apache::lonhomework::results{"resource.$version.0.checkedin"}=
+		$user.':'.$domain;
+	}
+	if (defined($slot_name)) {
+	    $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
+		$slot_name;
+	}
+    } elsif ($type eq 'problem') {
+	&Apache::lonxml::debug("authed $slot_name");
+	if (defined($user) && defined($domain)) {
+	    $Apache::lonhomework::results{"resource.0.checkedin"}=
+		$user.':'.$domain;
+	}
+	if (defined($slot_name)) {
+	    $Apache::lonhomework::results{"resource.0.checkedin.slot"}=
+		$slot_name;
+	}
+    }
+}
+
 sub get_version {
     my ($version,$previous);
     if ($env{'form.previousversion'} && 
@@ -120,7 +134,11 @@ sub get_version {
 	$version=$env{'form.previousversion'};
 	$previous=1;
     } else {
-	$version=$Apache::lonhomework::history{'resource.0.version'};
+	if (defined($Apache::lonhomework::results{'resource.0.version'})) {
+	    $version=$Apache::lonhomework::results{'resource.0.version'};
+	} elsif (defined($Apache::lonhomework::history{'resource.0.version'})) {
+	    $version=$Apache::lonhomework::history{'resource.0.version'};
+	}
 	$previous=0;
     }
     if (wantarray) {
@@ -170,16 +188,16 @@ 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 %sections = &Apache::loncommon::get_sections($cdom,$cnum);
+
     my $size=5;
     if (scalar(keys(%sections)) < 3) {
 	$size=scalar(keys(%sections))+2;
     }
-    my $sec_select = '<select multiple name="chosensections" size="'.$size.'">'."\n";
+    my $sec_select = '<select multiple="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=\"$sec\">$sec</option>\n";
     }
     $sec_select .= "<option value='none'>none</option></select>\n";
     
@@ -213,7 +231,8 @@ sub add_grading_button {
 						   'gradinguser',
 						   'gradingdomain');
 	$result.=&Apache::loncommon::studentbrowser_javascript();
-  }
+	$result.= '</p>';
+    }
     return $result;
 }
 
@@ -222,6 +241,12 @@ sub add_request_another_attempt_button {
     if (!$text) { $text="Request another attempt"; }
     my $result;
     my $symb=&Apache::lonnet::symbread();
+    # not a slot access based resource
+    my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
+    if ($useslots =~ /^\s*no\s*$/i) {
+	return '';
+    }
+
     my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);
     my $action='get_reservation';
     if ($slot_name) {
@@ -258,64 +283,14 @@ sub preserve_grade_info {
 }
 
 sub style {
-    return (<<STYLE);
-<style type="text/css">
-.LC_fail, .LC_pass, .LC_neutral {
-    position: relative;
-    margin : 5px;
-    margin-bottom :10px;
-    padding : 4px;
-    padding-left : 75px;
-	border : thin solid;
-    font-weight : bolder;
-    font-size: smaller;
-    font-family: Arial;
-    background-color : rgb(255,240,225);
-}
-
-.LC_fail h4, .LC_pass h4 {
-	position:absolute;
-	left: -4px;
-	top: -8px;
-	padding:2px;
-	margin:0;
-	background-color : rgb(255,240,225);
-	border : thin solid;
-}
-
-.LC_fail {
-	color: red;
-}
-
-.LC_pass {
-    color : green;
-}
-
-.LC_neutral {
-	color : blue;
-}
-
-.LC_question {
-	border : thin solid black;
-	padding : 4px;
-	margin-bottom : 1em;
-}
-
-.LC_grade {
-	font-size: x-large;
-	font-family: Arial;
-	position:absolute;
-	left: 5px;
-	top: -5px;
-	width: 70px;
-}
-
-div#feedback h1 {
-    color : inherit;
-}
-</style>
+    my ($target) = @_;
+    if ($target eq 'web'
+	|| $target eq 'webgrade') {
+	return (<<STYLE);
+<link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />
 STYLE
-
+    }
+    return;
 }
 
 sub show_task {
@@ -327,7 +302,8 @@ sub show_task {
 		       ( $status eq 'NOT_IN_A_SLOT') ||
 		       ( $status eq 'NEEDS_CHECKIN') ||
 		       ( $status eq 'WAITING_FOR_GRADE') ||
-		       ( $status eq 'INVALID_ACCESS') )) {
+		       ( $status eq 'INVALID_ACCESS') ||
+		       ( &get_version() eq ''))) {
 	return 0;
     }
     if ($env{'form.donescreen'}) { return 0; }
@@ -378,7 +354,7 @@ sub file_list {
     }
     my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
 
-    my $file_list="<ul class=\"LC_GRADE_handininfo\">\n";
+    my $file_list="<ul class=\"LC_GRADING_handininfo\">\n";
     foreach my $partial_file (split(',',$files)) {
 	my $file=$file_url.$partial_file;
 	$file=~s|/+|/|g;
@@ -398,12 +374,15 @@ sub webgrade_standard_info {
 
     my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',
 				       'stop' => 'Quit Grading',
+				       'fail' => 'Fail Rest',
 				       );
 				       
     my $result=<<INFO;
-  <div class="LC_GRADE_maincontrols">
+  <div class="LC_GRADING_maincontrols">
     <input type="submit" name="next" value="$lt{'done'}" />
     <input type="submit" name="stop" value="$lt{'stop'}" />
+    <input type="button" name="fail" value="$lt{'fail'}" 
+           onclick="javascript:onFailRest()" />
   </div>
   $file_list
 INFO
@@ -424,20 +403,32 @@ sub start_Task {
     } 
 
     $Apache::lonhomework::parsing_a_task=1;
-    #should get back a <html> or the neccesary stuff to start XML/MathML
-    my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
-	&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
-    
-    $body_tag_start = '<div class="LC_task">'."\n";
+
+    my $name;
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$name = &Apache::structuretags::get_resource_name($parstack,$safeeval);
+    }
+
+    my ($result,$form_tag_start);
+    if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
+	|| $target eq 'edit') {
+	($result,$form_tag_start) =
+	    &Apache::structuretags::page_start($target,$token,$tagstack,
+					       $parstack,$parser,$safeeval,
+					       $name,&style($target));
+	$result .= '<div class="LC_task">'."\n";
+    }
+
     if ($target eq 'web' && $env{'request.state'} ne 'construct') {
-	if ($Apache::lonhomework::modifygrades) {
-	    $body_tag_start.='<form name="gradesubmission" method="post" action="';
+	if ($Apache::lonhomework::queuegrade
+	    || $Apache::lonhomework::modifygrades) {
+	    $result.='<form name="gradesubmission" method="post" action="';
 	    my $uri=$env{'request.uri'};
 	    if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
-	    $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
+	    $result.=$uri.'">'.&add_grading_button()."</form>";
 	    my $symb=&Apache::lonnet::symbread();
 	    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
-		$body_tag_start.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
+		$result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
 		    '<input type="hidden" name="symb" value="'.$symb.'" />'.
 		    '<input type="hidden" name="command" value="showslots" />'.
 		    '<input type="submit" name="requestattempt" value="'.
@@ -446,7 +437,7 @@ sub start_Task {
 		my $target_id = 
 		    &Apache::lonstathelpers::make_target_id({symb => $symb,
 							     part => '0'});
-		$body_tag_start.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
+		$result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
 		    '<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
 		    '<input type="hidden" name="reportSelected" value="grading_analysis" />'.
 		    '<input type="submit" name="grading" value="'.
@@ -463,17 +454,21 @@ sub start_Task {
 	my ($version,$previous)=&get_version();
 	($status,$accessmsg,my $slot_name,$slot) = 
 	    &Apache::lonhomework::check_slot_access('0','Task');
+	if ($status eq 'CAN_ANSWER' && $version eq '' && $slot_name eq '') {
+	    &create_new_version('Task');
+	    ($version,$previous)=&get_version();
+	}
+
 	push(@Apache::inputtags::status,$status);
 	$Apache::inputtags::slot_name=$slot_name;
 	my $expression='$external::datestatus="'.$status.'";';
 	$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);
+	$result.=&add_previous_version_button($status);
 	if (!&show_task($status,$previous)) {
 	    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;
 		}
@@ -531,17 +526,18 @@ DONESCREEN
 		if ($status eq 'NEEDS_CHECKIN') {
 		    if(&proctor_check_auth($slot_name,$slot,'Task')
 		       && defined($Apache::inputtags::slot_name)) {
-			my $result=&add_to_queue('gradingqueue',
-						 [$Apache::inputtags::slot_name]);
+			my $result=
+			    &add_to_queue('gradingqueue',
+					  {'type' => 'task',
+					   'time' => time,
+					   'slot' => 
+					       $Apache::inputtags::slot_name});
 			&Apache::lonxml::debug("add_to_queue said $result");
 		    }
 		}
 	    }
 	} elsif ($target eq 'web') {
-	    my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);
-	    $result.="$head_tag_start<title>$name</title></head>
-              $body_tag_start \n".&style();
-	    
+
 	    $result.=&preserve_grade_info();
 	    $result.=&internal_location();
 	    $result.=$form_tag_start.
@@ -552,7 +548,9 @@ DONESCREEN
 	      $target eq 'webgrade') {
 	my $webgrade='yes';
 	if ($target eq 'webgrade') {
-	    $result.=$head_tag_start.'</head>'.$body_tag_start;
+	    $result.= "\n".'<div class="LC_GRADING_task">'."\n".
+		'<script type="text/javascript" 
+                         src="/res/adm/includes/task_grading.js"></script>';
 	    #$result.='<br />Review'.&show_queue('reviewqueue');
 	    #$result.='<br />Grade'.&show_queue('gradingqueue');
 	}
@@ -631,10 +629,10 @@ DONESCREEN
 	    if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
 	}
 	if ($target eq 'webgrade') {
-	    $result.="\n".'<div id="LC_GRADE_criterialist">';
+	    $result.="\n".'<div id="LC_GRADING_criterialist">';
 	}
     } elsif ($target eq 'edit') {
-	$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
+	$result.=$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 />";
@@ -670,7 +668,7 @@ sub get_key_todo {
     }
 
 
-    my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+    my $me=$env{'user.name'}.':'.$env{'user.domain'};
 
     #need to try both queues..
     if (defined($env{'form.regradeaspecificsubmission'}) &&
@@ -716,7 +714,7 @@ sub get_key_todo {
 	#otherwise (defined($who) && $who ne $me) some else has it...
 	return (undef,'not_allowed',
 		&mt('Another user ([_1]) currently has the record for [_2] locked.',
-		    $who,$env{'form.gradinguser'}.'@'.$env{'form.gradingdomain'}));
+		    $who,$env{'form.gradinguser'}.':'.$env{'form.gradingdomain'}));
     }
 
 
@@ -839,11 +837,19 @@ DONEBUTTON
 		    my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};
 		    my $title=&Apache::lonnet::gettitle();
 
+		    my $start_time;
+
 		    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'});
+		    if ($slot_name) {
+			my %slot=&Apache::lonnet::get_slot($slot_name);
+
+			$start_time=$slot{'starttime'}
+		    } else {
+			$start_time= 
+			    &Apache::lonnet::EXT('resource.0.opendate');
+		    }
+		    $start_time=&Apache::lonlocal::locallocaltime($start_time);
 
 		    my $status = "\n<div class='LC_$bt_status LC_criteria'>\n";
 		    
@@ -880,9 +886,8 @@ DONEBUTTON
 		    my $internal_location=&internal_location();
 		    $result=~s/\Q$internal_location\E/$status/;
 		}
-	    } 
-	    if ($target eq 'web') {
-		$result.="\n</div>\n".&Apache::lonxml::xmlend().'</html>';
+		$result.="\n</div>\n".
+		    &Apache::loncommon::end_page({'discussion' => 1});
 	    }
 	}
 	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
@@ -906,9 +911,18 @@ DONEBUTTON
 	    }
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &Apache::structuretags::finalize_storage();
-	    if ($award eq 'SUBMITTED'
-		&& defined($Apache::inputtags::slot_name)) {
-		&add_to_queue('gradingqueue',[$Apache::inputtags::slot_name]);
+	    if ($award eq 'SUBMITTED') {
+		my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
+		if ($useslots =~ /^\s*no\s*$/i) {
+		    &add_to_queue('gradingqueue',
+				  {'type' => 'task',
+				   'time' => time});
+		} elsif (defined($Apache::inputtags::slot_name)) {
+		    &add_to_queue('gradingqueue',
+				  {'type' => 'task',
+				   'time' => time,
+				   'slot' => $Apache::inputtags::slot_name});
+		}
 	    }
 	} elsif ($Apache::lonhomework::results{'INTERNAL_store'}) {
 	    &Apache::structuretags::finalize_storage();
@@ -944,7 +958,7 @@ DONEBUTTON
 	    }
 	    &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.0.regrader'}=
-		$env{'user.name'}.'@'.$env{'user.domain'};
+		$env{'user.name'}.':'.$env{'user.domain'};
 	    if ($review) {
 		$Apache::lonhomework::results{"resource.$version.0.status"}='review';
 		if ($env{'form.queue'} eq 'reviewqueue') {
@@ -1012,7 +1026,7 @@ DONEBUTTON
 	    &Apache::structuretags::finalize_storage();
 	}
     } elsif ($target eq 'webgrade') {
-	$result.="</div>\n<hr />";
+	$result.="</div>";
 	#$result.='<input type="submit" name="next" value="'.
 	#    &mt('Save &amp; Next').'" /> ';
 	#$result.='<input type="submit" name="end" value="'.
@@ -1021,8 +1035,8 @@ DONEBUTTON
 	#    &mt('Throw Away &amp; Stop Grading').'" /> ';
 	#$result.='<input type="submit" name="save" value="'.
 	#    &mt('Save Partial Grade and Continue Grading').'" /> ';
-	$result.='</form>'."\n</div>\n".
-	    &Apache::loncommon::endbodytag().'</html>';
+	$result.='</form>'."\n</div>\n</div>\n".
+	    &Apache::loncommon::end_page();
     } elsif ($target eq 'meta') {
 	$result.=&Apache::response::meta_package_write('Task');
         $result.=&Apache::response::meta_stores_write('solved','string',
@@ -1047,7 +1061,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);
     if ($result ne 'ok') {
 	return $result;
     }
@@ -1060,11 +1074,11 @@ sub check_queue_unlock {
     if ($queue eq 'none') { return 'ok'; }
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
     if (!defined($key)) {
-	$key="$symb\0queue\0$uname\@$udom";
+	$key="$symb\0queue\0$uname:$udom";
     }
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
-    my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+    my $me=$env{'user.name'}.':'.$env{'user.domain'};
     my $who=&queue_key_locked($queue,$key,$cdom,$cnum);
     if  ($who eq $me) {
 	return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
@@ -1127,7 +1141,7 @@ sub get_queue_data {
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
-    my $todo="$symb\0queue\0$uname\@$udom";
+    my $todo="$symb\0queue\0$uname:$udom";
     my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);
     if ($key eq $todo && ref($value)) {
 	return $value;
@@ -1146,17 +1160,17 @@ 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)) {
+	if (my $slot=&slotted_access($results{$todo})) {
 	    my %slot_data=&Apache::lonnet::get_slot($slot);
 	    if ($slot_data{'endtime'} > time) { 
 		return 'in_progress';
 	    }
+	} else {
+	    my ($symb) = &decode_queue_key($todo);
+	    my $due_date = &Apache::lonhomework::due_date('0',$symb);
+	    if ($due_date > time) {
+		return 'in_progress';
+	    }
 	}
 	return 'enqueued';
     }
@@ -1173,7 +1187,7 @@ sub add_to_queue {
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
     my %data;
-    $data{"$symb\0queue\0$uname\@$udom"}=$user_data;
+    $data{"$symb\0queue\0$uname:$udom"}=$user_data;
     return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);
 }
 
@@ -1216,13 +1230,20 @@ sub show_queue {
 		&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
 	} elsif ($key!~/(timestamp|locked)$/) {
 	    $result.="<tr>";
-	    my $slot=$queue{$key}->[0];
-	    my %slot_data=&Apache::lonnet::get_slot($slot);
+	    my ($end_time,$slot_text);
+	    if (my $slot=&slotted_access($queue{$key})) {
+		my %slot_data=&Apache::lonnet::get_slot($slot);
+		$end_time = $slot_data{'endtime'};
+		$slot_text = &mt('Slot: [_1]',$slot);
+	    } else {
+		$end_time = &Apache::lonhomework::due_date('0',$symb);
+		$slot_text = '';
+	    }
 	    if ($with_selects) {
 		my $ekey=&Apache::lonnet::escape($key);
 		my ($action,$description,$status)=('select',&mt('Select'));
 		if (exists($queue{"$key\0locked"})) {
-		    my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+		    my $me=$env{'user.name'}.':'.$env{'user.domain'};
 		    $status=&mt('Locked by <tt>[_1]</tt>',$queue{"$key\0locked"});
 		    if ($me eq $queue{"$key\0locked"}) {
 			($action,$description)=('resume',&mt('Resume'));
@@ -1235,7 +1256,7 @@ sub show_queue {
 		    $seclist.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';
 		}
-		if (time > $slot_data{'endtime'}) {
+		if ($end_time ne '' && time > $end_time) {
 		    $result.=(<<FORM);
 <td>$status</td>
 <td>
@@ -1252,13 +1273,13 @@ sub show_queue {
 FORM
 
                 } else {
-		    $result.='<td>'.&mt("In Progress").'</td>'
+		    $result.='<td>'.&mt("In Progress").'</td><td>&nbsp;</td>'
 		}
 	    }
 	    $result.= "<td>".$fullname->{$uname.':'.$udom}.
-		" <tt>($uname\@$udom)</tt> </td>";
-	    $result.='<td>Slot: '.$slot.' End time: '.
-		&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
+		" <tt>($uname:$udom)</tt> </td>";
+	    $result.='<td>'.$slot_text.' End time: '.
+		&Apache::lonlocal::locallocaltime($end_time).
 		"</td></tr>";
 	}
     }
@@ -1288,13 +1309,19 @@ sub get_queue_counts {
 	} elsif ($key!~/(timestamp|locked)$/) {
 	    my ($symb,$uname,$udom) = &decode_queue_key($key);
 	    $entries++;
-	    my $slot=$queue{$key}->[0];
-	    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++;
+	    if (my $slot=&slotted_access($queue{$key})) {
+		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++;
+		}
+	    } else {
+		my $due_date = &Apache::lonhomework::due_date('0',$symb);
+		if ($due_date ne '' && time > $due_date) {
+		    $ready_to_grade++;
+		}
 	    }
 	}
     }
@@ -1303,13 +1330,13 @@ sub get_queue_counts {
 
 sub encode_queue_key {
     my ($symb,$udom,$uname)=@_;
-    return "$symb\0queue\0$uname\@$udom";
+    return "$symb\0queue\0$uname:$udom";
 }
 
 sub decode_queue_key {
     my ($key)=@_;
     my ($symb,undef,$user) = split("\0",$key);
-    my ($uname,$udom) = split('@',$user);
+    my ($uname,$udom) = split(':',$user);
     return ($symb,$uname,$udom);
 }
 
@@ -1328,6 +1355,22 @@ sub queue_key_locked {
     return undef;
 }
 
+sub slotted_access {
+    my ($queue_entry) = @_;
+    if (ref($queue_entry) eq 'ARRAY') {
+	if (defined($queue_entry->[0])) {
+	    return $queue_entry->[0];
+	}
+	return undef;
+    } elsif (ref($queue_entry) eq 'HASH') {
+	if (defined($queue_entry->{'slot'})) {
+	    return $queue_entry->{'slot'};
+	}
+	return undef;
+    }
+    return undef;
+}
+
 sub pick_from_queue_data {
     my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
     my @possible; # will hold queue entries that are valid to be selected
@@ -1342,24 +1385,41 @@ sub pick_from_queue_data {
 		next;
 	    }
 	}
-	my $slot=$queuedata->{$key}[0];
-	my %slot_data=&Apache::lonnet::get_slot($slot);
-	if ($slot_data{'endtime'} > time) { 
+	my $end_time;
+	if (my $slot=&slotted_access($queuedata->{$key})) {
+	    my %slot_data=&Apache::lonnet::get_slot($slot);
+	    if ($slot_data{'endtime'} < time) { 
+		$end_time = $slot_data{'endtime'};
+	    }
+	} else {
+	    my $due_date = &Apache::lonhomework::due_date('0',$symb);
+	    if ($due_date > time) {
+		$end_time = $due_date;
+	    }
+	}
+	if ($end_time ne '') {
 	    &Apache::lonxml::debug("not time");
 	    next;
 	}
+	
 	if (exists($queuedata->{"$key\0locked"})) {
 	    &Apache::lonxml::debug("someone already has um.");
 	    next;
 	}
-	push(@possible,[$key,$slot_data{'endtime'}]);
+	push(@possible,[$key,$end_time]);
     }
     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];
+	# pick one of the entries in the top 10% in small queues and one
+	# of the first ten entries in large queues
+	#my $ten_percent = int($#possible * 0.1);
+	#if ($ten_percent < 1 ) { $ten_percent = 1;  }
+	#if ($ten_percent > 10) { $ten_percent = 10; }
+	#my $max=($#possible < $ten_percent) ? $#possible : $ten_percent;
+	
+	#return $possible[int(rand($max))][0];
+	return $possible[0][0];
     }
     return undef;
 }
@@ -1367,7 +1427,7 @@ sub pick_from_queue_data {
 sub find_mid_grade {
     my ($queue,$symb,$cdom,$cnum)=@_;
     my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
-    my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+    my $me=$env{'user.name'}.':'.$env{'user.domain'};
     if ($todo) {
 	my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
 	if ($who eq $me) { return $todo; }
@@ -1387,7 +1447,7 @@ sub find_mid_grade {
 
 sub lock_key {
     my ($queue,$todo)=@_;
-    my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+    my $me=$env{'user.name'}.':'.$env{'user.domain'};
     my (undef,$cid)=&Apache::lonxml::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
@@ -1691,9 +1751,11 @@ sub get_instance {
 	}
 	@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; 
+	if ($version =~ /^\d$/) {
+	    $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = 
+		$instance;
+	    $Apache::lonhomework::results{'INTERNAL_store'} = 1; 
+	}
 	&Apache::response::poprandomnumber();
 	return $instance;
     }
@@ -1701,6 +1763,10 @@ sub get_instance {
 
 {
     my $last_link;
+    sub link {
+	my ($instance,$id) = @_;
+	return 'LC_GRADING_criteria_'.$instance.'_'.$id;
+    }
     sub end_Dimension {
 	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 	my $result=&Apache::lonxml::endredirection();
@@ -1795,26 +1861,24 @@ sub get_instance {
 	    @Apache::scripttag::parser_env = @_;
 	    &Apache::scripttag::xmlparse($dimension{$instance.'.text'});
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-		my $link='LC_GRADE_criteria_'.$instance.'_'.$id;
+		my $link=&link($instance,$id);
 		my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
-		$result.='<div class="LC_GRADE_criteria" id="'.$link.'">'."\n".
-		    '<a name="'.$link.'" />'."\n".
-		    '<a name="next_'.$last_link.'" />'."\n".
-		    '<div class="LC_GRADE_criteriatext">'."\n";
+		$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
+		    '<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n";
 		@Apache::scripttag::parser_env = @_;
 		$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
 		$result.='</div>'."\n".
 		    #$dimension{$instance.'.criteria.'.$id}.
-		    '<div class="LC_GRADE_grade">'."\n".
-		    '<label class="LC_GRADE_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
-		    '<label class="LC_GRADE_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
-		    '<label class="LC_GRADE_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
-		    '<label class="LC_GRADE_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
+		    '<div class="LC_GRADING_grade">'."\n".
+		    '<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
+		    '<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
+		    '<label class="LC_GRADING_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
+		    '<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
 		    '</div>'."\n".
-		    '<label class="LC_GRADE_comment">'.&mt('Additional Comment for Student')."\n".
-		    '<textarea class="LC_GRADE_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\n".
+		    '<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".
+		    '<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\n".
 		    '</label>'."\n".
-		    '<ul class="LC_GRADE_navbuttons">'."\n".
+		    '<ul class="LC_GRADING_navbuttons">'."\n".
 		    '<li><a href="#'.$last_link.'">Prev</a></li>'."\n".
 		    '<li><a href="#next_'.$link.'">Next</a></li>'."\n".
 		    '</ul>'."\n".
@@ -1828,8 +1892,9 @@ sub get_instance {
 	    my $ungraded=0;
 	    my $review=0;
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-		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 $link=&link($instance,$id);
+		my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_'.$link};
+		$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
 		my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
 		if ($status eq 'pass') {
 		    if (!$mandatory) { $optional_passed++; }
@@ -1878,7 +1943,7 @@ sub grading_history {
     foreach my $t (1..$Apache::lonhomework::history{'version'}) {
 	if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) {
 	    my ($gname,$gdom) = 
-		split('@',$Apache::lonhomework::history{$t.':resource.0.regrader'});
+		split(':',$Apache::lonhomework::history{$t.':resource.0.regrader'});
 	    my $fullname = &Apache::loncommon::plainname($gname,$gdom);
 	    $grader = &Apache::loncommon::aboutmewrapper($fullname,
 							 $gname,$gdom);
@@ -1895,7 +1960,7 @@ sub grading_history {
 	}
     }
     if ($result) {
-	return '<ul class="LC_GRADE_pastgrading">'.$result.'</ul>';
+	return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>';
     }
     return '';
 }
@@ -1907,8 +1972,8 @@ sub start_IntroParagraph {
 	if ($tagstack->[-2] eq 'Dimension') {
 	    $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
 	
-	} elsif ($target eq 'webgrade') {
-	    &Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
+	} elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
+	    &Apache::lonxml::startredirection();
 	}
 	
     }
@@ -1916,6 +1981,10 @@ sub start_IntroParagraph {
 }
 
 sub end_IntroParagraph {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    if ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
+	my $result = &Apache::lonxml::endredirection();
+    }
 }
 
 sub start_Instance {
@@ -1998,7 +2067,7 @@ sub proctor_validation_screen {
       <tr><td colspan="2">Student who should be logged in is:</td></tr>
       <tr><td>Name:</td><td>$name</td></tr>
       <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>
-      <tr><td>Usename</td><td>$user\@$domain</td></tr>
+      <tr><td>Usename</td><td>$user:$domain</td></tr>
       <tr><td colspan="2"><img src="$url" /></td></tr>
     </table>
   </tr></td>