version 1.196, 2006/06/12 22:03:44
|
version 1.234, 2007/11/01 20:56:51
|
Line 31 use strict;
|
Line 31 use strict;
|
use Apache::loncommon; |
use Apache::loncommon; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
use LONCAPA; |
|
|
|
|
Line 70 BEGIN {
|
Line 69 BEGIN {
|
# %Apache::inputtags::answertxt - <*response> tags store correct |
# %Apache::inputtags::answertxt - <*response> tags store correct |
# answer strings for display by <textline/> |
# answer strings for display by <textline/> |
# in this hash. |
# in this hash. |
|
# %Apache::inputtags::submission_display |
|
# - <*response> tags store improved display |
|
# of submission strings for display by part |
|
# end. |
|
|
sub initialize_inputtags { |
sub initialize_inputtags { |
@Apache::inputtags::input=(); |
@Apache::inputtags::input=(); |
Line 88 sub initialize_inputtags {
|
Line 91 sub initialize_inputtags {
|
@Apache::inputtags::importlist=(); |
@Apache::inputtags::importlist=(); |
$Apache::inputtags::response_with_no_part=0; |
$Apache::inputtags::response_with_no_part=0; |
%Apache::inputtags::answertxt=(); |
%Apache::inputtags::answertxt=(); |
|
%Apache::inputtags::submission_display=(); |
} |
} |
|
|
sub check_for_duplicate_ids { |
sub check_for_duplicate_ids { |
Line 111 sub check_for_duplicate_ids {
|
Line 115 sub check_for_duplicate_ids {
|
|
|
sub start_input { |
sub start_input { |
my ($parstack,$safeeval)=@_; |
my ($parstack,$safeeval)=@_; |
my $id = &Apache::lonxml::get_param('id',$parstack,$safeeval); |
my $id = &Apache::lonxml::get_id($parstack,$safeeval); |
if ($id eq '') { $id = $Apache::lonxml::curdepth; } |
|
push (@Apache::inputtags::input,$id); |
push (@Apache::inputtags::input,$id); |
push (@Apache::inputtags::inputlist,$id); |
push (@Apache::inputtags::inputlist,$id); |
return $id; |
return $id; |
Line 140 sub start_textfield {
|
Line 143 sub start_textfield {
|
my $resid=$Apache::inputtags::response[-1]; |
my $resid=$Apache::inputtags::response[-1]; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$Apache::lonxml::evaluate--; |
$Apache::lonxml::evaluate--; |
|
my $partid=$Apache::inputtags::part; |
|
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"'); |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
my $partid=$Apache::inputtags::part; |
|
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); |
Line 161 sub start_textfield {
|
Line 164 sub start_textfield {
|
&Apache::lonxml::get_all_text("/textfield",$parser,$style); |
&Apache::lonxml::get_all_text("/textfield",$parser,$style); |
} |
} |
} else { |
} else { |
#right or wrong don't show it |
#show past answer in the essayresponse case |
#$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>'; |
if ($oldresponse =~ /\S/ |
$result=''; |
&& &Apache::londefdef::is_inside_of($tagstack, |
|
'essayresponse') ) { |
|
$result='<table class="LC_pastsubmission"><tr><td>'. |
|
$oldresponse.'</td></tr></table>'; |
|
} |
#get rid of any startup text |
#get rid of any startup text |
&Apache::lonxml::get_all_text("/textfield",$parser,$style); |
&Apache::lonxml::get_all_text("/textfield",$parser,$style); |
} |
} |
Line 279 sub needs_exam_box {
|
Line 286 sub needs_exam_box {
|
sub start_textline { |
sub start_textline { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result = ""; |
my $result = ""; |
|
my $input_id = &start_input($parstack,$safeeval); |
if ($target eq 'web') { |
if ($target eq 'web') { |
$Apache::lonxml::evaluate--; |
$Apache::lonxml::evaluate--; |
my $partid=$Apache::inputtags::part; |
my $partid=$Apache::inputtags::part; |
my $id=$Apache::inputtags::response[-1]; |
my $id=$Apache::inputtags::response[-1]; |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER' |
if (!&Apache::response::show_answer()) { |
|| ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER' && |
|
$Apache::lonhomework::history{"resource.$partid.solved"} !~ /^correct/ )) { |
|
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 = ' maxlength="'.$size.'"'; |
|
} |
} |
} |
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"},'<>&"'); |
my $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
|
&Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse)); |
|
|
|
if (ref($oldresponse) eq 'ARRAY') { |
|
$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist]; |
|
} |
|
$oldresponse = &HTML::Entities::encode($oldresponse,'<>&"'); |
|
|
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=''; |
Line 310 sub start_textline {
|
Line 325 sub start_textline {
|
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { |
$name = "none"; |
$name = "none"; |
} |
} |
$result.= '<input type="text" '.$readonly.' name="'.$name.'" value="'. |
$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');" type="text" '.$readonly.' name="'.$name.'" value="'. |
$oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />'; |
$oldresponse.'" size="'.$size.'"'.$maxlength.' />'; |
} |
} |
if ($Apache::lonhomework::type eq 'exam' |
if ($Apache::lonhomework::type eq 'exam' |
&& &needs_exam_box($tagstack)) { |
&& &needs_exam_box($tagstack)) { |
Line 319 sub start_textline {
|
Line 334 sub start_textline {
|
} |
} |
} 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='<b>'.$Apache::inputtags::answertxt{$id}.'</b>'; |
my $count = scalar(@Apache::inputtags::inputlist)-1; |
|
$result='<b>'.$Apache::inputtags::answertxt{$id}[$count].'</b>'; |
#$result=''; |
#$result=''; |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
Line 354 sub end_textline {
|
Line 370 sub end_textline {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web') { $Apache::lonxml::evaluate++; } |
if ($target eq 'web') { $Apache::lonxml::evaluate++; } |
elsif ($target eq 'edit') { return ('','no'); } |
elsif ($target eq 'edit') { return ('','no'); } |
|
&end_input(); |
return ""; |
return ""; |
} |
} |
|
|
sub start_hiddenline { |
sub start_hiddenline { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result = ""; |
my $result = ""; |
|
my $input_id = &start_input($parstack,$safeeval); |
if ($target eq 'web') { |
if ($target eq 'web') { |
$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 $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 = $Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
|
if (ref($oldresponse) eq 'ARRAY') { |
|
$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist]; |
|
} |
|
$oldresponse = &HTML::Entities::encode($oldresponse,'<>&"'); |
|
|
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 388 sub end_hiddenline {
|
Line 411 sub end_hiddenline {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web') { $Apache::lonxml::evaluate++; } |
if ($target eq 'web') { $Apache::lonxml::evaluate++; } |
elsif ($target eq 'edit') { return ('','no'); } |
elsif ($target eq 'edit') { return ('','no'); } |
|
&end_input(); |
return ""; |
return ""; |
} |
} |
|
|
Line 417 sub file_selector {
|
Line 441 sub file_selector {
|
$result.=&mt('Submit a file: (only one file can be uploaded)'). |
$result.=&mt('Submit a file: (only one file can be uploaded)'). |
' <br /><input type="file" size="50" name="HWFILE'. |
' <br /><input type="file" size="50" name="HWFILE'. |
$jspart.'_'.$id.'" /><br />'; |
$jspart.'_'.$id.'" /><br />'; |
my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"'); |
$result .= &show_past_file_submission($part,$id); |
|
|
if ($uploadedfile) { |
|
my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; |
|
&Apache::lonxml::extlink($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 ( $which eq 'both') { |
if ( $which eq 'both') { |
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />'; |
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />'; |
} |
} |
if ($which eq 'portfolioonly' || $which eq 'both') { |
if ($which eq 'portfolioonly' || $which eq 'both') { |
$result.=$extratext.'<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"))'."'".'>'. |
$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'. |
&mt('Select Portfolio Files').'</a><br />'. |
&mt('Select Portfolio Files').'</a><br />'. |
'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'. |
'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'. |
'<br />'; |
'<br />'; |
if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){ |
$result .= &show_past_portfile_submission($part,$id); |
my (@filelist,@bad_file_list); |
|
foreach my $file (split(',',&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>'); |
|
if (! &Apache::lonnet::stat_file($url)) { |
|
&Apache::lonnet::logthis("bad file is $url"); |
|
push(@bad_file_list,'<a href="'.$url.'"><img src="'.$icon. |
|
'" border="0" />'.$file.'</a>'); |
|
} |
|
} |
|
$result.=&mt("Portfolio files previously selected: <strong>[_1]</strong>",join(', ',@filelist)); |
|
if (@bad_file_list) { |
|
$result.='<br />'.&mt('<span class="LC_error">These file(s) don\'t exist:</span> <span class="LC_filename">[_1]</span>',join(', ',@bad_file_list)); |
|
} |
|
} |
|
} |
} |
$result.='</td></tr>'; |
$result.='</td></tr>'; |
return $result; |
return $result; |
} |
} |
|
|
sub checkstatus { |
sub show_past_file_submission { |
my ($value,$awardref,$msgref)=@_; |
my ($part,$id) = @_; |
for (my $i=0;$i<=$#$awardref;$i++) { |
my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"'); |
if ($$awardref[$i] eq $value) { |
|
return ($$awardref[$i],$$msgref[$i]); |
return if (!$uploadedfile); |
} |
|
|
my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; |
|
&Apache::lonxml::extlink($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>'; |
|
return &mt('Currently submitted: <tt>[_1]</tt>',$curfile); |
|
|
|
} |
|
|
|
sub show_past_portfile_submission { |
|
my ($part,$id) = @_; |
|
if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}!~/[^\s]/){ |
|
return; |
|
} |
|
my (@file_list,@bad_file_list); |
|
foreach my $file (split(/\s*,\s*/,&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) { |
|
my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser(); |
|
my $url="/uploaded/$domain/$user/portfolio$file"; |
|
my $icon=&Apache::loncommon::icon($url); |
|
push(@file_list,'<a href="'.$url.'"><img src="'.$icon. |
|
'" border="0" />'.$file.'</a>'); |
|
if (! &Apache::lonnet::stat_file($url)) { |
|
&Apache::lonnet::logthis("bad file is $url"); |
|
push(@bad_file_list,'<a href="'.$url.'"><img src="'.$icon. |
|
'" border="0" />'.$file.'</a>'); |
|
} |
|
} |
|
my $files = '<span class="LC_filename">'. |
|
join('</span>, <span class="LC_filename">',@file_list). |
|
'</span>'; |
|
my $result = &mt("Portfolio files previously selected: [_1]",$files); |
|
if (@bad_file_list) { |
|
my $bad_files = '<span class="LC_filename">'. |
|
join('</span>, <span class="LC_filename">',@bad_file_list). |
|
'</span>'; |
|
$result.='<br />'.&mt('<span class="LC_error">These file(s) don\'t exist:</span> [_1]',$bad_files); |
} |
} |
return(undef,undef); |
return $result; |
|
|
} |
} |
|
|
sub valid_award { |
sub valid_award { |
Line 490 sub valid_award {
|
Line 523 sub valid_award {
|
return 0; |
return 0; |
} |
} |
|
|
|
{ |
|
my @awards = ('EXTRA_ANSWER', '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', |
|
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', |
|
'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', |
|
'APPROX_ANS', 'EXACT_ANS'); |
|
my $i=0; |
|
my %fwd_awards = map { ($_,$i++) } @awards; |
|
my $max=scalar(@awards); |
|
@awards=reverse(@awards); |
|
$i=0; |
|
my %rev_awards = map { ($_,$i++) } @awards; |
|
|
|
sub awarddetail_to_awarded { |
|
my ($awarddetail) = @_; |
|
if ($awarddetail eq 'EXACT_ANS' |
|
|| $awarddetail eq 'APPROX_ANS') { |
|
return 1; |
|
} |
|
return 0; |
|
} |
|
|
|
sub hide_award { |
|
my ($award) = @_; |
|
if (&Apache::lonhomework::show_no_problem_status()) { |
|
return 1; |
|
} |
|
if ($award =~ |
|
/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|ASSIGNED_SCORE|INCORRECT)/) { |
|
return 1; |
|
} |
|
return 0; |
|
} |
|
|
sub finalizeawards { |
sub finalizeawards { |
my ($awardref,$msgref,$nameref,$reverse)=@_; |
my ($awardref,$msgref,$nameref,$reverse,$final_scantron)=@_; |
my $result=undef; |
my $result; |
my $award; |
|
my $msg; |
|
if ($#$awardref == -1) { $result = "NO_RESPONSE"; } |
if ($#$awardref == -1) { $result = "NO_RESPONSE"; } |
if ($result eq '' ) { |
if ($result eq '' ) { |
my $blankcount; |
my $blankcount; |
foreach $award (@$awardref) { |
foreach my $award (@$awardref) { |
if ($award eq '') { |
if ($award eq '') { |
$result='MISSING_ANSWER'; |
$result='MISSING_ANSWER'; |
$blankcount++; |
$blankcount++; |
} |
} |
} |
} |
if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; } |
if ($blankcount == ($#$awardref + 1)) { |
|
return ('NO_RESPONSE'); |
|
} |
} |
} |
if (defined($result)) { return ($result,$msg); } |
if (!$final_scantron && defined($result)) { return ($result); } |
|
|
|
# if in scantron mode, if the award for any response is |
|
# assigned score, then the part gets an assigned score |
|
if ($final_scantron |
|
&& grep {$_ eq 'ASSIGNED_SCORE'} (@$awardref)) { |
|
return ('ASSIGNED_SCORE'); |
|
} |
|
|
|
# if in scantron mode, if the award for any response is |
|
# correct and there are non-correct responses, |
|
# then the part gets an assigned score |
|
if ($final_scantron |
|
&& (grep { $_ eq 'EXACT_ANS' || |
|
$_ eq 'APPROX_ANS' } (@$awardref)) |
|
&& (grep { $_ ne 'EXACT_ANS' && |
|
$_ ne 'APPROX_ANS' } (@$awardref))) { |
|
return ('ASSIGNED_SCORE'); |
|
} |
# these awards are ordered from most important error through best correct |
# these awards are ordered from most important error through best correct |
|
my $awards = (!$reverse) ? \%fwd_awards : \%rev_awards ; |
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', |
|
'TOO_LONG', |
my $best = $max; |
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', |
my $j=0; |
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
my $which; |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', |
foreach my $award (@$awardref) { |
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', |
if ($awards->{$award} < $best) { |
'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', |
$best = $awards->{$award}; |
'APPROX_ANS', 'EXACT_ANS'); |
$which = $j; |
if ($reverse) { @awards=reverse(@awards); } |
} |
foreach my $possibleaward (@awards) { |
$j++; |
($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref); |
} |
if (defined($result)) { return ($result,$msg); } |
|
|
if (defined($which)) { |
|
if (ref($nameref)) { |
|
return ($$awardref[$which],$$msgref[$which],$$nameref[$which]); |
|
} else { |
|
return ($$awardref[$which],$$msgref[$which]); |
|
} |
} |
} |
return ('ERROR',undef); |
return ('ERROR',undef); |
} |
} |
|
} |
|
|
sub decideoutput { |
sub decideoutput { |
my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_; |
my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_; |
my $message=''; |
my $message=''; |
my $button=0; |
my $button=0; |
my $previousmsg; |
my $previousmsg; |
my $bgcolor='orange'; |
my $css_class='orange'; |
my $added_computer_text=0; |
my $added_computer_text=0; |
my %possiblecolors = |
my %possible_class = |
( 'correct' => '#aaffaa', |
( 'correct' => 'LC_answer_correct', |
'charged_try' => '#ffaaaa', |
'charged_try' => 'LC_answer_charged_try', |
'not_charged_try' => '#ffffaa', |
'not_charged_try' => 'LC_answer_not_charged_try', |
'no_message' => '#fffff', |
'no_grade' => 'LC_answer_no_grade', |
|
'no_message' => 'LC_no_message', |
); |
); |
|
|
my $part = $Apache::inputtags::part; |
my $part = $Apache::inputtags::part; |
Line 551 sub decideoutput {
|
Line 646 sub decideoutput {
|
if ($previous) { $previousmsg=&mt('You have entered that answer before'); } |
if ($previous) { $previousmsg=&mt('You have entered that answer before'); } |
|
|
if ($solved =~ /^correct/) { |
if ($solved =~ /^correct/) { |
$bgcolor=$possiblecolors{'correct'}; |
$css_class=$possible_class{'correct'}; |
$message=&mt('You are correct.'); |
$message=&mt('You are correct.'); |
if ($awarded < 1 && $awarded > 0) { |
if ($awarded < 1 && $awarded > 0) { |
$message=&mt('You are partially correct.'); |
$message=&mt('You are partially correct.'); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
} elsif ($awarded < 1) { |
} elsif ($awarded < 1) { |
$message=&mt('Incorrect.'); |
$message=&mt('Incorrect.'); |
$bgcolor=$possiblecolors{'charged_try'}; |
$css_class=$possible_class{'charged_try'}; |
} |
} |
if ($env{'request.filename'} =~ |
if ($env{'request.filename'} =~ |
m|/res/lib/templates/examupload.problem$|) { |
m|/res/lib/templates/examupload.problem$|) { |
Line 572 sub decideoutput {
|
Line 667 sub decideoutput {
|
$message.= $computer; |
$message.= $computer; |
} |
} |
$added_computer_text=1; |
$added_computer_text=1; |
unless ($env{'course.'. |
my ($symb) = &Apache::lonnet::whichuser(); |
$env{'request.course.id'}. |
if (($symb ne '') |
'.disable_receipt_display'} eq 'yes') { |
&& |
|
($env{'course.'.$env{'request.course.id'}. |
|
'.disable_receipt_display'} ne '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). |
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); |
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); |
Line 588 sub decideoutput {
|
Line 685 sub decideoutput {
|
} else { |
} else { |
$message = "<b>".&mt('You are excused from the problem.')."</b>"; |
$message = "<b>".&mt('You are excused from the problem.')."</b>"; |
} |
} |
$bgcolor=$possiblecolors{'charged_try'}; |
$css_class=$possible_class{'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 = &mt("Incorrect")."."; |
$message = &mt("Incorrect")."."; |
$bgcolor=$possiblecolors{'charged_try'}; |
$css_class=$possible_class{'charged_try'}; |
$button=1; |
$button=1; |
} else { |
} else { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
Line 611 sub decideoutput {
|
Line 708 sub decideoutput {
|
'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part). |
'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part). |
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); |
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); |
} |
} |
$bgcolor=$possiblecolors{'correct'}; |
$css_class=$possible_class{'correct'}; |
$button=0; |
$button=0; |
$previousmsg=''; |
$previousmsg=''; |
} |
} |
} elsif ($award eq 'NO_RESPONSE') { |
} elsif ($award eq 'NO_RESPONSE') { |
$message = ''; |
$message = ''; |
$bgcolor=$possiblecolors{'no_feedback'}; |
$css_class=$possible_class{'no_feedback'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'EXTRA_ANSWER') { |
} elsif ($award eq 'EXTRA_ANSWER') { |
$message = &mt('Some extra items were submitted.'); |
$message = &mt('Some extra items were submitted.'); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button = 1; |
$button = 1; |
} elsif ($award eq 'MISSING_ANSWER') { |
} elsif ($award eq 'MISSING_ANSWER') { |
$message = &mt('Some items were not submitted.'); |
$message = &mt('Some items were not submitted.'); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button = 1; |
$button = 1; |
} elsif ($award eq 'ERROR') { |
} elsif ($award eq 'ERROR') { |
$message = &mt('An error occured while grading your answer.'); |
$message = &mt('An error occured while grading your answer.'); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button = 1; |
$button = 1; |
} elsif ($award eq 'TOO_LONG') { |
} elsif ($award eq 'TOO_LONG') { |
$message = &mt("The submitted answer was too long."); |
$message = &mt("The submitted answer was too long."); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'WANTED_NUMERIC') { |
} elsif ($award eq 'WANTED_NUMERIC') { |
$message = &mt("This question expects a numeric answer."); |
$message = &mt("This question expects a numeric answer."); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} 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'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'INVALID_FILETYPE') { |
} elsif ($award eq 'INVALID_FILETYPE') { |
$message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.'); |
$message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.'); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'SIG_FAIL') { |
} elsif ($award eq 'SIG_FAIL') { |
my ($used,$min,$max)=split(':',$awardmsg); |
my ($used,$min,$max)=split(':',$awardmsg); |
my $word; |
my $word = ($used < $min) ? 'more' : 'fewer'; |
if ($used < $min) { $word=&mt('more'); } |
$message = &mt("Submission not graded. Use $word digits.",$used); |
if ($used > $max) { $word=&mt('fewer'); } |
$css_class=$possible_class{'not_charged_try'}; |
$message = &mt("Submission not graded. Use [_2] digits.",$used,$word); |
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
|
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') { |
} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') { |
$message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg); |
$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');} |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_INVALID_STUDENT') { |
} elsif ($award eq 'UNIT_INVALID_STUDENT') { |
$message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target)); |
$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');} |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') { |
} 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)); |
$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');} |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'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 "[_1]".',&markup_unit($awardmsg,$target)); |
$message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target)); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'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'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'COMMA_FAIL') { |
} elsif ($award eq 'COMMA_FAIL') { |
$message = &mt("Proper comma separation is required").'.'; |
$message = &mt("Proper comma separation is required").'.'; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$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'}; |
$css_class=$possible_class{'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'}; |
$css_class=$possible_class{'charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'SUBMITTED') { |
} elsif ($award eq 'SUBMITTED') { |
$message = &mt("Your submission has been recorded."); |
$message = &mt("Your submission has been recorded."); |
$bgcolor=$possiblecolors{'correct'}; |
$css_class=$possible_class{'no_grade'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'DRAFT') { |
} elsif ($award eq 'DRAFT') { |
$message = &mt("A draft copy has been saved."); |
$message = &mt("A draft copy has been saved."); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'ASSIGNED_SCORE') { |
} elsif ($award eq 'ASSIGNED_SCORE') { |
$message = &mt("A score has been assigned."); |
$message = &mt("A score has been assigned."); |
$bgcolor=$possiblecolors{'correct'}; |
$css_class=$possible_class{'correct'}; |
$button=0; |
$button=0; |
} elsif ($award eq '') { |
} elsif ($award eq '') { |
if ($handgrade && $Apache::inputtags::status[-1] eq 'SHOW_ANSWER') { |
if ($handgrade && $Apache::inputtags::status[-1] eq 'SHOW_ANSWER') { |
$message = &mt("Nothing submitted."); |
$message = &mt("Nothing submitted."); |
$bgcolor=$possiblecolors{'charged_try'}; |
$css_class=$possible_class{'charged_try'}; |
} else { |
} else { |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
} |
} |
$button=1; |
$button=1; |
} else { |
} else { |
$message = &mt("Unknown message").": $award"; |
$message = &mt("Unknown message").": $award"; |
$button=1; |
$button=1; |
} |
} |
my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser(); |
my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser(); |
foreach my $resid(@Apache::inputtags::response){ |
foreach my $resid(@Apache::inputtags::response){ |
&Apache::lonnet::logthis("handback is ".$Apache::lonhomework::history{"resource.$part.$resid.handback"}); |
|
if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) { |
if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) { |
$message.= '<br /><a href="/uploaded/'."$domain/$user".'/portfolio/'.$Apache::lonhomework::history{"resource.$part.$resid.handback"}.'">Returned File</a>'; |
$message.='<br />'; |
} |
my @files = split(/\s*,\s*/, |
|
$Apache::lonhomework::history{"resource.$part.$resid.handback"}); |
|
my $file_msg; |
|
foreach my $file (@files) { |
|
$file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>'; |
|
} |
|
$message .= &mt('Returned file(s): [_1]',$file_msg); |
|
} |
} |
} |
|
|
if (lc($Apache::lonhomework::problemstatus) eq 'no' && |
if (&Apache::lonhomework::hide_problem_status() |
$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') { |
&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER' |
|
&& &hide_award($award)) { |
$message = &mt("Answer Submitted: Your final submission will be graded after the due date."); |
$message = &mt("Answer Submitted: Your final submission will be graded after the due date."); |
$bgcolor=$possiblecolors{'correct'}; |
$css_class=$possible_class{'no_grade'}; |
$button=1; |
$button=1; |
} |
} |
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && |
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && |
Line 737 sub decideoutput {
|
Line 839 sub decideoutput {
|
$message.= $computer; |
$message.= $computer; |
$added_computer_text=1; |
$added_computer_text=1; |
} |
} |
return ($button,$bgcolor,$message,$previousmsg); |
return ($button,$css_class,$message,$previousmsg); |
} |
} |
|
|
sub markup_unit { |
sub markup_unit { |
Line 790 sub setgradedata {
|
Line 892 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/ || $Apache::lonhomework::scantronmode || |
/^correct/ |
lc($Apache::lonhomework::problemstatus) eq 'no') { |
|| $Apache::lonhomework::scantronmode |
|
|| &Apache::lonhomework::hide_problem_status() ) { |
# the student doesn't already have it correct, |
# the student doesn't already have it correct, |
# or we are in a mode (scantron orno problem status) where a correct |
# or we are in a mode (scantron orno problem status) where a correct |
# can become incorrect |
# can become incorrect |
Line 813 sub setgradedata {
|
Line 916 sub setgradedata {
|
my $numawards=scalar(@Apache::inputtags::response); |
my $numawards=scalar(@Apache::inputtags::response); |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
foreach my $res (@Apache::inputtags::response) { |
foreach my $res (@Apache::inputtags::response) { |
$Apache::lonhomework::results{"resource.$id.awarded"}+= |
if (defined($Apache::lonhomework::results{"resource.$id.$res.awarded"})) { |
$Apache::lonhomework::results{"resource.$id.$res.awarded"}; |
$Apache::lonhomework::results{"resource.$id.awarded"}+= |
|
$Apache::lonhomework::results{"resource.$id.$res.awarded"}; |
|
} else { |
|
$Apache::lonhomework::results{"resource.$id.awarded"}+= |
|
&awarddetail_to_awarded($Apache::lonhomework::results{"resource.$id.$res.awarddetail"}); |
|
} |
} |
} |
if ($numawards > 0) { |
if ($numawards > 0) { |
$Apache::lonhomework::results{"resource.$id.awarded"}/= |
$Apache::lonhomework::results{"resource.$id.awarded"}/= |
Line 829 sub setgradedata {
|
Line 937 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 (&Apache::lonhomework::hide_problem_status() |
$Apache::lonhomework::scantronmode) { |
|| $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 849 sub setgradedata {
|
Line 957 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 (&Apache::lonhomework::show_no_problem_status() |
$Apache::lonhomework::scantronmode) { |
|| $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 (&Apache::lonhomework::show_some_problem_status()) { |
|
# clear out the awarded if they had gotten it wrong/right |
|
# and are now in an error mode |
|
$Apache::lonhomework::results{"resource.$id.awarded"} = ''; |
|
} |
} |
} |
if (defined($msg)) { |
if (defined($msg)) { |
$Apache::lonhomework::results{"resource.$id.awardmsg"} = $msg; |
$Apache::lonhomework::results{"resource.$id.awardmsg"} = $msg; |
Line 868 sub setgradedata {
|
Line 982 sub setgradedata {
|
# 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') { |
if (lc($Apache::lonhomework::problemstatus) ne 'no') { |
if (&Apache::lonhomework::show_problem_status()) { |
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'; |
} |
} |
Line 895 sub setgradedata {
|
Line 1009 sub setgradedata {
|
} |
} |
} |
} |
|
|
|
sub find_which_previous { |
|
my ($version) = @_; |
|
my $part = $Apache::inputtags::part; |
|
my (@previous_version); |
|
foreach my $resp (@Apache::inputtags::response) { |
|
my $key = "$version:resource.$part.$resp.submission"; |
|
my $submission = $Apache::lonhomework::history{$key}; |
|
my %previous = &Apache::response::check_for_previous($submission, |
|
$part,$resp, |
|
$version); |
|
push(@previous_version,$previous{'version'}); |
|
} |
|
return &previous_match(\@previous_version, |
|
scalar(@Apache::inputtags::response)); |
|
} |
|
|
|
sub previous_match { |
|
my ($previous_array,$count) = @_; |
|
my $match = 0; |
|
my @matches; |
|
foreach my $versionar (@$previous_array) { |
|
foreach my $version (@$versionar) { |
|
$matches[$version]++; |
|
} |
|
} |
|
my $which=0; |
|
foreach my $elem (@matches) { |
|
if ($elem eq $count) { |
|
$match=1; |
|
last; |
|
} |
|
$which++; |
|
} |
|
return ($match,$which); |
|
} |
|
|
sub grade { |
sub grade { |
my ($target) = @_; |
my ($target) = @_; |
my $id = $Apache::inputtags::part; |
my $id = $Apache::inputtags::part; |
Line 910 sub grade {
|
Line 1060 sub grade {
|
&Apache::lonxml::debug("got message $value from $response for $id"); |
&Apache::lonxml::debug("got message $value from $response for $id"); |
push (@msgs,$value); |
push (@msgs,$value); |
} |
} |
my ($finalaward,$msg) = &finalizeawards(\@awards,\@msgs); |
my ($finalaward,$msg) = |
|
&finalizeawards(\@awards,\@msgs,undef,undef, |
|
$Apache::lonhomework::scantronmode); |
my $previously_used; |
my $previously_used; |
if ( $#Apache::inputtags::previous eq $#awards ) { |
if ( $#Apache::inputtags::previous eq $#awards ) { |
my $match=0; |
my ($match) = |
my @matches; |
&previous_match(\@Apache::inputtags::previous_version, |
foreach my $versionar (@Apache::inputtags::previous_version) { |
scalar(@Apache::inputtags::response)); |
foreach my $version (@$versionar) { |
|
$matches[$version]++; |
|
} |
|
} |
|
foreach my $elem (@matches) {if ($elem eq ($#awards+1)) {$match=1;}} |
|
if ($match) { |
if ($match) { |
$previously_used = 'PREVIOUSLY_LAST'; |
$previously_used = 'PREVIOUSLY_LAST'; |
foreach my $value (@Apache::inputtags::previous) { |
foreach my $value (@Apache::inputtags::previous) { |
Line 937 sub grade {
|
Line 1085 sub grade {
|
return ''; |
return ''; |
} |
} |
|
|
|
sub get_grade_messages { |
|
my ($id,$prefix,$target,$status) = @_; |
|
|
|
my ($message,$latemessage,$trystr,$previousmsg); |
|
my $showbutton = 1; |
|
|
|
my $award = $Apache::lonhomework::history{"$prefix.award"}; |
|
my $awarded = $Apache::lonhomework::history{"$prefix.awarded"}; |
|
my $solved = $Apache::lonhomework::history{"$prefix.solved"}; |
|
my $previous = $Apache::lonhomework::history{"$prefix.previous"}; |
|
my $awardmsg = $Apache::lonhomework::history{"$prefix.awardmsg"}; |
|
&Apache::lonxml::debug("Found Award |$award|$solved|$awardmsg"); |
|
if ( $award ne '' || $solved ne '' || $status eq 'SHOW_ANSWER') { |
|
&Apache::lonxml::debug('Getting message'); |
|
($showbutton,my $css_class,$message,$previousmsg) = |
|
&decideoutput($award,$awarded,$awardmsg,$solved,$previous, |
|
$target); |
|
if ($target eq 'tex') { |
|
$message='\vskip 2 mm '.$message.' '; |
|
} else { |
|
$message="<td class=\"$css_class\">$message</td>"; |
|
if ($previousmsg) { |
|
$previousmsg="<td class=\"LC_answer_previous\">$previousmsg</td>"; |
|
} |
|
} |
|
} |
|
my $tries = $Apache::lonhomework::history{"$prefix.tries"}; |
|
my $maxtries = &Apache::lonnet::EXT("resource.$id.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 ( $maxtries eq '' ) { $maxtries = '2'; } |
|
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
|
my $tries_text=&mt('Tries'); |
|
if ( $Apache::lonhomework::type eq 'survey' || |
|
$Apache::lonhomework::parsing_a_task) { |
|
$tries_text=&mt('Submissions'); |
|
} |
|
|
|
if ($showbutton) { |
|
if ($target eq 'tex') { |
|
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 '; |
|
} else { |
|
$trystr = '\vskip 0 mm '; |
|
} |
|
} else { |
|
$trystr = "<td><nobr>".$tries_text." $tries"; |
|
if ($Apache::lonhomework::parsing_a_task) { |
|
} elsif($env{'request.state'} ne 'construct') { |
|
$trystr.="/$maxtries"; |
|
} else { |
|
if (defined($Apache::inputtags::params{'maxtries'})) { |
|
$trystr.="/".$Apache::inputtags::params{'maxtries'}; |
|
} |
|
} |
|
$trystr.="</nobr></td>"; |
|
} |
|
} |
|
|
|
if ($Apache::lonhomework::history{"$prefix.afterduedate"}) { |
|
#last submissions was after due date |
|
$latemessage=&mt(' The last submission was after the Due Date ');; |
|
if ($target eq 'web') { |
|
$latemessage='<td class="LC_answer_late">'.$latemessage.'</td>'; |
|
} |
|
} |
|
return ($previousmsg,$latemessage,$message,$trystr,$showbutton); |
|
} |
|
|
sub gradestatus { |
sub gradestatus { |
my ($id,$target) = @_; |
my ($id,$target,$no_previous) = @_; |
my $showbutton = 1; |
my $showbutton = 1; |
my $bgcolor = ''; |
|
my $message = ''; |
my $message = ''; |
my $latemessage = ''; |
my $latemessage = ''; |
my $trystr=''; |
my $trystr=''; |
Line 954 sub gradestatus {
|
Line 1175 sub gradestatus {
|
&& $status ne 'INVALID_ACCESS' |
&& $status ne 'INVALID_ACCESS' |
&& $status ne 'NEEDS_CHECKIN' |
&& $status ne 'NEEDS_CHECKIN' |
&& $status ne 'NOT_IN_A_SLOT') { |
&& $status ne 'NOT_IN_A_SLOT') { |
my $award = $Apache::lonhomework::history{"resource.$id.award"}; |
|
my $awarded = $Apache::lonhomework::history{"resource.$id.awarded"}; |
($previousmsg,$latemessage,$message,$trystr) = |
my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; |
&get_grade_messages($id,"resource.$id",$target,$status, |
my $previous = $Apache::lonhomework::history{"resource.$id.previous"}; |
$showbutton); |
my $awardmsg = $Apache::lonhomework::history{"resource.$id.awardmsg"}; |
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') { |
&Apache::lonxml::debug("Found Award |$award|$solved|$awardmsg"); |
$showbutton = 0; |
if ( $award ne '' || $solved ne '' || $status eq 'SHOW_ANSWER') { |
|
&Apache::lonxml::debug('Getting message'); |
|
($showbutton,$bgcolor,$message,$previousmsg) = |
|
&decideoutput($award,$awarded,$awardmsg,$solved,$previous, |
|
$target); |
|
if ($target eq 'tex') { |
|
$message='\vskip 2 mm '.$message.' '; |
|
} else { |
|
$message="<td bgcolor=\"$bgcolor\">$message</td>"; |
|
if ($previousmsg) { |
|
$previousmsg="<td bgcolor=\"#aaaaff\">$previousmsg</td>"; |
|
} |
|
} |
|
} |
|
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
|
my $maxtries = &Apache::lonnet::EXT("resource.$id.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 ( $maxtries eq '' ) { $maxtries = '2'; } |
|
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
|
my $tries_text=&mt('Tries'); |
|
if ( $Apache::lonhomework::type eq 'survey' || |
|
$Apache::lonhomework::parsing_a_task) { |
|
$tries_text=&mt('Submissions'); |
|
} |
} |
if ( $showbutton ) { |
if ( $status eq 'SHOW_ANSWER') { |
if ($target eq 'tex') { |
undef($previousmsg); |
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 '; |
|
} else { |
|
$trystr = '\vskip 0 mm '; |
|
} |
|
} else { |
|
$trystr = "<td><nobr>".$tries_text." $tries"; |
|
if ($Apache::lonhomework::parsing_a_task) { |
|
} elsif($env{'request.state'} ne 'construct') { |
|
$trystr.="/$maxtries"; |
|
} else { |
|
if (defined($Apache::inputtags::params{'maxtries'})) { |
|
$trystr.="/".$Apache::inputtags::params{'maxtries'}; |
|
} |
|
} |
|
$trystr.="</nobr></td>"; |
|
} |
|
} |
} |
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_'.$id.'" value="'.&mt('Submit Answer').'" />'; |
$button = |
} |
'<input |
} |
onmouseup="javascript:setSubmittedPart(\''.$id.'\')" |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
onsubmit="javascript:setSubmittedPart(\''.$id.'\')" |
#last submissions was after due date |
type="submit" name="submit_'.$id.'" |
$latemessage=&mt(' The last submission was after the Due Date ');; |
value="'.&mt('Submit Answer').'" />'; |
if ($target eq 'web') { |
|
$latemessage='<td bgcolor="#ffaaaa">'.$latemessage.'</td>'; |
|
} |
} |
} |
} |
|
|
} |
} |
my $output= $previousmsg.$latemessage.$message.$trystr; |
my $output= $previousmsg.$latemessage.$message.$trystr; |
if ($output =~ /^\s*$/) { |
if ($output =~ /^\s*$/) { |
Line 1028 sub gradestatus {
|
Line 1204 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 '<table><tr><td>'.$button.'</td>'.$output.'</tr></table>'; |
$output = |
|
'<table><tr><td>'.$button.'</td>'.$output; |
|
if (!$no_previous) { |
|
$output.='<td>'.&previous_tries($id,$target).'</td>'; |
|
} |
|
$output.= '</tr></table>'; |
|
return $output; |
|
} |
|
} |
|
} |
|
|
|
sub previous_tries { |
|
my ($id,$target) = @_; |
|
my $output; |
|
my $status = $Apache::inputtags::status['-1']; |
|
|
|
my $count; |
|
my %count_lookup; |
|
|
|
foreach my $i (1..$Apache::lonhomework::history{'version'}) { |
|
my $prefix = $i.":resource.$id"; |
|
|
|
next if (!exists($Apache::lonhomework::history{"$prefix.award"})); |
|
$count++; |
|
$count_lookup{$i} = $count; |
|
|
|
my ($previousmsg,$latemessage,$message,$trystr); |
|
|
|
($previousmsg,$latemessage,$message,$trystr) = |
|
&get_grade_messages($id,"$prefix",$target,$status); |
|
|
|
if ($previousmsg ne '') { |
|
my ($match,$which) = &find_which_previous($i); |
|
$message=$previousmsg; |
|
my $previous = $count_lookup{$which}; |
|
$message =~ s{(</td>)}{ as submission \# $previous $1}; |
|
} elsif ($Apache::lonhomework::history{"$prefix.tries"}) { |
|
if (!(&Apache::lonhomework::hide_problem_status() |
|
&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') |
|
&& $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/ |
|
) { |
|
|
|
$message =~ s{(<td.*?>)(.*?)(</td>)} |
|
{$1 <strong>Correct</strong>. $3}s; |
|
} |
|
my $trystr = "(Try ". |
|
$Apache::lonhomework::history{"$prefix.tries"}.')'; |
|
$message =~ s{(</td>)}{ $trystr $1}; |
|
} |
|
my ($class) = ($message =~ m{<td.*class="([^"]*)"}); #" |
|
$message =~ s{(<td.*?>)}{<td>}; |
|
|
|
|
|
$output.='<tr class="'.$class.'">'; |
|
$output.='<td align="center">'.$count.'</td>'; |
|
$output.=$message; |
|
|
|
foreach my $resid (@Apache::inputtags::response) { |
|
my $prefix = $prefix.".$resid"; |
|
if (exists($Apache::lonhomework::history{"$prefix.submission"})) { |
|
my $submission = |
|
$Apache::inputtags::submission_display{"$prefix.submission"}; |
|
if (!defined($submission)) { |
|
$submission = |
|
$Apache::lonhomework::history{"$prefix.submission"}; |
|
} |
|
$output.='<td>'.$submission.'</td>'; |
|
} else { |
|
$output.='<td></td>'; |
|
} |
} |
} |
|
$output.=&Apache::loncommon::end_data_table_row()."\n"; |
} |
} |
|
return if ($output eq ''); |
|
my $headers = |
|
'<tr>'.'<th>'.&mt('Submission #').'</th><th>'.&mt('Try'). |
|
'</th><th colspan="'.scalar(@Apache::inputtags::response).'">'. |
|
&mt('Submitted Answer').'</th>'; |
|
$output ='<table class="LC_prior_tries">'.$headers.$output.'</table>'; |
|
#return $output; |
|
$output = &Apache::loncommon::js_ready($output); |
|
$output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>'; |
|
|
|
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
|
my $start_page = |
|
&Apache::loncommon::start_page('Previous Tries', undef, |
|
{'only_body' => 1, |
|
'bgcolor' => '#FFFFFF', |
|
'js_ready' => 1, |
|
'inherit_jsmath' => 1, }); |
|
my $end_page = |
|
&Apache::loncommon::end_page({'js_ready' => 1,}); |
|
my $prefix = $env{'form.request.prefix'}; |
|
$prefix =~ tr{.}{_}; |
|
my $function_name = "LONCAPA_previous_tries_".$prefix. |
|
$Apache::lonxml::curdepth.'_'.$env{'form.counter'}; |
|
my $result ="<script type=\"text/javascript\"> |
|
// <![CDATA[ |
|
function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()} |
|
// ]]> |
|
</script><a href=\"javascript:$function_name();void(0);\">".&mt("Previous Tries")."</a><br />"; |
|
#use Data::Dumper; |
|
#&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display)); |
|
return $result; |
} |
} |
|
|
1; |
1; |
__END__ |
__END__ |
|
|