--- loncom/homework/inputtags.pm 2001/01/04 22:24:23 1.20
+++ loncom/homework/inputtags.pm 2001/01/10 21:49:43 1.23
@@ -175,13 +175,13 @@ sub decideoutput {
$message = "This question expects a numeric answer";
$button=1;
} elsif ($award eq 'SIG_FAIL') {
- $message = "Please adjust significant figures, you provided %s significant figures";
+ $message = "Please adjust significant figures.";# you provided %s significant figures";
$button=1;
} elsif ($award eq 'UNIT_FAIL') {
- $message = "Units incorrect, Computer reads units as %s";
+ $message = "Units incorrect."; #Computer reads units as %s";
$button=1;
} elsif ($award eq 'UNIT_NOTNEEDED') {
- $message = "Only a number required, Computer reads units of %s";
+ $message = "Only a number required.";# Computer reads units of %s";
$button=1;
} elsif ($award eq 'NO_UNIT') {
$message = "Units required";
@@ -255,7 +255,7 @@ sub gradestatus {
my $status = $Apache::inputtags::status['-1'];
&Apache::lonxml::debug("gradestatus has :$status:");
- if ( $status eq 'CAN_ANSWER' || $status eq 'SHOW_ANSWER' ) {
+ if ( $status ne 'CLOSED' ) {
my $award = $Apache::lonhomework::history{"resource.$id.award"};
&Apache::lonxml::debug("Found Award |$award|");
if ( $award ne '' ) {
@@ -267,11 +267,11 @@ sub gradestatus {
&Apache::lonxml::debug("got maxtries of :$maxtries:");
if ( $tries eq '' ) { $tries = '0'; }
if ( $maxtries eq '' ) { $maxtries = '2'; }
+ if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }
if ( $showbutton ) {
$trystr = "
Tries $tries/$maxtries";
}
- if ( $tries >= $maxtries ) { $showbutton = 0; }
- if ( $status eq 'SHOW_ANSWER' ) { $showbutton = 0; }
+ if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
if ( $showbutton ) {
$button = '
';
}