--- loncom/homework/bridgetask.pm	2005/05/03 06:44:56	1.16
+++ loncom/homework/bridgetask.pm	2005/05/09 21:55:01	1.19
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.16 2005/05/03 06:44:56 albertel Exp $
+# $Id: bridgetask.pm,v 1.19 2005/05/09 21:55:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -194,6 +194,7 @@ sub start_Task {
 	    $Apache::bridgetask::queue_key=$todo;
 	    &Apache::structuretags::initialize_storage();
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
+	    $result.="\n".'<table width="100%" style="width:100%" border="1">';
 	} else {
 	    $result.="\n".
 		'<table><tr><td>No user to be graded.</td></tr></table>';
@@ -246,7 +247,7 @@ sub end_Task {
 	    }
 	}
     } elsif ($target eq 'webgrade') {
-	$result.="\n<hr />";
+	$result.="</table>\n<hr />";
 	$result.='<input type="submit" name="next" value="'.
 	    &mt('Save & Next').'" /> ';
 	$result.='<input type="submit" name="end" value="'.
@@ -338,8 +339,8 @@ sub pick_from_queue_data {
 	my ($symb,$uname,$udom)=&decode_queue_key($key);
 	if ($check_section) {
 	    my $section=&Apache::lonnet::getsection($uname,$udom);
-	    if ($section ne $check_section) {
-		&Apache::lonnet::logthis("not my sec");
+	    if ($section eq $check_section) {
+		&Apache::lonnet::logthis("my sec");
 		next;
 	    }
 	}
@@ -468,11 +469,18 @@ sub end_ClosingParagraph {
     return $result;
 }
 
+sub get_id {
+    my ($parstack,$safeeval)=@_;
+    my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval);
+    if (!$id) { $id=$Apache::lonxml::curdepth; }
+    return $id;
+}
+
 my %dimension;
 sub start_Dimension {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     undef(%dimension);
-    my $dim_id=$Apache::lonxml::curdepth;
+    my $dim_id=&get_id($parstack,$safeeval);
     $Apache::bridgetask::dimension=$dim_id;
     push(@Apache::bridgetask::dimensionlist,$dim_id);
     undef(@Apache::bridgetask::instance);
@@ -488,22 +496,50 @@ sub get_instance {
     return $order[0];
 }
 
-sub end_Dimension {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    my $result;
-    if ($target eq 'web') {
+{
+    my $last_link;
+    sub end_Dimension {
+	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+	my $result;
 	my $instance=&get_instance();
-	$result=$dimension{'intro'}.$dimension{$instance.'.text'};
-    } elsif ($target eq 'webgrade') {
-	my $instance=&get_instance();
-	$result.="\n".'<table>';
-	foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-	    $result.='<tr><td>'.
-		$dimension{$instance.'.criteria.'.$id}.'</td></tr>';
+	if ($target eq 'web') {
+	    $result=$dimension{'intro'}.$dimension{$instance.'.text'};
+	} elsif ($target eq 'webgrade') {
+	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+		my $link='criteria_'.$instance.'_'.$id;
+		$result.='<tr><td width="100%" valign="top">'.
+		    '<a name="'.$link.'" />'.
+		    '<a name="next_'.$last_link.'" />'.
+		    '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">'.$dimension{$instance.'.criteria.'.$id}.'</textarea>'.
+		    #$dimension{$instance.'.criteria.'.$id}.
+		    '</td>'.
+		    '<td><nobr>Additional Comment for Student</nobr> <br />'.
+		    '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'"></textarea>'.
+		    '</td>'.
+		    '<td>'.
+		    '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" />Ungraded</label></nobr><br />'.
+		    '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" />Pass</label><br />'.
+		    '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" />Fail</label><br />'.
+		    '<label><input type="radio" name="HWVAL_'.$link.'" value="review" />Review</label><br />'.
+		    '</td>'.
+		    '<td>'.
+		    '<a href="#'.$last_link.'">Prev</a><br />'.
+		    '<a href="#next_'.$link.'">Next</a><br />'.
+		    '</td></tr>';
+		$last_link=$link;
+	    }
+	} elsif ($target eq 'grade') {
+	    my $optional_passed=0;
+	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+		if ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'pass') {
+		} elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'fail') {
+		} elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'ungraded') {
+		} elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'review') {
+		}
+	    }
 	}
-	$result.='</table>';
+	return $result;
     }
-    return $result;
 }
 
 sub start_IntroParagraph {
@@ -530,9 +566,12 @@ sub end_IntroParagraph {
 
 sub start_Instance {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    push(@{$dimension{'instances'}},$Apache::lonxml::curdepth);
-    push(@Apache::bridgetask::instance,$Apache::lonxml::curdepth);
-    push(@Apache::bridgetask::instancelist,$Apache::lonxml::curdepth);
+    my $id=&get_id($parstack,$safeeval);
+    push(@{$dimension{'instances'}},$id);
+    push(@Apache::bridgetask::instance,$id);
+    push(@Apache::bridgetask::instancelist,$id);
+    $dimension{$instance_id.'.optionalrequired'}=
+	&Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
     return '';
 }
 
@@ -571,8 +610,10 @@ sub end_Criteria {
     my $instance_id=$Apache::bridgetask::instance[-1];
     if ($target eq 'web' || $target eq 'webgrade') {
 	my $criteria=&Apache::lonxml::endredirection();
-	my $id=$Apache::lonxml::curdepth;
+	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);
     }
     return '';