--- loncom/homework/inputtags.pm 2000/12/21 18:13:33 1.19
+++ loncom/homework/inputtags.pm 2001/02/19 20:34:20 1.27
@@ -99,7 +99,7 @@ sub end_textline {
# my $usedtry='1';
# my $response='';
# if ( $target == 'web' ) {
-# if ( defined $ENV{'form.submit'}) {
+# if ( defined $ENV{'form.submitted'}) {
# }
# if ($showbutton > 0) { $result.=$button }
# }
@@ -163,7 +163,7 @@ sub decideoutput {
my $message='';
my $button=0;
if ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
- $message = "Correct computer gets %s";
+ $message = "You are correct. Your receipt is ".&Apache::lonnet::receipt;
$button=0;
} elsif ($award eq 'NO_RESPONSE') {
$message = '';
@@ -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";
@@ -222,10 +222,10 @@ sub setgradedata {
sub grade {
my ($target) = @_;
my $id = $Apache::inputtags::part;
- my $result='';
+# my $result='';
my $response='';
if ( $target == 'web' ) {
- if ( defined $ENV{'form.submit'}) {
+ if ( defined $ENV{'form.submitted'}) {
my @awards = ();
&Apache::lonxml::debug("$#Apache::inputtags::responselist");
foreach $response (@Apache::inputtags::responselist) {
@@ -243,7 +243,7 @@ sub grade {
&setgradedata($finalaward,$id);
}
}
- return $result;
+ return '';
}
sub gradestatus {
@@ -255,25 +255,26 @@ 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 '' ) {
&Apache::lonxml::debug('Getting message');
($showbutton,$message) = &decideoutput($award);
+ $message="
$message |