--- loncom/homework/inputtags.pm	2005/11/10 22:19:27	1.179
+++ loncom/homework/inputtags.pm	2007/02/27 19:43:16	1.216
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.179 2005/11/10 22:19:27 albertel Exp $
+# $Id: inputtags.pm,v 1.216 2007/02/27 19:43:16 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,9 @@ use strict;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 BEGIN {
     &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
@@ -131,15 +134,15 @@ 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];
     if ($target eq 'web') {
 	$Apache::lonxml::evaluate--;
+	my $partid=$Apache::inputtags::part;
+	my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"');
 	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
-	    my $partid=$Apache::inputtags::part;
-	    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"');
 	    my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
 	    if ( $cols eq '') { $cols = 80; }
 	    my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
@@ -149,23 +152,28 @@ sub start_textfield {
 	    if ($addchars) {
 		$result.=&addchars('HWVAL_'.$resid,$addchars);
 	    }
-	    push @Apache::lonxml::htmlareafields,'HWVAL_'.$resid;
+	    &Apache::lonhtmlcommon::add_htmlareafields('HWVAL_'.$resid);
 	    $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" '.
 		"rows=\"$rows\" cols=\"$cols\">".$oldresponse;
 	    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='';
+	    #show past answer in the essayresponse case
+	    if ($oldresponse =~ /\S/
+		&& &Apache::londefdef::is_inside_of($tagstack,
+						    'essayresponse') ) {
+		$result='<table class="LC_pastsubmission"><tr><td>'.
+		    $oldresponse.'</td></tr></table>';
+	    }
 	    #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 +184,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,
@@ -220,20 +229,81 @@ sub end_textfield {
     return $result;
 }
 
+sub exam_score_line {
+    my ($target) = @_;
+
+    my $result;
+    if ($target eq 'tex') {
+	my $repetition = &Apache::response::repetition();
+	$result.='\begin{enumerate}';
+	if ($env{'request.state'} eq "construct" ) {$result.='\item[\strut]';}
+	foreach my $i (0..$repetition-1) {
+	    $result.='\item[\textbf{'.
+		($Apache::lonxml::counter+$i).
+		'}.]\textit{Leave blank on scoring form}\vskip 0 mm';
+	}
+	$result.= '\end{enumerate}';
+    }
+
+    return $result;
+}
+
+sub exam_box {
+    my ($target) = @_;
+    my $result;
+
+    if ($target eq 'tex') {
+	$result .= '\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
+	$result .= &exam_score_line($target);
+    } elsif ($target eq 'web') {
+	my $id=$Apache::inputtags::response[-1];
+	$result.= '<br /><br />
+                   <textarea name="HWVAL_'.$id.'" rows="4" cols="50">
+                   </textarea> <br /><br />';
+    }
+    return $result;
+}
+
+sub needs_exam_box {
+    my ($tagstack) = @_;
+    my @tags = ('formularesponse',
+		'stringresponse',
+		'reactionresponse',
+		'organicresponse',
+		);
+
+    foreach my $tag (@tags) {
+	if (grep(/\Q$tag\E/,@$tagstack)) {
+	    return 1;
+	}
+    }
+    return 0;
+}
+
 sub start_textline {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result = "";
+    my $input_id = &start_input($parstack,$safeeval);
     if ($target eq 'web') {
 	$Apache::lonxml::evaluate--;
 	my $partid=$Apache::inputtags::part;
 	my $id=$Apache::inputtags::response[-1];
-	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+	if (!&Apache::response::show_answer()) {
 	    my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
 	    my $maxlength;
 	    if ($size eq '') { $size=20; } else {
-		if ($size < 20) { $maxlength=$size; }
+		if ($size < 20) {
+		    $maxlength = ' maxlength="'.$size.'"';
+		}
+	    }
+	    my $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+	    &Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse));
+
+	    if (ref($oldresponse) eq 'ARRAY') {
+		$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
 	    }
-	    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"},'<>&"');
+	    $oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
+
 	    if ($Apache::lonhomework::type ne 'exam') {
 		my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
 		$result='';
@@ -242,17 +312,27 @@ sub start_textline {
 		}
 		my $readonly=&Apache::lonxml::get_param('readonly',$parstack,
 							$safeeval);
-		if (lc($readonly) eq 'yes') {
+		if (lc($readonly) eq 'yes' 
+		    || $Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
 		    $readonly=' readonly="readonly" ';
 		} else {
 		    $readonly='';
 		}
-		$result.= '<input type="text" '.$readonly.' name="HWVAL_'.$id.'" value="'.
-		    $oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />';
+		my $name = 'HWVAL_'.$id;
+		if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
+		    $name = "none";
+		}
+		$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');" type="text" '.$readonly.' name="'.$name.'" value="'.
+		    $oldresponse.'" size="'.$size.'"'.$maxlength.' />';
+	    }
+	    if ($Apache::lonhomework::type eq 'exam'
+		&& &needs_exam_box($tagstack)) {
+		$result.=&exam_box($target);
 	    }
 	} else {
 	    #right or wrong don't show what was last typed in.
-	    $result='<b>'.$Apache::inputtags::answertxt{$id}.'</b>';
+	    my $count = scalar(@Apache::inputtags::inputlist)-1;
+	    $result='<b>'.$Apache::inputtags::answertxt{$id}[$count].'</b>';
 	    #$result='';
 	}
     } elsif ($target eq 'edit') {
@@ -269,10 +349,16 @@ sub start_textline {
 						     $safeeval,'size',
 						     'addchars','readonly');
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
-    } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
+    } elsif ($target eq 'tex' 
+	     && $Apache::lonhomework::type ne 'exam') {
 	my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
 	if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';}
 	$result='\framebox['.$size.'][s]{\tiny\strut}';
+
+    } elsif ($target eq 'tex' 
+	     && $Apache::lonhomework::type eq 'exam'
+	     && &needs_exam_box($tagstack)) {
+	$result.=&exam_box($target);
     }
     return $result;
 }
