--- loncom/homework/bridgetask.pm	2006/11/06 16:55:53	1.184.2.3
+++ loncom/homework/bridgetask.pm	2006/11/14 23:04:56	1.207
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.184.2.3 2006/11/06 16:55:53 albertel Exp $
+# $Id: bridgetask.pm,v 1.207 2006/11/14 23:04:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,12 +47,12 @@ BEGIN {
 }
 
 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=();
-    # list of all Dimension ids seen
-    %Apache::bridgetask::top_dimensionlist=();
     # list of all current Instance ids
     %Apache::bridgetask::instance=();
     # list of all Instance ids seen in this problem
@@ -105,7 +105,7 @@ sub check_in {
 sub check_in_sequence {
     my ($user,$domain,$slot_name) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my ($symb) = &Apache::lonxml::whichuser();
+    my ($symb) = &Apache::lonnet::whichuser();
     my ($map)  = &Apache::lonnet::decode_symb($symb);
     my @resources = 
 	$navmap->retrieveResources($map, sub { $_[0]->is_problem() },0,0);
@@ -225,7 +225,7 @@ 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 = &Apache::loncommon::get_sections($cdom,$cnum);
@@ -234,36 +234,43 @@ sub add_grading_button {
     if (scalar(keys(%sections)) < 3) {
 	$size=scalar(keys(%sections))+2;
     }
-    my $sec_select = '<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
-    $sec_select .= "<option value='all' selected='selected'>all</option>\n";
+    my $sec_select = "\n".'<select multiple="multiple" name="chosensections" size="'.$size.'">'."\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.='<td rowspan="4">Specify a section: </td><td rowspan="4">'.$sec_select.'</td>';
-	$result.='<td>'.' <input type="submit" name="reviewagrading" value="'.
+	$result.="\n\t".'<table>'."\n\t\t".'<tr>';
+	$result.="\n\t\t\t".'<td rowspan="4">Specify a section: </td>'.
+	    "\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>'.
-	    ' <input type="submit" name="reviewasubmission" value="'.
+	$result.="\n\t\t".'<tr>'.
+	    "\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";
-	$result.='<tr><td> <input type="submit" name="regradeasubmission" value="'.
-	    &mt("List of user's grade status").'" /> </td></tr></table>'."\n";
-	$result.='<p> <input type="submit" name="regradeaspecificsubmission" value="'.
-	    &mt("Regrade specific user:").'" />'."\n";
-	$result.='<input type="text" size="12" name="gradinguser" />';
+		     $entries,$ready,$locks).'</td>'."\n\t\t".'</tr>'."\n";
+	$result.="\n\t\t".'<tr>'.
+	    "\n\t\t\t".'<td>'.
+	    "\n\t\t\t\t".'<input type="submit" name="regradeasubmission" value="'.
+	    &mt("List of user's grade status").'" /> </td>'
+	    ."\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.=' '.
@@ -271,7 +278,7 @@ sub add_grading_button {
 						   'gradinguser',
 						   'gradingdomain');
 	$result.=&Apache::loncommon::studentbrowser_javascript();
-	$result.= '</p>';
+	$result.= '</p>'."\n";
     }
     return $result;
 }
@@ -295,18 +302,19 @@ 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=&escape($symb);
-    $result.='<form method="post" action="/adm/slotrequest">'.
-	'<input type="hidden" name="symb" value="'.$symb.'" />'.
-	'<input type="hidden" name="command" value="'.$action.'" />'.
+    $result.=
+        "\n\t".'<form method="post" action="/adm/slotrequest">'."\n\t\t".
+	'<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).'" />'.
-	'</form>';
+	&mt($text).'" />'."\n\t".
+	'</form>'."\n";
     return $result;
 }
 
@@ -341,7 +349,7 @@ STYLE
 STYLE
 	    }
 	}
-
+	return $style;
     }
     return;
 }
