--- loncom/homework/bridgetask.pm	2005/09/21 21:54:20	1.52
+++ loncom/homework/bridgetask.pm	2005/10/05 20:24:59	1.68
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.52 2005/09/21 21:54:20 albertel Exp $
+# $Id: bridgetask.pm,v 1.68 2005/10/05 20:24:59 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -144,11 +144,28 @@ sub add_previous_version_button {
 }
 
 sub add_grading_button {
+    my (undef,$cid)=&Apache::lonxml::whichuser();
+    my $cnum=$env{'course.'.$cid.'.num'};
+    my $cdom=$env{'course.'.$cid.'.domain'};
+    my %sections;
+    my $numsections=&Apache::loncommon::get_sections($cdom,$cnum,\%sections);
+    my $size=5;
+    if (scalar(keys(%sections)) < 3) {
+	$size=scalar(keys(%sections))+2;
+    }
+    my $sec_select = '<select multiple name="chosensections" size="'.$size.'">'."\n";
+    $sec_select .= "<option value='all' selected='selected'>all</option>\n";
+    foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
+	$sec_select .= "<option name=\"$sec\">$sec</option>\n";
+    }
+    $sec_select .= "<option value='none'>none</option></select>\n";
+    
     my $result=' <input type="submit" name="gradeasubmission" value="'.
 	&mt("Get a submission to grade").'" />';
     $result.='<input type="hidden" name="grade_target" value="webgrade" />';
     if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
 	my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
+	$result.='<p>Specify a section: '.$sec_select.'</p>';
 	$result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);
 
 	$result.=' <input type="submit" name="reviewagrading" value="'.
@@ -204,6 +221,120 @@ sub preserve_grade_info {
     return $result;
 }
 
+sub style {
+    return (<<STYLE);
+<style type="text/css">
+.fail, .pass, .neutral {
+    position: relative;
+    margin : 5px;
+    margin-bottom :10px;
+    padding : 4px;
+    padding-left : 75px;
+	border : thin solid;
+    font-weight : bolder;
+    font-size: smaller;
+    font-family: Arial;
+    background-color : rgb(255,240,225);
+}
+
+.fail h4, .pass h4 {
+	position:absolute;
+	left: -4px;
+	top: -8px;
+	padding:2px;
+	margin:0;
+	background-color : rgb(255,240,225);
+	border : thin solid;
+}
+
+.fail {
+	color: red;
+}
+
+.pass {
+    color : green;
+}
+
+.neutral {
+	color : blue;
+}
+
+.question {
+	border : thin solid black;
+	padding : 4px;
+	margin-bottom : 1em;
+}
+
+.grade {
+	font-size: x-large;
+	font-family: Arial;
+	position:absolute;
+	left: 5px;
+	top: -5px;
+	width: 70px;
+}
+
+div#feedback h1 {
+    color : inherit;
+}
+</style>
+STYLE
+
+}
+
+sub show_task {
+    my ($status,$previous)=@_;
+    if (!$previous && (
+		       ( $status eq 'CLOSED' ) ||
+		       ( $status eq 'BANNED') ||
+		       ( $status eq 'UNAVAILABLE') ||
+		       ( $status eq 'NOT_IN_A_SLOT') ||
+		       ( $status eq 'NEEDS_CHECKIN') ||
+		       ( $status eq 'WAITING_FOR_GRADE') ||
+		       ( $status eq 'INVALID_ACCESS') )) {
+	return 0;
+    }
+    if ($env{'form.donescreen'}) { return 0; }
+    return 1;
+}
+
+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 $submissiontime;
+    my $version=$Apache::lonhomework::history{'resource.version'};
+    for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {
+	if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) {
+	    $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};
+	}
+    }
+    my $result;
+    if ($submissiontime) {
+	my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.checkedin.slot'};
+	my %slot=&Apache::lonnet::get_slot($slot_name);
+	my $diff = $slot{'endtime'} - $submissiontime;
+	my ($color,$when)=('red','after');
+	if ($diff > 0) { ($color,$when)=('green','before'); }
+	my $info;
+	if ($diff%60) { $info=($diff%60).' seconds'; }
+	$diff=int($diff/60);
+	if ($diff%60) { $info=($diff%60).' minutes '.$info; }
+	$diff=int($diff/60);
+	if ($diff) {    $info=$diff.' hours '.$info; }
+	$result='<p><font color="'.$color.'">'.
+	    &mt('Student submitted [_1] [_2] the deadline. 
+                 (Submission was at [_3], end of period was [_4].)',
+		$info,$when,scalar(localtime($submissiontime)),
+		scalar(localtime($slot{'endtime'}))).
+		'</font></p>';
+    }
+    return $result;
+}
+
 sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
