version 1.53, 2002/03/01 00:23:04
|
version 1.62, 2002/09/23 17:25:24
|
Line 28
|
Line 28
|
# 2/19 Guy |
# 2/19 Guy |
|
|
package Apache::inputtags; |
package Apache::inputtags; |
|
use HTML::Entities(); |
use strict; |
use strict; |
|
|
BEGIN { |
BEGIN { |
Line 75 sub start_textfield {
|
Line 76 sub start_textfield {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result = ""; |
my $result = ""; |
my $id = &start_input($parstack,$safeeval); |
my $id = &start_input($parstack,$safeeval); |
|
my $resid=$Apache::inputtags::response[-1]; |
if ($target eq 'web') { |
if ($target eq 'web') { |
my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}; |
$Apache::lonxml::evaluate--; |
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
|
if ( $cols eq '') { $cols = 80; } |
|
my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
|
if ( $rows eq '') { $rows = 10; } |
|
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
$result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '. |
my $partid=$Apache::inputtags::part; |
"rows=\"$rows\" cols=\"$cols\">".$oldresponse; |
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"}); |
|
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
|
if ( $cols eq '') { $cols = 80; } |
|
my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
|
if ( $rows eq '') { $rows = 10; } |
|
$result= '<textarea name="HWVAL'.$resid.'" '. |
|
"rows=\"$rows\" cols=\"$cols\">".$oldresponse; |
|
if ($oldresponse ne '') { |
|
#get rid of any startup text if the user has already responded |
|
&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
|
} |
} else { |
} else { |
$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>'; |
#right or wrong don't show it |
} |
#$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>'; |
if ($oldresponse ne '') { |
$result=''; |
#get rid of any startup text if the user has already responded |
#get rid of any startup text |
&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
} |
} |
} |
} elsif ($target eq 'grade') { |
if ($target eq 'grade') { |
|
my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
if ($seedtext eq $ENV{'form.HWVAL'.$Apache::inputtags::response[-1]}) { |
if ($seedtext eq $ENV{'form.HWVAL'.$resid}) { |
# if the seed text is still there it wasn't a real submission |
# if the seed text is still there it wasn't a real submission |
$ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}=''; |
$ENV{'form.HWVAL'.$resid}=''; |
|
} |
|
} elsif ($target eq 'edit') { |
|
$result.=&Apache::edit::tag_start($target,$token); |
|
$result.=&Apache::edit::text_arg('Rows:','rows',$token,4); |
|
$result.=&Apache::edit::text_arg('Columns:','cols',$token,4); |
|
my $bodytext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
|
$result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'rows','cols'); |
|
if ($constructtag) { |
|
$result = &Apache::edit::rebuild_tag($token); |
|
} else { |
|
$result=$token->[4]; |
} |
} |
|
$result.=&Apache::edit::modifiedfield(); |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
sub end_textfield { |
sub end_textfield { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result; |
if ($target eq 'web') { |
if ($target eq 'web') { |
|
$Apache::lonxml::evaluate++; |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
return "</textarea>"; |
return "</textarea>"; |
} |
} |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::end_table(); |
} |
} |
&end_input; |
&end_input; |
return ''; |
return $result; |
} |
} |
|
|
sub start_textline { |
sub start_textline { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result = ""; |
my $result = ""; |
if ($target eq 'web') { |
if ($target eq 'web') { |
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
$Apache::lonxml::evaluate--; |
if ($size eq '') { $size=20; } |
|
my $partid=$Apache::inputtags::part; |
|
my $id=$Apache::inputtags::response['-1']; |
|
my $oldresponse = |
|
$Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
|
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
|
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
|
if ($size eq '') { $size=20; } |
|
my $partid=$Apache::inputtags::part; |
|
my $id=$Apache::inputtags::response[-1]; |
|
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"}); |
$result= '<input type="text" name="HWVAL'.$id.'" value="'. |
$result= '<input type="text" name="HWVAL'.$id.'" value="'. |
$oldresponse.'" size="'.$size.'" />'; |
$oldresponse.'" size="'.$size.'" />'; |
} else { |
} else { |
$result='<i>'.$oldresponse.'</i>'; |
#right or wrong don't show what was last typed in. |
|
#$result='<i>'.$oldresponse.'</i>'; |
|
$result=''; |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::tag_start($target,$token); |
$result=&Apache::edit::tag_start($target,$token); |
Line 142 sub start_textline {
|
Line 170 sub start_textline {
|
|
|
sub end_textline { |
sub end_textline { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'edit') { return ('','no'); } |
if ($target eq 'web') { $Apache::lonxml::evaluate++; } |
|
elsif ($target eq 'edit') { return ('','no'); } |
return ""; |
return ""; |
} |
} |
|
|
Line 185 sub finalizeawards {
|
Line 214 sub finalizeawards {
|
my $award; |
my $award; |
if ($#_ == '-1') { $result = "NO_RESPONSE"; } |
if ($#_ == '-1') { $result = "NO_RESPONSE"; } |
if ($result eq '' ) { |
if ($result eq '' ) { |
foreach $award (@_) { if ($award eq '') {$result='MISSING_ANSWER'; last;}} |
my $blankcount; |
|
foreach $award (@_) { |
|
if ($award eq '') { |
|
$result='MISSING_ANSWER'; |
|
$blankcount++; |
|
} |
|
} |
|
if ($blankcount == ($#_ + 1)) { $result = 'NO_RESPONSE'; } |
|
} |
|
if ($result eq '' ) { |
|
foreach $award (@_) { if ($award eq 'MISSING_ANSWER') {$result='MISSING_ANSWER'; last;}} |
} |
} |
if ($result eq '' ) { |
if ($result eq '' ) { |
foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}} |
foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}} |
Line 216 sub finalizeawards {
|
Line 255 sub finalizeawards {
|
foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} } |
foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} } |
} |
} |
if ($result eq '' ) { |
if ($result eq '' ) { |
|
foreach $award (@_) { if ($award eq 'DRAFT') {$result=$award; last;} } |
|
} |
|
if ($result eq '' ) { |
foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} } |
foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} } |
} |
} |
if ($result eq '' ) { |
if ($result eq '' ) { |
Line 282 sub decideoutput {
|
Line 324 sub decideoutput {
|
} elsif ($award eq 'SUBMITTED') { |
} elsif ($award eq 'SUBMITTED') { |
$message = "Your submission has been recorded."; |
$message = "Your submission has been recorded."; |
$button=1; |
$button=1; |
|
} elsif ($award eq 'DRAFT') { |
|
$message = "A draft copy has been saved."; |
|
$button=1; |
} else { |
} else { |
$message = "Unknown message: $award"; |
$message = "Unknown message: $award"; |
$button=1; |
$button=1; |
Line 311 sub setgradedata {
|
Line 356 sub setgradedata {
|
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'incorrect_attempted'; |
'incorrect_attempted' |
} elsif ( $award eq 'SUBMITTED' ) { |
} elsif ( $award eq 'SUBMITTED' ) { |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'ungraded_attempted'; |
'ungraded_attempted'; |
|
} elsif ( $award eq 'DRAFT' ) { |
|
$Apache::lonhomework::results{"resource.$id.solved"} = ''; |
} elsif ( $award eq 'NO_RESPONSE' ) { |
} elsif ( $award eq 'NO_RESPONSE' ) { |
return ''; |
return ''; |
} else { |
} else { |
Line 330 sub setgradedata {
|
Line 377 sub setgradedata {
|
delete($Apache::lonhomework::results{"resource.$id.tries"}); |
delete($Apache::lonhomework::results{"resource.$id.tries"}); |
$Apache::lonhomework::results{"resource.$id.previous"} = '1'; |
$Apache::lonhomework::results{"resource.$id.previous"} = '1'; |
} elsif ( $previously_used eq 'PREVIOUSLY_LAST') { |
} elsif ( $previously_used eq 'PREVIOUSLY_LAST') { |
#delete all data as they student didn't do anything |
#delete all data as they student didn't do anything, but save |
|
#the list of collaborators. |
foreach my $key (keys(%Apache::lonhomework::results)) { |
foreach my $key (keys(%Apache::lonhomework::results)) { |
if ($key =~ /^resource\.$id\./) { |
if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) { |
&Apache::lonxml::debug("Removing $key"); |
&Apache::lonxml::debug("Removing $key"); |
delete($Apache::lonhomework::results{$key}); |
delete($Apache::lonhomework::results{$key}); |
} |
} |
Line 355 sub grade {
|
Line 403 sub grade {
|
foreach $response (@Apache::inputtags::responselist) { |
foreach $response (@Apache::inputtags::responselist) { |
&Apache::lonxml::debug("looking for response.$id.$response.awarddetail"); |
&Apache::lonxml::debug("looking for response.$id.$response.awarddetail"); |
my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"}; |
my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"}; |
if ( $value ne '' ) { |
&Apache::lonxml::debug("keeping $value from $response for $id"); |
&Apache::lonxml::debug("keeping $value from $response for $id"); |
push (@awards,$value); |
push (@awards,$value); |
|
} else { |
|
&Apache::lonxml::debug("skipping $value from $response for $id"); |
|
} |
|
} |
} |
my $finalaward = &finalizeawards(@awards); |
my $finalaward = &finalizeawards(@awards); |
my $previously_used; |
my $previously_used; |