--- loncom/homework/bridgetask.pm	2005/05/09 21:55:01	1.19
+++ loncom/homework/bridgetask.pm	2005/05/10 16:44:35	1.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.19 2005/05/09 21:55:01 albertel Exp $
+# $Id: bridgetask.pm,v 1.21 2005/05/10 16:44:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,8 @@ sub initialize_bridgetask {
     $Apache::bridgetask::dimension='';
     # list of all Dimension ids seen
     @Apache::bridgetask::dimensionlist=();
+    # mandatory attribute of all Dimensions seen
+    %Apache::bridgetask::dimensionmandatory=();
     # list of all current Instance ids
     @Apache::bridgetask::instance=();
     # list of all Instance ids seen in this problem
@@ -115,7 +117,7 @@ sub start_Task {
 	    $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
 	}
     }
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+    if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
 	$target eq 'tex') {
 	($status,$accessmsg,my $slot_name,$slot) = 
 	    &Apache::lonhomework::check_task_access('0');
@@ -178,11 +180,13 @@ sub start_Task {
 		}
 	    }
 	}
-    } elsif ($target eq 'webgrade') {
-	$result.=$head_tag_start.$body_tag_start.$form_tag_start;
-	$result.=
-	    '<input type="hidden" name="grade_target" value="webgrade" />';
-	$result.=&show_queue();
+    } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
+	      $target eq 'webgrade') {
+	if ($target eq 'webgrade') {
+	    $result.=$head_tag_start.$body_tag_start.$form_tag_start;
+	    $result.='<input type="hidden" name="webgrade" value="yes" />';
+	    $result.=&show_queue();
+	}
 	my $todo=&get_from_queue();
 	if ($todo) {
 	    &setup_env_for_other_user($todo,$safeeval);
@@ -196,11 +200,12 @@ sub start_Task {
 	    &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>';
+	    if ($target eq 'webgrade') {
+		$result.="\n".
+		    '<table><tr><td>No user to be graded.</td></tr></table>';
+	    }
 	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
 	}
-	
     } else {
 	# page_start returned a starting result, delete it if we don't need it
 	$result = '';
@@ -231,9 +236,10 @@ sub end_Task {
 		$result.=&Apache::lonxml::xmlend().'</html>';
 	    }
 	}
-	if ($target eq 'grade') {
+	if ($target eq 'grade' && !$env{'form.webgrade'}) {
 	    my $award='SUBMITTED';
-	    &Apache::essayresponse::file_submission('0','bridgetask','portfiles',\$award);
+	    &Apache::essayresponse::file_submission('0','bridgetask',
+						    'portfiles',\$award);
 	    if ($award eq 'SUBMITTED' &&
 		$Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) {
 		$Apache::lonhomework::results{"resource.0.tries"}=
@@ -246,14 +252,63 @@ sub end_Task {
 		&add_to_queue();
 	    }
 	}
+	if ($target eq 'grade' && $env{'form.webgrade'}) {
+	    my $optional_required=
+		&Apache::lonxml::get_param('OptionalRequired',$parstack,
+					   $safeeval);
+	    my $optional_passed=0;
+	    my $mandatory_failed=0;
+	    my $ungraded=0;
+	    my $review=0;   
+	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
+	    foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
+		my $status=
+		    $Apache::lonhomework::results{"resource.$dim_id.status"};
+		my $mandatory=
+		    ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
+		if ($status eq 'pass') {
+		    if (!$mandatory) { $optional_passed++; }
+		} elsif ($status eq 'fail') {
+		    if ($mandatory) { $mandatory_failed++; }
+		} elsif ($status eq 'ungraded') {
+		    $ungraded++;
+		} elsif ($status eq 'review') {
+		    $review++;
+		}	
+	    }
+	    if ($optional_passed < $optional_required) {
+		$mandatory_failed++;
+	    }
+	    &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
+	    $Apache::lonhomework::results{'resource.grader'}=
+		$env{'user.name'}.'@'.$env{'user.domain'};
+	    if ($review) {
+		$Apache::lonhomework::results{'resource.status'}='review';
+		&move_to_review_queue();
+	    } elsif ($ungraded) {
+		$Apache::lonhomework::results{'resource.status'}='ungraded';
+		&check_queue_unlock();
+	    } elsif ($mandatory_failed) {
+		$Apache::lonhomework::results{'resource.status'}='fail';
+		$Apache::lonhomework::results{"resource.0.award"}='EXACT_ANS';
+		&remove_from_queue();
+	    } else {
+		$Apache::lonhomework::results{'resource.status'}='pass';
+		$Apache::lonhomework::results{"resource.0.award"}='INCORRECT';
+		&remove_from_queue();
+	    }
+	    &Apache::structuretags::finalize_storage();
+	}
     } elsif ($target eq 'webgrade') {
 	$result.="</table>\n<hr />";
-	$result.='<input type="submit" name="next" value="'.
-	    &mt('Save & Next').'" /> ';
-	$result.='<input type="submit" name="end" value="'.
-	    &mt('Save & Stop Grading').'" /> ';
-	$result.='<input type="submit" name="end" value="'.
-	    &mt('Throw Away & Stop Grading').'" /> ';
+	#$result.='<input type="submit" name="next" value="'.
+	#    &mt('Save &amp; Next').'" /> ';
+	#$result.='<input type="submit" name="end" value="'.
+	#    &mt('Save &amp; Stop Grading').'" /> ';
+	#$result.='<input type="submit" name="throwaway" value="'.
+	#    &mt('Throw Away &amp; Stop Grading').'" /> ';
+	#$result.='<input type="submit" name="save" value="'.
+	#    &mt('Save Partial Grade and Continue Grading').'" /> ';
 	$result.='</form>'.&Apache::loncommon::endbodytag().'</html>';
     } elsif ($target eq 'meta') {
 	$result.='<parameter part="0" package="Task"></parameter>'."\n";
@@ -264,6 +319,18 @@ sub end_Task {
     return $result;
 }
 
+sub move_to_review_queue {
+    &Apache::lonxml::debug("Want to move");
+}
+
+sub check_queue_unlock {
+    &Apache::lonxml::debug("Want to unlock?");
+}
+
+sub remove_from_queue {
+    &Apache::lonxml::debug("Want to remove. Done?");
+}
+
 sub setup_env_for_other_user {
     my ($queue_key,$safeeval)=@_;
     my ($symb,$uname,$udom)=&decode_queue_key($queue_key);
@@ -290,7 +357,8 @@ sub show_queue {
     my $cdom=$env{'course.'.$cid.'.domain'};
     my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);
-    $result.="\n<h3>Current Queue</h3><table><tr><th>resource</th><th>user</th><th>type</th><th>data</th></tr>";
+    $result.="\n<h3>Current Queue</h3><table><tr><th>resource</th>".
+	"<th>user</th><th>type</th><th>data</th></tr>";
     foreach my $key (sort(keys(%queue))) {
 	if ($key=~/locked$/) {
 	    my ($symb,$uname,$udom) = &decode_queue_key($key);
@@ -309,7 +377,9 @@ sub show_queue {
 	    $result.="<tr><td>$title</td><td>$uname</td><td>";
 	    my $slot=$queue{$key}->[0];
 	    my %slot_data=&Apache::lonnet::get_slot($slot);
-	    $result.='<td>queue entry</td><td>End time: '.&Apache::lonlocal::locallocaltime($slot_data{'endtime'})."</td></tr>";
+	    $result.='<td>queue entry</td><td>End time: '.
+		&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
+		"</td></tr>";
 	}
     }
     $result.="</table><hr />\n";
@@ -484,6 +554,8 @@ sub start_Dimension {
     $Apache::bridgetask::dimension=$dim_id;
     push(@Apache::bridgetask::dimensionlist,$dim_id);
     undef(@Apache::bridgetask::instance);
+    $Apache::bridgetask::dimensionmandatory{$dim_id}=
+	&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
     return '';
 }
 
@@ -501,12 +573,14 @@ sub get_instance {
     sub end_Dimension {
 	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 	my $result;
+	my $dim_id=&get_id($parstack,$safeeval);
 	my $instance=&get_instance();
 	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;
+		my $status=$Apache::lonhomework::history{'resource.'.$instance.'.'.$id.'.status'};
 		$result.='<tr><td width="100%" valign="top">'.
 		    '<a name="'.$link.'" />'.
 		    '<a name="next_'.$last_link.'" />'.
@@ -514,29 +588,56 @@ sub get_instance {
 		    #$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>'.
+		    '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{'resource.'.$instance.'.'.$id.'.comment'}).'</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 />'.
+		    '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>Ungraded</label></nobr><br />'.
+		    '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />Pass</label><br />'.
+		    '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />Fail</label><br />'.
+		    '<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />Review</label><br />'.
 		    '</td>'.
 		    '<td>'.
 		    '<a href="#'.$last_link.'">Prev</a><br />'.
-		    '<a href="#next_'.$link.'">Next</a><br />'.
+		    '<a href="#next_'.$link.'">Next</a><br /><br /><br />'.
+		    '<input type="submit" name="next" value="'.
+		    &mt('Done').'" /> '.
 		    '</td></tr>';
 		$last_link=$link;
 	    }
 	} elsif ($target eq 'grade') {
 	    my $optional_passed=0;
+	    my $mandatory_failed=0;
+	    my $ungraded=0;
+	    my $review=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') {
+		my $status=$Apache::lonhomework::results{'resource.'.$instance.'.'.$id.'.status'}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
+		$Apache::lonhomework::results{'resource.'.$instance.'.'.$id.'.comment'}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
+		my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
+		if ($status eq 'pass') {
+		    if (!$mandatory) { $optional_passed++; }
+		} elsif ($status eq 'fail') {
+		    if ($mandatory) { $mandatory_failed++; }
+		} elsif ($status eq 'review') {
+		    $review++;
+		} elsif ($status eq 'ungraded') {
+		    $ungraded++;
+		} else {
+		    &Apache::lonxml::error("got wierd status --$status--");
 		}
 	    }
+	    if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
+		$mandatory_failed++;
+	    }
+	    &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
+	    if ($review) {
+		$Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='review';
+	    } elsif ($ungraded) {
+		$Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='ungraded';
+	    } elsif ($mandatory_failed) {
+		$Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='fail';
+	    } else {
+		$Apache::lonhomework::results{'resource.'.$dim_id.'.status'}='pass';
+	    }
 	}
 	return $result;
     }
@@ -570,7 +671,7 @@ sub start_Instance {
     push(@{$dimension{'instances'}},$id);
     push(@Apache::bridgetask::instance,$id);
     push(@Apache::bridgetask::instancelist,$id);
-    $dimension{$instance_id.'.optionalrequired'}=
+    $dimension{$id.'.optionalrequired'}=
 	&Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
     return '';
 }
@@ -599,7 +700,7 @@ sub end_InstanceText {
 
 sub start_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    if ($target eq 'web' || $target eq 'webgrade') {
+    if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
 	&Apache::lonxml::startredirection();
     }
     return '';
@@ -608,7 +709,7 @@ sub start_Criteria {
 sub end_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];
-    if ($target eq 'web' || $target eq 'webgrade') {
+    if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
 	my $criteria=&Apache::lonxml::endredirection();
 	my $id=&get_id($parstack,$safeeval);
 	$dimension{$instance_id.'.criteria.'.$id}=$criteria;