version 1.224, 2007/05/21 22:57:17
|
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 116 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 449 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 541 sub valid_award {
|
Line 539 sub valid_award {
|
$i=0; |
$i=0; |
my %rev_awards = map { ($_,$i++) } @awards; |
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; |
my $result; |
if ($#$awardref == -1) { $result = "NO_RESPONSE"; } |
if ($#$awardref == -1) { $result = "NO_RESPONSE"; } |
if ($result eq '' ) { |
if ($result eq '' ) { |
Line 553 sub finalizeawards {
|
Line 572 sub finalizeawards {
|
$blankcount++; |
$blankcount++; |
} |
} |
} |
} |
if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; } |
if ($blankcount == ($#$awardref + 1)) { |
|
return ('NO_RESPONSE'); |
|
} |
} |
} |
if (defined($result)) { return ($result); } |
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 = (!$reverse) ? \%fwd_awards : \%rev_awards ; |
|
|
Line 570 sub finalizeawards {
|
Line 608 sub finalizeawards {
|
} |
} |
$j++; |
$j++; |
} |
} |
|
|
if (defined($which)) { |
if (defined($which)) { |
if (ref($nameref)) { |
if (ref($nameref)) { |
return ($$awardref[$which],$$msgref[$which],$$nameref[$which]); |
return ($$awardref[$which],$$msgref[$which],$$nameref[$which]); |
Line 637 sub decideoutput {
|
Line 676 sub decideoutput {
|
&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'):''); |
} |
} |
&Apache::lonnet::logthis(" er \n$symb\n$message\n".$env{'course.'. |
|
$env{'request.course.id'}. |
|
'.disable_receipt_display'}); |
|
} |
} |
$button=0; |
$button=0; |
$previousmsg=''; |
$previousmsg=''; |
Line 791 sub decideoutput {
|
Line 827 sub decideoutput {
|
} |
} |
} |
} |
|
|
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."); |
$css_class=$possible_class{'no_grade'}; |
$css_class=$possible_class{'no_grade'}; |
$button=1; |
$button=1; |
Line 855 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 878 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 894 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 914 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 933 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 1011 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) = |
my ($match) = |
Line 1136 sub gradestatus {
|
Line 1187 sub gradestatus {
|
} |
} |
if ( $showbutton ) { |
if ( $showbutton ) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$button = '<input onsubmit="javascript:setSubmittedPart(\''.$id.'\')" type="submit" name="submit_'.$id.'" value="'.&mt('Submit Answer').'" />'; |
$button = |
|
'<input |
|
onmouseup="javascript:setSubmittedPart(\''.$id.'\')" |
|
onsubmit="javascript:setSubmittedPart(\''.$id.'\')" |
|
type="submit" name="submit_'.$id.'" |
|
value="'.&mt('Submit Answer').'" />'; |
} |
} |
} |
} |
|
|
Line 1183 sub previous_tries {
|
Line 1239 sub previous_tries {
|
my ($match,$which) = &find_which_previous($i); |
my ($match,$which) = &find_which_previous($i); |
$message=$previousmsg; |
$message=$previousmsg; |
my $previous = $count_lookup{$which}; |
my $previous = $count_lookup{$which}; |
$message =~ s{(</td>)}{ as submission # $previous $1}; |
$message =~ s{(</td>)}{ as submission \# $previous $1}; |
} elsif ($Apache::lonhomework::history{"$prefix.tries"}) { |
} elsif ($Apache::lonhomework::history{"$prefix.tries"}) { |
if ( $Apache::lonhomework::history{"$prefix.solved"} =~ |
if (!(&Apache::lonhomework::hide_problem_status() |
/^correct/) { |
&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') |
|
&& $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/ |
|
) { |
|
|
$message =~ s{(<td.*?>)(.*?)(</td>)} |
$message =~ s{(<td.*?>)(.*?)(</td>)} |
{$1 <strong>Correct</strong>. $3}; |
{$1 <strong>Correct</strong>. $3}s; |
} |
} |
my $trystr = "(Try ". |
my $trystr = "(Try ". |
$Apache::lonhomework::history{"$prefix.tries"}.')'; |
$Apache::lonhomework::history{"$prefix.tries"}.')'; |
Line 1225 sub previous_tries {
|
Line 1284 sub previous_tries {
|
&mt('Submitted Answer').'</th>'; |
&mt('Submitted Answer').'</th>'; |
$output ='<table class="LC_prior_tries">'.$headers.$output.'</table>'; |
$output ='<table class="LC_prior_tries">'.$headers.$output.'</table>'; |
#return $output; |
#return $output; |
$output=~s/\\/\\\\/g; |
$output = &Apache::loncommon::js_ready($output); |
$output=~s/\'/\\\'/g; |
$output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>'; |
$output=~s/\s+/ /g; |
|
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
my $start_page = |
my $start_page = |
&Apache::loncommon::start_page('Previous Tries', undef, |
&Apache::loncommon::start_page('Previous Tries', undef, |
{'only_body' => 1, |
{'only_body' => 1, |
'bgcolor' => '#FFFFFF', |
'bgcolor' => '#FFFFFF', |
'js_ready' => 1,}); |
'js_ready' => 1, |
|
'inherit_jsmath' => 1, }); |
my $end_page = |
my $end_page = |
&Apache::loncommon::end_page({'js_ready' => 1,}); |
&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\"> |
my $result ="<script type=\"text/javascript\"> |
// <![CDATA[ |
// <![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()} |
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:LONCAPA_previous_tries_$Apache::lonxml::curdepth();void(0);\">".&mt("Previous Tries")."</a><br />"; |
</script><a href=\"javascript:$function_name();void(0);\">".&mt("Previous Tries")."</a><br />"; |
#use Data::Dumper; |
#use Data::Dumper; |
#&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display)); |
#&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display)); |
return $result; |
return $result; |