--- loncom/homework/inputtags.pm 2000/12/12 22:35:52 1.17
+++ 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;
@@ -16,6 +17,7 @@ sub initialize_inputtags {
@Apache::inputtags::responselist=();
@Apache::inputtags::answergroup=();
$Apache::inputtags::part='';
+ @Apache::inputtags::status=();
%Apache::inputtags::params=();
}
@@ -62,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;
}
@@ -93,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 }
# }
@@ -113,7 +115,7 @@ sub start_datasubmission {
sub end_datasubmission {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
if ( $target == 'web' ) {
- return '';
+ return '';
}
return '';
}
@@ -128,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 (@_) {
@@ -162,7 +167,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 = '';
@@ -174,13 +179,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";
@@ -221,10 +226,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) {
@@ -242,7 +247,7 @@ sub grade {
&setgradedata($finalaward,$id);
}
}
- return $result;
+ return '';
}
sub gradestatus {
@@ -250,28 +255,30 @@ sub gradestatus {
my $showbutton = 1;
my $message = '';
my $trystr='';
- my $button='';
+ my $button='';
- my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
-
- if ( $passed ) {
+ my $status = $Apache::inputtags::status['-1'];
+ &Apache::lonxml::debug("gradestatus has :$status:");
+ 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 |