@@ -247,14 +378,7 @@ sub start_Task {
 	&Apache::run::run($expression,$safeeval);
 	&Apache::lonxml::debug("Got $status");
 	$body_tag_start.=&add_previous_version_button($status);
-	if (!$previous && (
-			   ( $status eq 'CLOSED' ) ||
-			   ( $status eq 'BANNED') ||
-			   ( $status eq 'UNAVAILABLE') ||
-			   ( $status eq 'NOT_IN_A_SLOT') ||
-			   ( $status eq 'NEEDS_CHECKIN') ||
-			   ( $status eq 'WAITING_FOR_GRADE') ||
-			   ( $status eq 'INVALID_ACCESS') )) {
+	if (!&show_task($status,$previous)) {
 	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
 	    if ( $target eq "web" ) {
 		$result.= $head_tag_start.'</head>'.$body_tag_start;
@@ -269,6 +393,18 @@ sub start_Task {
 			'</h1>'.&proctor_validation_screen($slot);
 		} elsif ($status eq 'WAITING_FOR_GRADE') {
 		    $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
+		} elsif ($env{'form.donescreen'}) {
+		    my $title=&Apache::lonnet::gettitle();
+		    my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
+		    my $files='<ul><li>'.join('</li><li>',@files).'</li></ul>';
+		    $result.=<<DONESCREEN;
+<h2>$title</h2>
+<p> Files submitted: $files </p>
+<p> You are now done with this Bridge Task </p>
+<hr />
+<p> <a href="/adm/logout">Logout</a> </p>
+<p> <a href="/adm/roles">Change to a different course</a> </p>
+DONESCREEN
 		} elsif ($status ne 'NOT_YET_VIEWED') {
 		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
 		}
@@ -291,22 +427,13 @@ sub start_Task {
 	} elsif ($target eq 'web') {
 	    my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);
 	    $result.="$head_tag_start<title>$name</title></head>
-              $body_tag_start \n";
+              $body_tag_start \n".&style();
 	    
-	    my ($version,$previous)=&get_version();
-	    if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
-		$result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';
-		if (!$previous) {
-		    $result.=&add_request_another_attempt_button();
-		}
-	    }
-	    if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
-		$result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';
-	    }
+	    $result.=&preserve_grade_info();
+	    $result.=&internal_location();
 	    $result.=$form_tag_start.
 		'<input type="hidden" name="submitted" value="yes" />';
-	    $result.=&preserve_grade_info();
-
+	    &Apache::lonxml::startredirection();
 	}
     } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
 	      $target eq 'webgrade') {
@@ -323,7 +450,6 @@ sub start_Task {
         #       there isn't reshow the queue....
 	my ($todo,$status_code)=&get_key_todo($target);
 
-	&Apache::lonnet::logthis("got todo -$todo- stat -$status_code-");
 	if ($todo) {
 	    &setup_env_for_other_user($todo,$safeeval);
 	    my ($symb,$uname,$udom)=&decode_queue_key($todo);
@@ -365,6 +491,9 @@ sub start_Task {
 	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
 	}
 	if ($target eq 'webgrade' && defined($env{'form.queue'})) {
+	    if ($webgrade eq 'yes') {
+		$result.=&submission_time_stamp();
+	    }
 	    $result.=$form_tag_start;
 	    $result.='<input type="hidden" name="webgrade" value="'.
 		$webgrade.'" />';
@@ -374,6 +503,14 @@ sub start_Task {
 		$result.='<input type="hidden" name="regrade" value="'.
 		    $env{'form.regrade'}.'" />';
 	    }
+	    if ($env{'form.chosensections'}) {
+		my @chosen_sections=
+		    &Apache::loncommon::get_env_multiple('form.chosensections');
+		foreach my $sec (@chosen_sections) {
+		    $result.='<input type="hidden" name="chosensections" 
+                               value="'.$sec.'" />';
+		}
+	    }
 	}
     } else {
 	# page_start returned a starting result, delete it if we don't need it
@@ -387,7 +524,7 @@ sub get_key_todo {
     my $todo;
 
     if (defined($env{'form.reviewasubmission'})) {
-	&Apache::lonnet::logthis("review a submission....");
+	&Apache::lonxml::debug("review a submission....");
 	$env{'form.queue'}='reviewqueue';
 	return (undef,'show_list');
     }
@@ -418,12 +555,12 @@ sub get_key_todo {
 		if ($env{'form.stop'}) {
 		    return (undef,'stop');
 		} elsif ($env{'form.next'}) {
-		    return (undef,'show_list');
+		    return (undef,'select_user');
 		}
 	    }
 	    return ($gradingkey,'selected');
 	} else {
-	    return (undef,'show_list');
+	    return (undef,'select_user');
 	}
     }
     if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})
