loncom/homework/bridgetask.pm - diff

Return to bridgetask.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/bridgetask.pm between versions 1.130 and 1.226

-version 1.130, 2006/03/29 14:04:45
+version 1.226, 2007/02/22 21:40:40
  Line 38  use Apache::lonlocal;
  use Apache::lonxml;
  use Apache::slotrequest();
  use Time::HiRes qw( gettimeofday tv_interval );
+ use lib '/home/httpd/lib/perl/';
+ use LONCAPA;
  BEGIN {
-     &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph'));
+     &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','CriteriaText','GraderNote','ClosingParagraph'));
  }
+ my %dimension;
+ my $top = 'top';
  sub initialize_bridgetask {
      # id of current Dimension, 0 means that no dimension is current
      # (inside <Task> only)
-     $Apache::bridgetask::dimension='';
+     @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=();
+     %Apache::bridgetask::instance=();
      # list of all Instance ids seen in this problem
      @Apache::bridgetask::instancelist=();
      # key of queud user data that we are currently grading
      $Apache::bridgetask::queue_key='';
+     undef(%dimension);
  }
  sub proctor_check_auth {
- Line 66  sub proctor_check_auth {
+ Line 69  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/ &&
- Line 79  sub proctor_check_auth {
+ Line 82  sub proctor_check_auth {
  		    $authenticated=1;
  		}
  	    }
- 	    if ($authenticated && $type eq 'Task') {
+ 	    if ($authenticated) {
- 		# increment version
+ 		&check_in($type,$user,$domain,$slot_name);
- 		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;
  		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 check_in {
+     my ($type,$user,$domain,$slot_name) = @_;
+     my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
+     if ( $useslots eq 'map_map') {
+ 	&check_in_sequence($user,$domain,$slot_name);
+     } else {
+ 	&create_new_version($type,$user,$domain,$slot_name);
+ 	&Apache::structuretags::finalize_storage();
+     }
+     return 1;
+ }
+ sub check_in_sequence {
+     my ($user,$domain,$slot_name) = @_;
+     my $navmap = Apache::lonnavmaps::navmap->new();
+     my ($symb) = &Apache::lonnet::whichuser();
+     my ($map)  = &Apache::lonnet::decode_symb($symb);
+     my @resources =
+ 	$navmap->retrieveResources($map, sub { $_[0]->is_problem() },0,0);
+     my %old_history = %Apache::lonhomework::history;
+     my %old_results = %Apache::lonhomework::results;
+     foreach my $res (@resources) {
+ 	&Apache::lonxml::debug("doing ".$res->src);
+ 	&Apache::structuretags::initialize_storage($res->symb);
+ 	my $type = ($res->is_task()) ? 'Task' : 'problem';
+ 	&create_new_version($type,$user,$domain,$slot_name);
+ 	&Apache::structuretags::finalize_storage($res->symb);
+     }
+     %Apache::lonhomework::history = %old_history;
+     %Apache::lonhomework::results = %old_results;
+ }
+ sub create_new_version {
+     my ($type,$user,$domain,$slot_name) = @_;
+     my $id = '0';
+     if ($type eq 'Task') {
+ 	# increment version
+ 	my $version=
+ 	    $Apache::lonhomework::history{'resource.0.version'};
+ 	$version++;
+ 	&Apache::lonxml::debug("Making 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;
+ 	$id = "$version.0";
+ 	if (!defined($user) || !defined($domain)) {
+ 	    $user = $env{'user.name'};
+ 	    $domain = $env{'user.domain'};
+ 	}
+     } elsif ($type eq 'problem') {
+ 	&Apache::lonxml::debug("authed $slot_name");
+     }
+     if (!defined($user) || !defined($domain)) {
+ 	$user = $env{'user.name'};
+ 	$domain = $env{'user.domain'};
+     }
+     $Apache::lonhomework::results{"resource.$id.checkedin"}=
+ 	$user.':'.$domain;
+     if (defined($slot_name)) {
+ 	$Apache::lonhomework::results{"resource.$id.checkedin.slot"}=
+ 	    $slot_name;
+     }
+ }
  sub get_version {
      my ($version,$previous);
      if ($env{'form.previousversion'} &&
- Line 120  sub get_version {
+ Line 175  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) {
- Line 167  sub add_previous_version_button {
+ Line 226  sub add_previous_version_button {
  }
  sub add_grading_button {
-     my (undef,$cid)=&Apache::lonxml::whichuser();
+     my (undef,$cid)=&Apache::lonnet::whichuser();
      my $cnum=$env{'course.'.$cid.'.num'};
      my $cdom=$env{'course.'.$cid.'.domain'};
-     my %sections;
+     my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
-     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="multiple" name="chosensections" size="'.$size.'">'."\n";
+     my $sec_select = "\n".'<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
-     $sec_select .= "<option value='all' selected='selected'>all</option>\n";
+     $sec_select .= "\t<option value='all' selected='selected'>all</option>\n";
      foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
- 	$sec_select .= "<option value=\"$sec\">$sec</option>\n";
+ 	$sec_select .= "\t<option value=\"$sec\">$sec</option>\n";
      }
-     $sec_select .= "<option value='none'>none</option></select>\n";
+     $sec_select .= "\t<option value='none'>none</option>\n</select>\n";
-     my $result=' <input type="submit" name="gradeasubmission" value="'.
+     my $result="\n\t".'<input type="submit" name="gradeasubmission" value="'.
  	&mt("Get a submission to grade").'" />';
-     $result.='<input type="hidden" name="grade_target" value="webgrade" />';
+     $result.="\n\t".'<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.='<table><tr>';
+ 	$result.="\n\t".'<table>'."\n\t\t".'<tr>';
- 	$result.='<td rowspan="4">Specify a section: </td><td rowspan="4">'.$sec_select.'</td>';
+ 	$result.="\n\t\t\t".'<td rowspan="4">Specify a section: </td>'.
- 	$result.='<td>'.' <input type="submit" name="reviewagrading" value="'.
+ 	    "\n\t\t\t".'<td rowspan="4">'.$sec_select."\n\t\t\t".'</td>';
+ 	$result.="\n\t\t\t".'<td>'.'<input type="submit" name="reviewagrading" value="'.
  	    &mt("Select an entry from the grading queue:").'" /> ';
- 	$result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).' </td></tr>'."\n";
+ 	$result.= "\n\t\t\t\t".&mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).'</td>'."\n\t\t".'</tr>'."\n";
  	($entries,$ready,$locks)=&get_queue_counts('reviewqueue');
- 	$result.='<tr><td>'.
+ 	$result.="\n\t\t".'<tr>'.
- 	    ' <input type="submit" name="reviewasubmission" value="'.
+ 	    "\n\t\t\t".'<td>'.
+ 	    "\n\t\t\t\t".'<input type="submit" name="reviewasubmission" value="'.
  	    &mt("Select an entry from the review queue:").'" /> ';
  	$result.=&mt("[_1] entries, [_2] ready, [_3] being graded",
- 		     $entries,$ready,$locks).'</td></tr>'."\n";
+ 		     $entries,$ready,$locks).'</td>'."\n\t\t".'</tr>'."\n";
- 	$result.='<tr><td> <input type="submit" name="regradeasubmission" value="'.
+ 	$result.="\n\t\t".'<tr>'.
- 	    &mt("List of user's grade status").'" /> </td></tr></table>'."\n";
+ 	    "\n\t\t\t".'<td>'.
- 	$result.='<p> <input type="submit" name="regradeaspecificsubmission" value="'.
+ 	    "\n\t\t\t\t".'<input type="submit" name="regradeasubmission" value="'.
- 	    &mt("Regrade specific user:").'" />'."\n";
+ 	    &mt("List of user's grade status").'" /> </td>'
- 	$result.='<input type="text" size="12" name="gradinguser" />';
+ 	    ."\n\t\t".'</tr>'
+ 	    ."\n\t".'</table>'."\n";
+ 	$result.="\n\t".'<p>'.
+ 	    "\n\t\t".'<input type="submit" name="regradeaspecificsubmission" value="'.
+ 	    &mt("Regrade specific user:").'" />';
+ 	$result.= "\n\t\t".'<input type="text" size="12" name="gradinguser" />';
  	$result.=&Apache::loncommon::select_dom_form($env{'user.domain'},
  						     'gradingdomain');
  	$result.=' '.
- Line 213  sub add_grading_button {
+ Line 279  sub add_grading_button {
  						   'gradinguser',
  						   'gradingdomain');
  	$result.=&Apache::loncommon::studentbrowser_javascript();
- 	$result.= '</p>';
+ 	$result.= '</p>'."\n";
-   }
+     }
      return $result;
  }
- Line 223  sub add_request_another_attempt_button {
+ Line 289  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) {
- Line 231  sub add_request_another_attempt_button {
+ Line 303  sub add_request_another_attempt_button {
  	my $description=&Apache::slotrequest::get_description($slot_name,
  							      $slot);
  	$result.=(<<STUFF);
- <p> Will be next available: $description </p>
+     <p> Will be next available: $description </p>
  STUFF
      }
      if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
-     $symb=&Apache::lonnet::escape($symb);
+     $symb=&escape($symb);
-     $result.='<form method="post" action="/adm/slotrequest">'.
+     $result.=
- 	'<input type="hidden" name="symb" value="'.$symb.'" />'.
+         "\n\t".'<form method="post" action="/adm/slotrequest">'."\n\t\t".
- 	'<input type="hidden" name="command" value="'.$action.'" />'.
+ 	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n\t\t".
+ 	'<input type="hidden" name="command" value="'.$action.'" />'."\n\t\t".
  	'<input type="submit" name="requestattempt" value="'.
- 	&mt($text).'" />'.
+ 	&mt($text).'" />'."\n\t".
- 	'</form>';
+ 	'</form>'."\n";
      return $result;
  }
- Line 262  sub style {
+ Line 335  sub style {
      my ($target) = @_;
      if ($target eq 'web'
  	|| $target eq 'webgrade') {
- 	return (<<STYLE);
+ 	my $style = (<<STYLE);
  <link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />
  STYLE
+         if ($env{'browser.type'} eq 'explorer'
+ 	    && $env{'browser.os'} eq 'win' ) {
+ 	    if ($env{'browser.version'} < 7) {
+ 		$style .= (<<STYLE);
+ <link rel="stylesheet" type="text/css" href="/res/adm/includes/task_ie.css" />
+ STYLE
+             } else {
+ 		$style .= (<<STYLE);
+ <link rel="stylesheet" type="text/css" href="/res/adm/includes/task_ie7.css" />
+ STYLE
+ 	    }
+ 	}
+ 	return $style;
      }
      return;
  }
- Line 278  sub show_task {
+ Line 364  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; }
      return 1;
  }
+ my @delay;
+ sub nest {
+     if (@delay) {
+ 	return $delay[-1];
+     } else {
+ 	return;
+     }
+ }
+ sub start_delay {
+     push(@delay,1);
+ }
+ sub end_delay {
+     pop(@delay);
+ }
+ sub nested_parse {
+     my ($str,$env,$args) = @_;
+     my @old_env = @Apache::scripttag::parser_env;
+     @Apache::scripttag::parser_env = @$env;
+     if (exists($args->{'set_dim_id'})) {
+ 	&enable_dimension_parsing($args->{'set_dim_id'});
+     }
+     push(@delay,(($args->{'delayed_dim_results'})? 1 : 0));
+     my $result = &Apache::scripttag::xmlparse($$str);
+     pop(@delay);
+     if (exists($args->{'set_dim_id'})) {
+ 	&disable_dimension_parsing();
+     }
+     @Apache::scripttag::parser_env = @old_env;
+     if ($args->{'delayed_dim_results'}) {
+ 	my $dim = &get_dim_id();
+ 	&Apache::lonxml::debug(" tossing out $result ");
+ 	&Apache::lonxml::debug(" usining out $dim 's  ". $dimension{$dim}{'result'});
+ 	return $dimension{$dim}{'result'};
+     }
+     return $result;
+ }
  sub internal_location {
      my ($id)=@_;
      return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->';
  }
  sub submission_time_stamp {
-     my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+     my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::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'})) {
+ 	if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})
+ 	    && defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.tries'})) {
  	    $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};
+ 	    last;
  	}
      }
      my $result;
- Line 307  sub submission_time_stamp {
+ Line 435  sub submission_time_stamp {
  	my ($color,$when)=('#FF6666','after');
  	if ($diff > 0) { ($color,$when)=('#336600','before'); }
  	my $info;
+ 	$diff = abs($diff);
  	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.
+ 	    &mt('Student submitted [_1] [_2] the deadline. '.
-                  (Submission was at [_3], end of period was [_4].)',
+ 		'(Submission was at [_3], end of period was [_4].)',
- 		$info,$when,scalar(localtime($submissiontime)),
+ 		$info,$when,
- 		scalar(localtime($slot{'endtime'}))).
+ 		&Apache::lonlocal::locallocaltime($submissiontime),
+ 		&Apache::lonlocal::locallocaltime($slot{'endtime'})).
  		'</font></p>';
      }
      return $result;
- Line 325  sub submission_time_stamp {
+ Line 455  sub submission_time_stamp {
  sub file_list {
      my ($files,$uname,$udom) = @_;
      if (!defined($uname) || !defined($udom)) {
- 	(undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
+ 	(undef,undef,$udom,$uname) = &Apache::lonnet::whichuser();
      }
      my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
- Line 334  sub file_list {
+ Line 464  sub file_list {
  	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="'.
+ 	$file_list.='<li><span style="white-space: nowrap;"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
- 	    &Apache::loncommon::icon($file).'" border="0"> '.$file.
+ 	    &Apache::loncommon::icon($file).'" alt="file icon" border="0" /> '.$file.
- 	    '</a></nobr></li>'."\n";
+ 	    '</a></span></li>'."\n";
      }
      $file_list.="</ul>\n";
      return $file_list;
  }
+ sub grade_mode {
+     if ($env{'form.regrade'} || $env{'form.regradeaspecificsubmission'}) {
+ 	return 'regrade';
+     }
+     return 'queue_grade';
+ }
  sub webgrade_standard_info {
      my ($version)=&get_version();
      my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"});
-     my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',
+     my %lt=('done'   => 'Next Item',
- 				       'stop' => 'Quit Grading',
+ 	    'stop'   => 'Quit Grading',
- 				       );
+ 	    'fail'   => 'Fail Rest',
+ 	    'cancel' => 'Cancel',
+ 	    );
+     %lt=&Apache::lonlocal::texthash(%lt);
      my $result=<<INFO;
    <div class="LC_GRADING_maincontrols">
+ INFO
+     if (&grade_mode() eq 'regrade') {
+ 	$result.=<<INFO;
+     <input type="submit" name="cancel" value="$lt{'cancel'}" />
+ INFO
+     }
+     $result.=<<INFO;
      <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
      return $result;
  }
+ sub done_screen {
+     my ($version) = @_;
+     my $title=&Apache::lonnet::gettitle();
+     my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
+     my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();
+     my $files = '<ul>';
+     my $msg;
+     foreach my $file (@files) {
+ 	my $url="/uploaded/$domain/$user/portfolio$file";
+ 	if (! &Apache::lonnet::stat_file($url)) {
+ 	    $file = &mt('<span class="LC_error"> Nonexistent file:</span> '.
+ 			'<span class="LC_filename">[_1]</span>',$file);
+ 	    $msg .= "<p>Submitted non-existant file $file</p>\n";
+ 	} else {
+ 	    $file = '<span class="LC_filename">'.$file.'</span>';
+ 	    $msg .= "<p>Submitted file $file</p>\n";
+ 	}
+ 	$files .= '<li>'.$file.'</li>';
+     }
+     $files.='</ul>';
+     my $subject = "Submission message for $title";
+     my ($message_status,$comment_status);
+     my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'};
+     $setting =~ s/^\s*(\S*)\s*$/$1/;
+     $setting = lc($setting);
+     if ($setting eq 'only_student'
+ 	|| $setting eq 'student_and_user_notes_screen') {
+ 	$message_status =
+ 	    &Apache::lonmsg::user_normal_msg($user,$domain,$subject,$msg);
+ 	$message_status = '<p>'.&mt('Message sent to user: [_1]',
+ 				    $message_status).' </p>';
+     }
+     if ($setting eq 'student_and_user_notes_screen') {
+ 	$comment_status =
+ 	    &Apache::lonmsg::store_instructor_comment($subject.'<br />'.
+ 						      $msg,$user,$domain);
+ 	$comment_status = '<p>'.&mt('Message sent to instructor: [_1]',
+ 				    $comment_status).' </p>';
+     }
+     return <<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>
+ $message_status
+ $comment_status
+ DONESCREEN
+ }
  sub start_Task {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      my ($status,$accessmsg,$slot);
+     &Apache::structuretags::init_problem_globals('Task');
      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') {
- Line 375  sub start_Task {
+ Line 578  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);
-     $head_tag_start .= &style($target);
-     $body_tag_start .= '<div class="LC_task">'."\n";
+     my $name;
      if ($target eq 'web' || $target eq 'webgrade') {
- 	$head_tag_start.='<title>'.
+ 	$name = &Apache::structuretags::get_resource_name($parstack,$safeeval);
- 	    &Apache::structuretags::get_resource_name($parstack,$safeeval).
+     }
- 	    '</title>';
+     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));
      }
      if ($target eq 'web' && $env{'request.state'} ne 'construct') {
- 	if ($Apache::lonhomework::modifygrades) {
+ 	if ($Apache::lonhomework::queuegrade
- 	    $body_tag_start.='<form name="gradesubmission" method="post" action="';
+ 	    || $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>\n";
  	    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="'.
- Line 405  sub start_Task {
+ Line 611  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="'.
- Line 417  sub start_Task {
+ Line 623  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' ||
+     if ($target eq 'web'
- 	$target eq 'tex') {
+ 	|| ($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_slot_access('0','Task');
+ 	if ($status eq 'CAN_ANSWER' && $version eq '') {
+ 	    # CAN_ANSWER mode, and no current version, unproctored access
+ 	    # thus self-checkedin
+ 	    &check_in('Task',undef,undef,$slot_name);
+ 	    &add_to_queue('gradingqueue',{'type' => 'Task',
+ 					  'time' => time,
+ 					  'slot' => $slot_name});
+ 	    ($version,$previous)=&get_version();
+ 	}
+ 	my $status_id =
+ 	    ($previous || $status eq 'SHOW_ANSWER') ? 'LC_task_feedback'
+ 	                                            : 'LC_task_take';
+ 	$result .= '<div class="LC_task" id="'.$status_id.'">'."\n";
  	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;
  		}
- Line 448  sub start_Task {
+ Line 670  sub start_Task {
  		} 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();
+ 		    $result .= &done_screen($version);
- 		    my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
- 		    my (undef,undef,$domain,$user)=
- 			&Apache::lonxml::whichuser();
- 		    my $files = '<ul>';
- 		    foreach my $file (@files) {
- 			my $url="/uploaded/$domain/$user/portfolio$file";
- 			if (! &Apache::lonnet::stat_file($url)) {
- 			    $file = &mt('<font color="red"> Nonexistant file:</font> <tt>[_1]</tt>',$file);
- 			} else {
- 			    $file = '<tt>'.$file.'</tt>';
- 			}
- 			$files .= '<li>'.$file.'</li>';
- 		    }
- 		    $files.='</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>';
  		}
- Line 490  DONESCREEN
+ Line 689  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',
+ 			my $result=
- 						 [$Apache::inputtags::slot_name]);
+ 			    &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') {
- 	    $result.="$head_tag_start</head>
-               $body_tag_start \n";
  	    $result.=&preserve_grade_info();
  	    $result.=&internal_location();
- 	    $result.=$form_tag_start.
+ 	    $result.=$form_tag_start."\t".
  		'<input type="hidden" name="submitted" value="yes" />';
  	    &Apache::lonxml::startredirection();
  	}
- Line 510  DONESCREEN
+ Line 711  DONESCREEN
  	      $target eq 'webgrade') {
  	my $webgrade='yes';
  	if ($target eq 'webgrade') {
- 	    $result.=$head_tag_start.
+ 	    $result .= '<div class="LC_task">'."\n";
- 		'</head>'.$body_tag_start.
+ 	    $result.= "\n".'<div class="LC_GRADING_task">'."\n".
- 		"\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');
  	}
- 	# FIXME Blast! still need to reorg this, need to reshow the
-         #       queue being reviewed once done with the grade pass...
-         #       Hrrm, vaildation pass should perhaps say 'not_locked'
-         #       perhaps do a search if there is a key that is mine and if
-         #       there isn't reshow the queue....
  	my ($todo,$status_code,$msg)=&get_key_todo($target);
  	if ($todo) {
- Line 532  DONESCREEN
+ Line 728  DONESCREEN
  		&Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
  	    $form_tag_start.=
  		'<input type="hidden" name="gradingkey" value="'.
- 		&Apache::lonnet::escape($todo).'" />';
+ 		&escape($todo).'" />';
  	    $Apache::bridgetask::queue_key=$todo;
  	    &Apache::structuretags::initialize_storage();
  	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
- Line 547  DONESCREEN
+ Line 743  DONESCREEN
  		    &mt('Return to resource').'</a></p>';
  		if      ($status_code eq 'stop') {
  		    $result.='<b>'.&mt("Stopped grading.").'</b>'.$back;
+ 		} elsif ($status_code eq 'cancel') {
+ 		    $result.='<b>'.&mt("Cancelled grading.").'</b>'.$back;
+ 		} elsif ($status_code eq 'never_versioned') {
+ 		    $result.='<b>'.
+ 			&mt("Requested user has never accessed the task.").
+ 			'</b>'.$back;
+ 		} elsif ($status_code =~ /still_open:(.*)/) {
+ 		    my $date = &Apache::lonlocal::locallocaltime($1);
+ 		    $result.='<b>'.
+ 			&mt("Task is still open, will close at [_1].",$date).
+ 			'</b>'.$back;
  		} elsif ($status_code eq 'lock_failed') {
  		    $result.='<b>'.&mt("Failed to lock the requested record.")
  			.'</b>'.$back;
- Line 567  DONESCREEN
+ Line 774  DONESCREEN
  		}
  	    }
  	    $webgrade='no';
+ 	}
+ 	if (!$todo || $env{'form.cancel'}) {
  	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
  	}
  	if ($target eq 'webgrade' && defined($env{'form.queue'})) {
- Line 594  DONESCREEN
+ Line 803  DONESCREEN
  	}
  	if ($target eq 'webgrade') {
  	    $result.="\n".'<div id="LC_GRADING_criterialist">';
+ 	    &Apache::lonxml::startredirection();
+ 	    &start_delay();
+ 	    $dimension{$top}{'result'}=$result;
+ 	    undef($result);
  	}
      } 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 />";
- 	my $temp=&Apache::edit::insertlist($target,$token);
+ 	$result.= &Apache::edit::text_arg('Required number of passed optional elements to pass the Task:','OptionalRequired',$token,10)." <br />\n";
- 	$result.=$temp;
+ 	$result.= &Apache::edit::insertlist($target,$token);
+     } elsif ($target eq 'modified') {
+ 	my $constructtag=
+ 	    &Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 					'OptionalRequired');
+ 	if ($constructtag) {
+ 	    $result = &Apache::edit::rebuild_tag($token);
+ 	}
      } else {
  	# page_start returned a starting result, delete it if we don't need it
  	$result = '';
- Line 609  DONESCREEN
+ Line 829  DONESCREEN
      return $result;
  }
+ sub get_task_end_time {
+     my ($queue_entry,$symb,$udom,$uname) = @_;
+     my $end_time;
+     if (my $slot = &slotted_access($queue_entry)) {
+ 	my %slot_data=&Apache::lonnet::get_slot($slot);
+ 	$end_time = $slot_data{'endtime'};
+     } else {
+ 	$end_time = &Apache::lonhomework::due_date('0',$symb,
+ 						   $udom,$uname);
+     }
+     return $end_time;
+ }
  sub get_key_todo {
      my ($target)=@_;
      my $todo;
- Line 632  sub get_key_todo {
+ Line 866  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'}) &&
  	defined($env{'form.gradinguser'})               &&
  	defined($env{'form.gradingdomain'})               ) {
- 	my ($symb,$cid)=&Apache::lonxml::whichuser();
+ 	my ($symb,$cid)=&Apache::lonnet::whichuser();
  	my $cnum  = $env{'course.'.$cid.'.num'};
  	my $cdom  = $env{'course.'.$cid.'.domain'};
- 	my $uname = $env{'form.gradinguser'};
+ 	my $uname = &LONCAPA::clean_username($env{'form.gradinguser'});
- 	my $udom  = $env{'form.gradingdomain'};
+ 	my $udom  = &LONCAPA::clean_domain($env{'form.gradingdomain'});
  	my $gradingkey=&encode_queue_key($symb,$udom,$uname);
- Line 657  sub get_key_todo {
+ Line 891  sub get_key_todo {
  	if (!$queue) {
  	    $env{'form.queue'} = $queue = 'none';
  	    #not queued so doing either a re or pre grade
+ 	    my %status = &Apache::lonnet::restore($symb,$cid,$udom,$uname);
+ 	    if ($status{'resource.0.version'} < 1) {
+ 		return (undef,'never_versioned');
+ 	    }
  	    return ($gradingkey);
  	}
+ 	if ($queue) {
+ 	    my $queue_entry = &get_queue_data($queue,$udom,$uname);
+ 	    my $end_time = &get_task_end_time($queue_entry,$symb,
+ 					      $udom,$uname);
+ 	    if ($end_time > time) {
+ 		return (undef,"still_open:$end_time");
+ 	    }
+ 	}
  	my $who=&queue_key_locked($queue,$gradingkey);
  	if ($who eq $me) {
  	    #already have the lock
- 	    $env{'form.gradingkey'}=&Apache::lonnet::escape($gradingkey);
+ 	    $env{'form.gradingkey'}=&escape($gradingkey);
+ 	    &Apache::lonxml::debug("already locked");
  	    return ($gradingkey);
  	}
  	if (!defined($who)) {
  	    if (&lock_key($queue,$gradingkey)) {
+ 		&Apache::lonxml::debug("newly locked");
  		return ($gradingkey);
  	    } else {
  		return (undef,'lock_failed');
- Line 678  sub get_key_todo {
+ Line 928  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'}));
      }
- Line 688  sub get_key_todo {
+ Line 938  sub get_key_todo {
  	$env{'form.queue'}=$queue='gradingqueue';
      }
-     my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});
+     my $gradingkey=&unescape($env{'form.gradingkey'});
      if ($env{'form.queue'} eq 'none') {
  	if (defined($env{'form.gradingkey'})) {
  	    if ($target eq 'webgrade') {
  		if ($env{'form.stop'}) {
  		    return (undef,'stop');
+ 		} elsif ($env{'form.cancel'}) {
+ 		    return (undef,'cancel');
  		} elsif ($env{'form.next'}) {
  		    return (undef,'select_user');
  		}
- Line 740  sub get_key_todo {
+ Line 992  sub get_key_todo {
      if ($env{'form.queuemode'} ne 'selected') {
  	# don't get something new from the queue if they hit the stop button
-     	if (!($env{'form.stop'} && $target eq 'webgrade')
+     	if (!(($env{'form.cancel'} || $env{'form.stop'})
+ 	      && $target eq 'webgrade')
  	    && !$env{'form.gradingaction'}) {
  	    &Apache::lonxml::debug("Getting anew $queue");
  	    return (&get_from_queue($queue));
- Line 787  sub end_Task {
+ Line 1040  sub end_Task {
  		if (!$previous && $status ne 'SHOW_ANSWER' &&
  		    &show_task($status,$previous)) {
  		    $result.=&Apache::inputtags::gradestatus('0');
- 		    $result.='</form>';
+ 		}
+ 		$result.='</form>';
+ 		if (!$previous && $status ne 'SHOW_ANSWER' &&
+ 		    &show_task($status,$previous)) {
  		    my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
  		    $result.=<<DONEBUTTON;
  <form name="done" method="post" action="$action">
- Line 801  DONEBUTTON
+ Line 1059  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);
+ 		    if ($slot_name) {
- 		    my $start_time=
+ 			my %slot=&Apache::lonnet::get_slot($slot_name);
- 			&Apache::lonlocal::locallocaltime($slot{'starttime'});
- 		    my $status = "\n<div class='LC_$bt_status LC_criteria'>\n";
+ 			$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 LC_task_overall_status'>\n\t";
+ 		    my $dim = $top;
+ 		    my %counts = &get_counts($dim,undef,$parstack,
+ 					     $safeeval);
+ 		    my $question_status ="\n\t<p>".
+ 			&question_status_message(\%counts,-1).
+ 			"</p>\n";
  		    if ($bt_status eq 'pass')  {
  			$status.='<h2>You passed the '.$title.' given on '.
  			    $start_time.'</h2>';
+ 			$status.=$question_status;
  		    }
  		    if ($bt_status eq 'fail')  {
  			$status.='<h2>You did not pass the '.$title.' given on '.
  			    $start_time.'</h2>';
+ 			$status.=$question_status;
  			if (!$previous) {
  			    $status.=&add_request_another_attempt_button();
  			}
  		    }
- 		    my $man_count=0;
- 		    my $opt_count=0;
+ 		    $status.="\n".'</div>'."\n";
- 		    my $opt_passed=0;
- 		    foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
+ 		    foreach my $id (@{$dimension{$dim}{'criterias'}}) {
- 			if ($Apache::bridgetask::dimensionmandatory{$dim_id}
+ 			my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
- 			    eq 'N') {
+ 			if ($type eq 'dimension') {
- 			    $opt_count++;
+ 			    $result.=$dimension{$id}{'result'};
- 			    if ($Apache::lonhomework::history{"resource.$version.0.$dim_id.status"} eq 'pass') {
+ 			    next;
- 				$opt_passed++;
- 			    }
- 			} else {
- 			    $man_count++;
  			}
+ 			my $criteria =
+ 			    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+ 					  [@_]);
+ 			$status .= &layout_web_Criteria($dim,$id,$criteria);
  		    }
- 		    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, 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/;
  		}
- 	    }
+ 		$result.="\n</div>\n".
- 	    if ($target eq 'web') {
+ 		    &Apache::loncommon::end_page({'discussion' => 1});
- 		$result.="\n</div>\n".&Apache::lonxml::xmlend().'</html>';
  	    }
  	}
- 	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
+ 	my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
+ 	my %queue_data = ('type' => 'Task',
+ 			  'time' => time,);
+ 	if (defined($Apache::inputtags::slot_name)) {
+ 	    $queue_data{'slot'} = $Apache::inputtags::slot_name;
+ 	} elsif (defined($Apache::lonhomework::history{"resource.$version.0.checkedin.slot"})) {
+ 	    $queue_data{'slot'} = $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"};
+ 	}
+ 	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous
+ 	    && $status eq 'CAN_ANSWER') {
  	    my $award='SUBMITTED';
  	    &Apache::essayresponse::file_submission("$version.0",'bridgetask',
  						    'portfiles',\$award);
- Line 868  DONEBUTTON
+ Line 1151  DONEBUTTON
  	    }
  	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
  	    &Apache::structuretags::finalize_storage();
- 	    if ($award eq 'SUBMITTED'
+ 	    if ($award eq 'SUBMITTED') {
- 		&& defined($Apache::inputtags::slot_name)) {
+ 		&add_to_queue('gradingqueue',\%queue_data);
- 		&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') {
+ 	if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes'
+ 	    && exists($env{'form.cancel'})) {
+ 	    &check_queue_unlock($env{'form.queue'});
+ 	    &Apache::lonxml::debug(" cancelled grading .".$env{'form.queue'});
+ 	} elsif ($target eq 'grade' && $env{'form.webgrade'} eq 'yes'
+ 		 && !exists($env{'form.cancel'})) {
  	    my $optional_required=
  		&Apache::lonxml::get_param('OptionalRequired',$parstack,
  					   $safeeval);
- Line 884  DONEBUTTON
+ Line 1169  DONEBUTTON
  	    my $ungraded=0;
  	    my $review=0;
  	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
- 	    foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
+ 	    my $dim = $top;
+ 	    foreach my $id (@{$dimension{$dim}{'criterias'}}) {
+ 		my $link=&link($id);
+ 		my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+ 		if ($type eq 'criteria') {
+ 		    # dimensional 'criteria' don't get assigned grades
+ 		    $Apache::lonhomework::results{"resource.$version.0.$id.status"}=$env{'form.HWVAL_'.$link};
+ 		    $Apache::lonhomework::results{"resource.$version.0.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
+ 		}
  		my $status=
- 		    $Apache::lonhomework::results{"resource.$version.0.$dim_id.status"};
+ 		    $Apache::lonhomework::results{"resource.$version.0.$id.status"};
- 		my $mandatory=
+ 		my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N');
- 		    ($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++;
+ 		} elsif ($status eq 'ungraded') {
+ 		    $ungraded++;
  		} else {
  		    $ungraded++;
  		}
- Line 904  DONEBUTTON
+ Line 1199  DONEBUTTON
  	    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::lonxml::debug(" task 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') {
- 		    &check_queue_unlock($env{'form.queue'});
- 		    &Apache::lonxml::debug(" still needs review not changing status.");
- 		} else {
- 		    &move_between_queues($env{'form.queue'},'reviewqueue');
- 		}
  	    } elsif ($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.");
- 		    &move_between_queues($env{'form.queue'},'gradingqueue');
- 		} else {
- 		    &check_queue_unlock($env{'form.queue'});
- 		}
  	    } elsif ($mandatory_failed) {
  		$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';
- 		&remove_from_queue($env{'form.queue'});
+ 		my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
- 		my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
  		if ($env{'form.regrade'} ne 'yes') {
  		    $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
- Line 947  DONEBUTTON
+ Line 1227  DONEBUTTON
  		$Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
  		$Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';
  		$Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
- 		&remove_from_queue($env{'form.queue'});
+ 		my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
- 		my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
  		if ($env{'form.regrade'} ne 'yes') {
  		    $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
  			$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
- Line 972  DONEBUTTON
+ Line 1250  DONEBUTTON
  	    }
  	    &minimize_storage();
  	    &Apache::structuretags::finalize_storage();
+ 	    # data stored, now handle queue
+ 	    if ($review) {
+ 		if ($env{'form.queue'} eq 'reviewqueue') {
+ 		    &check_queue_unlock($env{'form.queue'});
+ 		    &Apache::lonxml::debug(" still needs review not changing status.");
+ 		} else {
+ 		    if ($env{'form.queue'} ne 'none') {
+ 			&move_between_queues($env{'form.queue'},'reviewqueue');
+ 		    } else {
+ 			&add_to_queue('reviewqueue',\%queue_data);
+ 		    }
+ 		}
+ 	    } elsif ($ungraded) {
+ 		if ($env{'form.queue'} eq 'reviewqueue') {
+ 		    &Apache::lonxml::debug("moving back.");
+ 		    &move_between_queues($env{'form.queue'},
+ 					 'gradingqueue');
+ 		} elsif ($env{'form.queue'} eq 'none' ) {
+ 		    &add_to_queue('gradingqueue',\%queue_data);
+ 		} else {
+ 		    &check_queue_unlock($env{'form.queue'});
+ 		}
+ 	    } elsif ($mandatory_failed) {
+ 		&remove_from_queue($env{'form.queue'});
+ 	    } else {
+ 		&remove_from_queue($env{'form.queue'});
+ 	    }
+ 	}
+ 	if (exists($Apache::lonhomework::results{'INTERNAL_store'})) {
+ 	    # instance generation occured and hasn't yet been stored
+ 	    &Apache::structuretags::finalize_storage();
  	}
      } elsif ($target eq 'webgrade') {
- 	$result.="</div>\n<hr />";
+ 	if (&nest()) {
+ 	    &Apache::lonxml::endredirection();
+ 	    &end_delay();
+ 	    $result.=$dimension{$top}{'result'};
+ 	} else {
+ 	    $result.=&Apache::lonxml::endredirection();
+ 	}
+ 	my $dim = $top;
+ 	foreach my $id (@{$dimension{$dim}{'criterias'}} ) {
+ 	    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+ 	    if ($type eq 'dimension') {
+ 		# dimensional 'criteria' don't get assigned grades
+ 		next;
+ 	    } else {
+ 		my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id},
+ 					     [@_]);
+ 		$criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
+ 		my $internal_location=&internal_location($id);
+ 		if ($result =~ m/\Q$internal_location\E/) {
+ 		    $result=~s/\Q$internal_location\E/$criteria/;
+ 		} else {
+ 		    $result.=$criteria;
+ 		}
+ 	    }
+ 	}
+         $result.="</div>";
  	#$result.='<input type="submit" name="next" value="'.
  	#    &mt('Save &amp; Next').'" /> ';
  	#$result.='<input type="submit" name="end" value="'.
- Line 984  DONEBUTTON
+ Line 1320  DONEBUTTON
  	#$result.='<input type="submit" name="save" value="'.
  	#    &mt('Save Partial Grade and Continue Grading').'" /> ';
  	$result.='</form>'."\n</div>\n</div>\n".
- 	    &Apache::loncommon::endbodytag().'</html>';
+ 	    &Apache::loncommon::end_page();
      } elsif ($target eq 'meta') {
  	$result.=&Apache::response::meta_package_write('Task');
          $result.=&Apache::response::meta_stores_write('solved','string',
- Line 995  DONEBUTTON
+ Line 1331  DONEBUTTON
  						      'Partial Credit Factor');
  	$result.=&Apache::response::meta_stores_write('status','string',
  						      'Bridge Task Status');
+     } elsif ($target eq 'edit') {
+ 	&Apache::structuretags::reset_problem_globals('Task');
+ 	undef($Apache::lonhomework::parsing_a_task);
+ 	return ('','no');
      }
+     &Apache::structuretags::reset_problem_globals('Task');
      undef($Apache::lonhomework::parsing_a_task);
      return $result;
  }
- Line 1009  sub move_between_queues {
+ Line 1350  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;
      }
- Line 1020  sub move_between_queues {
+ Line 1361  sub move_between_queues {
  sub check_queue_unlock {
      my ($queue,$key,$allow_not_me)=@_;
      if ($queue eq 'none') { return 'ok'; }
-     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+     my ($symb,$cid,$udom,$uname)=&Apache::lonnet::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) {
+ 	&Apache::lonxml::debug("unlocking my own $who");
  	return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
      } elsif ($allow_not_me) {
  	&Apache::lonxml::debug("unlocking $who by $me");
- Line 1042  sub in_queue {
+ Line 1384  sub in_queue {
      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();
+ 	($symb,my $cid,$udom,$uname)=&Apache::lonnet::whichuser();
  	$cnum=$env{'course.'.$cid.'.num'};
  	$cdom=$env{'course.'.$cid.'.domain'};
      }
- Line 1061  sub remove_from_queue {
+ Line 1403  sub remove_from_queue {
      if ($queue eq 'none') { return 'ok'; }
      if (!defined($symb) || !defined($cdom) || !defined($cnum)
  	|| !defined($udom) || !defined($uname)) {
- 	($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();
+ 	($symb,my $cid,$udom,$uname)=&Apache::lonnet::whichuser();
  	$cnum=$env{'course.'.$cid.'.num'};
  	$cdom=$env{'course.'.$cid.'.domain'};
      }
- Line 1085  sub setup_env_for_other_user {
+ Line 1427  sub setup_env_for_other_user {
  }
  sub get_queue_data {
-     my ($queue)=@_;
+     my ($queue,$udom,$uname)=@_;
-     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+     my ($symb,$cid,$other_udom,$other_uname)=&Apache::lonnet::whichuser();
+     if (!$uname || !$udom) {
+ 	$uname=$other_uname;
+ 	$udom =$other_udom;
+     }
      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;
- Line 1108  sub check_queue_for_key {
+ Line 1454  sub check_queue_for_key {
  	if (defined($results{"$todo\0locked"})) {
  	    return 'locked';
  	}
- 	my $slot;
+ 	if (my $slot=&slotted_access($results{$todo})) {
- 	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';
  	    }
+ 	} 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';
      }
- Line 1128  sub check_queue_for_key {
+ Line 1474  sub check_queue_for_key {
  sub add_to_queue {
      my ($queue,$user_data)=@_;
      if ($queue eq 'none') { return 'ok'; }
-     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+     my ($symb,$cid,$udom,$uname)=&Apache::lonnet::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"}=$user_data;
+     $data{"$symb\0queue\0$uname:$udom"}=$user_data;
      return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);
  }
+ sub get_limited_classlist {
+     my ($sections) = @_;
+     my $classlist = &Apache::loncoursedata::get_classlist();
+     foreach my $student (keys(%$classlist)) {
+ 	if ( $classlist->{$student}[&Apache::loncoursedata::CL_STATUS()]
+ 	     ne 'Active') {
+ 	    delete($classlist->{$student});
+        	}
+     }
+     if (ref($sections) && !grep('all',@{ $sections })) {
+ 	foreach my $student (keys(%$classlist)) {
+ 	    my $section  =
+ 		$classlist->{$student}[&Apache::loncoursedata::CL_SECTION()];
+ 	    if (! grep($section,@{ $sections })) {
+ 		delete($classlist->{$student});
+ 	    }
+ 	}
+     }
+     return $classlist;
+ }
  sub show_queue {
      my ($queue,$with_selects)=@_;
      my $result;
-     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+     my ($symb,$cid,$udom,$uname)=&Apache::lonnet::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,);
+     my $classlist = &get_limited_classlist(\@chosen_sections);
-     &Apache::grades::reset_perm();
      if (!(grep(/^all$/,@chosen_sections))) {
  	$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
  	    '</tt>.</p> '."\n";
      }
+     my ($view,$view_section);
+     my $scope = $env{'request.course.id'};
+     if (!($view=&Apache::lonnet::allowed('vgr',$scope))) {
+ 	$scope .= '/'.$env{'request.course.sec'};
+ 	if ( $view = &Apache::lonnet::allowed('vgr',$scope)) {
+ 	    $view_section=$env{'request.course.sec'};
+ 	} else {
+ 	    undef($view);
+ 	}
+     }
      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>";
+ 	return "\n<h3>Current Queue - $queue</h3>".
+ 	    &Apache::loncommon::start_data_table().
+ 	    &Apache::loncommon::start_data_table_row().
+ 	    '<td>'.&mt('Empty').'</td>'.
+ 	    &Apache::loncommon::end_data_table_row().
+ 	    &Apache::loncommon::end_data_table();
      }
      my $title=&Apache::lonnet::gettitle($symb);
-     $result.="\n<h3>Current Queue - $title $queue </h3><table border='1'><tr>";
+     $result.="\n<h3>Current Queue - $title $queue </h3>".
+ 	&Apache::loncommon::start_data_table().
+ 	&Apache::loncommon::start_data_table_header_row();
      if ($with_selects) { $result.="<th>Status</th><th></th>"; }
-     $result.="<th>user</th><th>data</th></tr>";
+     $result.="<th>user</th><th>data</th>".
+ 	&Apache::loncommon::end_data_table_header_row();
      foreach my $key (sort(keys(%queue))) {
  	my ($symb,$uname,$udom) = &decode_queue_key($key);
  	if (!defined($classlist->{$uname.':'.$udom})) { next; }
+ 	my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];
+ 	my $can_view=1;
+ 	if (!$view
+ 	    || ($view_section && !$section)
+ 	    || ($view_section && $section && ($view_section ne $section))) {
+ 	    $can_view=0;
+ 	}
  	if ($key=~/locked$/ && !$with_selects) {
- 	    $result.="<tr><td>$uname</td>";
+ 	    $result.= &Apache::loncommon::start_data_table_row().
+ 		"<td>$uname</td>";
  	    $result.='<td>'.$queue{$key}.'</td></tr>';
  	} elsif ($key=~/timestamp$/ && !$with_selects) {
- 	    $result.="<tr><td></td>";
+ 	    $result.=&Apache::loncommon::start_data_table_row()."<td></td>";
  	    $result.='<td>'.
  		&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
  	} elsif ($key!~/(timestamp|locked)$/) {
- 	    $result.="<tr>";
+ 	    $result.= &Apache::loncommon::start_data_table_row();
- 	    my $slot=$queue{$key}->[0];
+ 	    my ($end_time,$slot_text);
- 	    my %slot_data=&Apache::lonnet::get_slot($slot);
+ 	    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 $ekey=&escape($key);
  		my ($action,$description,$status)=('select',&mt('Select'));
  		if (exists($queue{"$key\0locked"})) {
- 		    my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ 		    my ($locker,$time) =
- 		    $status=&mt('Locked by <tt>[_1]</tt>',$queue{"$key\0locked"});
+ 			&get_lock_info($queue{"$key\0locked"});
- 		    if ($me eq $queue{"$key\0locked"}) {
+ 		    if ($time) {
+ 			$time =
+ 			    &Apache::lonnavmaps::timeToHumanString($time,
+ 								   'start');
+ 		    }
+ 		    my $me=$env{'user.name'}.':'.$env{'user.domain'};
+ 		    $status=&mt('Locked by <tt>[_1]</tt> [_2]',$locker,$time);
+ 		    if ($me eq $locker) {
  			($action,$description)=('resume',&mt('Resume'));
  		    } else {
  			($action,$description)=('unlock',&mt('Unlock'));
- Line 1197  sub show_queue {
+ Line 1611  sub show_queue {
  		    $seclist.='<input type="hidden" name="chosensections"
                                 value="'.$sec.'" />';
  		}
- 		if (time > $slot_data{'endtime'}) {
+ 		if ($can_view && ($end_time ne '' && time > $end_time)) {
  		    $result.=(<<FORM);
  <td>$status</td>
  <td>
- Line 1212  sub show_queue {
+ Line 1626  sub show_queue {
  </form>
  </td>
  FORM
+                 } elsif (!$can_view && ($end_time ne '' && time > $end_time)) {
+ 		    $result.='<td>'.&mt("Not gradable").'</td><td>&nbsp;</td>'
                  } else {
- 		    $result.='<td>'.&mt("In Progress").'</td>'
+ 		    $result.='<td>'.&mt("In Progress").'</td><td>&nbsp;</td>'
  		}
  	    }
- 	    $result.= "<td>".$fullname->{$uname.':'.$udom}.
+ 	    $result.= "<td>".$classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_FULLNAME()].
- 		" <tt>($uname\@$udom)</tt> </td>";
+ 		" <tt>($uname:$udom)</tt> </td>";
- 	    $result.='<td>Slot: '.$slot.' End time: '.
+ 	    $result.='<td>'.$slot_text.' End time: '.
- 		&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
+ 		&Apache::lonlocal::locallocaltime($end_time).
- 		"</td></tr>";
+ 		"</td>".&Apache::loncommon::end_data_table_row();
  	}
      }
-     $result.="</table><hr />\n";
+     $result.= &Apache::loncommon::end_data_table()."<hr />\n";
      return $result;
  }
  sub get_queue_counts {
      my ($queue)=@_;
      my $result;
-     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+     my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
      my $cnum=$env{'course.'.$cid.'.num'};
      my $cdom=$env{'course.'.$cid.'.domain'};
+     my $classlist=&get_limited_classlist();
      my $regexp="^$symb\0";
      my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
      my ($tmp)=%queue;
- Line 1243  sub get_queue_counts {
+ Line 1661  sub get_queue_counts {
      my ($entries,$ready_to_grade,$locks)=(0,0,0);
      my %slot_cache;
      foreach my $key (sort(keys(%queue))) {
+ 	my ($symb,$uname,$udom) = &decode_queue_key($key);
+ 	if (!defined($classlist->{$uname.':'.$udom})) { next; }
  	if ($key=~/locked$/) {
  	    $locks++;
  	} elsif ($key=~/timestamp$/) {
  	    #ignore
  	} elsif ($key!~/(timestamp|locked)$/) {
- 	    my ($symb,$uname,$udom) = &decode_queue_key($key);
  	    $entries++;
- 	    my $slot=$queue{$key}->[0];
+ 	    if (my $slot=&slotted_access($queue{$key})) {
- 	    if (!exists($slot_cache{$slot})) {
+ 		if (!exists($slot_cache{$slot})) {
- 		my %slot_data=&Apache::lonnet::get_slot($slot);
+ 		    my %slot_data=&Apache::lonnet::get_slot($slot);
- 		$slot_cache{$slot} = \%slot_data;
+ 		    $slot_cache{$slot} = \%slot_data;
- 	    }
+ 		}
- 	    if (time > $slot_cache{$slot}{'endtime'}) {
+ 		if (time > $slot_cache{$slot}{'endtime'}) {
- 		$ready_to_grade++;
+ 		    $ready_to_grade++;
+ 		}
+ 	    } else {
+ 		my $due_date = &Apache::lonhomework::due_date('0',$symb);
+ 		if ($due_date ne '' && time > $due_date) {
+ 		    $ready_to_grade++;
+ 		}
  	    }
  	}
      }
- Line 1265  sub get_queue_counts {
+ Line 1690  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);
  }
  sub queue_key_locked {
      my ($queue,$key,$cdom,$cnum)=@_;
      if (!defined($cdom) || !defined($cnum)) {
- 	my (undef,$cid)=&Apache::lonxml::whichuser();
+ 	my (undef,$cid)=&Apache::lonnet::whichuser();
  	$cnum=$env{'course.'.$cid.'.num'};
  	$cdom=$env{'course.'.$cid.'.domain'};
      }
      my ($key_locked,$value)=
  	&Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum);
      if ($key_locked eq "$key\0locked") {
- 	return $value;
+ 	return &get_lock_info($value);
+     }
+     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 ($queue,$check_section,$queuedata,$cdom,$cnum,$classlist)=@_;
      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 (!defined($classlist->{$uname.':'.$udom})) { next; }
  	if ($check_section) {
- 	    my $section=&Apache::lonnet::getsection($uname,$udom);
+ 	    my $section =
+ 		$classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];
  	    if ($section eq $check_section) {
  		&Apache::lonxml::debug("my sec");
  		next;
  	    }
  	}
- 	my $slot=$queuedata->{$key}[0];
+ 	my $end_time;
- 	my %slot_data=&Apache::lonnet::get_slot($slot);
+ 	if (my $slot=&slotted_access($queuedata->{$key})) {
- 	if ($slot_data{'endtime'} > time) {
+ 	    &Apache::lonxml::debug("looking at slot $slot");
- 	    &Apache::lonxml::debug("not time");
+ 	    my %slot_data=&Apache::lonnet::get_slot($slot);
- 	    next;
+ 	    if ($slot_data{'endtime'} < time) {
+ 		$end_time = $slot_data{'endtime'};
+ 	    } else {
+ 		&Apache::lonxml::debug("not time ".$slot_data{'endtime'});
+ 		next;
+ 	    }
+ 	} else {
+ 	    my $due_date = &Apache::lonhomework::due_date('0',$symb);
+ 	    if ($due_date < time) {
+ 		$end_time = $due_date;
+ 	    } else {
+ 		&Apache::lonxml::debug("not time $due_date");
+ 		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
+ 	# pick one of the entries in the top 10% in small queues and one
- 	my $max=($#possible < 10) ? $#possible : 10;
+ 	# of the first ten entries in large queues
- 	return $possible[int(rand($max))][0];
+ 	#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;
  }
+ sub get_lock_info {
+     my ($lock_info) = @_;
+     if (wantarray) {
+ 	if (ref($lock_info) eq 'ARRAY') {
+ 	    return @{$lock_info};
+ 	} else {
+ 	    return ($lock_info);
+ 	}
+     } else {
+ 	if (ref($lock_info) eq 'ARRAY') {
+ 	    return $lock_info->[0];
+ 	} else {
+ 	    return $lock_info;
+ 	}
+     }
+     return;
+ }
  sub find_mid_grade {
      my ($queue,$symb,$cdom,$cnum)=@_;
-     my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
+     my $todo=&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; }
- Line 1337  sub find_mid_grade {
+ Line 1820  sub find_mid_grade {
      my $regexp="^$symb\0.*\0locked\$";
      my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
      foreach my $key (keys(%locks)) {
- 	my $who=$locks{$key};
+ 	my $who= &get_lock_info($locks{$key});
  	if ($who eq $me) {
  	    $todo=$key;
  	    $todo=~s/\0locked$//;
- Line 1349  sub find_mid_grade {
+ Line 1832  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 (undef,$cid)=&Apache::lonnet::whichuser();
      my $cnum=$env{'course.'.$cid.'.num'};
      my $cdom=$env{'course.'.$cid.'.domain'};
-     my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},
+     my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> [$me,time]},
  					$cdom,$cnum);
      &Apache::lonxml::debug("success $success $todo");
      if ($success eq 'ok') {
- Line 1365  sub lock_key {
+ Line 1848  sub lock_key {
  sub get_queue_symb_status {
      my ($queue,$symb,$cdom,$cnum) = @_;
      if (!defined($cdom) || !defined($cnum)) {
- 	my (undef,$cid)=&Apache::lonxml::whichuser();
+ 	my (undef,$cid)=&Apache::lonnet::whichuser();
  	$cnum=$env{'course.'.$cid.'.num'};
  	$cdom=$env{'course.'.$cid.'.domain'};
      }
+     my $classlist=&get_limited_classlist();
      my $regexp="^$symb\0";
      my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
      my ($tmp)=%queue;
- Line 1378  sub get_queue_symb_status {
+ Line 1863  sub get_queue_symb_status {
  	next if ($key=~/locked$/);
  	next if ($key=~/timestamp$/);
  	my ($symb,$uname,$udom) = &decode_queue_key($key);
+ 	next if (!defined($classlist->{$uname.':'.$udom}));
  	push(@users,"$uname:$udom");
      }
      return @users;
- Line 1386  sub get_queue_symb_status {
+ Line 1872  sub get_queue_symb_status {
  sub get_from_queue {
      my ($queue)=@_;
      my $result;
-     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+     my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
      my $cnum=$env{'course.'.$cid.'.num'};
      my $cdom=$env{'course.'.$cid.'.domain'};
      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;
+     my $classlist=&get_limited_classlist();
      while (1) {
  	if ($attempts > 2) {
  	    # tried twice to get a queue entry, giving up
- Line 1403  sub get_from_queue {
+ Line 1892  sub get_from_queue {
  			      $cdom,$cnum);
  	&Apache::lonxml::debug("$starttime");
  	my $regexp="^$symb\0queue\0";
- 	my $range= ($attempts < 1 ) ? '0-100' : '0-400';
+ 	#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'}) {
  	    &Apache::lonxml::debug("sce");
  	    $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
- 					\%queue,$cdom,$cnum);
+ 					\%queue,$cdom,$cnum,$classlist);
  	    &Apache::lonxml::debug("sce $todo");
  	}
  	# no one _not_ in our section so look for any user that is
  	# ready for grading
  	if (!$todo) {
  	    &Apache::lonxml::debug("no sce");
- 	    $todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum);
+ 	    $todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum,
+ 					$classlist);
  	    &Apache::lonxml::debug("no sce $todo");
  	}
  	# no user to grade
- Line 1458  sub get_from_queue {
+ Line 1948  sub get_from_queue {
  }
  sub select_user {
-     my ($symb,$cid)=&Apache::lonxml::whichuser();
+     my ($symb,$cid)=&Apache::lonnet::whichuser();
      my @chosen_sections=
  	&Apache::loncommon::get_env_multiple('form.chosensections');
-     &Apache::grades::init_perm();
-     my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
+     my $classlist = &get_limited_classlist(\@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">';
+     $result.=&Apache::loncommon::start_data_table();
-     foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+     foreach my $student (sort {lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]) cmp lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]) } (keys(%$classlist))) {
  	my ($uname,$udom) = split(/:/,$student);
  	my $cnum=$env{'course.'.$cid.'.num'};
- Line 1494  sub select_user {
+ Line 1983  sub select_user {
  	    }
  	}
  	my $todo =
- 	    &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
+ 	    &escape(&encode_queue_key($symb,$udom,$uname));
  	if ($cannot_grade) {
- 	    $result.='<tr><td>&nbsp;</td><td>'.$fullname->{$student}.
+ 	    $result.=&Apache::loncommon::start_data_table_row().
+ 		'<td>&nbsp;</td><td>'.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()].
  		'</td><td>';
  	} else {
  	    my $seclist;
- Line 1504  sub select_user {
+ Line 1994  sub select_user {
  		$seclist.='<input type="hidden" name="chosensections"
                                 value="'.$sec.'" />';
  	    }
- 	    my $studentdis = $student;
+ 	    $result.=&Apache::loncommon::start_data_table_row();
- 	    $studentdis =~ tr/:/@/;
  	    $result.=<<RESULT;
- <tr>
    <td>
      <form style="display: inline" method="post">
        <input type="hidden" name="gradingkey" value="$todo" />
- Line 1517  sub select_user {
+ Line 2005  sub select_user {
        <input type="submit" name="submit" value="Regrade" />
        $seclist
      </form>
-   <td>$fullname->{$student} <tt>($studentdis)</tt></td>
+   <td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt></td>
    <td>
  RESULT
          }
- Line 1556  RESULT
+ Line 2044  RESULT
  	} else {
  	    $result.="&nbsp;";
  	}
- 	$result.= '</td></tr>';
+ 	$result.= '</td>'.&Apache::loncommon::end_data_table_row();
      }
-     $result.='</table>';
+     $result.=&Apache::loncommon::end_data_table();
      return $result;
  }
- Line 1589  sub start_ClosingParagraph {
+ Line 2077  sub start_ClosingParagraph {
      if ($target eq 'web') {
      } elsif ($target eq 'webgrade') {
  	&Apache::lonxml::startredirection();
+     } elsif ($target eq 'edit') {
+ 	my $bodytext=&Apache::lonxml::get_all_text("/closingparagraph",
+ 						   $parser);
+ 	$result = &Apache::edit::tag_start($target,$token);
+ 	$result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+     } elsif ($target eq 'modified') {
+ 	$result = $token->[4].&Apache::edit::modifiedfield('/closingparagraph',
+ 							   $parser);
      }
      return $result;
  }
- Line 1603  sub end_ClosingParagraph {
+ Line 2099  sub end_ClosingParagraph {
      return $result;
  }
+ sub get_dim_id {
+     if (@Apache::bridgetask::dimension) {
+ 	return $Apache::bridgetask::dimension[-1];
+     } else {
+ 	return $top;
+     }
+ }
  sub get_id {
      my ($parstack,$safeeval)=@_;
      my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval);
- Line 1610  sub get_id {
+ Line 2114  sub get_id {
      return $id;
  }
- my %dimension;
+ sub start_Setup {
- sub start_Dimension {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-     undef(%dimension);
+     my $result;
-     my $dim_id=&get_id($parstack,$safeeval);
+     my $dim = &get_id($parstack,$safeeval);
-     $Apache::bridgetask::dimension=$dim_id;
+     push(@Apache::bridgetask::dimension,$dim);
-     push(@Apache::bridgetask::dimensionlist,$dim_id);
+     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
-     undef(@Apache::bridgetask::instance);
+ 	&Apache::lonxml::startredirection();
-     $Apache::bridgetask::dimensionmandatory{$dim_id}=
+     } elsif ($target eq 'edit') {
- 	&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
+ 	$result = &Apache::edit::tag_start($target,$token);
-     &Apache::lonxml::startredirection();
+ 	$result.= &Apache::edit::text_arg('Id:','id',$token,10).
-     return &internal_location($dim_id);
+ 	    &Apache::edit::end_row().
+ 	    &Apache::edit::start_spanning_row();
+     } elsif ($target eq 'modified') {
+ 	my $constructtag=
+ 	    &Apache::edit::get_new_args($token,$parstack,$safeeval,'id');
+ 	if ($constructtag) {
+ 	    $result = &Apache::edit::rebuild_tag($token);
+ 	}
+     }
+     return $result;
+ }
+ {
+     my @allowed;
+     sub enable_dimension_parsing {
+ 	my ($id) = @_;
+ 	push(@allowed,$id);
+     }
+     sub disable_dimension_parsing {
+ 	pop(@allowed);
+     }
+     sub skip_dimension_parsing {
+ 	my ($check) = @_;
+ 	if (!@allowed) { return 0;}
+ 	# if unspecified allow any id
+ 	if ($allowed[-1] eq undef) { return 0;}
+ 	return ($check ne $allowed[-1]);
+     }
+ }
+ sub start_Question { return &start_Dimension(@_); }
+ sub start_Dimension {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     my $dim = &get_id($parstack,$safeeval);
+     my $previous_dim;
+     my $result;
+     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+ 	if (@Apache::bridgetask::dimension) {
+ 	    $previous_dim = $Apache::bridgetask::dimension[-1];
+ 	    push(@{$Apache::bridgetask::dimension{$previous_dim}{'contains'}},
+ 		 $dim);
+ 	    if(&skip_dimension_parsing($dim)) {
+ 		$dimension{$previous_dim}{'criteria.'.$dim} =
+ 		    $token->[4]
+ 		    .&Apache::lonxml::get_all_text('/'.$tagstack->[-1],$parser,
+ 						   $style)
+ 		    .'</'.$tagstack->[-1].'>';
+ 	    }
+ 	    $dimension{$previous_dim}{'criteria.'.$dim.'.type'}='dimension';
+ 	    $dimension{$previous_dim}{'criteria.'.$dim.'.mandatory'}=
+ 		&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
+ 	    push(@{$dimension{$previous_dim}{'criterias'}},$dim);
+ 	    $dimension{$dim}{'nested'}=$previous_dim;
+ 	    $dimension{$dim}{'depth'} = 1 + $dimension{$previous_dim}{'depth'};
+ 	    &Apache::lonxml::debug("adding $dim as criteria to $previous_dim");
+ 	} else {
+ 	    $dimension{$top}{'depth'}=0;
+ 	    $dimension{$top}{'criteria.'.$dim.'.type'}='dimension';
+ 	    $dimension{$top}{'criteria.'.$dim.'.mandatory'}=
+ 		&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
+ 	    push(@{$dimension{$top}{'criterias'}},$dim);
+ 	    $dimension{$dim}{'nested'}=$top;
+ 	}
+         push(@Apache::bridgetask::dimension,$dim);
+ 	&Apache::lonxml::startredirection();
+ 	if (!&skip_dimension_parsing($dim)) {
+ 	    &enable_dimension_parsing($dim);
+ 	}
+     } elsif ($target eq 'edit') {
+   	$result = &Apache::edit::tag_start($target,$token);
+ 	$result.=
+ 	    &Apache::edit::text_arg('Id:','id',$token,10).' '.
+ 	    &Apache::edit::select_arg('Passing is Mandatory:','Mandatory',
+ 				      [['yes', 'Yes'],
+ 				       ['no','No'],],
+ 				      $token).' <br /> '.
+ 	    &Apache::edit::text_arg('Required number of passed optional elements to pass the '.$token->[1].':',
+ 				    'OptionalRequired',$token,4).
+ 	    &Apache::edit::end_row().
+ 	    &Apache::edit::start_spanning_row();
+     } elsif ($target eq 'modified') {
+ 	my $constructtag=
+ 	    &Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 					'id','Mandatory','OptionalRequired');
+ 	if ($constructtag) {
+ 	    $result = &Apache::edit::rebuild_tag($token);
+ 	}
+     }
+     return $result;# &internal_location($dim);
+ }
+ sub start_QuestionText {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     my $result;
+     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+ 	my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style);
+     my $dim = &get_dim_id();
+ 	$dimension{$dim}{'questiontext'}=$text;
+     } elsif ($target eq 'edit') {
+ 	my $bodytext=&Apache::lonxml::get_all_text("/questiontext",$parser);
+ 	$result = &Apache::edit::tag_start($target,$token);
+ 	$result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+     } elsif ($target eq 'modified') {
+ 	$result = $token->[4].&Apache::edit::modifiedfield('/questiontext',
+ 							   $parser);
+     }
+     return $result;
+ }
+ sub end_QuestionText {
+     return '';
  }
  sub get_instance {
- Line 1631  sub get_instance {
+ Line 2246  sub get_instance {
  	$rand_alg eq '64bit2' || $rand_alg eq '64bit3' ||
  	$rand_alg eq '64bit4' ) {
  	&Apache::response::pushrandomnumber();
- 	my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
+ 	my @order=&Math::Random::random_permutation(@{$dimension{$dim}{'instances'}});
  	my $num=@order;
  	my $version=&get_version();
  	my $which=($version-1)%$num;
- Line 1643  sub get_instance {
+ Line 2258  sub get_instance {
  	if (defined($instance)) { return $instance; }
  	&Apache::response::pushrandomnumber();
- 	my @instances = @{$dimension{'instances'}};
+ 	if (ref($dimension{$dim}{'instances'}) eq 'ARRAY') {
- 	# remove disabled instances
+ 	    my @instances = @{$dimension{$dim}{'instances'}};
- 	for (my $i=0; $i < $#instances; $i++) {
+ 	    # remove disabled instances
- 	    if ($dimension{$instances[$i].'.disabled'}) {
+ 	    for (my $i=0; $i < $#instances; $i++) {
- 		splice(@instances,$i,1);
+ 		if ($dimension{$dim}{$instances[$i].'.disabled'}) {
- 		$i--;
+ 		    splice(@instances,$i,1);
+ 		    $i--;
+ 		}
+ 	    }
+ 	    @instances = &Math::Random::random_permutation(@instances);
+ 	    $instance  = $instances[($version-1)%scalar(@instances)];
+ 	    if ($version =~ /^\d$/) {
+ 		$Apache::lonhomework::results{"resource.$version.0.$dim.instance"} =
+ 		    $instance;
+ 		$Apache::lonhomework::results{'INTERNAL_store'} = 1;
  	    }
  	}
- 	@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;
      }
  }
- {
+ sub get_criteria {
-     my $last_link;
+     my ($what,$version,$dim,$id) = @_;
-     sub link {
+     my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
- 	my ($instance,$id) = @_;
+     my $prefix = ($type eq 'criteria' && $dim ne $top) ? "$dim.$id"
- 	return 'LC_GRADING_criteria_'.$instance.'_'.$id;
+ 	                                               : "$id";
-     }
+     my $entry = "resource.$version.0.$prefix.$what";
-     sub end_Dimension {
+     if (exists($Apache::lonhomework::results{$entry})) {
- 	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ 	return $Apache::lonhomework::results{$entry};
- 	my $result=&Apache::lonxml::endredirection();
+     }
- 	my $dim=&get_id($parstack,$safeeval);
+     return $Apache::lonhomework::history{$entry};
- 	my $instance=&get_instance($dim);
+ }
- 	my $version=&get_version();
- 	if ($target eq 'web') {
+ sub link {
- 	    @Apache::scripttag::parser_env = @_;
+     my ($id) = @_;
- 	    $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
+     $id =~ s/\./_/g;
- 	    my @instances = $instance;
+     return 'LC_GRADING_criteria_'.$id;
- 	    if (&Apache::response::showallfoils()) {
+ }
- 		@instances = @{$dimension{'instances'}};
+ sub end_Question { return &end_Dimension(@_); }
- 	    }
+ sub end_Dimension {
- 	    foreach my $instance (@instances) {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- 		@Apache::scripttag::parser_env = @_;
+     my $result;
- 		$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
+     my $dim=&get_id($parstack,$safeeval);
- 		if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' ||
+     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
- 		    $Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') {
+ 	$result=&Apache::lonxml::endredirection();
+ 	if (&skip_dimension_parsing($dim)) {
- 		    my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
+ 	    pop(@Apache::bridgetask::dimension);
- 		    my $mandatory='Mandatory';
+ 	    return;
- 		    if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
+ 	}
- 			$mandatory='Optional';
+     }
- 		    }
+     my $instance=&get_instance($dim);
- 		    my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";
+     my $version=&get_version();
- 		    if ($dim_status eq 'pass') {
+     if ($target eq 'web') {
- 			$dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';
+ 	$result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
- 		    }
+ 	my @instances = $instance;
- 		    if ($dim_status eq 'fail') {
+ 	if (&Apache::response::showallfoils()) {
- 			$dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>';
+ 	    @instances = @{$dimension{$dim}{'instances'}};
- 		    }
+ 	}
- 		    my $man_count=0;
+ 	my $shown_question_text;
- 		    my $man_passed=0;
+ 	foreach my $instance (@instances) {
- 		    my $opt_count=0;
+ 	    $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},
- 		    my $opt_passed=0;
+ 				     [@_]);
- 		    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+ 	    $result .= &nested_parse(\$dimension{$dim}{'questiontext'},
- 			if ($dimension{$instance.'.criteria.'.$id.'.mandatory'}
+ 				     [@_],{'set_dim_id' => undef});
- 			    eq 'N') {
+ 	    my $task_status =
- 			    $opt_count++;
+ 		$Apache::lonhomework::history{"resource.$version.0.status"};
- 			    if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
+ 	    if ($task_status ne 'pass' && $task_status ne 'fail') {
- 				$opt_passed++;
- 			    }
+ 		foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
- 			} else {
+ 				@{$dimension{$dim}{'criterias'}}) {
- 			    $man_count++;
+ 		    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
- 			    if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
+ 		    &Apache::lonxml::debug("$id is $type");
- 				$man_passed++;
+ 		    if ($type eq 'dimension') {
- 			    }
+ 			$result.=
- 			}
+ 			    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+ 					  [@_],{'set_dim_id' => $id});
  		    }
- 		    if ($man_passed eq $man_count) { $man_passed='all'; }
+ 		}
- 		    my $opt_req=$dimension{$instance.'.optionalrequired'};
+ 	    } else {
- 		    if ($opt_req !~ /\S/) { $opt_req='0'; }
+ 		my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
- 		    $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 $mandatory='Mandatory';
+ 		if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') {
- 		    my $internal_location=&internal_location($dim);
+ 		    $mandatory='Optional';
- 		    $result=~s/\Q$internal_location\E/$dim_info/;
+ 		}
+ 		my $dim_info=
- 		    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+ 		    "\n<div class='LC_$dim_status LC_question_grade'>\n\t";
- 			my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
+ 		my $ucquestion =
- 			my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"};
+ 		    my $question =
- 			my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
+ 		    ('sub' x $dimension{$dim}{'depth'}).'question';
- 			if ($mandatory) {
+ 		$ucquestion =~ s/^(.)/uc($1)/e;
- 			    $mandatory='Mandatory';
+ 		if ($dim_status eq 'pass') {
- 			} else {
+ 		    $dim_info.='<h3>'.$ucquestion.' : you passed this '.$mandatory.' '.$question.'</h3>';
- 			    $mandatory='Optional';
+ 		}
- 			}
+ 		if ($dim_status eq 'fail') {
- 			if ($status eq 'fail') {
+ 		    $dim_info.='<h3>'.$ucquestion.' : you did not pass this '.$mandatory.' '.$question.'</h3>';
- 			} elsif ($status eq 'pass') {
+ 		}
+ 		my %counts = &get_counts($dim,$instance,$parstack,
+ 					 $safeeval);
+ 		$dim_info.="\n\t<p>"
+ 		    .&question_status_message(\%counts,
+ 					      $dimension{$dim}{'depth'})
+ 		    ."</p>\n</div>\n";
+ 		foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
+ 				@{$dimension{$dim}{'criterias'}}) {
+ 		    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+ 		    if ($type eq 'dimension') {
+ 			if (defined($dimension{$id}{'result'})) {
+ 			    $result.=$dimension{$id}{'result'};
+ 			    next;
  			} else {
- 			    &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");
+ 			    $dim_info .=
- 			}
+ 				&nested_parse(\$dimension{$dim}{'criteria.'.$id},
- 			my $status_display=$status;
+ 					      [@_],{'set_dim_id' => $id});
- 			$status_display=~s/^([a-z])/uc($1)/e;
- 			@Apache::scripttag::parser_env = @_;
- 			$result.=
- 			    '<div class="LC_'.$status.' LC_criteria"><h4>'
- 			    .$mandatory.' Criteria</h4><p>';
- 			@Apache::scripttag::parser_env = @_;
- 			$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
- 			$result.='</p><p class="LC_grade">'.$status_display.'</p>';
- 			if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}) {
- 			    $result.='<p class="LC_comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</p>';
  			}
- 			$result.='</div>';
+ 		    } else {
+ 			my $criteria =
+ 			    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+ 					  [@_]);
+ 			$dim_info .= &layout_web_Criteria($dim,$id,$criteria);
  		    }
  		}
+ 		# puts the results at the end of the dimension
+ 		if ($result =~m{<QuestionGradeInfo\s*/>}) {
+ 		    $result=~s{<QuestionGradeInfo\s*/>}{$dim_info};
+ 		} else {
+ 		    $result .= $dim_info;
+ 		}
+ 		# puts the results at the beginning of the dimension
+ 		# my $internal_location=&internal_location($dim);
+ 		# $result=~s/\Q$internal_location\E/$dim_info/;
+ 	    }
+ 	}
+ 	if ($result !~ /^\s*$/s) {
+ 	    # FIXME? this maybe unneccssary in the future, (CSE101 BT
+ 	    # from Fall 2006 geenrate a div that attempts to hide some
+ 	    # of the output in an odd way, this is a workaround so
+ 	    # those old ones will continue to work.  # It puts the
+ 	    # LC_question div to come after any starting closie div
+ 	    # that the dimension produces
+ 	    if ($result =~ m{^\s*</div>}) {
+ 		$result =~ s{^(\s*</div>)}
+ 		            {$1\n<div id="$dim" class="LC_question">};
+ 	    } else {
+ 		$result = "\n".'<div id="'.$dim.'" class="LC_question">'.
+ 		    "\n".$result;
  	    }
- 	} elsif ($target eq 'webgrade') {
+ 	    $result .= "\n</div>\n";
- 	    # in case of any side effects that we need
+ 	}
- 	    @Apache::scripttag::parser_env = @_;
+     } elsif ($target eq 'webgrade') {
- 	    &Apache::scripttag::xmlparse($dimension{'intro'});
+ 	# in case of any side effects that we need
- 	    @Apache::scripttag::parser_env = @_;
+ 	&nested_parse(\$dimension{$dim}{'intro'},[@_]);
- 	    &Apache::scripttag::xmlparse($dimension{$instance.'.text'});
+ 	&nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]);
- 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+ 	$result.=
- 		my $link=&link($instance,$id);
+ 	    &nested_parse(\$dimension{$dim}{'questiontext'},[@_],
- 		my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
+ 			  {'set_dim_id'          => undef,
- 		$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
+ 			   'delayed_dim_results' => 1});
- 		    '<a name="'.$link.'" />'."\n".
+ 	foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
- 		    '<a name="next_'.$last_link.'" />'."\n".
+ 			@{$dimension{$dim}{'criterias'}} ) {
- 		    '<div class="LC_GRADING_criteriatext">'."\n";
+ 	    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
- 		@Apache::scripttag::parser_env = @_;
+ 	    if ($type eq 'dimension') {
- 		$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
+ 		# dimensional 'criteria' don't get assigned grades
- 		$result.='</div>'."\n".
+ 		$result.=
- 		    #$dimension{$instance.'.criteria.'.$id}.
+ 		    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
- 		    '<div class="LC_GRADING_grade">'."\n".
+ 				  [@_],{'set_dim_id' => $id});
- 		    '<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
+ 		next;
- 		    '<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
+ 	    } else {
- 		    '<label class="LC_GRADING_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
+ 		my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id},
- 		    '<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
+ 					     [@_]);
- 		    '</div>'."\n".
+ 		$criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
- 		    '<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".
+ 		my $internal_location=&internal_location($id);
- 		    '<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".
+ 		if ($result =~ m/\Q$internal_location\E/) {
- 		    '</label>'."\n".
+ 		    $result =~ s/\Q$internal_location\E/$criteria/;
- 		    '<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".
-                     '</div>'."\n";
- 		$result.=&grading_history($version,$dim,$instance,$id);
- 		$last_link=$link;
- 	    }
- 	} 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'}}) {
- 		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++; }
- 		} elsif ($status eq 'fail') {
- 		    if ($mandatory) { $mandatory_failed++; }
- 		} elsif ($status eq 'review') {
- 		    $review++;
- 		} elsif ($status eq 'ungraded') {
- 		    $ungraded++;
  		} else {
- 		    $ungraded++;
+ 		    $result.=$criteria ;
  		}
  	    }
- 	    if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
+ 	}
- 		$mandatory_failed++;
+ 	if (&nest()) {
+ 	    &Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'});
+ 	    $dimension{$dimension{$dim}{'nested'}}{'result'}.=$result;
+ 	    undef($result);
+ 	}
+     } elsif ($target eq 'grade' && $env{'form.webgrade'}) {
+ 	my $optional_passed=0;
+ 	my $mandatory_failed=0;
+ 	my $ungraded=0;
+ 	my $review=0;
+ 	$result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
+ 	$result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},
+ 				 [@_]);
+ 	$result .= &nested_parse(\$dimension{$dim}{'questiontext'},
+ 				 [@_],{'set_dim_id' => undef});
+ 	foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
+ 			@{$dimension{$dim}{'criterias'}}) {
+ 	    my $link=&link($id);
+ 	    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+ 	    if ($type eq 'criteria') {
+ 		# dimensional 'criteria' don't get assigned grades
+ 		$Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link};
+ 		$Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
+ 	    } else {
+ 		$result .=
+ 		    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+ 				  [@_],{'set_dim_id' => $id});
  	    }
- 	    &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
+ 	    my $status= &get_criteria('status',$version,$dim,$id);
- 	    if ($review) {
- 		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
+ 	    my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N');
- 		    'review';
+ 	    if ($status eq 'pass') {
- 	    } elsif ($ungraded) {
+ 		if (!$mandatory) { $optional_passed++; }
- 		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
+ 	    } elsif ($status eq 'fail') {
- 		    'ungraded';
+ 		if ($mandatory) { $mandatory_failed++; }
- 	    } elsif ($mandatory_failed) {
+ 	    } elsif ($status eq 'review') {
- 		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
+ 		$review++;
- 		    'fail';
+ 	    } elsif ($status eq 'ungraded') {
+ 		$ungraded++;
  	    } else {
- 		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
+ 		$ungraded++;
- 		    'pass';
  	    }
+ 	}
+ 	my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'};
+ 	if ($opt_req !~ /\S/) {
+ 	    $opt_req=
+ 		&Apache::lonxml::get_param('OptionalRequired',
+ 					   $parstack,$safeeval);
+ 	    if ($opt_req !~ /\S/) { $opt_req = 0; }
+ 	}
+ 	if ($optional_passed < $opt_req) {
+ 	    $mandatory_failed++;
+ 	}
+ 	&Apache::lonxml::debug("all instance ".join(':',@{$dimension{$dim}{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
+ 	if ($review) {
+ 	    $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
+ 		'review';
+ 	} elsif ($ungraded) {
+ 	    $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
+ 		'ungraded';
+ 	} elsif ($mandatory_failed) {
+ 	    $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
+ 		'fail';
  	} else {
- 	    # any other targets no output
+ 	    $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
- 	    undef($result);
+ 		'pass';
  	}
- 	return $result;
+     } elsif ($target eq 'edit') {
+     } elsif ($target eq 'modified') {
+     } else {
+ 	# any other targets no output
+ 	undef($result);
+     }
+     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+ 	&disable_dimension_parsing();
+ 	pop(@Apache::bridgetask::dimension);
+     }
+     return $result;
+ }
+ sub question_status_message {
+     my ($counts,$depth) = @_;
+     my %req  = ('man' => 'mandatory',
+ 		'opt' => 'optional',);
+     my %type = ('cri' => 'criteria',
+ 		'dim' => ('sub'x($depth+1)).'questions',);
+     my @sections;
+     foreach my $req ('man','opt') {
+ 	foreach my $type ('cri','dim') {
+ 	    if ($counts->{$req.'_'.$type}) {
+ 		push(@sections,
+ 		     $counts->{$req.'_'.$type.'_passed'}.' of the '.
+ 		     $counts->{$req.'_'.$type}.' '.
+ 		     $req{$req}.' '.$type{$type});
+ 	    }
+ 	}
+     }
+     my $status = 'You passed ';
+     if (@sections == -1) {
+     } elsif (@sections == 1) {
+ 	$status .= $sections[0];
+     } elsif (@sections == 2) {
+ 	$status .= $sections[0].' and '.$sections[1];
+     } else {
+ 	my $last = pop(@sections);
+ 	$status .= join(', ',@sections).', and '.$last;
+     }
+     $status .= '.';
+     if ($counts->{'opt'}) {
+ 	$status .= ' You were required to pass '.$counts->{'opt_req'}.
+ 	    ' optional ';
+ 	if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
+ 	    $status .=
+ 		($counts->{'opt_req'} == 1?'criterion':'criteria');
+ 	} else {
+ 	    $status .=
+ 		'component'.($counts->{'opt_req'} == 1?'':'s');
+ 	}
+ 	$status .= '.';
+     }
+     return $status;
+ }
+ sub get_counts {
+     my ($dim,$instance,$parstack,$safeeval) = @_;
+     my %counts;
+     my @possible = ('man_cri','man_dim',
+ 		    'opt_cri','opt_dim',
+ 		    'man_cri_passed', 'man_dim_passed',
+ 		    'opt_cri_passed', 'opt_dim_passed',
+ 		    'man_passed',
+ 		    'opt_passed',
+ 		    'opt_req');
+     foreach my $which (@possible) { $counts{$which} = 0; }
+     my $version = &get_version();
+     foreach my $id ( @{$dimension{$dim}{$instance.'.criterias'}},
+ 		     @{$dimension{$dim}{'criterias'}} ) {
+ 	my $status = &get_criteria('status',$version,$dim,$id);
+ 	my $which;
+ 	if ($dimension{$dim}{'criteria.'.$id.'.mandatory'}
+ 	    eq 'N') {
+ 	    $which = 'opt';
+ 	} else {
+ 	    $which = 'man';
+ 	}
+ 	$counts{$which}++;
+ 	if ($status eq 'pass') { $counts{$which.'_passed'}++; }
+ 	if ($dimension{$dim}{'criteria.'.$id.'.type'}
+ 	    eq 'dimension') {
+ 	    $which .= '_dim';
+ 	} else {
+ 	    $which .= '_cri';
+ 	}
+ 	$counts{$which}++;
+ 	if ($status eq 'pass') { $counts{$which.'_passed'}++; }
+     }
+     if ($counts{'man_dim_passed'} eq $counts{'man_dim'}) {
+ 	$counts{'man_dim_passed'}='all';
+     }
+     if ($counts{'man_cri_passed'} eq $counts{'man_cri'}) {
+ 	$counts{'man_cri_passed'}='all';
+     }
+     $counts{'opt_req'}=$dimension{$dim}{$instance.'.optionalrequired'};
+     if ($counts{'opt_req'} !~ /\S/) {
+ 	$counts{'opt_req'}= &Apache::lonxml::get_param('OptionalRequired',
+ 						       $parstack,$safeeval);
+ 	if ($counts{'opt_req'} !~ /\S/) { $counts{'opt_req'} = 0; }
+     }
+     return %counts;
+ }
+ sub end_Setup {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my $result;
+     my $dim=&get_id($parstack,$safeeval);
+     my $instance=&get_instance($dim);
+     my $version=&get_version();
+     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
+ 	$result=&Apache::lonxml::endredirection();
      }
+     if ($target eq 'web') {
+ 	@Apache::scripttag::parser_env = @_;
+ 	$result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'});
+ 	my @instances = $instance;
+ 	if (&Apache::response::showallfoils()) {
+ 	    @instances = @{$dimension{$dim}{'instances'}};
+ 	}
+ 	foreach my $instance (@instances) {
+ 	    @Apache::scripttag::parser_env = @_;
+ 	    $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'});
+ 	    @Apache::scripttag::parser_env = @_;
+ 	    $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'});
+ 	}
+     } elsif ($target eq 'webgrade'
+ 	     || $target eq 'grade' && $env{'form.webgrade'}) {
+ 	# in case of any side effects that we need
+ 	@Apache::scripttag::parser_env = @_;
+ 	&Apache::scripttag::xmlparse($dimension{$dim}{'intro'});
+ 	@Apache::scripttag::parser_env = @_;
+ 	&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'});
+ 	@Apache::scripttag::parser_env = @_;
+ 	&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'});
+     } else {
+ 	# any other targets no output
+ 	undef($result);
+     }
+     pop(@Apache::bridgetask::dimension);
+     return $result;
  }
  sub grading_history {
-     my ($version,$dim,$instance,$criteria) = @_;
+     my ($version,$dim,$id) = @_;
      if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
  	return '';
      }
      my ($result,$grader);
-     my $scope="resource.$version.0.$dim.$instance.$criteria";
+     my $scope="resource.$version.0.";
+     $scope .= ($dim ne $top) ? "$dim.$id"
+ 	                     : "$id";
      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);
- Line 1858  sub grading_history {
+ Line 2683  sub grading_history {
  	    $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';
  	}
  	if ($entry) {
- 	    $result.= "<li>$grader : $entry </li>";
+ 	    $result.= "\n\t\t<li>\n\t\t\t$grader :\n\t\t\t $entry \n\t\t</li>";
  	}
      }
      if ($result) {
- 	return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>';
+ 	return "\n\t".'<ul class="LC_GRADING_pastgrading">'.$result.
+ 	    "\n\t".'</ul>'."\n";
      }
      return '';
  }
- Line 1870  sub grading_history {
+ Line 2696  sub grading_history {
  sub start_IntroParagraph {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      my $result;
-     if ($target eq 'web' || $target eq 'webgrade') {
+     my $dim = &get_dim_id();
- 	if ($tagstack->[-2] eq 'Dimension') {
+     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
- 	    $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
+ 	if ($tagstack->[-2] eq 'Dimension' || $tagstack->[-2] eq 'Question' ) {
+ 	    $dimension{$dim}{'intro'}=
- 	} elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
+ 		&Apache::lonxml::get_all_text('/introparagraph',
+ 					      $parser,$style);
+        	} elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
  	    &Apache::lonxml::startredirection();
- 	} else {
- 	    &Apache:;lonxml::error("Invalid use of <IntroParagraph> inside of <".$tagstack->[-2].">");
- 	    &Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
  	}
+     } elsif ($target eq 'edit') {
+ 	my $bodytext=&Apache::lonxml::get_all_text("/introparagraph",$parser);
+ 	$result = &Apache::edit::tag_start($target,$token);
+ 	$result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+     } elsif ($target eq 'modified') {
+ 	$result = $token->[4].&Apache::edit::modifiedfield('/introparagraph',
+ 							   $parser);
      }
      return $result;
  }
- Line 1894  sub end_IntroParagraph {
+ Line 2726  sub end_IntroParagraph {
  sub start_Instance {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-     my $id=&get_id($parstack,$safeeval);
+     my $dim = &get_dim_id();
-     push(@{$dimension{'instances'}},$id);
+     my $id  = &get_id($parstack,$safeeval);
-     push(@Apache::bridgetask::instance,$id);
+     push(@{$dimension{$dim}{'instances'}},$id);
+     push(@{$Apache::bridgetask::instance{$dim}},$id);
      push(@Apache::bridgetask::instancelist,$id);
-     $dimension{$id.'.optionalrequired'}=
+     $dimension{$dim}{$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';
+ 	$dimension{$dim}{$id.'.disabled'}='1';
      }
-     return '';
+     my $result;
+     if ($target eq 'edit') {
+ 	$result = &Apache::edit::tag_start($target,$token);
+ 	$result.=
+ 	    &Apache::edit::text_arg('Id:','id',$token,10).' '.
+ 	    &Apache::edit::select_arg('Instance is Disabled:','Disabled',
+ 				      [['no', 'No'],
+ 				       ['yes','Yes'],],
+ 				      $token)
+ 	    .' <br /> '.
+ 	    &Apache::edit::text_arg('Required number of passed optional elements to pass the Instance:',
+ 				    'OptionalRequired',$token,4)
+ 	    .&Apache::edit::end_row().
+ 	    &Apache::edit::start_spanning_row();
+     } elsif ($target eq 'modified') {
+ 	my $constructtag=
+ 	    &Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 					'id','OptionalRequired','Disabled');
+ 	if ($constructtag) {
+ 	    $result = &Apache::edit::rebuild_tag($token);
+ 	}
+     }
+     return $result;
  }
  sub end_Instance {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my $result;
+     if ($target eq 'edit') {
+ 	$result = &Apache::edit::tag_end($target,$token);
+     }
+     return $result;
  }
  sub start_InstanceText {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-     my $instance_id=$Apache::bridgetask::instance[-1];
+     my $result;
-     my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
+     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
-     if ($target eq 'web' || $target eq 'webgrade') {
+ 	my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
- 	$dimension{$instance_id.'.text'}=$text;
+ 	my $dim = &get_dim_id();
+ 	my $instance_id=$Apache::bridgetask::instance{$dim}[-1];
+ 	$dimension{$dim}{$instance_id.'.text'}=$text;
+     } elsif ($target eq 'edit') {
+ 	my $bodytext=&Apache::lonxml::get_all_text("/instancetext",$parser);
+ 	$result = &Apache::edit::tag_start($target,$token);
+ 	$result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+     } elsif ($target eq 'modified') {
+ 	$result = $token->[4].&Apache::edit::modifiedfield('/instancetext',
+ 							   $parser);
      }
-     return '';
+     return $result;
  }
  sub end_InstanceText {
- Line 1926  sub end_InstanceText {
+ Line 2796  sub end_InstanceText {
  sub start_Criteria {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-     my $instance_id=$Apache::bridgetask::instance[-1];
+     my $result = '';
-     my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
      if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
+ 	my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
+ 	my $dim = &get_dim_id();
  	my $id=&get_id($parstack,$safeeval);
- 	$dimension{$instance_id.'.criteria.'.$id}=$criteria;
+ 	if ($target eq 'web' || $target eq 'webgrade') {
- 	$dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=
+ 	    if ($target eq 'webgrade') {
- 	    &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
+ 		&Apache::lonxml::debug(" for $dim $id stashing results into $dim ");
- 	push(@{$dimension{$instance_id.'.criterias'}},$id);
+ 		$dimension{$dim}{'result'} .= &internal_location($id);
+ 	    } else {
+ 		&Apache::lonxml::debug(" not stashing $dim $id");
+ 		#$result .= &internal_location($id);
+ 	    }
+ 	}
+ 	&Apache::lonxml::debug("Criteria $id with $dim");
+ 	if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) {
+ 	    my $instance_id=$Apache::bridgetask::instance{$dim}[-1];
+ 	    $dimension{$dim}{"criteria.$instance_id.$id"}=$criteria;
+ 	    $dimension{$dim}{"criteria.$instance_id.$id.type"}='criteria';
+ 	    $dimension{$dim}{"criteria.$instance_id.$id.mandatory"}=
+ 		&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
+ 	    push(@{$dimension{$dim}{$instance_id.'.criterias'}},"$instance_id.$id");
+ 	} else {
+ 	    $dimension{$dim}{'criteria.'.$id}=$criteria;
+ 	    $dimension{$dim}{'criteria.'.$id.'.type'}='criteria';
+ 	    $dimension{$dim}{'criteria.'.$id.'.mandatory'}=
+ 		&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
+ 	    push(@{$dimension{$dim}{'criterias'}},$id);
+ 	}
+     } elsif ($target eq 'edit') {
+ 	if (0) {
+ 	    $result = &Apache::edit::tag_start($target,$token);
+ 	    my $text=&Apache::lonxml::get_all_text("/criteria",$parser);
+ 	    &Apache::lonnet::logthis("get_all_text criteria \n$text");
+ 	    my $local_parser = HTML::LCParser->new(\$text);
+ 	    $local_parser->xml_mode(1);
+ 	    $local_parser->marked_sections(1);
+ 	    while (1) {
+ 		my $criteria_text =
+ 		    &Apache::lonxml::get_all_text('gradernote',$local_parser);
+ 		$result.=
+ 		    &Apache::edit::editfield($token->[1],$criteria_text,'',80,4);
+ 		# check for a <GraderNote> next might be end
+ 		my $token = $local_parser->get_token();
+ 		# is the end
+ 		last if (!$token);
+ 		my $gradernote = &Apache::lonxml::get_all_text('/gradernote',
+ 							       $local_parser);
+ 		# purge the end tag
+ 		my $token = $local_parser->get_token();
+ 		$gradernote = '<GraderNote>'.$gradernote.'</GraderNote>';
+ 		@Apache::scripttag::parser_env = @_;
+ 		$result .=
+ 		    &Apache::edit::end_row().&Apache::edit::start_spanning_row().
+ 		    &Apache::scripttag::xmlparse($gradernote).
+ 		    &Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ 	    }
+ 	}
+ 	$result .=&Apache::edit::tag_start($target,$token);
+ 	$result.=
+ 	    &Apache::edit::text_arg('Id:','id',$token,10).' '.
+ 	    &Apache::edit::select_arg('Passing is Mandatory:','Mandatory',
+ 				      [['yes', 'Yes'],
+ 				       ['no','No'],],
+ 				      $token)
+ 	    .' <br /> '.&Apache::edit::end_row().
+ 	    &Apache::edit::start_spanning_row();
+     } elsif ($target eq 'modified') {
+ 	my $constructtag=
+ 	    &Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 					'id','Mandatory');
+ 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
      }
-     return '';
+     return $result;
+ }
+ sub layout_web_Criteria {
+     my ($dim,$id,$criteria) = @_;
+     my $version = &get_version();
+     my $status= &get_criteria('status', $version,$dim,$id);
+     my $comment=&get_criteria('comment',$version,$dim,$id);
+     my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N');
+     if ($mandatory) {
+ 	$mandatory='Mandatory';
+     } else {
+ 	$mandatory='Optional';
+     }
+     my $status_display=$status;
+     $status_display=~s/^([a-z])/uc($1)/e;
+     my $criteria_info.=
+ 	'<div class="LC_'.$status.' LC_criteria">'."\n\t".'<h4>'
+ 	.$mandatory.' Criteria</h4>'."\n\t".'<p class="LC_criteria_text">'
+ 	."\n";
+     $criteria =~ s/^\s*//s;
+     $criteria =~ s/\s*$//s;
+     $criteria_info.= $criteria;
+     $criteria_info.="\n\t".'</p>'.
+ 	"\n\t".'<p class="LC_grade">'.$status_display.'</p>';
+     if ($comment =~ /\w/) {
+ 	$criteria_info.=
+ 	    "\n\t".
+ 	    '<p class="LC_comment">'.&mt('Comment: [_1]',$comment).'</p>';
+     }
+     $criteria_info.="\n".'</div>'."\n";
+     return $criteria_info;
+ }
+ sub layout_webgrade_Criteria {
+     my ($dim,$id,$criteria) = @_;
+     my $link=&link($id);
+     my $version = &get_version();
+     my $status  = &get_criteria('status',$version,$dim,$id);
+     my %lt = ( 'ungraded' => 'Ungraded',
+ 	       'fail'     => 'Fail',
+ 	       'pass'     => 'Pass',
+ 	       'review'   => 'Review',
+ 	       'comment'  => 'Additional Comment for Student',
+ 	       );
+     %lt = &Apache::lonlocal::texthash(%lt);
+     my $comment = &get_criteria('comment',$version,$dim,$id);
+     $comment = &HTML::Entities::encode($comment,'<>"&');
+     my %checked;
+     foreach my $which ('ungraded','fail','pass','review') {
+ 	if ($status eq $which) { $checked{$which} = 'checked="checked"'; }
+     }
+     if (!%checked) { $checked{'ungraded'} = 'checked="checked"'; }
+     my $buttons;
+     foreach my $which  ('ungraded','fail','pass','review') {
+ 	$buttons .= <<END_BUTTON;
+ 		<label class="LC_GRADING_$which">
+ 			<input type="radio" name="HWVAL_$link" value="$which" $checked{$which} />
+ 			$lt{$which}
+ 		</label>
+ END_BUTTON
+     }
+     $criteria =~ s/^\s*//s;
+     $criteria =~ s/\s*$//s;
+     my $result = <<END_CRITERIA;
+ <div class="LC_GRADING_criteria">
+ 	<div class="LC_GRADING_criteriatext">
+ 		$criteria
+ 	</div>
+ 	<div class="LC_GRADING_grade">
+ $buttons
+ 	</div>
+ 	<label class="LC_GRADING_comment">
+ 		$lt{'comment'}
+ 		<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_$link">$comment</textarea>
+ 	</label>
+ </div>
+ END_CRITERIA
+     $result .= &grading_history($version,$dim,$id);
+     return $result;
  }
  sub end_Criteria {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target eq 'edit') {
+     } elsif ($target eq 'modified') {
+     }
+ }
+ sub start_CriteriaText {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     my $result;
+     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+     } elsif ($target eq 'edit') {
+ 	my $bodytext=&Apache::lonxml::get_all_text("/criteriatext",$parser);
+ 	$result = &Apache::edit::tag_start($target,$token);
+ 	$result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+     } elsif ($target eq 'modified') {
+ 	$result = $token->[4].&Apache::edit::modifiedfield('/criteriatext',
+ 							   $parser);
+     }
+     return $result;
+ }
+ sub end_CriteriaText {
+     return '';
  }
+ sub start_GraderNote {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     my $result;
+     if ($target eq 'webgrade') {
+ 	$result = '<div class="LC_GRADING_gradernote"><b>'.
+ 	    &mt('Note to graders:').'</b>';
+     } elsif ($target eq 'edit') {
+ 	my $bodytext=&Apache::lonxml::get_all_text("/gradernote",$parser);
+ 	$result = &Apache::edit::tag_start($target,$token);
+ 	$result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+     } elsif ($target eq 'modified') {
+ 	$result = $token->[4].&Apache::edit::modifiedfield('/gradernote',
+ 							   $parser);
+     } elsif ($target eq 'web' || $target eq 'grade') {
+ 	my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style);
+     }
+     return $result;
+ }
+ sub end_GraderNote {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if ($target eq 'webgrade') {
+ 	return '</div>';
+     }
+     return;
+ }
  sub proctor_validation_screen {
      my ($slot) = @_;
-     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
+     my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();
      my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
      my $name=&Apache::loncommon::plainname($user,$domain);
- Line 1972  sub proctor_validation_screen {
+ Line 3042  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>

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.130
changed lines
	Added in v.1.226