@@ -401,7 +409,7 @@ sub internal_location {
 }
 
 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--) {
@@ -439,7 +447,7 @@ 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/';
 
@@ -500,7 +508,7 @@ 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::lonxml::whichuser();
+    my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();
     my $files = '<ul>';
     my $msg;
     foreach my $file (@files) {
@@ -584,7 +592,7 @@ sub start_Task {
 	    $result.='<form name="gradesubmission" method="post" action="';
 	    my $uri=$env{'request.uri'};
 	    if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
-	    $result.=$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'})) {
 		$result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
@@ -682,8 +690,8 @@ sub start_Task {
 	} elsif ($target eq 'web') {
 
 	    $result.=&preserve_grade_info();
-	    $result.=&internal_location();
-	    $result.=$form_tag_start.
+	    $result.=&internal_location(); 
+	    $result.=$form_tag_start."\t".
 		'<input type="hidden" name="submitted" value="yes" />';
 	    &Apache::lonxml::startredirection();
 	}
@@ -697,11 +705,7 @@ sub start_Task {
 	    #$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) {
@@ -786,6 +790,7 @@ sub start_Task {
 	}
 	if ($target eq 'webgrade') {
 	    $result.="\n".'<div id="LC_GRADING_criterialist">';
+	    &Apache::lonxml::startredirection();
 	}
     } elsif ($target eq 'edit') {
 	$result.=$form_tag_start.
@@ -844,7 +849,7 @@ sub get_key_todo {
     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'};
@@ -1012,7 +1017,12 @@ 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">
@@ -1040,7 +1050,8 @@ DONEBUTTON
 		    }
 		    $start_time=&Apache::lonlocal::locallocaltime($start_time);
 
-		    my $status = "\n<div class='LC_$bt_status LC_criteria'>\n";
+		    my $status = 
+			"\n<div class='LC_$bt_status LC_criteria'>\n\t";
 		    
 		    if ($bt_status eq 'pass')  {
 			$status.='<h2>You passed the '.$title.' given on '.
@@ -1053,25 +1064,26 @@ DONEBUTTON
 			    $status.=&add_request_another_attempt_button();
 			}
 		    }
-		    my $man_count=0;
-		    my $opt_count=0;
-		    my $opt_passed=0;
-		    foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) {
-			if ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'}
-			    eq 'N') {
-			    $opt_count++;
-			    if ($Apache::lonhomework::history{"resource.$version.0.$dim.status"} eq 'pass') {
-				$opt_passed++;
-			    }
-			} else {
-			    $man_count++;
+		    $status.="\n".'</div>'."\n";
+		    my $dim = $top;
+		    my %counts = &get_counts($dim,undef,$parstack,
+					     $safeeval);
+		    $status.="\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'>\n\t<p>".
+			&question_status_message(\%counts,-1).
+			"</p>\n</div>\n";
+		    
+
+		    foreach my $id (@{$dimension{$dim}{'criterias'}}) {
+			my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+			if ($type eq 'dimension') {
+			    $result.=$dimension{$id}{'result'};
+			    next;
 			}
+			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/;
@@ -1130,19 +1142,29 @@ DONEBUTTON
 	    my $ungraded=0;
 	    my $review=0;   
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
-	    foreach my $dim (keys(%Apache::bridgetask::top_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.status"};
-		my $mandatory=
-		    ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'} ne 'N');
+		    $Apache::lonhomework::results{"resource.$version.0.$id.status"};
+		my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} 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++;
 		}
@@ -1150,7 +1172,7 @@ DONEBUTTON
 	    if ($optional_passed < $optional_required) {
 		$mandatory_failed++;
 	    }
-	    &Apache::lonxml::debug("all dim ".join(':',keys(%Apache::bridgetask::top_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'};
 	    if ($review) {
@@ -1162,7 +1184,7 @@ DONEBUTTON
 		$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';
-		my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+		my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
 		
 		if ($env{'form.regrade'} ne 'yes') {
 		    $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
@@ -1178,7 +1200,7 @@ 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';
-		my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+		my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
 		if ($env{'form.regrade'} ne 'yes') {
 		    $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
 			$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
@@ -1235,7 +1257,22 @@ DONEBUTTON
 	    &Apache::structuretags::finalize_storage();
 	}
     } elsif ($target eq 'webgrade') {
-	$result.="</div>";
+	$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);
+		$result=~s/\Q$internal_location\E/$criteria/;
+	    }
+	}
+        $result.="</div>";
 	#$result.='<input type="submit" name="next" value="'.
 	#    &mt('Save &amp; Next').'" /> ';
 	#$result.='<input type="submit" name="end" value="'.
@@ -1286,7 +1323,7 @@ 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";
     }
@@ -1309,7 +1346,7 @@ 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'};
     }
@@ -1328,7 +1365,7 @@ 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'};
     }
@@ -1353,7 +1390,7 @@ sub setup_env_for_other_user {
 
 sub get_queue_data {
     my ($queue,$udom,$uname)=@_;
-    my ($symb,$cid,$other_udom,$other_uname)=&Apache::lonxml::whichuser();
+    my ($symb,$cid,$other_udom,$other_uname)=&Apache::lonnet::whichuser();
     if (!$uname || !$udom) {
 	$uname=$other_uname;
 	$udom =$other_udom;
@@ -1399,7 +1436,7 @@ 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';
     }
@@ -1437,7 +1474,7 @@ sub get_limited_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'};
 
@@ -1564,7 +1601,7 @@ FORM
 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'};
 
@@ -1621,7 +1658,7 @@ sub decode_queue_key {
 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'};
     }
@@ -1733,7 +1770,7 @@ sub find_mid_grade {
 sub lock_key {
     my ($queue,$todo)=@_;
     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},
@@ -1748,7 +1785,7 @@ 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'};
     }
@@ -1772,7 +1809,7 @@ 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);
@@ -1848,7 +1885,7 @@ 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');
@@ -1992,7 +2029,11 @@ sub end_ClosingParagraph {
 }
 
 sub get_dim_id {
-    return $Apache::bridgetask::dimension[-1];
+    if (@Apache::bridgetask::dimension) {
+	return $Apache::bridgetask::dimension[-1];
+    } else {
+	return $top;
+    }
 }
 
 sub get_id {
@@ -2051,15 +2092,22 @@ sub start_Dimension {
 	    &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 {
-	$Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'}=
+	$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);
     }
     push(@Apache::bridgetask::dimension,$dim);
     &Apache::lonxml::startredirection();
-    &enable_dimension_parsing($dim);
-    return &internal_location($dim);
+    if (!&skip_dimension_parsing($dim)) {
+	&enable_dimension_parsing($dim);
+    }
+    return;# &internal_location($dim);
 }
 
 sub start_QuestionText {
@@ -2120,8 +2168,8 @@ sub get_instance {
 sub get_criteria {
     my ($what,$version,$dim,$id) = @_;
     my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
-    my $prefix = ($type eq 'criteria') ? "$dim.$id"
-	                               : "$id";
+    my $prefix = ($type eq 'criteria' && $dim ne $top) ? "$dim.$id"
+	                                               : "$id";
     my $entry = "resource.$version.0.$prefix.$what";
     if (exists($Apache::lonhomework::results{$entry})) {
 	return $Apache::lonhomework::results{$entry};
@@ -2129,263 +2177,332 @@ sub get_criteria {
     return $Apache::lonhomework::history{$entry};
 }
 
-{
-    my $last_link;
-    sub link {
-	my ($id) = @_;
-	$id =~ s/\./_/g;
-	return 'LC_GRADING_criteria_'.$id;
+sub link {
+    my ($id) = @_;
+    $id =~ s/\./_/g;
+    return 'LC_GRADING_criteria_'.$id;
+}
+sub end_Question { return &end_Dimension(@_); }
+sub end_Dimension {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result=&Apache::lonxml::endredirection();
+    my $dim=&get_id($parstack,$safeeval);
+    if (&skip_dimension_parsing($dim)) {
+	&disable_dimension_parsing($dim);
+	pop(@Apache::bridgetask::dimension);
+	return;
     }
-    sub end_Question { return &end_Dimension(@_); }
-    sub end_Dimension {
-	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-	my $result=&Apache::lonxml::endredirection();
-	my $dim=&get_id($parstack,$safeeval);
-	if (&skip_dimension_parsing($dim)) {
-	    &disable_dimension_parsing($dim);
-	    pop(@Apache::bridgetask::dimension);
-	    return;
+    my $instance=&get_instance($dim);
+    my $version=&get_version();
+    if ($target eq 'web') {
+	$result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
+	my @instances = $instance;
+	if (&Apache::response::showallfoils()) {
+	    @instances = @{$dimension{$dim}{'instances'}};
 	}
-	my $instance=&get_instance($dim);
-	my $version=&get_version();
-	if ($target eq 'web') {
-	    $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
-	    my @instances = $instance;
-	    if (&Apache::response::showallfoils()) {
-		@instances = @{$dimension{$dim}{'instances'}};
-	    }
-	    my $shown_question_text;
-	    foreach my $instance (@instances) {
-		$result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},
-					 [@_]);
-		$result .= &nested_parse(\$dimension{$dim}{'questiontext'},
-					 [@_],{'set_dim_id' => undef});
-		my $task_status = 
-		    $Apache::lonhomework::history{"resource.$version.0.status"};
-		if ($task_status ne 'pass' && $task_status ne 'fail') {
-
-		    foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
-				    @{$dimension{$dim}{'criterias'}}) {
-			my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
-			&Apache::lonxml::debug("$id is $type");
-			if ($type eq 'dimension') {
-			    $result.=
-				&nested_parse(\$dimension{$dim}{'criteria.'.$id},
-					      [@_],{'set_dim_id' => $id});
-			}
-		    }
-		} else {
-		    my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
-		    my $mandatory='Mandatory';
-		    if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') {
-			$mandatory='Optional';
-		    }
-		    my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";
-		    if ($dim_status eq 'pass') {
-			$dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';
-		    }
-		    if ($dim_status eq 'fail') {
-			$dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>';
-		    }
-		    my $man_count=0;
-		    my $man_passed=0;
-		    my $opt_count=0;
-		    my $opt_passed=0;
-		    foreach my $id ( @{$dimension{$dim}{$instance.'.criterias'}},
-				     @{$dimension{$dim}{'criterias'}} ) {
-			my $status = &get_criteria('status',$version,$dim,$id);
-			if ($dimension{$dim}{'criteria.'.$id.'.mandatory'} 
-			    eq 'N') {
-			    $opt_count++;
-			    if ($status eq 'pass') { $opt_passed++; }
-			} else {
-			    $man_count++;
-			    if ($status eq 'pass') { $man_passed++; }
-			}
-		    }
-		    if ($man_passed eq $man_count) { $man_passed='all'; }
-
-		    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; }
+	my $shown_question_text;
+	foreach my $instance (@instances) {
+	    $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},
+				     [@_]);
+	    $result .= &nested_parse(\$dimension{$dim}{'questiontext'},
+				     [@_],{'set_dim_id' => undef});
+	    my $task_status = 
+		$Apache::lonhomework::history{"resource.$version.0.status"};
+	    if ($task_status ne 'pass' && $task_status ne 'fail') {
+		
+		foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
+				@{$dimension{$dim}{'criterias'}}) {
+		    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+		    &Apache::lonxml::debug("$id is $type");
+		    if ($type eq 'dimension') {
+			$result.=
+			    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+					  [@_],{'set_dim_id' => $id});
 		    }
-		    $dim_info.="\n<p>".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."</p>\n</div>";
-
-		    my $internal_location=&internal_location($dim);
-		    $result=~s/\Q$internal_location\E/$dim_info/;
-
-		    foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
-				    @{$dimension{$dim}{'criterias'}}) {
-			my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
-			if ($type eq 'dimension') {
+		}
+	    } else {
+		my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
+		my $mandatory='Mandatory';
+		if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') {
+		    $mandatory='Optional';
+		}
+		my $dim_info=
+		    "\n<div class='LC_$dim_status LC_question_grade'>\n\t";
+		my $question = ('sub' x $dimension{$dim}{'depth'}).'question';
+		$question =~ s/^(.)/uc($1)/e;
+		if ($dim_status eq 'pass') {
+		    $dim_info.='<h3>'.$question.' : you passed the above '.$mandatory.' question</h3>';
+		}
+		if ($dim_status eq 'fail') {
+		    $dim_info.='<h3>'.$question.' : you did not pass the above '.$mandatory.' question</h3>';
+		}
+		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 {
+			    $dim_info .=
+				&nested_parse(\$dimension{$dim}{'criteria.'.$id},
+					      [@_],{'set_dim_id' => $id});
 			}
+		    } else {
+			my $criteria =
+			    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+					  [@_]);
+			$dim_info .= &layout_web_Criteria($dim,$id,$criteria);
 		    }
 		}
-	    }
-	} elsif ($target eq 'webgrade') {
-	    # in case of any side effects that we need
-	    &nested_parse(\$dimension{$dim}{'intro'},[@_]);
-	    &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]);
-	    $result.=
-		&nested_parse(\$dimension{$dim}{'questiontext'},[@_],
-			      {'set_dim_id'          => undef,
-			       'delayed_dim_results' => 1});
-	    foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
-			    @{$dimension{$dim}{'criterias'}} ) {
-		my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
-		if ($type eq 'dimension') {
-		    # dimensional 'criteria' don't get assigned grades
-		    $result.=
-			&nested_parse(\$dimension{$dim}{'criteria.'.$id},
-				      [@_],{'set_dim_id' => $id});
-		    next;
-		}
-
-		my $link=&link($id);
-		my $status= &get_criteria('status',$version,$dim,$id);
-		$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
-		    '<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n";
-		$result.=
-		    &nested_parse(\$dimension{$dim}{'criteria.'.$id},[@_]);
+		# puts the results at the end of the dimension
+		$result .= $dim_info;
 
-		$result.='</div>'."\n".
-		    '<div class="LC_GRADING_grade">'."\n".
-		    '<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
-		    '<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
-		    '<label class="LC_GRADING_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
-		    '<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
-		    '</div>'."\n".
-		    '<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".
-		    '<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode(&get_criteria('comment',$version,$dim,$id),'<>"&').'</textarea>'."\n".
-		    '</label>'."\n".
-		    '<ul class="LC_GRADING_navbuttons">'."\n".
-		    '<li><a href="#'.$last_link.'">Prev</a></li>'."\n".
-		    '<li><a href="#next_'.$link.'">Next</a></li>'."\n".
-		    '</ul>'."\n".
-                    '</div>'."\n";
-		$result.=&grading_history($version,$dim,$id);
-		$last_link=$link;
-	    }
-	    if (&nest()) {
-		&Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'});
-		$dimension{$dimension{$dim}{'nested'}}{'result'}.=$result;
-		undef($result);
+		# puts the results at the beginning of the dimension
+		# my $internal_location=&internal_location($dim);
+		# $result=~s/\Q$internal_location\E/$dim_info/;
 	    }
-	} 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});
-		}
-		my $status= &get_criteria('status',$version,$dim,$id);
-
-		my $mandatory=($dimension{$dim}{'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++;
-		}
-	    }
-	    # FIXME optional required can apply to only <instance> right now...
-	    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 ($result !~ /^\s*$/s) {
+	    $result = "\n".'<div class="LC_question">'.
+		"\n".$result."\n</div>\n";
+	}
+    } elsif ($target eq 'webgrade') {
+	# in case of any side effects that we need
+	&nested_parse(\$dimension{$dim}{'intro'},[@_]);
+	&nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]);
+	$result.=
+	    &nested_parse(\$dimension{$dim}{'questiontext'},[@_],
+			  {'set_dim_id'          => undef,
+			   'delayed_dim_results' => 1});
+	foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
+			@{$dimension{$dim}{'criterias'}} ) {
+	    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+	    if ($type eq 'dimension') {
+		# dimensional 'criteria' don't get assigned grades
+		$result.=
+		    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+				  [@_],{'set_dim_id' => $id});
+		next;
+	    } else {
+		my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id},
+					     [@_]);
+		$criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
+		my $internal_location=&internal_location($id);
+		$result=~s/\Q$internal_location\E/$criteria/;
 	    }
