--- loncom/homework/inputtags.pm 2000/12/11 23:47:36 1.14
+++ loncom/homework/inputtags.pm 2000/12/12 22:35:52 1.17
@@ -61,7 +61,7 @@ sub start_textline {
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);
if ($size eq '') { $size=20; }
- my $oldresponse = $Apache::lonhomework::history{"resource.submission.$Apache::inputtags::part.$Apache::inputtags::response['-1']"};
+ my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
$result= '';
}
return $result;
@@ -122,7 +122,13 @@ sub finalizeawards {
my $result='';
my $award;
if ($#_ == '-1') { $result = "NO_RESPONSE"; }
- foreach $award (@_) { if ($award eq '') {$result='MISSING_ANSWER'; last;}}
+ if ($result eq '' ) {
+ foreach $award (@_) { if ($award eq '') {$result='MISSING_ANSWER'; last;}}
+ }
+ if ($result eq '' ) {
+ foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}
+ }
+
if ($result eq '' ) {
foreach $award (@_) {
if ($award eq 'UNIT_FAIL' ||
@@ -195,21 +201,21 @@ sub decideoutput {
sub setgradedata {
my ($award,$id) = @_;
if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
- $Apache::lonhomework::results{"resource.tries.$id"} =
- $Apache::lonhomework::history{"resource.tries.$id"} + 1;
- $Apache::lonhomework::results{"resource.solved.$id"} =
+ $Apache::lonhomework::results{"resource.$id.tries"} =
+ $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+ $Apache::lonhomework::results{"resource.$id.solved"} =
'correct_by_student';
- $Apache::lonhomework::results{"resource.awarded.$id"} = '1';
+ $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
} elsif ( $award eq 'INCORRECT' ) {
- $Apache::lonhomework::results{"resource.tries.$id"} =
- $Apache::lonhomework::history{"resource.tries.$id"} + 1;
- $Apache::lonhomework::results{"resource.solved.$id"} =
+ $Apache::lonhomework::results{"resource.$id.tries"} =
+ $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+ $Apache::lonhomework::results{"resource.$id.solved"} =
'incorrect_attempted';
} else {
- $Apache::lonhomework::results{"resource.solved.$id"} =
+ $Apache::lonhomework::results{"resource.$id.solved"} =
'incorrect_attempted';
}
- $Apache::lonhomework::results{"resource.award.$id"} = $award;
+ $Apache::lonhomework::results{"resource.$id.award"} = $award;
}
sub grade {
@@ -222,8 +228,8 @@ sub grade {
my @awards = ();
&Apache::lonxml::debug("$#Apache::inputtags::responselist");
foreach $response (@Apache::inputtags::responselist) {
- &Apache::lonxml::debug("looking for response.awarddetail.$id.$response");
- my $value=$Apache::lonhomework::results{"resource.awarddetail.$id.$response"};
+ &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");
+ my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};
if ( $value ne '' ) {
&Apache::lonxml::debug("keep ing $value from $response for $id");
push (@awards,$value);
@@ -243,24 +249,30 @@ sub gradestatus {
my ($id) = @_;
my $showbutton = 1;
my $message = '';
- my $award = $Apache::lonhomework::history{"resource.award.$id"};
- &Apache::lonxml::debug("Found Award |$award|");
- if ( $award ne '' ) {
- &Apache::lonxml::debug('Getting message');
- ($showbutton,$message) = &decideoutput($award);
- }
- my $button='';
- my $tries = $Apache::lonhomework::history{"resource.tries.$id"};
- my $maxtries = $Apache::lonhomework::history{"resource.maxtries.$id"};
- if ( $tries eq '' ) { $tries = '0'; }
- if ( $maxtries eq '' ) { $maxtries = '2'; }
my $trystr='';
- if ( $showbutton ) {
- $trystr = "
Tries $tries/$maxtries";
- }
- if ( $tries >= $maxtries ) { $showbutton = 0; }
- if ( $showbutton ) {
- $button = '
';
+ my $button='';
+
+ my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
+
+ if ( $passed ) {
+ 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);
+ }
+ my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
+ my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+ &Apache::lonxml::debug("goit maxtries of :$maxtries:");
+ if ( $tries eq '' ) { $tries = '0'; }
+ if ( $maxtries eq '' ) { $maxtries = '2'; }
+ if ( $showbutton ) {
+ $trystr = "
Tries $tries/$maxtries";
+ }
+ if ( $tries >= $maxtries ) { $showbutton = 0; }
+ if ( $showbutton ) {
+ $button = '
';
+ }
}
return $button.$message.$trystr;
}