@@ -486,7 +623,11 @@ sub end_Task {
 	    ($target eq 'answer') || ($target eq 'tex')
 	   ) {
 	    if ($target eq 'web') {
-		if ($status eq 'CAN_ANSWER' && !$previous) {
+		if (&show_task($status,$previous)) {
+		    $result.=&Apache::lonxml::endredirection();
+		}
+		if ($status eq 'CAN_ANSWER' && !$previous && 
+		    !$env{'form.donescreen'}) {
 		    $result.="\n".'<table border="1">'.
 			&Apache::inputtags::file_selector("$version.0",
 							  "bridgetask","*",
@@ -496,6 +637,57 @@ sub end_Task {
 <p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').
 							  "</table>";
 		    $result.=&Apache::inputtags::gradestatus('0');
+		    $result.='</form>';
+		    $result.=<<DONEBUTTON;
+<form method="POST">
+   <input type="hidden" name="donescreen" value="1" />
+   <input type="submit" value="Done" />
+</form>
+DONEBUTTON
+		}
+		if (&show_task($status,$previous) &&
+		    $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {
+		    my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};
+		    my $title=&Apache::lonnet::gettitle();
+		    my %slot=&Apache::lonnet::get_slot($Apache::inputtags::slot_name);
+		    my $start_time=
+			&Apache::lonlocal::locallocaltime($slot{'starttime'});
+
+		    my $status;
+		    $status.="\n<div class='$bt_status'>\n";
+		    
+		    if ($bt_status eq 'pass')  {
+			$status.='<h2>You passed the '.$title.' given on '.
+			    $start_time.'.</h2>';
+		    }
+		    if ($bt_status eq 'fail')  {
+			$status.='<h2>You did not pass the '.$title.' given on '.
+			    $start_time.'.</h2>';
+			if (!$previous) {
+			    $status.=&add_request_another_attempt_button();
+			}
+		    }
+		    my $man_count=0;
+		    my $opt_count=0;
+		    my $opt_passed=0;
+		    foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
+			if ($Apache::bridgetask::dimensionmandatory{$dim_id}
+			    eq 'N') {
+			    $opt_count++;
+			    if ($Apache::lonhomework::history{"resource.$version.$dim_id.status"} eq 'pass') {
+				$opt_passed++;
+			    }
+			} else {
+			    $man_count++;
+			}
+		    }
+		    my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
+							 $parstack,$safeeval);
+		    if ($opt_req !~ /\S/) { $opt_req='0'; }
+		    $status.="\n<p>".&mt('You needed to pass all of the [_1]  mandatory components and [_2] of the [_3] optional components on the bridge task.',$man_count,$opt_req,$opt_count)."</p></div>\n";
+
+		    my $internal_location=&internal_location();
+		    $result=~s/\Q$internal_location\E/$status/;
 		}
 	    } 
 	    if ($target eq 'web' || $target eq 'webgrade') {
@@ -517,6 +709,8 @@ sub end_Task {
 		    $award;
 		$Apache::lonhomework::results{"resource.0.submission"}=
 		    $Apache::lonhomework::results{"resource.$version.0.submission"}='';
+	    } else {
+		delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});
 	    }
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &Apache::structuretags::finalize_storage();
@@ -724,6 +918,11 @@ sub check_queue_for_key {
 	if (defined($results{"$todo\0locked"})) {
 	    return 'locked';
 	}
+	my $slot=$results{$todo}->[0];
+	my %slot_data=&Apache::lonnet::get_slot($slot);
+	if ($slot_data{'endtime'} > time) { 
+	    return 'in_progress';
+	}
 	return 'enqueued';
     }
     return undef;
@@ -746,6 +945,17 @@ sub show_queue {
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
+
+    my @chosen_sections=
+	&Apache::loncommon::get_env_multiple('form.chosensections');
+    &Apache::grades::init_perm();
+    my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
+    &Apache::grades::reset_perm();
+    if (!(grep(/^all$/,@chosen_sections))) {
+	$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
+	    '</tt>.</p> '."\n";
+    }
+
     my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     my ($tmp)=%queue;
@@ -756,8 +966,9 @@ sub show_queue {
     if ($with_selects) { $result.="<th></th>"; }
     $result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";
     foreach my $key (sort(keys(%queue))) {
+	my ($symb,$uname,$udom) = &decode_queue_key($key);
+	if (!defined($classlist->{$uname.':'.$udom})) { next; }
 	if ($key=~/locked$/ && !$with_selects) {
-	    my ($symb,$uname,$udom) = &decode_queue_key($key);
 	    my $title=&Apache::lonnet::gettitle($symb);
 	    $result.="<tr><td>$title</td><td>$uname</td>";
 	    $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
@@ -768,7 +979,6 @@ sub show_queue {
 	    $result.='<td>last queue modification time</td><td>'.
 		&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
 	} elsif ($key!~/(timestamp|locked)$/) {
-	    my ($symb,$uname,$udom) = &decode_queue_key($key);
 	    my $title=&Apache::lonnet::gettitle($symb);
 	    $result.="<tr>";
 	    my $slot=$queue{$key}->[0];
@@ -784,6 +994,11 @@ sub show_queue {
 			($action,$description)=('unlock',&mt('Unlock'));
 		    }
 		}
+		my $seclist;
+		foreach my $sec (@chosen_sections) {
+		    $seclist.='<input type="hidden" name="chosensections" 
+                               value="'.$sec.'" />';
+		}
 		if (time > $slot_data{'endtime'}) {
 		    $result.=(<<FORM);
 <td>
@@ -794,6 +1009,7 @@ sub show_queue {
  <input type="hidden" name="webgrade" value="no" />
  <input type="hidden" name="queuemode" value="selected" />
  <input type="submit" name="submit" value="$description" />
+ $seclist
 </form>
 </td>
 FORM
@@ -873,6 +1089,8 @@ sub queue_key_locked {
 sub pick_from_queue_data {
     my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
     foreach my $key (keys(%$queuedata)) {
+	if ($key =~ /\0locked$/) { next; }
+	if ($key =~ /\0timestamp$/) { next; }
 	my ($symb,$uname,$udom)=&decode_queue_key($key);
 	if ($check_section) {
 	    my $section=&Apache::lonnet::getsection($uname,$udom);
@@ -998,24 +1216,49 @@ sub get_from_queue {
 
 sub select_user {
     my ($symb,$cid)=&Apache::lonxml::whichuser();
-    my $result.='<table border="1">';
 
+    my @chosen_sections=
+	&Apache::loncommon::get_env_multiple('form.chosensections');
     &Apache::grades::init_perm();
-    my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all',);
+    my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
     &Apache::grades::reset_perm();
+    
+    my $result;
+    if (!(grep(/^all$/,@chosen_sections))) {
+	$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
+	    '</tt>.</p> '."\n";
+    }
+    $result.='<table border="1">';
 
     foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
 	my ($uname,$udom) = split(/:/,$student);
+	
 	my %status = &get_student_status($symb,$cid,$udom,$uname);
 	my $queue = 'none';
-	if ($status{'reviewqueue'} eq 'enqueued') {
+	my $cannot_grade;
+	if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) {
 	    $queue = 'reviewqueue';
-	} elsif ($status{'gradingqueue'} eq 'enqueued') {
+	    if ($status{'reviewqueue'} eq 'in_progress') {
+		$cannot_grade=1;
+	    }
+	} elsif ($status{'gradingqueue'} =~ /^(in_progress|enqueue)$/) {
 	    $queue = 'gradingqueue';
+	    if ($status{'gradingqueue'} eq 'in_progress') {
+		$cannot_grade=1;
+	    }
 	}
 	my $todo = 
 	    &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
-	$result.=<<RESULT;
+	if ($cannot_grade) {
+	    $result.='<tr><td>&nbsp;</td><td>'.$fullname->{$student}.
+		'</td><td>';
+	} else {
+	    my $seclist;
+	    foreach my $sec (@chosen_sections) {
+		$seclist.='<input type="hidden" name="chosensections" 
+                               value="'.$sec.'" />';
+	    }
+	    $result.=<<RESULT;
 <tr>
   <td>
     <form method="POST">
@@ -1023,12 +1266,13 @@ sub select_user {
       <input type="hidden" name="queue" value="$queue" />
       <input type="hidden" name="webgrade" value="no" />
       <input type="hidden" name="regrade" value="yes" />
-     <input type="submit" name="submit" value="Regrade" />
+      <input type="submit" name="submit" value="Regrade" />
+      $seclist
     </form>
   <td>$fullname->{$student}</td>
   <td>
 RESULT
-
+        }
         if ($status{'status'} eq 'pass') {
 	    $result .= '<font color="green">'.&mt('Passed').'</font>';
 	} elsif ($status{'status'} eq 'fail') {
@@ -1050,10 +1294,14 @@ RESULT
 	    $result .= &mt('Awaiting Review');
 	} elsif ($status{'reviewqueue'} eq 'locked') {
 	    $result .= &mt('Under Review');
+	} elsif ($status{'reviewqueue'} eq 'in_progress') {
+	    $result .= &mt('Still being worked on.');
 	} elsif ($status{'gradingqueue'} eq 'enqueued') {
 	    $result .= &mt('Awaiting Grading');
 	} elsif ($status{'gradingqueue'} eq 'locked') {
 	    $result .= &mt('Being Graded');
+	} elsif ($status{'gradingqueue'} eq 'in_progress') {
+	    $result .= &mt('Still being worked on.');
 	} else {
 	    $result.="&nbsp;";
 	}
@@ -1115,7 +1363,8 @@ sub start_Dimension {
     undef(@Apache::bridgetask::instance);
     $Apache::bridgetask::dimensionmandatory{$dim_id}=
 	&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
-    return '';
+    &Apache::lonxml::startredirection();
+    return &internal_location($dim_id);
 }
 
 sub get_instance {
@@ -1131,7 +1380,7 @@ sub get_instance {
     my $last_link;
     sub end_Dimension {
 	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-	my $result;
+	my $result=&Apache::lonxml::endredirection();
 	my $dim=&get_id($parstack,$safeeval);
 	my $instance=&get_instance();
 	my $version=&get_version();
@@ -1142,23 +1391,71 @@ sub get_instance {
 	    $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
 	    if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||
 		$Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+
+		my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"};
+		my $mandatory='Mandatory';
+		if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
+		    $mandatory='Optional';
+		}
+		my $dim_info="<div class='$dim_status'>\n";
+		if ($dim_status eq 'pass') {
+		    $dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';
+		}
+		if ($dim_status eq 'fail') {
+		    $dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>';
+		}
+		my $man_count=0;
+		my $man_passed=0;
+		my $opt_count=0;
+		my $opt_passed=0;
+		foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+		    if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} 
+			eq 'N') {
+			$opt_count++;
+			if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
+			    $opt_passed++;
+			}
+		    } else {
+			$man_count++;
+			if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
+			    $man_passed++;
+			}
+		    }
+		}
+		if ($man_passed eq $man_count) { $man_passed='all'; }
+		my $opt_req=$dimension{$instance.'.optionalrequired'};
+		if ($opt_req !~ /\S/) { $opt_req='0'; }
+		$dim_info.="\n<p>".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."</p>\n</div>";
+
+		my $internal_location=&internal_location($dim);
+		$result=~s/\Q$internal_location\E/$dim_info/;
+
 		foreach my $id (@{$dimension{$instance.'.criterias'}}) {
 		    my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
 		    my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
-		    $result.='<table border="1"><tr><td>';
+		    my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
+		    if ($mandatory) {
+			$mandatory='Mandatory';
+		    } else {
+			$mandatory='Optional';
+		    }
 		    if ($status eq 'fail') {
-			$result.='<font color="red">'.&mt('Did not pass').'</font>';
 		    } elsif ($status eq 'pass') {
-			$result.='<font color="green">'.&mt('Passed').'</font>';
 		    } else {
 			&Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");
 		    }
-		    $result.='</td></tr><tr><td>';
+		    my $status_display=$status;
+		    $status_display=~s/^([a-z])/uc($1)/e;
+		    @Apache::scripttag::parser_env = @_;
+		    $result.='<div class="'.$status.'"><h4>'.$mandatory.
+			' Criteria</h4><p>';
+		    @Apache::scripttag::parser_env = @_;
+		    $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
+		    $result.='</p><p class="grade">'.$status_display.'</p>';
 		    if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
-			$result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</td></tr><tr><td>';
+			$result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</p>';
 		    }
-		    $result.=$dimension{$instance.'.criteria.'.$id}.
-			'</td></tr></table>';
+		    $result.='</div>';
 		}
 	    }
 	} elsif ($target eq 'webgrade') {