@@ -281,18 +367,25 @@ sub end_textline {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     if    ($target eq 'web') { $Apache::lonxml::evaluate++; }
     elsif ($target eq 'edit') { return ('','no'); }
+    &end_input();
     return "";
 }
 
 sub start_hiddenline {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result = "";
+    my $input_id = &start_input($parstack,$safeeval);
     if ($target eq 'web') {
 	$Apache::lonxml::evaluate--;
 	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
 	    my $partid=$Apache::inputtags::part;
 	    my $id=$Apache::inputtags::response[-1];
-	    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"},'<>&"');
+	    my $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+	    if (ref($oldresponse) eq 'ARRAY') {
+		$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
+	    }
+	    $oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
+
 	    if ($Apache::lonhomework::type ne 'exam') {
 		$result= '<input type="hidden" name="HWVAL_'.$id.'" value="'.
 		    $oldresponse.'" />';
@@ -302,6 +395,12 @@ sub start_hiddenline {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::end_table;
     }
+
+    if ( ($target eq 'web' || $target eq 'tex')
+	 && $Apache::lonhomework::type eq 'exam'
+	 && &needs_exam_box($tagstack)) {
+	$result.=&exam_box($target);
+    }
     return $result;
 }
 
@@ -309,6 +408,7 @@ sub end_hiddenline {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     if    ($target eq 'web') { $Apache::lonxml::evaluate++; }
     elsif ($target eq 'edit') { return ('','no'); }
+    &end_input();
     return "";
 }
 
@@ -338,19 +438,7 @@ sub file_selector {
 	$result.=&mt('Submit a file: (only one file can be uploaded)').
 	    ' <br /><input type="file" size="50" name="HWFILE'.
 	    $jspart.'_'.$id.'" /><br />';
-	my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
-
-	if ($uploadedfile) {
-	    my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
-	    &Apache::lonxml::extlink($url);
-	    &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
-	    my $icon=&Apache::loncommon::icon($url);
-	    my $curfile='<a href="'.$url.'"><img src="'.$icon.
-		'" border="0" />'.$uploadedfile.'</a>';
-	    $result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile);
-	} else {
-	    #$result.=&mt('(Hand in a file you have prepared on your computer)');
-	}
+	$result .= &show_past_file_submission($part,$id);
     }
     if ( $which eq 'both') { 
 	$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
@@ -360,35 +448,65 @@ sub file_selector {
 	    &mt('Select Portfolio Files').'</a><br />'.
 	    '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
 	    '<br />';
-	if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
-	    my @filelist;
-	    foreach my $file (split(',',&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
-		my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
-		my $url="/uploaded/$domain/$user/portfolio$file";
-		my $icon=&Apache::loncommon::icon($url);
-		push(@filelist,'<a href="'.$url.'"><img src="'.$icon.
-		     '" border="0" />'.$file.'</a>');
-	    }
-	    $result.=&mt("Portfolio files previously selected: <strong>[_1]</strong>",join(', ',@filelist));
-	}
+	$result .= &show_past_portfile_submission($part,$id);
+
     }
     $result.='</td></tr>'; 
     return $result;
 }
 
-sub checkstatus {
-    my ($value,$awardref,$msgref)=@_;
-    for (my $i=0;$i<=$#$awardref;$i++) {
-	if ($$awardref[$i] eq $value) {
-	    return ($$awardref[$i],$$msgref[$i]);
-	}
+sub show_past_file_submission {
+    my ($part,$id) = @_;
+    my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
+
+    return if (!$uploadedfile);
+
+    my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+    &Apache::lonxml::extlink($url);
+    &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
+    my $icon=&Apache::loncommon::icon($url);
+    my $curfile='<a href="'.$url.'"><img src="'.$icon.
+	'" border="0" />'.$uploadedfile.'</a>';
+    return &mt('Currently submitted: <tt>[_1]</tt>',$curfile);
+
+}
+
+sub show_past_portfile_submission {
+    my ($part,$id) = @_;
+    if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}!~/[^\s]/){
+	return;
+    }
+    my (@file_list,@bad_file_list);
+    foreach my $file (split(/\s*,\s*/,&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
+	my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
+	my $url="/uploaded/$domain/$user/portfolio$file";
+	my $icon=&Apache::loncommon::icon($url);
+	push(@file_list,'<a href="'.$url.'"><img src="'.$icon.
+	     '" border="0" />'.$file.'</a>');
+	if (! &Apache::lonnet::stat_file($url)) {
+	    &Apache::lonnet::logthis("bad file is $url");
+	    push(@bad_file_list,'<a href="'.$url.'"><img src="'.$icon.
+		 '" border="0" />'.$file.'</a>');
+	}
+    }
+    my $files = '<span class="LC_filename">'.
+	join('</span>, <span class="LC_filename">',@file_list).
+	'</span>';
+    my $result = &mt("Portfolio files previously selected: [_1]",$files);
+    if (@bad_file_list) {
+	my $bad_files = '<span class="LC_filename">'.
+	    join('</span>, <span class="LC_filename">',@bad_file_list).
+	    '</span>';
+	$result.='<br />'.&mt('<span class="LC_error">These file(s) don\'t exist:</span> [_1]',$bad_files);
     }
-    return(undef,undef);
+    return $result;
+
 }
 
 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',
@@ -402,15 +520,29 @@ sub valid_award {
     return 0;
 }
 
+{
+    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');
+    my $i=0;
+    my %fwd_awards = map { ($_,$i++) } @awards;
+    my $max=scalar(@awards);
+    @awards=reverse(@awards);
+    $i=0;
+    my %rev_awards = map { ($_,$i++) } @awards;
+
 sub finalizeawards {
-    my ($awardref,$msgref)=@_;
-    my $result=undef;
-    my $award;
-    my $msg;
+    my ($awardref,$msgref,$nameref,$reverse)=@_;
+    my $result;
     if ($#$awardref == -1) { $result = "NO_RESPONSE"; }
     if ($result eq '' ) {
 	my $blankcount;
-	foreach $award (@$awardref) {
+	foreach my $award (@$awardref) {
 	    if ($award eq '') {
 		$result='MISSING_ANSWER';
 		$blankcount++;
@@ -418,21 +550,31 @@ 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') {
-	($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref);
-	if (defined($result)) { return ($result,$msg); }
+    if (defined($result)) { return ($result); }
+
+    # these awards are ordered from most important error through best correct
+    my $awards = (!$reverse) ? \%fwd_awards : \%rev_awards ;
+
+    my $best = $max;
+    my $j=0;
+    my $which;
+    foreach my $award (@$awardref) {
+	if ($awards->{$award} < $best) {
+	    $best  = $awards->{$award};
+	    $which = $j;
+	}
+	$j++;
+    }
+    if (defined($which)) {
+	if (ref($nameref)) {
+	    return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);
+	} else {
+	    return ($$awardref[$which],$$msgref[$which]);
+	}
     }
     return ('ERROR',undef);
 }
+}
 
 sub decideoutput {
     my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_;
@@ -442,16 +584,25 @@ sub decideoutput {
     my $bgcolor='orange';
     my $added_computer_text=0;
     my %possiblecolors =
-	( 'correct' => '#aaffaa',
-	  'charged_try' => '#ffaaaa',
+	( 'correct'         => '#aaffaa',
+	  'charged_try'     => '#ffaaaa',
 	  'not_charged_try' => '#ffffaa',
-	  'no_message' => '#fffff',
+	  'no_grade'        => '#ffffaa',
+	  'no_message'      => '#ffffff',
 	  );
 
+    my $part = $Apache::inputtags::part;
+    my $handgrade = 
+	('yes' eq lc(&Apache::lonnet::EXT("resource.$part.handgrade")));
+    
+    my $computer = ($handgrade)? ''
+	                       : " ".&mt("Computer's answer now shown above.");
+    &Apache::lonxml::debug("handgrade has :$handgrade:");
+
     if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
     
-    if      ($solved =~ /^correct/) {
-	$bgcolor=$possiblecolors{'correct'};
+    if ($solved =~ /^correct/) {
+        $bgcolor=$possiblecolors{'correct'};
 	$message=&mt('You are correct.');
 	if ($awarded < 1 && $awarded > 0) {
 	    $message=&mt('You are partially correct.');
@@ -469,12 +620,14 @@ sub decideoutput {
 		$message = '\textbf{'.$message.'}';
 	    } else {
 		$message = "<b>".$message."</b>";
-		$message.=" ".&mt("Computer's answer now shown above.");
+		$message.= $computer;
 	    }
 	    $added_computer_text=1;
-	    unless ($env{'course.'.
+	    my ($symb) = &Apache::lonnet::whichuser();
+	    if ((!$env{'course.'.
 			     $env{'request.course.id'}.
-			     '.disable_receipt_display'} eq 'yes') { 
+			     '.disable_receipt_display'} eq 'yes')&&
+		    $symb) { 
 		$message.=(($target eq 'web')?'<br />':' ').
 		    &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
 		    (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
@@ -501,7 +654,7 @@ sub decideoutput {
 		$message = '\textbf{'.&mt('You are correct.').'}';
 	    } else {
 		$message = "<b>".&mt('You are correct.')."</b>";
-		$message.=" ".&mt("Computer's answer now shown above.");
+		$message.= $computer;
 	    }
 	    $added_computer_text=1;
 	    unless ($env{'course.'.
@@ -519,6 +672,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'};
@@ -548,10 +705,8 @@ sub decideoutput {
 	$button=1;
     } elsif ($award eq 'SIG_FAIL') {
 	my ($used,$min,$max)=split(':',$awardmsg);
-	my $word;
-	if ($used < $min) { $word=&mt('more'); }
-	if ($used > $max) { $word=&mt('fewer'); }
-	$message = &mt("Submission not graded.  Use [_2] digits.",$used,$word);
+	my $word = ($used < $min) ? 'more' : 'fewer';
+	$message = &mt("Submission not graded.  Use $word digits.",$used);
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
@@ -592,7 +747,7 @@ sub decideoutput {
 	$button=1;
     } elsif ($award eq 'SUBMITTED') {
 	$message = &mt("Your submission has been recorded.");
-	$bgcolor=$possiblecolors{'correct'};
+	$bgcolor=$possiblecolors{'no_grade'};
 	$button=1;
     } elsif ($award eq 'DRAFT') {
 	$message = &mt("A draft copy has been saved.");
@@ -603,21 +758,40 @@ 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";
 	$button=1;
     }
+    my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
+    foreach my $resid(@Apache::inputtags::response){
+        if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {
+	    $message.='<br />';
+	    my @files = split(/\s*,\s*/,
+			      $Apache::lonhomework::history{"resource.$part.$resid.handback"});
+	    my $file_msg;
+	    foreach my $file (@files) {
+		$file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>';
+	    }
+	    $message .= &mt('Returned file(s): [_1]',$file_msg);
+	}
+    }
+
     if (lc($Apache::lonhomework::problemstatus) eq 'no'  && 
 	$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
 	$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
-	$bgcolor=$possiblecolors{'correct'};
+	$bgcolor=$possiblecolors{'no_grade'};
 	$button=1;
     }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && 
 	!$added_computer_text && $target ne 'tex') {
-	$message.=" ".&mt("Computer's answer now shown above.");
+	$message.= $computer;
 	$added_computer_text=1;
     }
     return ($button,$bgcolor,$message,$previousmsg);
@@ -773,6 +947,9 @@ sub setgradedata {
 	return '';
     }
     $Apache::lonhomework::results{"resource.$id.award"} = $award;
+    if ($award eq 'SUBMITTED') {
+	&Apache::response::add_to_gradingqueue();
+    }
 }
 
 sub grade {
@@ -829,8 +1006,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"};
@@ -887,7 +1067,7 @@ sub gradestatus {
 	if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
 	if ( $showbutton ) { 
 	    if ($target ne 'tex') {
-		$button = '<input type="submit" name="submit_'.$id.'" value="'.&mt('Submit Answer').'" />';
+		$button = '<input onsubmit="javascript:setSubmittedPart(\''.$id.'\')" type="submit" name="submit_'.$id.'" value="'.&mt('Submit Answer').'" />';
 	    }
 	}
 	if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {