--- loncom/homework/inputtags.pm	2007/03/15 02:52:16	1.219
+++ loncom/homework/inputtags.pm	2008/07/26 19:11:23	1.244
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.219 2007/03/15 02:52:16 albertel Exp $
+# $Id: inputtags.pm,v 1.244 2008/07/26 19:11:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +31,6 @@ use strict;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
 
@@ -116,8 +115,7 @@ sub check_for_duplicate_ids {
 
 sub start_input {
     my ($parstack,$safeeval)=@_;
-    my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval);
-    if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+    my $id = &Apache::lonxml::get_id($parstack,$safeeval);
     push (@Apache::inputtags::input,$id);
     push (@Apache::inputtags::inputlist,$id);
     return $id;
@@ -308,7 +306,9 @@ sub start_textline {
 		$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
 	    }
 	    $oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
-
+            $oldresponse =~ s/^\s+//;
+            $oldresponse =~ s/\s+$//;
+            $oldresponse =~ s/\s+/ /g;
 	    if ($Apache::lonhomework::type ne 'exam') {
 		my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
 		$result='';
@@ -449,7 +449,7 @@ sub file_selector {
 	$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
     }
     if ($which eq 'portfolioonly' || $which eq 'both') { 
-	$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
+	$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
 	    &mt('Select Portfolio Files').'</a><br />'.
 	    '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
 	    '<br />';
@@ -541,8 +541,29 @@ sub valid_award {
     $i=0;
     my %rev_awards = map { ($_,$i++) } @awards;
 
+sub awarddetail_to_awarded {
+    my ($awarddetail) = @_;
+    if ($awarddetail eq 'EXACT_ANS'
+	|| $awarddetail eq 'APPROX_ANS') {
+	return 1;
+    }
+    return 0;
+}
+
+sub hide_award {
+    my ($award) = @_;
+    if (&Apache::lonhomework::show_no_problem_status()) {
+	return 1;
+    }
+    if ($award =~
+	/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|ASSIGNED_SCORE|INCORRECT)/) {
+	return 1;
+    }
+    return 0;
+}
+
 sub finalizeawards {
-    my ($awardref,$msgref,$nameref,$reverse)=@_;
+    my ($awardref,$msgref,$nameref,$reverse,$final_scantron)=@_;
     my $result;
     if ($#$awardref == -1) { $result = "NO_RESPONSE"; }
     if ($result eq '' ) {
@@ -553,10 +574,29 @@ sub finalizeawards {
 		$blankcount++;
 	    }
 	}
-	if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; }
+	if ($blankcount == ($#$awardref + 1)) {
+	    return ('NO_RESPONSE');
+	}
     }
-    if (defined($result)) { return ($result); }
+    if (!$final_scantron && defined($result)) { return ($result); }
 
+    # if in scantron mode, if the award for any response is 
+    # assigned score, then the part gets an assigned score
+    if ($final_scantron 
+	&& grep {$_ eq 'ASSIGNED_SCORE'} (@$awardref)) {
+	return ('ASSIGNED_SCORE');
+    }
+
+    # if in scantron mode, if the award for any response is 
+    # correct and there are non-correct responses,
+    # then the part gets an assigned score
+    if ($final_scantron 
+	&& (grep { $_ eq 'EXACT_ANS' ||
+		   $_ eq 'APPROX_ANS'  } (@$awardref))
+	&& (grep { $_ ne 'EXACT_ANS' &&
+		   $_ ne 'APPROX_ANS'  } (@$awardref))) {
+	return ('ASSIGNED_SCORE');
+    }
     # these awards are ordered from most important error through best correct
     my $awards = (!$reverse) ? \%fwd_awards : \%rev_awards ;
 
@@ -570,6 +610,7 @@ sub finalizeawards {
 	}
 	$j++;
     }
+
     if (defined($which)) {
 	if (ref($nameref)) {
 	    return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);
@@ -586,19 +627,19 @@ sub decideoutput {
     my $message='';
     my $button=0;
     my $previousmsg;
-    my $bgcolor='orange';
+    my $css_class='orange';
     my $added_computer_text=0;
-    my %possiblecolors =
-	( 'correct'         => '#aaffaa',
-	  'charged_try'     => '#ffaaaa',
-	  'not_charged_try' => '#ffffaa',
-	  'no_grade'        => '#ffffaa',
-	  'no_message'      => '#ffffff',
+    my %possible_class =
+	( 'correct'         => 'LC_answer_correct',
+	  'charged_try'     => 'LC_answer_charged_try',
+	  'not_charged_try' => 'LC_answer_not_charged_try',
+	  'no_grade'        => 'LC_answer_no_grade',
+	  'no_message'      => 'LC_no_message',
 	  );
 
     my $part = $Apache::inputtags::part;
-    my $handgrade = 
-	('yes' eq lc(&Apache::lonnet::EXT("resource.$part.handgrade")));
+    my $tohandgrade = &Apache::lonnet::EXT("resource.$part.handgrade");
+    my $handgrade = ('yes' eq lc($tohandgrade)); 
     
     my $computer = ($handgrade)? ''
 	                       : " ".&mt("Computer's answer now shown above.");
@@ -607,14 +648,14 @@ sub decideoutput {
     if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
     
     if ($solved =~ /^correct/) {
-        $bgcolor=$possiblecolors{'correct'};
+        $css_class=$possible_class{'correct'};
 	$message=&mt('You are correct.');
 	if ($awarded < 1 && $awarded > 0) {
 	    $message=&mt('You are partially correct.');
-	    $bgcolor=$possiblecolors{'not_charged_try'};
+	    $css_class=$possible_class{'not_charged_try'};
 	} elsif ($awarded < 1) {
 	    $message=&mt('Incorrect.');
-	    $bgcolor=$possiblecolors{'charged_try'};
+	    $css_class=$possible_class{'charged_try'};
 	}
 	if ($env{'request.filename'} =~ 
 	    m|/res/lib/templates/examupload.problem$|) {
@@ -628,14 +669,18 @@ sub decideoutput {
 		$message.= $computer;
 	    }
 	    $added_computer_text=1;
-	    my ($symb) = &Apache::lonnet::whichuser();
-	    if ((!$env{'course.'.
-			     $env{'request.course.id'}.
-			     '.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'):'');
+	    if ($awarded > 0) {
+		my ($symb) = &Apache::lonnet::whichuser();
+		if (($symb ne '') 
+		    &&
+		    ($env{'course.'.$env{'request.course.id'}.
+			      '.disable_receipt_display'} ne 'yes') &&
+                    ($Apache::lonhomework::type ne 'practice')) { 
+		    $message.=(($target eq 'web')?'<br />':' ').
+			&mt('Your receipt is [_1]',
+			    (&Apache::lonnet::receipt($Apache::inputtags::part).
+			     (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
+		}
 	    }
 	}
 	$button=0;
@@ -646,13 +691,13 @@ sub decideoutput {
 	} else {
 	    $message = "<b>".&mt('You are excused from the problem.')."</b>";
 	}
-	$bgcolor=$possiblecolors{'charged_try'};
+	$css_class=$possible_class{'charged_try'};
 	$button=0;
 	$previousmsg='';
     } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
 	if ($solved =~ /^incorrect/ || $solved eq '') {
 	    $message = &mt("Incorrect").".";
-	    $bgcolor=$possiblecolors{'charged_try'};
+	    $css_class=$possible_class{'charged_try'};
 	    $button=1;
 	} else {
 	    if ($target eq 'tex') {
@@ -662,112 +707,115 @@ sub decideoutput {
 		$message.= $computer;
 	    }
 	    $added_computer_text=1;
-	    unless ($env{'course.'.
+	    if  ($awarded > 0 
+		 && $env{'course.'.
 			     $env{'request.course.id'}.
-			     '.disable_receipt_display'} eq 'yes') { 
+			     '.disable_receipt_display'} ne 'yes') { 
 		$message.=(($target eq 'web')?'<br />':' ').
-		    'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part).
-		    (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
+		    &mt('Your receipt is [_1]',
+			(&Apache::lonnet::receipt($Apache::inputtags::part).
+			 (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
 	    }
-	    $bgcolor=$possiblecolors{'correct'};
+	    $css_class=$possible_class{'correct'};
 	    $button=0;
 	    $previousmsg='';
 	}
     } elsif ($award eq 'NO_RESPONSE') {
 	$message = '';
-	$bgcolor=$possiblecolors{'no_feedback'};
+	$css_class=$possible_class{'no_feedback'};
 	$button=1;
     } elsif ($award eq 'EXTRA_ANSWER') {
 	$message = &mt('Some extra items were submitted.');
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$css_class=$possible_class{'not_charged_try'};
 	$button = 1;
     } elsif ($award eq 'MISSING_ANSWER') {
-	$message = &mt('Some items were not submitted.');
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$message = &mt('Some items were not submitted.').&Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted');
+	$css_class=$possible_class{'not_charged_try'};
 	$button = 1;
     } elsif ($award eq 'ERROR') {
 	$message = &mt('An error occured while grading your answer.');
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$css_class=$possible_class{'not_charged_try'};
 	$button = 1;
     } elsif ($award eq 'TOO_LONG') {
 	$message = &mt("The submitted answer was too long.");
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'WANTED_NUMERIC') {
 	$message = &mt("This question expects a numeric answer.");
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'MISORDERED_RANK') {
-	$message = &mt('You have provided an invalid ranking');
-	if ($target ne 'tex') {
-	    $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems');
-	}
-	$bgcolor=$possiblecolors{'not_charged_try'};
+        $message = &mt('You have provided an invalid ranking.');
+        if ($target ne 'tex') {
+            $message.=' '.&mt('Please refer to [_1]',&Apache::loncommon::help_open_topic('Ranking_Problems',&mt('help on ranking problems')));
+        }
+	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'INVALID_FILETYPE') {
 	$message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'SIG_FAIL') {
 	my ($used,$min,$max)=split(':',$awardmsg);
 	my $word = ($used < $min) ? 'more' : 'fewer';
 	$message = &mt("Submission not graded.  Use $word digits.",$used);
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
 	$message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg);
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_INVALID_STUDENT') {
 	$message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target));
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
 	$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target));
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_NOTNEEDED') {
 	$message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target));
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'NO_UNIT') {
 	$message = &mt("Units required").'.';
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'COMMA_FAIL') {
 	$message = &mt("Proper comma separation is required").'.';
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'BAD_FORMULA') {
-	$message = &mt("Unable to understand formula");
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$message = &mt("Unable to understand formula").'.';
+        if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')};
+	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'INCORRECT') {
 	$message = &mt("Incorrect").'.';
-	$bgcolor=$possiblecolors{'charged_try'};
+	$css_class=$possible_class{'charged_try'};
 	$button=1;
     } elsif ($award eq 'SUBMITTED') {
 	$message = &mt("Your submission has been recorded.");
-	$bgcolor=$possiblecolors{'no_grade'};
+	$css_class=$possible_class{'no_grade'};
 	$button=1;
     } elsif ($award eq 'DRAFT') {
 	$message = &mt("A draft copy has been saved.");
-	$bgcolor=$possiblecolors{'not_charged_try'};
+	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'ASSIGNED_SCORE') {
 	$message = &mt("A score has been assigned.");
-	$bgcolor=$possiblecolors{'correct'};
+	$css_class=$possible_class{'correct'};
 	$button=0;
     } elsif ($award eq '') {
 	if ($handgrade && $Apache::inputtags::status[-1] eq 'SHOW_ANSWER') {
 	    $message = &mt("Nothing submitted.");
-	    $bgcolor=$possiblecolors{'charged_try'};
+	    $css_class=$possible_class{'charged_try'};
 	} else {
-	    $bgcolor=$possiblecolors{'not_charged_try'};
+	    $css_class=$possible_class{'not_charged_try'};
 	}
 	$button=1;
     } else {
@@ -788,10 +836,11 @@ sub decideoutput {
 	}
     }
 
-    if (lc($Apache::lonhomework::problemstatus) eq 'no'  && 
-	$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
+    if (&Apache::lonhomework::hide_problem_status()
+	&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
+	&& &hide_award($award)) {
 	$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
-	$bgcolor=$possiblecolors{'no_grade'};
+	$css_class=$possible_class{'no_grade'};
 	$button=1;
     }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && 
@@ -799,7 +848,16 @@ sub decideoutput {
 	$message.= $computer;
 	$added_computer_text=1;
     }
-    return ($button,$bgcolor,$message,$previousmsg);
+    if ($Apache::lonhomework::type eq 'practice') {
+       if ($target eq 'web') {
+           $message .= '<br />';
+       } else {
+           $message .= ' ';      
+       }
+       $message.=&mt('Submissions to practice problems are not permanently recorded.');
+    }
+
+    return ($button,$css_class,$message,$previousmsg);
 }
 
 sub markup_unit {
@@ -852,8 +910,9 @@ sub setgradedata {
 	$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
 	return '';
     } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
-	      /^correct/ || $Apache::lonhomework::scantronmode ||
-	      lc($Apache::lonhomework::problemstatus) eq 'no') {
+	      /^correct/ 
+	      || $Apache::lonhomework::scantronmode 
+	      || &Apache::lonhomework::hide_problem_status()  ) {
         # the student doesn't already have it correct,
 	# or we are in a mode (scantron orno problem status) where a correct 
         # can become incorrect
@@ -875,8 +934,13 @@ sub setgradedata {
 	    my $numawards=scalar(@Apache::inputtags::response);
 	    $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
 	    foreach my $res (@Apache::inputtags::response) {
-		$Apache::lonhomework::results{"resource.$id.awarded"}+=
-		    $Apache::lonhomework::results{"resource.$id.$res.awarded"};
+		if (defined($Apache::lonhomework::results{"resource.$id.$res.awarded"})) {
+		    $Apache::lonhomework::results{"resource.$id.awarded"}+=
+			$Apache::lonhomework::results{"resource.$id.$res.awarded"};
+		} else {
+		    $Apache::lonhomework::results{"resource.$id.awarded"}+=
+			&awarddetail_to_awarded($Apache::lonhomework::results{"resource.$id.$res.awarddetail"});
+		}
 	    }
 	    if ($numawards > 0) {
 		$Apache::lonhomework::results{"resource.$id.awarded"}/=
@@ -891,8 +955,8 @@ sub setgradedata {
 	} elsif ( $award eq 'INCORRECT' ) {
 	    $Apache::lonhomework::results{"resource.$id.tries"} =
 		$Apache::lonhomework::history{"resource.$id.tries"} + 1;
-	    if (lc($Apache::lonhomework::problemstatus) eq 'no' ||
-		$Apache::lonhomework::scantronmode) {
+	    if (&Apache::lonhomework::hide_problem_status()
+		|| $Apache::lonhomework::scantronmode) {
 		$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
 	    }
 	    $Apache::lonhomework::results{"resource.$id.solved"} =
@@ -911,12 +975,18 @@ sub setgradedata {
 	} else {
 	    $Apache::lonhomework::results{"resource.$id.solved"} =
 		'incorrect_attempted';
-	    if (lc($Apache::lonhomework::problemstatus) eq 'no' ||
-		$Apache::lonhomework::scantronmode) {
+	    if (&Apache::lonhomework::show_no_problem_status()
+		|| $Apache::lonhomework::scantronmode) {
 		$Apache::lonhomework::results{"resource.$id.tries"} =
 		    $Apache::lonhomework::history{"resource.$id.tries"} + 1;
 		$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
 	    }
+
+	    if (&Apache::lonhomework::show_some_problem_status()) {
+		# clear out the awarded if they had gotten it wrong/right
+		# and are now in an error mode	
+		$Apache::lonhomework::results{"resource.$id.awarded"} = '';
+	    }
 	}
 	if (defined($msg)) {
 	    $Apache::lonhomework::results{"resource.$id.awardmsg"} = $msg;
@@ -930,7 +1000,7 @@ sub setgradedata {
 	    # check if this was a previous submission if it was delete the
 	    # unneeded data and update the previously_used attribute
 	    if ( $previously_used eq 'PREVIOUSLY_USED') {
-		if (lc($Apache::lonhomework::problemstatus) ne 'no') {
+		if (&Apache::lonhomework::show_problem_status()) {
 		    delete($Apache::lonhomework::results{"resource.$id.tries"});
 		    $Apache::lonhomework::results{"resource.$id.previous"} = '1';
 		}
@@ -1008,13 +1078,15 @@ sub grade {
 	    &Apache::lonxml::debug("got message $value from $response for $id");
 	    push (@msgs,$value);
 	}
-	my ($finalaward,$msg) = &finalizeawards(\@awards,\@msgs);
+	my ($finalaward,$msg) = 
+	    &finalizeawards(\@awards,\@msgs,undef,undef,
+			    $Apache::lonhomework::scantronmode);
 	my $previously_used;
 	if ( $#Apache::inputtags::previous eq $#awards ) {
 	    my ($match) =
 		&previous_match(\@Apache::inputtags::previous_version,
 				scalar(@Apache::inputtags::response));
-	    
+
 	    if ($match) {
 		$previously_used = 'PREVIOUSLY_LAST';
 		foreach my $value (@Apache::inputtags::previous) {
@@ -1045,15 +1117,15 @@ sub get_grade_messages {
     &Apache::lonxml::debug("Found Award |$award|$solved|$awardmsg");
     if ( $award ne '' || $solved ne '' || $status eq 'SHOW_ANSWER') {
 	&Apache::lonxml::debug('Getting message');
-	($showbutton,my $bgcolor,$message,$previousmsg) =
+	($showbutton,my $css_class,$message,$previousmsg) =
 	    &decideoutput($award,$awarded,$awardmsg,$solved,$previous,
 			  $target);
 	if ($target eq 'tex') {
 	    $message='\vskip 2 mm '.$message.' ';
 	} else {
-	    $message="<td bgcolor=\"$bgcolor\">$message</td>";
+	    $message="<td class=\"$css_class\">$message</td>";
 	    if ($previousmsg) {
-		$previousmsg="<td bgcolor=\"#aaaaff\">$previousmsg</td>";
+		$previousmsg="<td class=\"LC_answer_previous\">$previousmsg</td>";
 	    }
 	}
     }
@@ -1094,18 +1166,19 @@ sub get_grade_messages {
 	    $trystr.="</nobr></td>";
 	}
     }
+
     if ($Apache::lonhomework::history{"$prefix.afterduedate"}) {
 	#last submissions was after due date
 	$latemessage=&mt(' The last submission was after the Due Date ');;
 	if ($target eq 'web') {
-	    $latemessage='<td bgcolor="#ffaaaa">'.$latemessage.'</td>';
+	    $latemessage='<td class="LC_answer_late">'.$latemessage.'</td>';
 	}
     }
     return ($previousmsg,$latemessage,$message,$trystr,$showbutton);
 }
 
 sub gradestatus {
-    my ($id,$target) = @_;
+    my ($id,$target,$no_previous) = @_;
     my $showbutton = 1;
     my $message = '';
     my $latemessage = '';
@@ -1132,7 +1205,12 @@ sub gradestatus {
 	}
 	if ( $showbutton ) { 
 	    if ($target ne 'tex') {
-		$button = '<input onsubmit="javascript:setSubmittedPart(\''.$id.'\')" type="submit" name="submit_'.$id.'" value="'.&mt('Submit Answer').'" />';
+		$button = 
+		    '<input 
+                          onmouseup="javascript:setSubmittedPart(\''.$id.'\')"
+                           onsubmit="javascript:setSubmittedPart(\''.$id.'\')"
+                        type="submit" name="submit_'.$id.'"
+                         value="'.&mt('Submit Answer').'" />';
 	    }
 	}
 
@@ -1144,7 +1222,13 @@ sub gradestatus {
 	if ($target eq 'tex') {
 	    return $button.' \vskip 0 mm '.$output.' ';
 	} else {
-	    return '<table><tr><td>'.$button.'</td>'.$output.'<td>'.&previous_tries($id,$target).'</td></tr></table>';
+	    $output =
+		'<table><tr><td>'.$button.'</td>'.$output;
+	    if (!$no_previous) {
+		$output.='<td>'.&previous_tries($id,$target).'</td>';
+	    }
+	    $output.= '</tr></table>';
+	    return $output;
 	}
     }
 }
@@ -1168,24 +1252,31 @@ sub previous_tries {
 
 	($previousmsg,$latemessage,$message,$trystr) =
 	    &get_grade_messages($id,"$prefix",$target,$status);
-	if (!exists($Apache::lonhomework::history{"$prefix.tries"})) {
-	    undef($trystr);
-	}
 
 	if ($previousmsg ne '') {
 	    my ($match,$which) = &find_which_previous($i);
 	    $message=$previousmsg;
 	    my $previous = $count_lookup{$which};
-	    $message =~ s{(</td>)}{ as submission $previous $1};
-	    
-	} elsif ($trystr ne '') { 
-	    ($trystr) = ($trystr =~ m{(\d+)/\d+});
-	    $message =~ s{(<td.*?>)}{$1 $trystr };
+	    $message =~ s{(</td>)}{ as submission \# $previous $1};
+	} elsif ($Apache::lonhomework::history{"$prefix.tries"}) {
+	    if (!(&Apache::lonhomework::hide_problem_status()
+		  && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER')
+		&& $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/
+		) {
+		
+                my $txt_correct = &mt('Correct');
+		$message =~ s{(<td.*?>)(.*?)(</td>)}
+                             {$1 <strong>$txt_correct</strong>. $3}s;
+	    }
+            my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")";
+	    $message =~ s{(</td>)}{ $trystr $1};
 	}
+	my ($class) = ($message =~ m{<td.*class="([^"]*)"}); #"
+	$message =~ s{(<td.*?>)}{<td>};
+	
 
-
-	$output.='<tr>';
-	$output.='<td align ="center">'.$count.'</td>';
+	$output.='<tr class="'.$class.'">';
+	$output.='<td align="center">'.$count.'</td>';
 	$output.=$message;
 
 	foreach my $resid (@Apache::inputtags::response) {
@@ -1202,7 +1293,7 @@ sub previous_tries {
 		$output.='<td></td>';
 	    }
 	}
-	$output.='</tr>'."\n";
+	$output.=&Apache::loncommon::end_data_table_row()."\n";
     }
     return if ($output eq '');
     my $headers = 
@@ -1210,25 +1301,28 @@ sub previous_tries {
 	'</th><th colspan="'.scalar(@Apache::inputtags::response).'">'.
 	&mt('Submitted Answer').'</th>';
     $output ='<table class="LC_prior_tries">'.$headers.$output.'</table>';
-    $output .='<pre>'.join("\n",@Apache::inputtags::previous_version).'</pre>';
     #return $output;
-    $output=~s/\\/\\\\/g;
-    $output=~s/\'/\\\'/g;
-    $output=~s/\s+/ /g;
+    $output = &Apache::loncommon::js_ready($output); 
+    $output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>';
+
     my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
     my $start_page =
 	&Apache::loncommon::start_page('Previous Tries', undef,
-				       {'only_body' => 1,
-					'bgcolor'   => '#FFFFFF',
-					'js_ready'  => 1,});
+				       {'only_body'      => 1,
+					'bgcolor'        => '#FFFFFF',
+					'js_ready'       => 1,
+				        'inherit_jsmath' => 1, });
     my $end_page =
 	&Apache::loncommon::end_page({'js_ready' => 1,});
-    
+    my $prefix = $env{'form.request.prefix'};
+    $prefix =~ tr{.}{_};
+    my $function_name = "LONCAPA_previous_tries_".$prefix.
+	$Apache::lonxml::curdepth.'_'.$env{'form.counter'};
     my $result ="<script type=\"text/javascript\">
 // <![CDATA[
-    function LONCAPA_previous_tries_$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}
+    function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}
 // ]]>
-</script><a href=\"javascript:LONCAPA_previous_tries_$Apache::lonxml::curdepth();void(0);\">".&mt("Previous Tries")."</a><br />";
+</script><a href=\"javascript:$function_name();void(0);\">".&mt("Previous Tries")."</a><br />";
     #use Data::Dumper;
     #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
     return $result;