version 1.14, 2000/12/11 23:47:36
|
version 1.15, 2000/12/12 14:54:10
|
Line 61 sub start_textline {
|
Line 61 sub start_textline {
|
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } |
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } |
my $size = &Apache::run::run("{$args;".'return $size}',$safeeval); |
my $size = &Apache::run::run("{$args;".'return $size}',$safeeval); |
if ($size eq '') { $size=20; } |
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= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'">'; |
$result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'">'; |
} |
} |
return $result; |
return $result; |
Line 122 sub finalizeawards {
|
Line 122 sub finalizeawards {
|
my $result=''; |
my $result=''; |
my $award; |
my $award; |
if ($#_ == '-1') { $result = "NO_RESPONSE"; } |
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 '' ) { |
if ($result eq '' ) { |
foreach $award (@_) { |
foreach $award (@_) { |
if ($award eq 'UNIT_FAIL' || |
if ($award eq 'UNIT_FAIL' || |
Line 195 sub decideoutput {
|
Line 201 sub decideoutput {
|
sub setgradedata { |
sub setgradedata { |
my ($award,$id) = @_; |
my ($award,$id) = @_; |
if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) { |
if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) { |
$Apache::lonhomework::results{"resource.tries.$id"} = |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::history{"resource.tries.$id"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::results{"resource.solved.$id"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'correct_by_student'; |
'correct_by_student'; |
$Apache::lonhomework::results{"resource.awarded.$id"} = '1'; |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
} elsif ( $award eq 'INCORRECT' ) { |
} elsif ( $award eq 'INCORRECT' ) { |
$Apache::lonhomework::results{"resource.tries.$id"} = |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::history{"resource.tries.$id"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::results{"resource.solved.$id"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'incorrect_attempted'; |
'incorrect_attempted'; |
} else { |
} else { |
$Apache::lonhomework::results{"resource.solved.$id"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'incorrect_attempted'; |
'incorrect_attempted'; |
} |
} |
$Apache::lonhomework::results{"resource.award.$id"} = $award; |
$Apache::lonhomework::results{"resource.$id.award"} = $award; |
} |
} |
|
|
sub grade { |
sub grade { |
Line 222 sub grade {
|
Line 228 sub grade {
|
my @awards = (); |
my @awards = (); |
&Apache::lonxml::debug("$#Apache::inputtags::responselist"); |
&Apache::lonxml::debug("$#Apache::inputtags::responselist"); |
foreach $response (@Apache::inputtags::responselist) { |
foreach $response (@Apache::inputtags::responselist) { |
&Apache::lonxml::debug("looking for response.awarddetail.$id.$response"); |
&Apache::lonxml::debug("looking for response.$id.$response.awarddetail"); |
my $value=$Apache::lonhomework::results{"resource.awarddetail.$id.$response"}; |
my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"}; |
if ( $value ne '' ) { |
if ( $value ne '' ) { |
&Apache::lonxml::debug("keep ing $value from $response for $id"); |
&Apache::lonxml::debug("keep ing $value from $response for $id"); |
push (@awards,$value); |
push (@awards,$value); |
Line 243 sub gradestatus {
|
Line 249 sub gradestatus {
|
my ($id) = @_; |
my ($id) = @_; |
my $showbutton = 1; |
my $showbutton = 1; |
my $message = ''; |
my $message = ''; |
my $award = $Apache::lonhomework::history{"resource.award.$id"}; |
my $award = $Apache::lonhomework::history{"resource.$id.award"}; |
&Apache::lonxml::debug("Found Award |$award|"); |
&Apache::lonxml::debug("Found Award |$award|"); |
if ( $award ne '' ) { |
if ( $award ne '' ) { |
&Apache::lonxml::debug('Getting message'); |
&Apache::lonxml::debug('Getting message'); |
($showbutton,$message) = &decideoutput($award); |
($showbutton,$message) = &decideoutput($award); |
} |
} |
my $button=''; |
my $button=''; |
my $tries = $Apache::lonhomework::history{"resource.tries.$id"}; |
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
my $maxtries = $Apache::lonhomework::history{"resource.maxtries.$id"}; |
my $maxtries = $Apache::lonhomework::history{"resource.$id.maxtries"}; |
if ( $tries eq '' ) { $tries = '0'; } |
if ( $tries eq '' ) { $tries = '0'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
my $trystr=''; |
my $trystr=''; |