--- loncom/homework/bridgetask.pm	2006/05/12 06:55:46	1.150
+++ loncom/homework/bridgetask.pm	2006/06/01 19:22:29	1.160
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.150 2006/05/12 06:55:46 albertel Exp $
+# $Id: bridgetask.pm,v 1.160 2006/06/01 19:22:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,9 +38,12 @@ 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','Instance','InstanceText','Criteria','ClosingParagraph'));
 }
 
 sub initialize_bridgetask {
@@ -95,7 +98,7 @@ sub create_new_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\./) {
@@ -108,6 +111,9 @@ sub create_new_version {
 	if (defined($user) && defined($domain)) {
 	    $Apache::lonhomework::results{"resource.$version.0.checkedin"}=
 		$user.':'.$domain;
+	} else {
+	    $Apache::lonhomework::results{"resource.$version.0.checkedin"}=
+		$env{'user.name'}.':'.$env{'user.domain'};
 	}
 	if (defined($slot_name)) {
 	    $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
@@ -260,7 +266,7 @@ 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">'.
 	'<input type="hidden" name="symb" value="'.$symb.'" />'.
 	'<input type="hidden" name="command" value="'.$action.'" />'.
@@ -454,8 +460,11 @@ sub start_Task {
 	my ($version,$previous)=&get_version();
 	($status,$accessmsg,my $slot_name,$slot) = 
 	    &Apache::lonhomework::check_slot_access('0','Task');
-	if ($status eq 'CAN_ANSWER' && $version eq '' && $slot_name eq '') {
-	    &create_new_version('Task');
+	if ($status eq 'CAN_ANSWER' && $version eq '') {
+	    &create_new_version('Task',undef,undef,$slot_name);
+	    &add_to_queue('gradingqueue',{'type' => 'Task',
+					  'time' => time,
+					  'slot' => $slot_name});
 	    ($version,$previous)=&get_version();
 	}
 
@@ -528,7 +537,7 @@ DONESCREEN
 		       && defined($Apache::inputtags::slot_name)) {
 			my $result=
 			    &add_to_queue('gradingqueue',
-					  {'type' => 'task',
+					  {'type' => 'Task',
 					   'time' => time,
 					   'slot' => 
 					       $Apache::inputtags::slot_name});
@@ -568,7 +577,7 @@ 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);
@@ -699,7 +708,7 @@ sub get_key_todo {
 	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);
 	    return ($gradingkey);
 	}
 	
@@ -724,7 +733,7 @@ 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'})) {
@@ -878,6 +887,7 @@ DONEBUTTON
 			    $man_count++;
 			}
 		    }
+		    
 		    my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
 							 $parstack,$safeeval);
 		    if ($opt_req !~ /\S/) { $opt_req='0'; }
@@ -915,11 +925,11 @@ DONEBUTTON
 		my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
 		if ($useslots =~ /^\s*no\s*$/i) {
 		    &add_to_queue('gradingqueue',
-				  {'type' => 'task',
+				  {'type' => 'Task',
 				   'time' => time});
 		} elsif (defined($Apache::inputtags::slot_name)) {
 		    &add_to_queue('gradingqueue',
-				  {'type' => 'task',
+				  {'type' => 'Task',
 				   'time' => time,
 				   'slot' => $Apache::inputtags::slot_name});
 		}
@@ -1191,6 +1201,30 @@ sub add_to_queue {
     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;
@@ -1200,36 +1234,66 @@ sub show_queue {
 
     my @chosen_sections=
 	&Apache::loncommon::get_env_multiple('form.chosensections');
-    &Apache::grades::init_perm();
-    my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
-    &Apache::grades::reset_perm();
+
+    my $classlist = &get_limited_classlist(\@chosen_sections);
+
     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 ($end_time,$slot_text);
 	    if (my $slot=&slotted_access($queue{$key})) {
 		my %slot_data=&Apache::lonnet::get_slot($slot);
@@ -1240,7 +1304,7 @@ sub show_queue {
 		$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'};
@@ -1256,7 +1320,7 @@ sub show_queue {
 		    $seclist.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';
 		}
-		if ($end_time ne '' && time > $end_time) {
+		if ($can_view && ($end_time ne '' && time > $end_time)) {
 		    $result.=(<<FORM);
 <td>$status</td>
 <td>
@@ -1271,19 +1335,20 @@ 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><td>&nbsp;</td>'
 		}
 	    }
-	    $result.= "<td>".$fullname->{$uname.':'.$udom}.
+	    $result.= "<td>".$classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_FULLNAME()].
 		" <tt>($uname:$udom)</tt> </td>";
 	    $result.='<td>'.$slot_text.' End time: '.
 		&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;
 }
 
@@ -1293,6 +1358,9 @@ sub get_queue_counts {
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::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;
@@ -1302,12 +1370,14 @@ 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++;
 	    if (my $slot=&slotted_access($queue{$key})) {
 		if (!exists($slot_cache{$slot})) {
@@ -1372,14 +1442,18 @@ sub slotted_access {
 }
 
 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;
@@ -1387,20 +1461,23 @@ sub pick_from_queue_data {
 	}
 	my $end_time;
 	if (my $slot=&slotted_access($queuedata->{$key})) {
+	    &Apache::lonxml::debug("looking at slot $slot");
 	    my %slot_data=&Apache::lonnet::get_slot($slot);
 	    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) {
+	    if ($due_date < time) {
 		$end_time = $due_date;
+	    } else {
+		&Apache::lonxml::debug("not time $due_date");
+		next;
 	    }
 	}
-	if ($end_time ne '') {
-	    &Apache::lonxml::debug("not time");
-	    next;
-	}
 	
 	if (exists($queuedata->{"$key\0locked"})) {
 	    &Apache::lonxml::debug("someone already has um.");
@@ -1426,7 +1503,7 @@ sub pick_from_queue_data {
 
 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'};
     if ($todo) {
 	my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
@@ -1467,6 +1544,8 @@ sub get_queue_symb_status {
 	$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;
@@ -1476,6 +1555,7 @@ 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;
@@ -1491,6 +1571,9 @@ sub get_from_queue {
     &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
@@ -1501,21 +1584,22 @@ 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 
@@ -1560,18 +1644,17 @@ sub select_user {
 
     my @chosen_sections=
 	&Apache::loncommon::get_env_multiple('form.chosensections');
-    &Apache::grades::init_perm();
-    my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
-    &Apache::grades::reset_perm();
+
+    my $classlist = &get_limited_classlist(\@chosen_sections);
     
     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'};
@@ -1592,9 +1675,10 @@ 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;
@@ -1602,10 +1686,8 @@ sub select_user {
 		$seclist.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';
 	    }
-	    my $studentdis = $student;
-	    $studentdis =~ tr/:/@/;
+	    $result.=&Apache::loncommon::start_data_table_row();
 	    $result.=<<RESULT;
-<tr>
   <td>
     <form style="display: inline" method="post">
       <input type="hidden" name="gradingkey" value="$todo" />
@@ -1615,7 +1697,7 @@ 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
         }
@@ -1654,9 +1736,9 @@ 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;
 }
 
@@ -1709,6 +1791,7 @@ sub get_id {
 }
 
 my %dimension;
+sub start_Question { return &start_Dimension(@_); }
 sub start_Dimension {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     undef(%dimension);
@@ -1722,6 +1805,20 @@ sub start_Dimension {
     return &internal_location($dim_id);
 }
 
+sub start_QuestionText {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $dim_id=$Apache::bridgetask::dimension;
+    my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style);
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+	$dimension{'questiontext'}=$text;
+    }
+    return '';
+}
+
+sub end_QuestionText {
+    return '';
+}
+
 sub get_instance {
     my ($dim)=@_;
     my $rand_alg=&Apache::lonnet::get_rand_alg();
@@ -1764,9 +1861,11 @@ sub get_instance {
 {
     my $last_link;
     sub link {
-	my ($instance,$id) = @_;
-	return 'LC_GRADING_criteria_'.$instance.'_'.$id;
+	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();
@@ -1780,9 +1879,12 @@ sub get_instance {
 	    if (&Apache::response::showallfoils()) {
 		@instances = @{$dimension{'instances'}};
 	    }
+	    my $shown_question_text;
 	    foreach my $instance (@instances) {
 		@Apache::scripttag::parser_env = @_;
 		$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
+		@Apache::scripttag::parser_env = @_;
+		$result.=&Apache::scripttag::xmlparse($dimension{'questiontext'});
 		if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' ||
 		    $Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') {
 
@@ -1802,11 +1904,12 @@ sub get_instance {
 		    my $man_passed=0;
 		    my $opt_count=0;
 		    my $opt_passed=0;
-		    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-			if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} 
+		    foreach my $id ( @{$dimension{$instance.'.criterias'}},
+				     @{$dimension{'criterias'}} ) {
+			if ($dimension{'criteria.'.$id.'.mandatory'} 
 			    eq 'N') {
 			    $opt_count++;
-			    if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
+			    if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"} eq 'pass') {
 				$opt_passed++;
 			    }
 			} else {
@@ -1817,17 +1920,24 @@ sub get_instance {
 			}
 		    }
 		    if ($man_passed eq $man_count) { $man_passed='all'; }
+
 		    my $opt_req=$dimension{$instance.'.optionalrequired'};
-		    if ($opt_req !~ /\S/) { $opt_req='0'; }
+		    if ($opt_req !~ /\S/) {
+			$opt_req=
+			    &Apache::lonxml::get_param('OptionalRequired',
+						       $parstack,$safeeval);
+			if ($opt_req !~ /\S/) { $opt_req = 0; }
+		    }
 		    $dim_info.="\n<p>".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."</p>\n</div>";
 
 		    my $internal_location=&internal_location($dim);
 		    $result=~s/\Q$internal_location\E/$dim_info/;
 
-		    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-			my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
-			my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"};
-			my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
+		    foreach my $id (@{$dimension{$instance.'.criterias'}},
+				    @{$dimension{'criterias'}}) {
+			my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"};
+			my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"};
+			my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N');
 			if ($mandatory) {
 			    $mandatory='Mandatory';
 			} else {
@@ -1840,15 +1950,14 @@ sub get_instance {
 			}
 			my $status_display=$status;
 			$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.=&Apache::scripttag::xmlparse($dimension{'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>';
+			if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}) {
+			    $result.='<p class="LC_comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}).'</p>';
 			}
 			$result.='</div>';
 		    }
@@ -1860,15 +1969,18 @@ sub get_instance {
 	    &Apache::scripttag::xmlparse($dimension{'intro'});
 	    @Apache::scripttag::parser_env = @_;
 	    &Apache::scripttag::xmlparse($dimension{$instance.'.text'});
-	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-		my $link=&link($instance,$id);
-		my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
+	    @Apache::scripttag::parser_env = @_;
+	    &Apache::scripttag::xmlparse($dimension{'questiontext'});
+	    foreach my $id (@{$dimension{$instance.'.criterias'}},
+			    @{$dimension{'criterias'}} ) {
+		my $link=&link($id);
+		my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"};
 		$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
 		    '<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n";
 		@Apache::scripttag::parser_env = @_;
-		$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
+		$result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id});
 		$result.='</div>'."\n".
-		    #$dimension{$instance.'.criteria.'.$id}.
+		    #$dimension{'criteria.'.$id}.
 		    '<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".
@@ -1876,14 +1988,14 @@ sub get_instance {
 		    '<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($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\n".
+		    '<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}).'</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,$instance,$id);
+		$result.=&grading_history($version,$dim,$id);
 		$last_link=$link;
 	    }
 	} elsif ($target eq 'grade' && $env{'form.webgrade'}) {
@@ -1891,11 +2003,20 @@ sub get_instance {
 	    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');
+
+	    @Apache::scripttag::parser_env = @_;
+	    $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
+	    @Apache::scripttag::parser_env = @_;
+	    $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
+	    @Apache::scripttag::parser_env = @_;
+	    &Apache::scripttag::xmlparse($dimension{'questiontext'});
+
+	    foreach my $id (@{$dimension{$instance.'.criterias'}},
+			    @{$dimension{'criterias'}}) {
+		my $link=&link($id);
+		my $status=$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};
+		my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N');
 		if ($status eq 'pass') {
 		    if (!$mandatory) { $optional_passed++; }
 		} elsif ($status eq 'fail') {
@@ -1908,7 +2029,15 @@ sub get_instance {
 		    $ungraded++;
 		}
 	    }
-	    if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
+	    # FIXME optional required can apply to only <instance> right now...
+	    my $opt_req=$dimension{$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{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
@@ -1934,12 +2063,12 @@ sub get_instance {
 }
 
 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.$dim.$id";
     foreach my $t (1..$Apache::lonhomework::history{'version'}) {
 	if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) {
 	    my ($gname,$gdom) = 
@@ -1968,11 +2097,12 @@ sub grading_history {
 sub start_IntroParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
-    if ($target eq 'web' || $target eq 'webgrade') {
-	if ($tagstack->[-2] eq 'Dimension') {
-	    $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
-	
-	} elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+	if ($tagstack->[-2] eq 'Dimension' || $tagstack->[-2] eq 'Question' ) {
+	    $dimension{'intro'}=
+		&Apache::lonxml::get_all_text('/introparagraph',
+					      $parser,$style);
+       	} elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
 	    &Apache::lonxml::startredirection();
 	}
 	
@@ -2009,7 +2139,7 @@ sub start_InstanceText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];
     my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
-    if ($target eq 'web' || $target eq 'webgrade') {
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
 	$dimension{$instance_id.'.text'}=$text;
     }
     return '';
@@ -2021,14 +2151,21 @@ sub end_InstanceText {
 
 sub start_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    my $instance_id=$Apache::bridgetask::instance[-1];
     my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
 	my $id=&get_id($parstack,$safeeval);
-	$dimension{$instance_id.'.criteria.'.$id}=$criteria;
-	$dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=
-	    &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
-	push(@{$dimension{$instance_id.'.criterias'}},$id);
+	if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) {
+	    my $instance_id=$Apache::bridgetask::instance[-1];
+	    $dimension{"criteria.$instance_id.$id"}=$criteria;
+	    $dimension{"criteria.$instance_id.$id.mandatory"}=
+		&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
+	    push(@{$dimension{$instance_id.'.criterias'}},"$instance_id.$id");
+	} else {
+	    $dimension{'criteria.'.$id}=$criteria;
+	    $dimension{'criteria.'.$id.'.mandatory'}=
+		&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
+	    push(@{$dimension{'criterias'}},$id);
+	}
     }
     return '';
 }