--- loncom/homework/inputtags.pm 2001/01/05 01:14:49 1.21
+++ loncom/homework/inputtags.pm 2001/03/21 18:24:36 1.29
@@ -1,5 +1,6 @@
# The LearningOnline Network with CAPA
# input definitons
+# 2/19 Guy
package Apache::inputtags;
use strict;
@@ -63,7 +64,7 @@ sub start_textline {
my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);
if ($size eq '') { $size=20; }
my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
- $result= '';
+ $result= '';
}
return $result;
}
@@ -94,12 +95,12 @@ sub end_textline {
# my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
# push (@Apache::inputtags::answergroup,$id);
# my $result='';
-# my $button='';
+# my $button='';
# my $showbutton='1';
# my $usedtry='1';
# my $response='';
# if ( $target == 'web' ) {
-# if ( defined $ENV{'form.submit'}) {
+# if ( defined $ENV{'form.submitted'}) {
# }
# if ($showbutton > 0) { $result.=$button }
# }
@@ -114,7 +115,7 @@ sub start_datasubmission {
sub end_datasubmission {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
if ( $target == 'web' ) {
- return '';
+ return '';
}
return '';
}
@@ -129,6 +130,9 @@ sub finalizeawards {
if ($result eq '' ) {
foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}
}
+ if ($result eq '' ) {
+ foreach $award (@_) { if ($award eq 'NO_RESPONSE') {$result='NO_RESPONSE'; last;} }
+ }
if ($result eq '' ) {
foreach $award (@_) {
@@ -163,7 +167,7 @@ sub decideoutput {
my $message='';
my $button=0;
if ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
- $message = "You are correct. You receipt is ".&Apache::lonnet::receipt;
+ $message = "You are correct. Your receipt is ".&Apache::lonnet::receipt;
$button=0;
} elsif ($award eq 'NO_RESPONSE') {
$message = '';
@@ -225,7 +229,7 @@ sub grade {
# 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) {
@@ -255,25 +259,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 |