-	    if ($optional_passed < $opt_req) {
-		$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{$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';
+	    my $status= &get_criteria('status',$version,$dim,$id);
+	    
+	    my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N');
+	    if ($status eq 'pass') {
+		if (!$mandatory) { $optional_passed++; }
+	    } elsif ($status eq 'fail') {
+		if ($mandatory) { $mandatory_failed++; }
+	    } elsif ($status eq 'review') {
+		$review++;
+	    } elsif ($status eq 'ungraded') {
+		$ungraded++;
 	    } else {
-		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
-		    'pass';
+		$ungraded++;
 	    }
+	}
+
+	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
-	    undef($result);
+	    $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
+		'pass';
 	}
-	&disable_dimension_parsing();
-	pop(@Apache::bridgetask::dimension);
-	return $result;
+    } else {
+	# any other targets no output
+	undef($result);
     }
+    &disable_dimension_parsing();
+    pop(@Apache::bridgetask::dimension);
+    return $result;
+}
 
-    sub end_Setup {
-	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-	my $result=&Apache::lonxml::endredirection();
-	my $dim=&get_id($parstack,$safeeval);
-	my $instance=&get_instance($dim);
-	my $version=&get_version();
-	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'});
+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 '.
+		     $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 component'.($counts->{'opt_req'} == 1?'':'s');
+    }
+    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=&Apache::lonxml::endredirection();
+    my $dim=&get_id($parstack,$safeeval);
+    my $instance=&get_instance($dim);
+    my $version=&get_version();
+    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 = @_;
-	    &Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'});
+	    $result.=&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);
+	    $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'});
 	}
