--- loncom/homework/inputtags.pm	2005/11/15 22:28:30	1.180
+++ loncom/homework/inputtags.pm	2006/01/04 05:56:16	1.186
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.180 2005/11/15 22:28:30 albertel Exp $
+# $Id: inputtags.pm,v 1.186 2006/01/04 05:56:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -131,7 +131,7 @@ sub addchars {
 }
 
 sub start_textfield {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = "";
     my $id = &start_input($parstack,$safeeval);
     my $resid=$Apache::inputtags::response[-1];
@@ -155,17 +155,18 @@ sub start_textfield {
 	    if ($oldresponse ne '') {
 
 		#get rid of any startup text if the user has already responded
-		&Apache::lonxml::get_all_text("/textfield",$parser);
+		&Apache::lonxml::get_all_text("/textfield",$parser,$style);
 	    }
 	} else {
 	    #right or wrong don't show it
 	    #$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';
 	    $result='';
 	    #get rid of any startup text
-	    &Apache::lonxml::get_all_text("/textfield",$parser);
+	    &Apache::lonxml::get_all_text("/textfield",$parser,$style);
 	}
     } elsif ($target eq 'grade') {
-	my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser);
+	my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser,
+						   $style);
 	if ($seedtext eq $env{'form.HWVAL_'.$resid}) {
 	    # if the seed text is still there it wasn't a real submission
 	    $env{'form.HWVAL_'.$resid}='';
@@ -176,7 +177,8 @@ sub start_textfield {
 	$result.=&Apache::edit::text_arg('Columns:','cols',$token,4);
 	$result.=&Apache::edit::text_arg
 	    ('Click-On Texts (comma sep):','addchars',$token,10);
-	my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser);
+	my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser,
+						   $style);
 	$result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2);
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -388,7 +390,8 @@ sub checkstatus {
 
 sub valid_award {
     my ($award) =@_;
-    foreach my $possibleaward ('MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
+    foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR',
+			       'NO_RESPONSE',
 			       'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR',
 			       'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',
 			       'UNIT_FAIL', 'NO_UNIT',
@@ -403,7 +406,7 @@ sub valid_award {
 }
 
 sub finalizeawards {
-    my ($awardref,$msgref)=@_;
+    my ($awardref,$msgref,$nameref,$reverse)=@_;
     my $result=undef;
     my $award;
     my $msg;
@@ -419,15 +422,19 @@ sub finalizeawards {
 	if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; }
     }
     if (defined($result)) { return ($result,$msg); }
-    foreach my $possibleaward ('MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
-			       'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR',
-			       'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',
-			       'UNIT_FAIL', 'NO_UNIT',
-			       'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
-			       'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', 
-			       'MISORDERED_RANK', 'INVALID_FILETYPE',
-			       'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
-			       'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
+
+    # these awards are ordered from most important error through best correct
+    
+    my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
+		  'TOO_LONG',
+		  'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
+		  'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
+		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',
+		  'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
+		  'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
+		  'APPROX_ANS', 'EXACT_ANS');
+    if ($reverse) { @awards=reverse(@awards); }
+    foreach my $possibleaward (@awards) {
 	($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref);
 	if (defined($result)) { return ($result,$msg); }
     }
@@ -527,6 +534,10 @@ sub decideoutput {
 	$message = '';
 	$bgcolor=$possiblecolors{'no_feedback'};
 	$button=1;
+    } elsif ($award eq 'EXTRA_ANSWER') {
+	$message = &mt('Some extra items were submitted.');
+	$bgcolor=$possiblecolors{'not_charged_try'};
+	$button = 1;
     } elsif ($award eq 'MISSING_ANSWER') {
 	$message = &mt('Some items were not submitted.');
 	$bgcolor=$possiblecolors{'not_charged_try'};
@@ -611,7 +622,12 @@ sub decideoutput {
 	$bgcolor=$possiblecolors{'correct'};
 	$button=0;
     } elsif ($award eq '') {
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	if ($handgrade && $Apache::inputtags::status[-1] eq 'SHOW_ANSWER') {
+	    $message = &mt("Nothing submitted.");
+	    $bgcolor=$possiblecolors{'charged_try'};
+	} else {
+	    $bgcolor=$possiblecolors{'not_charged_try'};
+	}
 	$button=1;
     } else {
 	$message = &mt("Unknown message").": $award";
@@ -781,6 +797,9 @@ sub setgradedata {
 	return '';
     }
     $Apache::lonhomework::results{"resource.$id.award"} = $award;
+    if ($award eq 'SUBMITTED') {
+	&Apache::response::add_to_gradingqueue();
+    }
 }
 
 sub grade {
@@ -837,8 +856,11 @@ sub gradestatus {
 
     my $status = $Apache::inputtags::status['-1'];
     &Apache::lonxml::debug("gradestatus has :$status:");
-    if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' &&
-	 $status ne 'INVALID_ACCESS') {  
+    if ( $status ne 'CLOSED' 
+	 && $status ne 'UNAVAILABLE' 
+	 && $status ne 'INVALID_ACCESS' 
+	 && $status ne 'NEEDS_CHECKIN' 
+	 && $status ne 'NOT_IN_A_SLOT') {  
 	my $award = $Apache::lonhomework::history{"resource.$id.award"};
 	my $awarded = $Apache::lonhomework::history{"resource.$id.awarded"};
 	my $solved = $Apache::lonhomework::history{"resource.$id.solved"};