version 1.135, 2004/03/12 21:14:54
|
version 1.168, 2005/06/20 19:54:28
|
Line 30 use HTML::Entities();
|
Line 30 use HTML::Entities();
|
use strict; |
use strict; |
use Apache::loncommon; |
use Apache::loncommon; |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
use Apache::lonnet; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); |
&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); |
Line 65 sub initialize_inputtags {
|
Line 66 sub initialize_inputtags {
|
@Apache::inputtags::importlist=(); |
@Apache::inputtags::importlist=(); |
# just used to note whether we have seen a response that isn't in a part |
# just used to note whether we have seen a response that isn't in a part |
$Apache::inputtags::response_with_no_part=0; |
$Apache::inputtags::response_with_no_part=0; |
|
# storage location so the begin <*response> tag can generate the correct |
|
# answer string for display by the <textline /> |
|
%Apache::inputtags::answertxt=(); |
} |
} |
|
|
sub check_for_duplicate_ids { |
sub check_for_duplicate_ids { |
Line 118 sub start_textfield {
|
Line 122 sub start_textfield {
|
$Apache::lonxml::evaluate--; |
$Apache::lonxml::evaluate--; |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
my $partid=$Apache::inputtags::part; |
my $partid=$Apache::inputtags::part; |
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"}); |
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"'); |
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
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 = 16; } |
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); |
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); |
$result=''; |
$result=''; |
if ($addchars) { |
if ($addchars) { |
$result.=&addchars('HWVAL_'.$resid,$addchars); |
$result.=&addchars('HWVAL_'.$resid,$addchars); |
} |
} |
$result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" '. |
push @Apache::lonxml::htmlareafields,'HWVAL_'.$resid; |
|
$result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="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); |
&Apache::lonxml::get_all_text("/textfield",$parser); |
} |
} |
Line 143 sub start_textfield {
|
Line 149 sub start_textfield {
|
} |
} |
} elsif ($target eq 'grade') { |
} elsif ($target eq 'grade') { |
my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser); |
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); |
Line 210 sub start_textline {
|
Line 216 sub start_textline {
|
if ($size eq '') { $size=20; } else { |
if ($size eq '') { $size=20; } else { |
if ($size < 20) { $maxlength=$size; } |
if ($size < 20) { $maxlength=$size; } |
} |
} |
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') { |
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); |
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); |
$result=''; |
$result=''; |
if ($addchars) { |
if ($addchars) { |
$result.=&addchars('HWVAL_'.$id,$addchars); |
$result.=&addchars('HWVAL_'.$id,$addchars); |
} |
} |
$result.= '<input type="text" name="HWVAL_'.$id.'" value="'. |
my $readonly=&Apache::lonxml::get_param('readonly',$parstack, |
|
$safeeval); |
|
if (lc($readonly) eq 'yes') { |
|
$readonly=' readonly="readonly" '; |
|
} else { |
|
$readonly=''; |
|
} |
|
$result.= '<input type="text" '.$readonly.' name="HWVAL_'.$id.'" value="'. |
$oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />'; |
$oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />'; |
} |
} |
} else { |
} else { |
#right or wrong don't show what was last typed in. |
#right or wrong don't show what was last typed in. |
#$result='<i>'.$oldresponse.'</i>'; |
$result='<b>'.$Apache::inputtags::answertxt{$id}.'</b>'; |
$result=''; |
#$result=''; |
} |
} |
} 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'). |
$result.=&Apache::edit::text_arg('Size:','size',$token,'5'). |
&Apache::edit::text_arg |
&Apache::edit::text_arg('Click-On Texts (comma sep):', |
('Click-On Texts (comma sep):','addchars',$token,10)."</td></tr>"; |
'addchars',$token,10); |
$result.=&Apache::edit::end_table; |
$result.=&Apache::edit::select_arg('Readonly:','readonly', |
|
['no','yes'],$token); |
|
$result.=&Apache::edit::end_row(); |
|
$result.=&Apache::edit::end_table(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size','addchars'); |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'size', |
|
'addchars','readonly'); |
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 257 sub start_hiddenline {
|
Line 275 sub start_hiddenline {
|
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
my $partid=$Apache::inputtags::part; |
my $partid=$Apache::inputtags::part; |
my $id=$Apache::inputtags::response[-1]; |
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="hidden" name="HWVAL_'.$id.'" value="'. |
$result= '<input type="hidden" name="HWVAL_'.$id.'" value="'. |
$oldresponse.'" />'; |
$oldresponse.'" />'; |
Line 277 sub end_hiddenline {
|
Line 295 sub end_hiddenline {
|
return ""; |
return ""; |
} |
} |
|
|
sub finalizeawards { |
# $part -> partid |
my $result=''; |
# $id -> responseid |
my $award; |
# $uploadefiletypes -> comma seperated list of extensions allowed or * for any |
if ($#_ == '-1') { $result = "NO_RESPONSE"; } |
# $which -> 'uploadedonly' -> only newly uploaded files |
if ($result eq '' ) { |
# 'portfolioonly' -> only allow files from portfolio |
my $blankcount; |
# 'both' -> allow files from either location |
foreach $award (@_) { |
# returns a table row <tr> |
if ($award eq '') { |
sub file_selector { |
$result='MISSING_ANSWER'; |
my ($part,$id,$uploadedfiletypes,$which)=@_; |
$blankcount++; |
if (!$uploadedfiletypes) { return ''; } |
} |
|
|
my $jspart=$part; |
|
$jspart=~s/\./_/g; |
|
|
|
my $result; |
|
|
|
$result.='<tr><td>'; |
|
if ($uploadedfiletypes ne '*') { |
|
$result.= |
|
&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'; |
|
} |
|
if ($which eq 'uploadonly' || $which eq 'both') { |
|
$result.=&mt('Submit a file: (only one file can be uploaded)'). |
|
' <br /><input type="file" size="50" name="HWFILE'. |
|
$jspart.'_'.$id.'" /><br />'; |
|
my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"'); |
|
|
|
if ($uploadedfile) { |
|
my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; |
|
push (@Apache::lonxml::extlinks,$url); |
|
&Apache::lonnet::allowuploaded('/adm/essayresponse',$url); |
|
my $icon=&Apache::loncommon::icon($url); |
|
my $curfile='<a href="'.$url.'"><img src="'.$icon. |
|
'" border="0" />'.$uploadedfile.'</a>'; |
|
$result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile); |
|
} else { |
|
#$result.=&mt('(Hand in a file you have prepared on your computer)'); |
} |
} |
if ($blankcount == ($#_ + 1)) { $result = 'NO_RESPONSE'; } |
|
} |
|
if ($result eq '' ) { |
|
foreach $award (@_) { if ($award eq 'MISSING_ANSWER') {$result='MISSING_ANSWER'; last;}} |
|
} |
|
if ($result eq '' ) { |
|
foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}} |
|
} |
|
if ($result eq '' ) { |
|
foreach $award (@_) { if ($award eq 'NO_RESPONSE') {$result='NO_RESPONSE'; last;} } |
|
} |
} |
if ($result eq '' ) { |
if ( $which eq 'both') { |
foreach $award (@_) { if ($award eq 'TOO_LONG') {$result='TOO_LONG'; last;}} |
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />'; |
} |
} |
if ($result eq '' ) { |
if ($which eq 'portfolioonly' || $which eq 'both') { |
foreach $award (@_) { |
$result.='<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname=HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'. |
if ($award eq 'UNIT_FAIL' || |
&mt('Select Portfolio Files').'</a><br />'. |
$award eq 'NO_UNIT' || |
'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'. |
$award eq 'UNIT_NOTNEEDED') { |
'<br />'; |
$result=$award; last; |
if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){ |
|
my @filelist; |
|
foreach my $file (split(',',&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) { |
|
my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser(); |
|
my $url="/uploaded/$domain/$user/portfolio$file"; |
|
my $icon=&Apache::loncommon::icon($url); |
|
push(@filelist,'<a href="'.$url.'"><img src="'.$icon. |
|
'" border="0" />'.$file.'</a>'); |
} |
} |
|
$result.=&mt("Portfolio files previously selected: <strong>[_1]</strong>",join(', ',@filelist)); |
} |
} |
} |
} |
if ($result eq '' ) { |
$result.='</td></tr>'; |
foreach $award (@_) { |
return $result; |
if ($award eq 'WANTED_NUMERIC' || |
} |
$award eq 'BAD_FORMULA') {$result=$award; last;} |
|
|
sub checkstatus { |
|
my ($value,$awardref,$msgref)=@_; |
|
for (my $i=0;$i<=$#$awardref;$i++) { |
|
if ($$awardref[$i] eq $value) { |
|
return ($$awardref[$i],$$msgref[$i]); |
} |
} |
} |
} |
|
return(undef,undef); |
|
} |
|
|
|
sub finalizeawards { |
|
my ($awardref,$msgref)=@_; |
|
my $result=undef; |
|
my $award; |
|
my $msg; |
|
if ($#$awardref == -1) { $result = "NO_RESPONSE"; } |
if ($result eq '' ) { |
if ($result eq '' ) { |
foreach $award (@_) { if ($award eq 'SIG_FAIL') {$result=$award; last;} } |
my $blankcount; |
} |
foreach $award (@$awardref) { |
if ($result eq '' ) { |
if ($award eq '') { |
foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} } |
$result='MISSING_ANSWER'; |
} |
$blankcount++; |
if ($result eq '' ) { |
} |
foreach $award (@_) { if ($award eq 'MISORDERED_RANK') {$result=$award; last;} } |
} |
} |
if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; } |
if ($result eq '' ) { |
|
foreach $award (@_) { if ($award eq 'INVALID_FILETYPE') {$result=$award; last;} } |
|
} |
|
if ($result eq '' ) { |
|
foreach $award (@_) { if ($award eq 'DRAFT') {$result=$award; last;} } |
|
} |
|
if ($result eq '' ) { |
|
foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} } |
|
} |
|
if ($result eq '' ) { |
|
foreach $award (@_) { if ($award eq 'ASSIGNED_SCORE') {$result=$award; last;} } |
|
} |
} |
if ($result eq '' ) { |
if (defined($result)) { return ($result,$msg); } |
foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} } |
foreach my $possibleaward ('MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', |
|
'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR', |
|
'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', |
|
'UNIT_FAIL', 'NO_UNIT', |
|
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', |
|
'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', |
|
'MISORDERED_RANK', 'INVALID_FILETYPE', |
|
'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', |
|
'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') { |
|
($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref); |
|
if (defined($result)) { return ($result,$msg); } |
} |
} |
if ($result eq '' ) { $result='EXACT_ANS'; } |
return ('ERROR',undef); |
return $result |
|
} |
} |
|
|
sub decideoutput { |
sub decideoutput { |
my ($award,$solved,$previous,$target)=@_; |
my ($award,$awardmsg,$solved,$previous,$target)=@_; |
my $message=''; |
my $message=''; |
my $button=0; |
my $button=0; |
my $previousmsg; |
my $previousmsg; |
my $bgcolor='orange'; |
my $bgcolor='orange'; |
|
my $added_computer_text=0; |
my %possiblecolors = |
my %possiblecolors = |
( 'correct' => '#aaffaa', |
( 'correct' => '#aaffaa', |
'charged_try' => '#ffaaaa', |
'charged_try' => '#ffaaaa', |
Line 368 sub decideoutput {
|
Line 423 sub decideoutput {
|
$message = '\textbf{'.&mt('You are correct.').'}'; |
$message = '\textbf{'.&mt('You are correct.').'}'; |
} else { |
} else { |
$message = "<b>".&mt('You are correct.')."</b>"; |
$message = "<b>".&mt('You are correct.')."</b>"; |
|
$message.=" ".&mt("Computer's answer now shown above."); |
} |
} |
unless ($ENV{'course.'. |
$added_computer_text=1; |
$ENV{'request.course.id'}. |
unless ($env{'course.'. |
|
$env{'request.course.id'}. |
'.disable_receipt_display'} eq 'yes') { |
'.disable_receipt_display'} eq 'yes') { |
$message.=(($target eq 'web')?'<br />':' '). |
$message.=(($target eq 'web')?'<br />':' '). |
&mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part). |
&mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part). |
Line 391 sub decideoutput {
|
Line 448 sub decideoutput {
|
$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 = &mt("Incorrect"); |
$message = &mt("Incorrect")."."; |
$bgcolor=$possiblecolors{'charged_try'}; |
$bgcolor=$possiblecolors{'charged_try'}; |
$button=1; |
$button=1; |
} else { |
} else { |
$message = "<b>".&mt('You are correct.')."</b>"; |
if ($target eq 'tex') { |
unless ($ENV{'course.'. |
$message = '\textbf{'.&mt('You are correct.').'}'; |
$ENV{'request.course.id'}. |
} else { |
|
$message = "<b>".&mt('You are correct.')."</b>"; |
|
$message.=" ".&mt("Computer's answer now shown above."); |
|
} |
|
$added_computer_text=1; |
|
unless ($env{'course.'. |
|
$env{'request.course.id'}. |
'.disable_receipt_display'} eq 'yes') { |
'.disable_receipt_display'} eq 'yes') { |
$message.=(($target eq 'web')?'<br />':' '). |
$message.=(($target eq 'web')?'<br />':' '). |
'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part). |
'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part). |
Line 430 sub decideoutput {
|
Line 493 sub decideoutput {
|
} elsif ($award eq 'MISORDERED_RANK') { |
} elsif ($award eq 'MISORDERED_RANK') { |
$message = &mt('You have provided an invalid ranking'); |
$message = &mt('You have provided an invalid ranking'); |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.'; |
$message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems'); |
} |
} |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'INVALID_FILETYPE') { |
} elsif ($award eq 'INVALID_FILETYPE') { |
$message = &mt('The filetype extension of the file you uploaded is not allowed.'); |
$message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.'); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'SIG_FAIL') { |
} elsif ($award eq 'SIG_FAIL') { |
$message = &mt("Significant figures are incorrect, submission was not graded.");# you provided %s significant figures"; |
my ($used,$min,$max)=split(':',$awardmsg); |
|
my $word; |
|
if ($used < $min) { $word=&mt('more'); } |
|
if ($used > $max) { $word=&mt('fewer'); } |
|
$message = &mt("Submission not graded. Use [_2] digits.",$used,$word); |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
|
$button=1; |
|
} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') { |
|
$message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg); |
|
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_FAIL') { |
} elsif ($award eq 'UNIT_INVALID_STUDENT') { |
$message = &mt("Units incorrect."); |
$message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target)); |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} #Computer reads units as %s"; |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
|
$button=1; |
|
} elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') { |
|
$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target)); |
|
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_NOTNEEDED') { |
} elsif ($award eq 'UNIT_NOTNEEDED') { |
$message = &mt("Only a number required.");# Computer reads units of %s"; |
$message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target)); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'NO_UNIT') { |
} elsif ($award eq 'NO_UNIT') { |
$message = &mt("Units required"); |
$message = &mt("Units required").'.'; |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')}; |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
|
} elsif ($award eq 'COMMA_FAIL') { |
|
$message = &mt("Proper comma separation is required").'.'; |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
|
$button=1; |
} elsif ($award eq 'BAD_FORMULA') { |
} elsif ($award eq 'BAD_FORMULA') { |
$message = &mt("Unable to understand formula"); |
$message = &mt("Unable to understand formula"); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'INCORRECT') { |
} elsif ($award eq 'INCORRECT') { |
$message = &mt("Incorrect"); |
$message = &mt("Incorrect").'.'; |
$bgcolor=$possiblecolors{'charged_try'}; |
$bgcolor=$possiblecolors{'charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'SUBMITTED') { |
} elsif ($award eq 'SUBMITTED') { |
Line 469 sub decideoutput {
|
Line 550 sub decideoutput {
|
$bgcolor=$possiblecolors{'correct'}; |
$bgcolor=$possiblecolors{'correct'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'DRAFT') { |
} elsif ($award eq 'DRAFT') { |
$message = "A draft copy has been saved."; |
$message = &mt("A draft copy has been saved."); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$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 = &mt("A score has been assigned."); |
$bgcolor=$possiblecolors{'correct'}; |
$bgcolor=$possiblecolors{'correct'}; |
$button=0; |
$button=0; |
|
} elsif ($award eq '') { |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
|
$button=1; |
} else { |
} else { |
$message = &mt("Unknown message").": $award"; |
$message = &mt("Unknown message").": $award"; |
$button=1; |
$button=1; |
Line 486 sub decideoutput {
|
Line 570 sub decideoutput {
|
$bgcolor=$possiblecolors{'correct'}; |
$bgcolor=$possiblecolors{'correct'}; |
$button=1; |
$button=1; |
} |
} |
|
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && |
|
!$added_computer_text && $target ne 'tex') { |
|
$message.=" ".&mt("Computer's answer now shown above."); |
|
$added_computer_text=1; |
|
} |
return ($button,$bgcolor,$message,$previousmsg); |
return ($button,$bgcolor,$message,$previousmsg); |
} |
} |
|
|
|
sub markup_unit { |
|
my ($unit,$target)=@_; |
|
if ($target eq 'tex') { |
|
return '\texttt{'.&Apache::lonxml::latex_special_symbols($unit).'}'; |
|
} else { |
|
return "<tt>".$unit."</tt>"; |
|
} |
|
} |
|
|
sub removealldata { |
sub removealldata { |
my ($id)=@_; |
my ($id)=@_; |
foreach my $key (keys(%Apache::lonhomework::results)) { |
foreach my $key (keys(%Apache::lonhomework::results)) { |
Line 499 sub removealldata {
|
Line 597 sub removealldata {
|
} |
} |
} |
} |
|
|
|
sub hidealldata { |
|
my ($id)=@_; |
|
foreach my $key (keys(%Apache::lonhomework::results)) { |
|
if (($key =~ /^resource\.\Q$id\E\./) && ($key !~ /\.collaborators$/)) { |
|
&Apache::lonxml::debug("Hidding $key"); |
|
my $newkey=$key; |
|
$newkey=~s/^(resource\.\Q$id\E\.[^\.]+\.)(.*)$/${1}hidden${2}/; |
|
$Apache::lonhomework::results{$newkey}= |
|
$Apache::lonhomework::results{$key}; |
|
delete($Apache::lonhomework::results{$key}); |
|
} |
|
} |
|
} |
|
|
sub setgradedata { |
sub setgradedata { |
my ($award,$id,$previously_used) = @_; |
my ($award,$msg,$id,$previously_used) = @_; |
# if the student already has it correct, don't modify the status |
if ($Apache::lonhomework::scantronmode && |
|
&Apache::lonnet::validCODE($env{'form.CODE'})) { |
|
$Apache::lonhomework::results{"resource.CODE"}=$env{'form.CODE'}; |
|
} elsif ($Apache::lonhomework::scantronmode && |
|
$env{'form.CODE'} eq '' && |
|
$Apache::lonhomework::history{"resource.CODE"} ne '') { |
|
$Apache::lonhomework::results{"resource.CODE"}=''; |
|
} |
|
|
if (!$Apache::lonhomework::scantronmode && |
if (!$Apache::lonhomework::scantronmode && |
$Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
$Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
Line 510 sub setgradedata {
|
Line 630 sub setgradedata {
|
} 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') { |
lc($Apache::lonhomework::problemstatus) eq 'no') { |
#handle assignment of tries and solved status |
# the student doesn't already have it correct, |
|
# or we are in a mode (scantron orno problem status) where a correct |
|
# can become incorrect |
|
# handle assignment of tries and solved status |
my $solvemsg; |
my $solvemsg; |
if ($Apache::lonhomework::scantronmode) { |
if ($Apache::lonhomework::scantronmode) { |
$solvemsg='correct_by_scantron'; |
$solvemsg='correct_by_scantron'; |
Line 544 sub setgradedata {
|
Line 667 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') { |
if (lc($Apache::lonhomework::problemstatus) eq 'no' || |
|
$Apache::lonhomework::scantronmode) { |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
} |
} |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
Line 563 sub setgradedata {
|
Line 687 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') { |
if (lc($Apache::lonhomework::problemstatus) eq 'no' || |
|
$Apache::lonhomework::scantronmode) { |
$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.awarded"} = 0; |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
} |
} |
} |
} |
|
if (defined($msg)) { |
|
$Apache::lonhomework::results{"resource.$id.awardmsg"} = $msg; |
|
} |
# did either of the overall awards chage? If so ignore the |
# did either of the overall awards chage? If so ignore the |
# previous check |
# previous check |
if (($Apache::lonhomework::results{"resource.$id.awarded"} eq |
if (($Apache::lonhomework::results{"resource.$id.awarded"} eq |
Line 607 sub grade {
|
Line 734 sub grade {
|
my ($target) = @_; |
my ($target) = @_; |
my $id = $Apache::inputtags::part; |
my $id = $Apache::inputtags::part; |
my $response=''; |
my $response=''; |
if ( defined $ENV{'form.submitted'}) { |
if ( defined $env{'form.submitted'}) { |
my @awards = (); |
my (@awards,@msgs); |
foreach $response (@Apache::inputtags::response) { |
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"); |
push (@awards,$value); |
push (@awards,$value); |
|
$value=$Apache::lonhomework::results{"resource.$id.$response.awardmsg"}; |
|
&Apache::lonxml::debug("got message $value from $response for $id"); |
|
push (@msgs,$value); |
} |
} |
my $finalaward = &finalizeawards(@awards); |
my ($finalaward,$msg) = &finalizeawards(\@awards,\@msgs); |
my $previously_used; |
my $previously_used; |
if ( $#Apache::inputtags::previous eq $#awards ) { |
if ( $#Apache::inputtags::previous eq $#awards ) { |
my $match=0; |
my $match=0; |
Line 636 sub grade {
|
Line 766 sub grade {
|
} |
} |
} |
} |
} |
} |
&Apache::lonxml::debug("final award $finalaward, $previously_used"); |
&Apache::lonxml::debug("final award $finalaward, $previously_used, message $msg"); |
&setgradedata($finalaward,$id,$previously_used); |
&setgradedata($finalaward,$msg,$id,$previously_used); |
} |
} |
return ''; |
return ''; |
} |
} |
Line 659 sub gradestatus {
|
Line 789 sub gradestatus {
|
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|"); |
my $awardmsg = $Apache::lonhomework::history{"resource.$id.awardmsg"}; |
if ( $award ne '' || $solved ne '') { |
&Apache::lonxml::debug("Found Award |$award|$solved|$awardmsg"); |
|
if ( $award ne '' || $solved ne '' || $status eq 'SHOW_ANSWER') { |
&Apache::lonxml::debug('Getting message'); |
&Apache::lonxml::debug('Getting message'); |
($showbutton,$bgcolor,$message,$previousmsg) = |
($showbutton,$bgcolor,$message,$previousmsg) = |
&decideoutput($award,$solved,$previous,$target); |
&decideoutput($award,$awardmsg,$solved,$previous,$target); |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$message='\vskip 2 mm '.$message.' '; |
$message='\vskip 2 mm '.$message.' '; |
} else { |
} else { |
Line 682 sub gradestatus {
|
Line 813 sub gradestatus {
|
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
my $tries_text=&mt('Tries'); |
my $tries_text=&mt('Tries'); |
if ( $Apache::lonhomework::type eq 'survey') { $tries_text=&mt('Submissions'); } |
if ( $Apache::lonhomework::type eq 'survey' || |
|
$Apache::lonhomework::parsing_a_task) { |
|
$tries_text=&mt('Submissions'); |
|
} |
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' && $env{'form.suppress_tries'} ne 'yes') { |
$trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; |
$trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; |
} else { |
} else { |
$trystr = '\vskip 0 mm '; |
$trystr = '\vskip 0 mm '; |
} |
} |
} else { |
} else { |
$trystr = "<td>".$tries_text." $tries"; |
$trystr = "<td><nobr>".$tries_text." $tries"; |
if($ENV{'request.state'} ne 'construct') { |
if ($Apache::lonhomework::parsing_a_task) { |
|
} elsif($env{'request.state'} ne 'construct') { |
$trystr.="/$maxtries"; |
$trystr.="/$maxtries"; |
} else { |
} else { |
if (defined($Apache::inputtags::params{'maxtries'})) { |
if (defined($Apache::inputtags::params{'maxtries'})) { |
$trystr.="/".$Apache::inputtags::params{'maxtries'}; |
$trystr.="/".$Apache::inputtags::params{'maxtries'}; |
} |
} |
} |
} |
$trystr.="</td>"; |
$trystr.="</nobr></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 = '<input type="submit" name="submit" value="'.&mt('Submit Answer').'" />'; |
$button = '<input type="submit" name="submit_'.$id.'" value="'.&mt('Submit Answer').'" />'; |
} |
} |
} |
} |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
#last submissions was after due date |
#last submissions was after due date |
if ($target eq 'tex') { |
$latemessage=&mt(' The last submission was after the Due Date ');; |
$latemessage=' The last submission was after the Due Date '; |
if ($target eq 'web') { |
} else { |
$latemessage='<td bgcolor="#ffaaaa">'.$latemessage.'</td>'; |
$latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>"; |
|
} |
} |
} |
} |
} |
} |