version 1.100, 2003/05/08 15:33:15
|
version 1.130, 2004/02/12 15:50:33
|
Line 24
|
Line 24
|
# /home/httpd/html/adm/gpl.txt |
# /home/httpd/html/adm/gpl.txt |
# |
# |
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
|
# 2/19 Guy |
|
|
|
package Apache::inputtags; |
package Apache::inputtags; |
use HTML::Entities(); |
use HTML::Entities(); |
use strict; |
use strict; |
use Apache::loncommon; |
use Apache::loncommon; |
|
use Apache::lonlocal; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); |
&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); |
Line 52 sub initialize_inputtags {
|
Line 51 sub initialize_inputtags {
|
@Apache::inputtags::previous_version=(); |
@Apache::inputtags::previous_version=(); |
# id of current part, 0 means that no part is current (inside <problem> only |
# id of current part, 0 means that no part is current (inside <problem> only |
$Apache::inputtags::part=''; |
$Apache::inputtags::part=''; |
|
# list of all part ids seen |
|
@Apache::inputtags::partlist=(); |
# list of problem date statuses, the first element is for <problem> |
# list of problem date statuses, the first element is for <problem> |
# if there is a second element it is for the current <part> |
# if there is a second element it is for the current <part> |
@Apache::inputtags::status=(); |
@Apache::inputtags::status=(); |
Line 59 sub initialize_inputtags {
|
Line 60 sub initialize_inputtags {
|
%Apache::inputtags::params=(); |
%Apache::inputtags::params=(); |
# list of all ids, for <import>, these get join()ed and prepended |
# list of all ids, for <import>, these get join()ed and prepended |
@Apache::inputtags::import=(); |
@Apache::inputtags::import=(); |
|
# list of all import ids seen |
|
@Apache::inputtags::importlist=(); |
|
} |
|
|
|
sub check_for_duplicate_ids { |
|
my %check; |
|
foreach my $id (@Apache::inputtags::partlist, |
|
@Apache::inputtags::responselist, |
|
@Apache::inputtags::importlist) { |
|
$check{$id}++; |
|
} |
|
my @duplicates; |
|
foreach my $id (sort(keys(%check))) { |
|
if ($check{$id} > 1) { |
|
push(@duplicates,$id); |
|
} |
|
} |
|
if (@duplicates) { |
|
&Apache::lonxml::error("Duplicated ids found, problem will operate incorrectly. Duplicated ids seen: ",join(', ',@duplicates)); |
|
} |
} |
} |
|
|
sub start_input { |
sub start_input { |
Line 75 sub end_input {
|
Line 96 sub end_input {
|
return ''; |
return ''; |
} |
} |
|
|
|
sub addchars { |
|
my ($fieldid,$addchars)=@_; |
|
my $output=''; |
|
foreach (split(/\,/,$addchars)) { |
|
$output.='<a href="javascript:void(document.forms.lonhomework.'. |
|
$fieldid.'.value+=\''.$_.'\')">'.$_.'</a> '; |
|
} |
|
return $output; |
|
} |
|
|
sub start_textfield { |
sub start_textfield { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result = ""; |
my $result = ""; |
Line 89 sub start_textfield {
|
Line 120 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.'" '. |
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); |
|
$result=''; |
|
if ($addchars) { |
|
$result.=&addchars('HWVAL_'.$resid,$addchars); |
|
} |
|
$result.= '<textarea wrap="hard" 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 |
Line 112 sub start_textfield {
|
Line 148 sub start_textfield {
|
$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); |
|
$result.=&Apache::edit::text_arg |
|
('Click-On Texts (comma sep):','addchars',$token,10); |
my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser); |
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, |
$safeeval,'rows','cols'); |
$safeeval,'rows','cols','addchars'); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
} else { |
} else { |
$result=$token->[4]; |
$result=$token->[4]; |
} |
} |
$result.=&Apache::edit::modifiedfield(); |
$result.=&Apache::edit::modifiedfield("/textfield",$parser); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $number_of_lines = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
my $number_of_lines = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
my $width_of_box = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
my $width_of_box = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
Line 170 sub start_textline {
|
Line 208 sub start_textline {
|
} |
} |
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="'. |
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); |
|
$result=''; |
|
if ($addchars) { |
|
$result.=&addchars('HWVAL_'.$id,$addchars); |
|
} |
|
$result.= '<input type="text" name="HWVAL_'.$id.'" value="'. |
$oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />'; |
$oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />'; |
} |
} |
} else { |
} else { |
Line 180 sub start_textline {
|
Line 223 sub start_textline {
|
} |
} |
} 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('Size:','size',$token,'5')."</td></tr>"; |
$result.=&Apache::edit::text_arg('Size:','size',$token,'5'). |
|
&Apache::edit::text_arg |
|
('Click-On Texts (comma sep):','addchars',$token,10)."</td></tr>"; |
$result.=&Apache::edit::end_table; |
$result.=&Apache::edit::end_table; |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size'); |
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size','addchars'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
} elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
Line 251 sub finalizeawards {
|
Line 296 sub finalizeawards {
|
if ($result eq '' ) { |
if ($result eq '' ) { |
foreach $award (@_) { if ($award eq 'NO_RESPONSE') {$result='NO_RESPONSE'; last;} } |
foreach $award (@_) { if ($award eq 'NO_RESPONSE') {$result='NO_RESPONSE'; last;} } |
} |
} |
|
if ($result eq '' ) { |
|
foreach $award (@_) { if ($award eq 'TOO_LONG') {$result='TOO_LONG'; last;}} |
|
} |
if ($result eq '' ) { |
if ($result eq '' ) { |
foreach $award (@_) { |
foreach $award (@_) { |
if ($award eq 'UNIT_FAIL' || |
if ($award eq 'UNIT_FAIL' || |
Line 300 sub decideoutput {
|
Line 347 sub decideoutput {
|
my $message=''; |
my $message=''; |
my $button=0; |
my $button=0; |
my $previousmsg; |
my $previousmsg; |
|
my $bgcolor='orange'; |
if ($previous) { $previousmsg='You have entered that answer before'; } |
my %possiblecolors = |
|
( 'correct' => '#aaffaa', |
|
'charged_try' => '#ffaaaa', |
|
'not_charged_try' => '#ffffaa', |
|
'no_message' => '#fffff', |
|
); |
|
if ($previous) { $previousmsg=&mt('You have entered that answer before'); } |
|
|
if ($solved =~ /^correct/) { |
if ($solved =~ /^correct/) { |
if ($award eq 'ASSIGNED_SCORE') { |
if ($award eq 'ASSIGNED_SCORE') { |
$message = "A score has been assigned."; |
$message = &mt("A score has been assigned."); |
} else { |
} else { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$message = '\textbf{You are correct}.'; |
$message = '\textbf{'.&mt('You are correct.').'}'; |
} else { |
} else { |
$message = "<b>You are correct.</b>"; |
$message = "<b>".&mt('You are correct.')."</b>"; |
|
} |
|
unless ($ENV{'course.'. |
|
$ENV{'request.course.id'}. |
|
'.disable_receipt_display'} eq 'yes') { |
|
$message.=(($target eq 'web')?'<br />':' '). |
|
&mt('Your receipt is').' '.&Apache::lonnet::receipt(). |
|
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); |
} |
} |
$message=' Your receipt is '.&Apache::lonnet::receipt; |
|
} |
} |
|
$bgcolor=$possiblecolors{'correct'}; |
$button=0; |
$button=0; |
$previousmsg=''; |
$previousmsg=''; |
} elsif ($solved =~ /^excused/) { |
} elsif ($solved =~ /^excused/) { |
$message = "<b>You are excused from the problem.</b>"; |
if ($target eq 'tex') { |
|
$message = ' \textbf{'.&mt('You are excused from the problem.').'} '; |
|
} else { |
|
$message = "<b>".&mt('You are excused from the problem.')."</b>"; |
|
} |
|
$bgcolor=$possiblecolors{'charged_try'}; |
$button=0; |
$button=0; |
$previousmsg=''; |
$previousmsg=''; |
} elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) { |
} elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) { |
if ($solved =~ /^incorrect/ || $solved eq '') { |
if ($solved =~ /^incorrect/ || $solved eq '') { |
$message = "Incorrect"; |
$message = &mt("Incorrect"); |
|
$bgcolor=$possiblecolors{'charged_try'}; |
$button=1; |
$button=1; |
} else { |
} else { |
$message = "<b>You are correct.</b> Your receipt is ". |
$message = "<b>".&mt('You are correct.')."</b>"; |
&Apache::lonnet::receipt; |
unless ($ENV{'course.'. |
|
$ENV{'request.course.id'}. |
|
'.disable_receipt_display'} eq 'yes') { |
|
$message.=(($target eq 'web')?'<br />':' '). |
|
'Your receipt is '.&Apache::lonnet::receipt(). |
|
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); |
|
} |
|
$bgcolor=$possiblecolors{'correct'}; |
$button=0; |
$button=0; |
$previousmsg=''; |
$previousmsg=''; |
} |
} |
} elsif ($award eq 'NO_RESPONSE') { |
} elsif ($award eq 'NO_RESPONSE') { |
$message = ''; |
$message = ''; |
|
$bgcolor=$possiblecolors{'no_feedback'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'MISSING_ANSWER') { |
} elsif ($award eq 'MISSING_ANSWER') { |
$message = 'Some parts were not submitted'; |
$message = &mt('Some parts were not submitted.'); |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
|
$button = 1; |
|
} elsif ($award eq 'ERROR') { |
|
$message = &mt('An error occured while grading your answer.'); |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button = 1; |
$button = 1; |
|
} elsif ($award eq 'TOO_LONG') { |
|
$message = &mt("The submitted answer was too long."); |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
|
$button=1; |
} elsif ($award eq 'WANTED_NUMERIC') { |
} elsif ($award eq 'WANTED_NUMERIC') { |
$message = "This question expects a numeric answer"; |
$message = &mt("This question expects a numeric answer."); |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
$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 = &mt('You have provided an invalid ranking'); |
&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.'; |
if ($target ne 'tex') { |
|
$message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.'; |
|
} |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
$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 = &mt('The filetype extension of the file you uploaded is not allowed.'); |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
$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 = &mt("Significant figures are incorrect, submission was not graded.");# you provided %s significant figures"; |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_FAIL') { |
} elsif ($award eq 'UNIT_FAIL') { |
$message = "Units incorrect. ". |
$message = &mt("Units incorrect."); |
&Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s"; |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} #Computer reads units as %s"; |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
$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 = &mt("Only a number required.");# Computer reads units of %s"; |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'NO_UNIT') { |
} elsif ($award eq 'NO_UNIT') { |
$message = "Units required". |
$message = &mt("Units required"); |
&Apache::loncommon::help_open_topic('Physical_Units'); |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')}; |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'BAD_FORMULA') { |
} elsif ($award eq 'BAD_FORMULA') { |
$message = "Unable to understand formula"; |
$message = &mt("Unable to understand formula"); |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'INCORRECT') { |
} elsif ($award eq 'INCORRECT') { |
$message = "Incorrect"; |
$message = &mt("Incorrect"); |
|
$bgcolor=$possiblecolors{'charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'SUBMITTED') { |
} elsif ($award eq 'SUBMITTED') { |
$message = "Your submission has been recorded."; |
$message = &mt("Your submission has been recorded."); |
|
$bgcolor=$possiblecolors{'correct'}; |
$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."; |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'ASSIGNED_SCORE') { |
} elsif ($award eq 'ASSIGNED_SCORE') { |
$message = "A score has been assigned."; |
$message = "A score has been assigned."; |
|
$bgcolor=$possiblecolors{'correct'}; |
$button=0; |
$button=0; |
} else { |
} else { |
$message = "Unknown message: $award"; |
$message = &mt("Unknown message").": $award"; |
$button=1; |
$button=1; |
} |
} |
if (lc($Apache::lonhomework::problemstatus) eq 'no') { |
if (lc($Apache::lonhomework::problemstatus) eq 'no' && |
$message = "Answer Submitted"; |
$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') { |
|
$message = &mt("Answer Submitted: Your final submission will be graded after the due date."); |
|
$bgcolor=$possiblecolors{'correct'}; |
$button=1; |
$button=1; |
} |
} |
return ($button,$message,$previousmsg); |
return ($button,$bgcolor,$message,$previousmsg); |
} |
} |
|
|
sub removealldata { |
sub removealldata { |
Line 399 sub removealldata {
|
Line 498 sub removealldata {
|
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 |
if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
if (!$Apache::lonhomework::scantronmode && |
|
$Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
$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/ || $Apache::lonhomework::scantronmode) { |
/^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; |
my $solvemsg; |
if ($Apache::lonhomework::scantronmode) { |
if ($Apache::lonhomework::scantronmode) { |
Line 420 sub setgradedata {
|
Line 521 sub setgradedata {
|
$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"} = |
$solvemsg; |
$solvemsg; |
my $numawards=scalar(@Apache::inputtags::responselist); |
my $numawards=scalar(@Apache::inputtags::response); |
&Apache::lonxml::debug("Whaaa!"); |
|
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
foreach my $res (@Apache::inputtags::responselist) { |
foreach my $res (@Apache::inputtags::response) { |
$Apache::lonhomework::results{"resource.$id.awarded"}+= |
$Apache::lonhomework::results{"resource.$id.awarded"}+= |
$Apache::lonhomework::results{"resource.$id.$res.awarded"}; |
$Apache::lonhomework::results{"resource.$id.$res.awarded"}; |
} |
} |
Line 440 sub setgradedata {
|
Line 540 sub setgradedata {
|
} elsif ( $award eq 'INCORRECT' ) { |
} elsif ( $award eq 'INCORRECT' ) { |
$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; |
|
if (lc($Apache::lonhomework::problemstatus) eq 'no') { |
|
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
|
} |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'incorrect_attempted' |
'incorrect_attempted' |
} elsif ( $award eq 'SUBMITTED' ) { |
} elsif ( $award eq 'SUBMITTED' ) { |
Line 456 sub setgradedata {
|
Line 559 sub setgradedata {
|
} 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; |
|
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
|
} |
} |
} |
|
|
# check if this was a previous submission if it was delete the |
# did either of the overall awards chage? If so ignore the |
# unneeded data and update the previously_used attribute |
# previous check |
if ( $previously_used eq 'PREVIOUSLY_USED') { |
if (($Apache::lonhomework::results{"resource.$id.awarded"} eq |
delete($Apache::lonhomework::results{"resource.$id.tries"}); |
$Apache::lonhomework::history{"resource.$id.awarded"}) && |
$Apache::lonhomework::results{"resource.$id.previous"} = '1'; |
($Apache::lonhomework::results{"resource.$id.solved"} eq |
} elsif ( $previously_used eq 'PREVIOUSLY_LAST') { |
$Apache::lonhomework::history{"resource.$id.solved"})) { |
#delete all data as they student didn't do anything, but save |
# check if this was a previous submission if it was delete the |
#the list of collaborators. |
# unneeded data and update the previously_used attribute |
&removealldata($id); |
if ( $previously_used eq 'PREVIOUSLY_USED') { |
#and since they didn't do anything we were never here |
if (lc($Apache::lonhomework::problemstatus) ne 'no') { |
return ''; |
delete($Apache::lonhomework::results{"resource.$id.tries"}); |
} else { |
$Apache::lonhomework::results{"resource.$id.previous"} = '1'; |
$Apache::lonhomework::results{"resource.$id.previous"} = '0'; |
} |
|
} elsif ( $previously_used eq 'PREVIOUSLY_LAST') { |
|
#delete all data as they student didn't do anything, but save |
|
#the list of collaborators. |
|
&removealldata($id); |
|
#and since they didn't do anything we were never here |
|
return ''; |
|
} else { |
|
$Apache::lonhomework::results{"resource.$id.previous"} = '0'; |
|
} |
} |
} |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~ |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~ |
/^correct/ ) { |
/^correct/ ) { |
Line 488 sub grade {
|
Line 605 sub grade {
|
my $response=''; |
my $response=''; |
if ( defined $ENV{'form.submitted'}) { |
if ( defined $ENV{'form.submitted'}) { |
my @awards = (); |
my @awards = (); |
foreach $response (@Apache::inputtags::responselist) { |
foreach $response (@Apache::inputtags::response) { |
&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"}; |
&Apache::lonxml::debug("keeping $value from $response for $id"); |
&Apache::lonxml::debug("keeping $value from $response for $id"); |
Line 524 sub grade {
|
Line 641 sub grade {
|
sub gradestatus { |
sub gradestatus { |
my ($id,$target) = @_; |
my ($id,$target) = @_; |
my $showbutton = 1; |
my $showbutton = 1; |
|
my $bgcolor = ''; |
my $message = ''; |
my $message = ''; |
my $latemessage = ''; |
my $latemessage = ''; |
my $trystr=''; |
my $trystr=''; |
Line 532 sub gradestatus {
|
Line 650 sub gradestatus {
|
|
|
my $status = $Apache::inputtags::status['-1']; |
my $status = $Apache::inputtags::status['-1']; |
&Apache::lonxml::debug("gradestatus has :$status:"); |
&Apache::lonxml::debug("gradestatus has :$status:"); |
if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE') { |
if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' && |
|
$status ne 'INVALID_ACCESS') { |
my $award = $Apache::lonhomework::history{"resource.$id.award"}; |
my $award = $Apache::lonhomework::history{"resource.$id.award"}; |
my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; |
my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; |
my $previous = $Apache::lonhomework::history{"resource.$id.previous"}; |
my $previous = $Apache::lonhomework::history{"resource.$id.previous"}; |
&Apache::lonxml::debug("Found Award |$award|$solved|"); |
&Apache::lonxml::debug("Found Award |$award|$solved|"); |
if ( $award ne '' ) { |
if ( $award ne '' || $solved ne '') { |
&Apache::lonxml::debug('Getting message'); |
&Apache::lonxml::debug('Getting message'); |
($showbutton,$message,$previousmsg) = |
($showbutton,$bgcolor,$message,$previousmsg) = |
&decideoutput($award,$solved,$previous,$target); |
&decideoutput($award,$solved,$previous,$target); |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$message=' '.$message.' '; |
$message='\vskip 2 mm '.$message.' '; |
} else { |
} else { |
$message="<td bgcolor=\"#aaffaa\">$message</td>"; |
$message="<td bgcolor=\"$bgcolor\">$message</td>"; |
if ($previousmsg) { |
if ($previousmsg) { |
$previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>"; |
$previousmsg="<td bgcolor=\"#aaaaff\">$previousmsg</td>"; |
} |
} |
} |
} |
} |
} |
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
&Apache::lonxml::debug("got maxtries of :$maxtries:"); |
&Apache::lonxml::debug("got maxtries of :$maxtries:"); |
|
#if tries are set to negative turn off the Tries/Button and messages |
|
if (defined($maxtries) && $maxtries < 0) { return ''; } |
if ( $tries eq '' ) { $tries = '0'; } |
if ( $tries eq '' ) { $tries = '0'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
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" && $Apache::lonhomework::type ne 'exam') { |
if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') { |
$trystr = ' {\vskip 1 mm \small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; |
$trystr = ' {\vskip 1 mm \small \textit{'.&mt('Tries').'} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; |
} else { |
} else { |
$trystr = '\vskip 0 mm '; |
$trystr = '\vskip 0 mm '; |
} |
} |
} else { |
} else { |
$trystr = "<td>Tries $tries/$maxtries</td>"; |
$trystr = "<td>".&mt('Tries')." $tries"; |
|
if($ENV{'request.state'} ne 'construct') { |
|
$trystr.="/$maxtries"; |
|
} else { |
|
if (defined($Apache::inputtags::params{'maxtries'})) { |
|
$trystr.="/".$Apache::inputtags::params{'maxtries'}; |
|
} |
|
} |
|
$trystr.="</td>"; |
} |
} |
} |
} |
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;} |
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;} |
if ( $showbutton ) { |
if ( $showbutton ) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$button = '<br /><input type="submit" name="submit" value="Submit Answer" />'; |
$button = '<input type="submit" name="submit" value="'.&mt('Submit Answer').'" />'; |
} |
} |
} |
} |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
Line 589 sub gradestatus {
|
Line 718 sub gradestatus {
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
return $button.' \vskip 0 mm '.$output.' '; |
return $button.' \vskip 0 mm '.$output.' '; |
} else { |
} else { |
return $button.'<table><tr>'.$output.'</tr></table>'; |
return '<table><tr><td>'.$button.'</td>'.$output.'</tr></table>'; |
} |
} |
} |
} |
} |
} |