version 1.209, 2006/10/17 15:11:11
|
version 1.230, 2007/09/18 22:18:41
|
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 283 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 $id = &start_input($parstack,$safeeval); |
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; |
Line 292 sub start_textline {
|
Line 295 sub start_textline {
|
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 313 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 365 sub end_textline {
|
Line 377 sub end_textline {
|
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 393 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 428 sub file_selector {
|
Line 447 sub file_selector {
|
$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 />'; |
Line 565 sub decideoutput {
|
Line 584 sub decideoutput {
|
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_grade' => '#ffffaa', |
'no_grade' => 'LC_answer_no_grade', |
'no_message' => '#ffffff', |
'no_message' => 'LC_no_message', |
); |
); |
|
|
my $part = $Apache::inputtags::part; |
my $part = $Apache::inputtags::part; |
Line 586 sub decideoutput {
|
Line 605 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 607 sub decideoutput {
|
Line 626 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 623 sub decideoutput {
|
Line 644 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 646 sub decideoutput {
|
Line 667 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{'no_grade'}; |
$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 { |
Line 770 sub decideoutput {
|
Line 789 sub decideoutput {
|
if (lc($Apache::lonhomework::problemstatus) eq 'no' && |
if (lc($Apache::lonhomework::problemstatus) eq 'no' && |
$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') { |
$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') { |
$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{'no_grade'}; |
$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 778 sub decideoutput {
|
Line 797 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 936 sub setgradedata {
|
Line 955 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 954 sub grade {
|
Line 1009 sub grade {
|
my ($finalaward,$msg) = &finalizeawards(\@awards,\@msgs); |
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) = |
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 978 sub grade {
|
Line 1029 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 995 sub gradestatus {
|
Line 1119 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"}; |
if ( $status eq 'SHOW_ANSWER') { |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
undef($previousmsg); |
&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 ( $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 1069 sub gradestatus {
|
Line 1148 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 (!(lc($Apache::lonhomework::problemstatus) eq 'no' |
|
&& $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 $result ="<script type=\"text/javascript\"> |
|
// <![CDATA[ |
|
function LONCAPA_previous_tries_$Apache::lonxml::curdepth() {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:LONCAPA_previous_tries_$Apache::lonxml::curdepth();void(0);\">".&mt("Previous Tries")."</a><br />"; |
|
#use Data::Dumper; |
|
#&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display)); |
|
return $result; |
|
} |
|
|
1; |
1; |
__END__ |
__END__ |
|
|