version 1.82, 2003/01/24 22:32:08
|
version 1.101, 2003/05/09 22:24:05
|
Line 33 use strict;
|
Line 33 use strict;
|
use Apache::loncommon; |
use Apache::loncommon; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::inputtags',('textfield','textline')); |
&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); |
} |
} |
|
|
|
|
Line 89 sub start_textfield {
|
Line 89 sub start_textfield {
|
if ( $cols eq '') { $cols = 80; } |
if ( $cols eq '') { $cols = 80; } |
my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
if ( $rows eq '') { $rows = 10; } |
if ( $rows eq '') { $rows = 10; } |
$result= '<textarea name="HWVAL'.$resid.'" '. |
$result= '<textarea name="HWVAL_'.$resid.'" '. |
"rows=\"$rows\" cols=\"$cols\">".$oldresponse; |
"rows=\"$rows\" cols=\"$cols\">".$oldresponse; |
if ($oldresponse ne '') { |
if ($oldresponse ne '') { |
#get rid of any startup text if the user has already responded |
#get rid of any startup text if the user has already responded |
&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
&Apache::lonxml::get_all_text("/textfield",$parser); |
} |
} |
} else { |
} else { |
#right or wrong don't show it |
#right or wrong don't show it |
#$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>'; |
#$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>'; |
$result=''; |
$result=''; |
#get rid of any startup text |
#get rid of any startup text |
&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
&Apache::lonxml::get_all_text("/textfield",$parser); |
} |
} |
} elsif ($target eq 'grade') { |
} elsif ($target eq 'grade') { |
my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser); |
if ($seedtext eq $ENV{'form.HWVAL'.$resid}) { |
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'.$resid}=''; |
$ENV{'form.HWVAL_'.$resid}=''; |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::text_arg('Rows:','rows',$token,4); |
$result.=&Apache::edit::text_arg('Rows:','rows',$token,4); |
$result.=&Apache::edit::text_arg('Columns:','cols',$token,4); |
$result.=&Apache::edit::text_arg('Columns:','cols',$token,4); |
my $bodytext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]); |
my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser); |
$result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2); |
$result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
Line 124 sub start_textfield {
|
Line 124 sub start_textfield {
|
} |
} |
$result.=&Apache::edit::modifiedfield(); |
$result.=&Apache::edit::modifiedfield(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
|
my $number_of_lines = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
|
my $width_of_box = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
if ($$tagstack[-2] eq 'essayresponse' and $Apache::lonhomework::type eq 'exam') { |
if ($$tagstack[-2] eq 'essayresponse' and $Apache::lonhomework::type eq 'exam') { |
my $number_of_lines= &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
|
$result = '\fbox{\fbox{\parbox{\textwidth-5mm}{'; |
$result = '\fbox{\fbox{\parbox{\textwidth-5mm}{'; |
for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';} |
for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';} |
$result.='\strut \\\\\strut \\\\\strut \\\\\strut \\\\}}}'; |
$result.='\strut \\\\\strut \\\\\strut \\\\\strut \\\\}}}'; |
|
} else { |
|
my $TeXwidth=$width_of_box/80; |
|
$result = '\vskip 1 mm \fbox{\fbox{\parbox{'.$TeXwidth.'\textwidth-5mm}{'; |
|
for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';} |
|
$result.='}}}\vskip 2 mm '; |
} |
} |
} |
} |
return $result; |
return $result; |
Line 154 sub start_textline {
|
Line 160 sub start_textline {
|
my $result = ""; |
my $result = ""; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$Apache::lonxml::evaluate--; |
$Apache::lonxml::evaluate--; |
|
my $partid=$Apache::inputtags::part; |
|
my $id=$Apache::inputtags::response[-1]; |
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); |
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
my $maxlength; |
my $maxlength; |
if ($size eq '') { $size=20; } else { |
if ($size eq '') { $size=20; } else { |
if ($size < 20) { $maxlength=$size; } |
if ($size < 20) { $maxlength=$size; } |
} |
} |
my $partid=$Apache::inputtags::part; |
|
my $id=$Apache::inputtags::response[-1]; |
|
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"}); |
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"}); |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
$result= '<input type="text" name="HWVAL'.$id.'" value="'. |
$result= '<input type="text" name="HWVAL_'.$id.'" value="'. |
$oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />'; |
$oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />'; |
} |
} |
} else { |
} else { |
Line 194 sub end_textline {
|
Line 200 sub end_textline {
|
return ""; |
return ""; |
} |
} |
|
|
|
sub start_hiddenline { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result = ""; |
|
if ($target eq 'web') { |
|
$Apache::lonxml::evaluate--; |
|
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
|
my $partid=$Apache::inputtags::part; |
|
my $id=$Apache::inputtags::response[-1]; |
|
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"}); |
|
if ($Apache::lonhomework::type ne 'exam') { |
|
$result= '<input type="hidden" name="HWVAL_'.$id.'" value="'. |
|
$oldresponse.'" />'; |
|
} |
|
} |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::tag_start($target,$token); |
|
$result.=&Apache::edit::end_table; |
|
} |
|
return $result; |
|
} |
|
|
|
sub end_hiddenline { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
if ($target eq 'web') { $Apache::lonxml::evaluate++; } |
|
elsif ($target eq 'edit') { return ('','no'); } |
|
return ""; |
|
} |
|
|
sub finalizeawards { |
sub finalizeawards { |
my $result=''; |
my $result=''; |
my $award; |
my $award; |
Line 252 sub finalizeawards {
|
Line 286 sub finalizeawards {
|
foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} } |
foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} } |
} |
} |
if ($result eq '' ) { |
if ($result eq '' ) { |
|
foreach $award (@_) { if ($award eq 'ASSIGNED_SCORE') {$result=$award; last;} } |
|
} |
|
if ($result eq '' ) { |
foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} } |
foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} } |
} |
} |
if ($result eq '' ) { $result='EXACT_ANS'; } |
if ($result eq '' ) { $result='EXACT_ANS'; } |
Line 267 sub decideoutput {
|
Line 304 sub decideoutput {
|
if ($previous) { $previousmsg='You have entered that answer before'; } |
if ($previous) { $previousmsg='You have entered that answer before'; } |
|
|
if ($solved =~ /^correct/) { |
if ($solved =~ /^correct/) { |
if ($target eq 'tex') { |
if ($award eq 'ASSIGNED_SCORE') { |
$message = '\textbf{You are correct}. Your receipt is '. |
$message = "A score has been assigned."; |
&Apache::lonnet::receipt; |
} else { |
} else { |
if ($target eq 'tex') { |
$message = "<b>You are correct.</b> Your receipt is ". |
$message = '\textbf{You are correct}.'; |
&Apache::lonnet::receipt; |
} else { |
} |
$message = "<b>You are correct.</b>"; |
$button=0; |
} |
$previousmsg=''; |
$message=' Your receipt is '.&Apache::lonnet::receipt; |
|
} |
|
$button=0; |
|
$previousmsg=''; |
} elsif ($solved =~ /^excused/) { |
} elsif ($solved =~ /^excused/) { |
$message = "<b>You are excused from the problem.</b>"; |
$message = "<b>You are excused from the problem.</b>"; |
$button=0; |
|
$previousmsg=''; |
|
} elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) { |
|
if ($solved =~ /^incorrect/ || $solved eq '') { |
|
$message = "Incorrect"; |
|
$button=1; |
|
} else { |
|
$message = "<b>You are correct.</b> Your receipt is ". |
|
&Apache::lonnet::receipt; |
|
$button=0; |
$button=0; |
$previousmsg=''; |
$previousmsg=''; |
} |
} elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) { |
|
if ($solved =~ /^incorrect/ || $solved eq '') { |
|
$message = "Incorrect"; |
|
$button=1; |
|
} else { |
|
$message = "<b>You are correct.</b> Your receipt is ". |
|
&Apache::lonnet::receipt; |
|
$button=0; |
|
$previousmsg=''; |
|
} |
} elsif ($award eq 'NO_RESPONSE') { |
} elsif ($award eq 'NO_RESPONSE') { |
$message = ''; |
$message = ''; |
$button=1; |
$button=1; |
} elsif ($award eq 'MISSING_ANSWER') { |
} elsif ($award eq 'MISSING_ANSWER') { |
$message = 'Some parts were not submitted'; |
$message = 'Some parts were not submitted'; |
$button = 1; |
$button = 1; |
} elsif ($award eq 'WANTED_NUMERIC') { |
} elsif ($award eq 'WANTED_NUMERIC') { |
$message = "This question expects a numeric answer"; |
$message = "This question expects a numeric answer"; |
$button=1; |
$button=1; |
} elsif ($award eq 'MISORDERED_RANK') { |
} elsif ($award eq 'MISORDERED_RANK') { |
$message = 'You have provided an invalid ranking, please refer to '. |
$message = 'You have provided an invalid ranking, please refer to '. |
&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.'; |
&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.'; |
$button=1; |
$button=1; |
} elsif ($award eq 'INVALID_FILETYPE') { |
} elsif ($award eq 'INVALID_FILETYPE') { |
$message = 'The filetype extension of the file you uploaded is not allowed.'; |
$message = 'The filetype extension of the file you uploaded is not allowed.'; |
$button=1; |
$button=1; |
} elsif ($award eq 'SIG_FAIL') { |
} 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; |
$button=1; |
} elsif ($award eq 'UNIT_FAIL') { |
} elsif ($award eq 'UNIT_FAIL') { |
$message = "Units incorrect. ". |
$message = "Units incorrect. ". |
&Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s"; |
&Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s"; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_NOTNEEDED') { |
} 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; |
$button=1; |
} elsif ($award eq 'NO_UNIT') { |
} elsif ($award eq 'NO_UNIT') { |
$message = "Units required". |
$message = "Units required". |
&Apache::loncommon::help_open_topic('Physical_Units'); |
&Apache::loncommon::help_open_topic('Physical_Units'); |
$button=1; |
$button=1; |
} elsif ($award eq 'BAD_FORMULA') { |
} elsif ($award eq 'BAD_FORMULA') { |
$message = "Unable to understand formula"; |
$message = "Unable to understand formula"; |
$button=1; |
$button=1; |
} elsif ($award eq 'INCORRECT') { |
} elsif ($award eq 'INCORRECT') { |
$message = "Incorrect"; |
$message = "Incorrect"; |
$button=1; |
$button=1; |
} 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') { |
} elsif ($award eq 'DRAFT') { |
$message = "A draft copy has been saved."; |
$message = "A draft copy has been saved."; |
$button=1; |
$button=1; |
|
} elsif ($award eq 'ASSIGNED_SCORE') { |
|
$message = "A score has been assigned."; |
|
$button=0; |
} else { |
} else { |
$message = "Unknown message: $award"; |
$message = "Unknown message: $award"; |
$button=1; |
$button=1; |
|
} |
|
if (lc($Apache::lonhomework::problemstatus) eq 'no') { |
|
$message = "Answer Submitted"; |
|
$button=1; |
} |
} |
return ($button,$message,$previousmsg); |
return ($button,$message,$previousmsg); |
} |
} |
|
|
|
sub removealldata { |
|
my ($id)=@_; |
|
foreach my $key (keys(%Apache::lonhomework::results)) { |
|
if (($key =~ /^resource\.\Q$id\E\./) && ($key !~ /\.collaborators$/)) { |
|
&Apache::lonxml::debug("Removing $key"); |
|
delete($Apache::lonhomework::results{$key}); |
|
} |
|
} |
|
} |
|
|
sub setgradedata { |
sub setgradedata { |
my ($award,$id,$previously_used) = @_; |
my ($award,$id,$previously_used) = @_; |
# if the student already has it correct, don't modify the status |
# if the student already has it correct, don't modify the status |
Line 347 sub setgradedata {
|
Line 404 sub setgradedata {
|
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; |
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; |
return ''; |
return ''; |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ |
/^correct/ ) { |
/^correct/ || $Apache::lonhomework::scantronmode || |
|
lc($Apache::lonhomework::problemstatus) eq 'no') { |
#handle assignment of tries and solved status |
#handle assignment of tries and solved status |
|
my $solvemsg; |
|
if ($Apache::lonhomework::scantronmode) { |
|
$solvemsg='correct_by_scantron'; |
|
} else { |
|
$solvemsg='correct_by_student'; |
|
} |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
$Apache::lonhomework::results{"resource.$id.afterduedate"}=''; |
$Apache::lonhomework::results{"resource.$id.afterduedate"}=''; |
} |
} |
if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) { |
if ( $award eq 'ASSIGNED_SCORE') { |
|
$Apache::lonhomework::results{"resource.$id.tries"} = |
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
|
$solvemsg; |
|
my $numawards=scalar(@Apache::inputtags::responselist); |
|
&Apache::lonxml::debug("Whaaa!"); |
|
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
|
foreach my $res (@Apache::inputtags::responselist) { |
|
$Apache::lonhomework::results{"resource.$id.awarded"}+= |
|
$Apache::lonhomework::results{"resource.$id.$res.awarded"}; |
|
} |
|
if ($numawards > 0) { |
|
$Apache::lonhomework::results{"resource.$id.awarded"}/= |
|
$numawards; |
|
} |
|
} elsif ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) { |
$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"} = |
'correct_by_student'; |
$solvemsg; |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
} elsif ( $award eq 'INCORRECT' ) { |
} elsif ( $award eq 'INCORRECT' ) { |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::results{"resource.$id.tries"} = |
Line 371 sub setgradedata {
|
Line 451 sub setgradedata {
|
} elsif ( $award eq 'DRAFT' ) { |
} elsif ( $award eq 'DRAFT' ) { |
$Apache::lonhomework::results{"resource.$id.solved"} = ''; |
$Apache::lonhomework::results{"resource.$id.solved"} = ''; |
} elsif ( $award eq 'NO_RESPONSE' ) { |
} elsif ( $award eq 'NO_RESPONSE' ) { |
return ''; |
#no real response so delete any data that got stored |
|
&removealldata($id); |
|
return ''; |
} else { |
} else { |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'incorrect_attempted'; |
'incorrect_attempted'; |
|
if (lc($Apache::lonhomework::problemstatus) eq 'no') { |
|
$Apache::lonhomework::results{"resource.$id.tries"} = |
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
|
} |
} |
} |
|
|
# check if this was a previous submission if it was delete the |
# check if this was a previous submission if it was delete the |
# unneeded data and update the previously_used attribute |
# unneeded data and update the previously_used attribute |
if ( $previously_used eq 'PREVIOUSLY_USED') { |
if ( $previously_used eq 'PREVIOUSLY_USED') { |
delete($Apache::lonhomework::results{"resource.$id.tries"}); |
if (lc($Apache::lonhomework::problemstatus) ne 'no') { |
$Apache::lonhomework::results{"resource.$id.previous"} = '1'; |
delete($Apache::lonhomework::results{"resource.$id.tries"}); |
|
$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, but save |
#delete all data as they student didn't do anything, but save |
#the list of collaborators. |
#the list of collaborators. |
foreach my $key (keys(%Apache::lonhomework::results)) { |
&removealldata($id); |
if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) { |
|
&Apache::lonxml::debug("Removing $key"); |
|
delete($Apache::lonhomework::results{$key}); |
|
} |
|
} |
|
#and since they didn't do anything we were never here |
#and since they didn't do anything we were never here |
return ''; |
return ''; |
} else { |
} else { |
$Apache::lonhomework::results{"resource.$id.previous"} = '0'; |
$Apache::lonhomework::results{"resource.$id.previous"} = '0'; |
} |
} |
|
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~ |
|
/^correct/ ) { |
|
#delete all data as they student already has it correct |
|
&removealldata($id); |
|
#and since they didn't do anything we were never here |
|
return ''; |
} |
} |
$Apache::lonhomework::results{"resource.$id.award"} = $award; |
$Apache::lonhomework::results{"resource.$id.award"} = $award; |
} |
} |
Line 476 sub gradestatus {
|
Line 565 sub gradestatus {
|
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
if ( $showbutton ) { |
if ( $showbutton ) { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
if ($ENV{'request.state'} ne "construct") { |
if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') { |
$trystr = ' {\small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 0 mm '; |
$trystr = ' {\vskip 1 mm \small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; |
|
} else { |
|
$trystr = '\vskip 0 mm '; |
} |
} |
} else { |
} else { |
$trystr = "<td>Tries $tries/$maxtries</td>"; |
$trystr = "<td>Tries $tries/$maxtries</td>"; |