-	pop(@Apache::bridgetask::dimension);
-	return $result;
+    } 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 {
@@ -2394,7 +2511,9 @@ sub grading_history {
 	return '';
     }
     my ($result,$grader);
-    my $scope="resource.$version.0.$dim.$id";
+    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) = 
@@ -2411,11 +2530,12 @@ 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 '';
 }
@@ -2485,6 +2605,15 @@ sub start_Criteria {
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
 	my $dim = &get_dim_id();
 	my $id=&get_id($parstack,$safeeval);
+	if ($target eq 'web' || $target eq 'webgrade') {
+	    if ($target eq 'webgrade' && $dim ne 'top') {
+		&Apache::lonxml::debug(" for $dim $id stashing results into $dim ");
+		$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];
@@ -2499,39 +2628,92 @@ sub start_Criteria {
 	    $dimension{$dim}{'criteria.'.$id.'.mandatory'}=
 		&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
 	    push(@{$dimension{$dim}{'criterias'}},$id);
-
-	    my $version=&get_version();
-	    my $task_status = 
-		$Apache::lonhomework::history{"resource.$version.0.status"};
-	    if ($target eq 'web' 
-		&& ($task_status eq 'pass' || $task_status eq 'fail')) {
-		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;
-		$result.=
-		    '<div class="LC_'.$status.' LC_criteria"><h4>'
-		    .$mandatory.' Criteria</h4><p>';
-		$result.=
-		    &nested_parse(\$dimension{$dim}{'criteria.'.$id},[@_]);
-		$result.='</p><p class="LC_grade">'.$status_display.'</p>';
-		if ($comment =~ /\w/) {
-		    $result.='<p class="LC_comment">'.
-			&mt('Comment: [_1]',$comment).'</p>';
-		}
-		$result.='</div>';
-	    }
 	}
     }
     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 {
 }
 
@@ -2559,7 +2741,7 @@ sub end_GraderNote {
 
 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);