version 1.252, 2008/12/09 00:27:20
|
version 1.264, 2010/06/17 00:13:20
|
Line 388 sub start_textline {
|
Line 388 sub start_textline {
|
&& $Apache::lonhomework::type ne 'exam') { |
&& $Apache::lonhomework::type ne 'exam') { |
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';} |
if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';} |
if ($env{'form.pdfFormFields'} eq 'yes') { |
if ($env{'form.pdfFormFields'} eq 'yes' |
|
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
my $fieldname = $env{'request.symb'}. |
my $fieldname = $env{'request.symb'}. |
'&part_'. $Apache::inputtags::part. |
'&part_'. $Apache::inputtags::part. |
'&textresponse'. |
'&textresponse'. |
'&HWVAL_' . $Apache::inputtags::response['-1']; |
'&HWVAL_' . $Apache::inputtags::response['-1']; |
$result="\n\\\\\n".'\textField{'.$fieldname.'}{'.$size.'}{12 bp}'; |
$result='\textField{'.$fieldname.'}{'.$size.'}{12 bp}'; |
} else { |
} else { |
$result='\framebox['.$size.'][s]{\tiny\strut}'; |
$result='\framebox['.$size.'][s]{\tiny\strut}'; |
} |
} |
Line 571 sub valid_award {
|
Line 572 sub valid_award {
|
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', |
'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', |
'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'EXCESS_FILESIZE', 'DRAFT', |
'EXCESS_FILESIZE', 'FILENAME_INUSE', |
'SUBMITTED', 'ASSIGNED_SCORE', |
'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT', |
'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') { |
'ANONYMOUS', 'ANONYMOUS_CREDIT', |
|
'ASSIGNED_SCORE', 'APPROX_ANS', |
|
'EXACT_ANS','COMMA_FAIL') { |
if ($award eq $possibleaward) { return 1; } |
if ($award eq $possibleaward) { return 1; } |
} |
} |
return 0; |
return 0; |
Line 586 sub valid_award {
|
Line 589 sub valid_award {
|
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR', |
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', |
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', |
'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED', |
'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE', |
|
'DRAFT', 'SUBMITTED', |
|
'SUBMITTED_CREDIT', 'ANONYMOUS', 'ANONYMOUS_CREDIT', |
'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS'); |
'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS'); |
my $i=0; |
my $i=0; |
my %fwd_awards = map { ($_,$i++) } @awards; |
my %fwd_awards = map { ($_,$i++) } @awards; |
Line 610 sub hide_award {
|
Line 615 sub hide_award {
|
return 1; |
return 1; |
} |
} |
if ($award =~ |
if ($award =~ |
/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|ASSIGNED_SCORE|INCORRECT)/) { |
/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|SUBMITTED_CREDIT|ANONYMOUS|ANONYMOUS_CREDIT|ASSIGNED_SCORE|INCORRECT)/) { |
return 1; |
return 1; |
} |
} |
return 0; |
return 0; |
Line 735 sub decideoutput {
|
Line 740 sub decideoutput {
|
'.disable_receipt_display'} ne 'yes') && |
'.disable_receipt_display'} ne 'yes') && |
($Apache::lonhomework::type ne 'practice')) { |
($Apache::lonhomework::type ne 'practice')) { |
$message.=(($target eq 'web')?'<br />':' '). |
$message.=(($target eq 'web')?'<br />':' '). |
&mt('Your receipt is [_1]', |
&mt('Your receipt no. is [_1]', |
(&Apache::lonnet::receipt($Apache::inputtags::part). |
(&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 816 sub decideoutput {
|
Line 821 sub decideoutput {
|
$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.'); |
$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.'); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
|
} elsif ($award eq 'FILENAME_INUSE') { |
|
$message = &mt('You have already uploaded a file with that filename.'); |
|
if ($target eq 'tex') { |
|
$message.= "\\\\\n"; |
|
} else { |
|
$message .= '<br />'; |
|
} |
|
$message .= &mt('Please use a different file name.'); |
|
$css_class=$possible_class{'not_charged_try'}; |
|
$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."); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'SIG_FAIL') { |
} elsif ($award eq 'SIG_FAIL') { |
Line 871 sub decideoutput {
|
Line 886 sub decideoutput {
|
$message = &mt("Your submission has been recorded."); |
$message = &mt("Your submission has been recorded."); |
$css_class=$possible_class{'no_grade'}; |
$css_class=$possible_class{'no_grade'}; |
$button=1; |
$button=1; |
|
} elsif ($award eq 'SUBMITTED_CREDIT') { |
|
$message = &mt("Your submission has been recorded, and credit awarded."); |
|
$css_class=$possible_class{'correct'}; |
|
$button=1; |
|
} elsif ($award eq 'ANONYMOUS') { |
|
$message = &mt("Your anonymous submission has been recorded."); |
|
$css_class=$possible_class{'no_grade'}; |
|
$button=1; |
|
} elsif ($award eq 'ANONYMOUS_CREDIT') { |
|
$message = &mt("Your anonymous submission has been recorded, and credit awarded."); |
|
$css_class=$possible_class{'correct'}; |
} elsif ($award eq 'DRAFT') { |
} elsif ($award eq 'DRAFT') { |
$message = &mt("A draft copy has been saved."); |
$message = &mt("Copy saved but not submitted."); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'ASSIGNED_SCORE') { |
} elsif ($award eq 'ASSIGNED_SCORE') { |
Line 894 sub decideoutput {
|
Line 920 sub decideoutput {
|
my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser(); |
my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser(); |
foreach my $resid(@Apache::inputtags::response){ |
foreach my $resid(@Apache::inputtags::response){ |
if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) { |
if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) { |
$message.='<br />'; |
if ($target eq 'tex') { |
|
$message.= "\\\\\n"; |
|
} else { |
|
$message.='<br />'; |
|
} |
my @files = split(/\s*,\s*/, |
my @files = split(/\s*,\s*/, |
$Apache::lonhomework::history{"resource.$part.$resid.handback"}); |
$Apache::lonhomework::history{"resource.$part.$resid.handback"}); |
my $file_msg; |
my $file_msg; |
foreach my $file (@files) { |
foreach my $file (@files) { |
$file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>'; |
if ($target eq 'tex') { |
|
$file_msg.= "\\\\\n".$file; |
|
} else { |
|
$file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>'; |
|
} |
} |
} |
$message .= &mt('Returned file(s): [_1]',$file_msg); |
$message .= &mt('Returned file(s): [_1]',$file_msg); |
|
if ($target eq 'tex') { |
|
$message.= "\\\\\n"; |
|
} else { |
|
$message.='<br />'; |
|
} |
} |
} |
} |
} |
|
|
Line 1021 sub setgradedata {
|
Line 1060 sub setgradedata {
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$solvemsg; |
$solvemsg; |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
|
} elsif ( $award eq 'SUBMITTED_CREDIT' ) { |
|
$Apache::lonhomework::results{"resource.$id.tries"} = |
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
|
'credit_attempted'; |
|
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
|
} elsif ( $award eq 'ANONYMOUS_CREDIT' ) { |
|
$Apache::lonhomework::results{"resource.$id.tries"} = |
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
|
'credit_attempted'; |
|
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
} 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; |
Line 1035 sub setgradedata {
|
Line 1086 sub setgradedata {
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'ungraded_attempted'; |
'ungraded_attempted'; |
|
} elsif ( $award eq 'ANONYMOUS' ) { |
|
$Apache::lonhomework::results{"resource.$id.tries"} = |
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
|
'ungraded_attempted'; |
} elsif ( $award eq 'DRAFT' ) { |
} elsif ( $award eq 'DRAFT' ) { |
$Apache::lonhomework::results{"resource.$id.solved"} = ''; |
$Apache::lonhomework::results{"resource.$id.solved"} = ''; |
} elsif ( $award eq 'NO_RESPONSE' ) { |
} elsif ( $award eq 'NO_RESPONSE' ) { |
Line 1094 sub setgradedata {
|
Line 1150 sub setgradedata {
|
if ($award eq 'SUBMITTED') { |
if ($award eq 'SUBMITTED') { |
&Apache::response::add_to_gradingqueue(); |
&Apache::response::add_to_gradingqueue(); |
} |
} |
|
if (($Apache::lonhomework::type eq 'anonsurvey') || |
|
($Apache::lonhomework::type eq 'anonsurveycred')) { |
|
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type; |
|
} |
} |
} |
|
|
sub find_which_previous { |
sub find_which_previous { |
Line 1206 sub get_grade_messages {
|
Line 1266 sub get_grade_messages {
|
if ( $tries eq '' ) { $tries = '0'; } |
if ( $tries eq '' ) { $tries = '0'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
my $tries_text=&mt('Tries'); |
my $tries_text= &get_tries_text();; |
if ( $Apache::lonhomework::type eq 'survey' || |
|
$Apache::lonhomework::parsing_a_task) { |
|
$tries_text=&mt('Submissions'); |
|
} |
|
|
|
if ($showbutton) { |
if ($showbutton) { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
if ($env{'request.state'} ne "construct" |
if ($env{'request.state'} ne "construct" |
Line 1223 sub get_grade_messages {
|
Line 1278 sub get_grade_messages {
|
$trystr = '\vskip 0 mm '; |
$trystr = '\vskip 0 mm '; |
} |
} |
} else { |
} else { |
$trystr = "<td><nobr>".$tries_text." $tries"; |
$trystr = '<td><span class="LC_nobreak">'.&mt($tries_text)." $tries"; |
if ($Apache::lonhomework::parsing_a_task) { |
if ($Apache::lonhomework::parsing_a_task) { |
} elsif($env{'request.state'} ne 'construct') { |
} elsif($env{'request.state'} ne 'construct') { |
$trystr.="/$maxtries"; |
$trystr.="/$maxtries"; |
Line 1232 sub get_grade_messages {
|
Line 1287 sub get_grade_messages {
|
$trystr.="/".$Apache::inputtags::params{'maxtries'}; |
$trystr.="/".$Apache::inputtags::params{'maxtries'}; |
} |
} |
} |
} |
$trystr.="</nobr></td>"; |
$trystr.="</span></td>"; |
} |
} |
} |
} |
|
|
Line 1275 sub gradestatus {
|
Line 1330 sub gradestatus {
|
if ( $showbutton ) { |
if ( $showbutton ) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$button = |
$button = |
'<input |
'<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';" |
onmouseup="javascript:setSubmittedPart(\''.$id.'\')" |
type="submit" name="submit_'.$id.'" |
onsubmit="javascript:setSubmittedPart(\''.$id.'\')" |
value="'.&mt('Submit Answer').'" />'; |
type="submit" name="submit_'.$id.'" |
|
value="'.&mt('Submit Answer').'" />'; |
|
} |
} |
} |
} |
|
|
Line 1312 sub previous_tries {
|
Line 1365 sub previous_tries {
|
|
|
foreach my $i (1..$Apache::lonhomework::history{'version'}) { |
foreach my $i (1..$Apache::lonhomework::history{'version'}) { |
my $prefix = $i.":resource.$id"; |
my $prefix = $i.":resource.$id"; |
|
my $is_anon; |
|
if (defined($env{'form.grade_symb'})) { |
|
if (($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurvey') || |
|
($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurveycred')) { |
|
$is_anon = 1; |
|
} |
|
} |
next if (!exists($Apache::lonhomework::history{"$prefix.award"})); |
next if (!exists($Apache::lonhomework::history{"$prefix.award"})); |
$count++; |
$count++; |
$count_lookup{$i} = $count; |
$count_lookup{$i} = $count; |
Line 1357 sub previous_tries {
|
Line 1416 sub previous_tries {
|
$submission = |
$submission = |
$Apache::lonhomework::history{"$prefix.submission"}; |
$Apache::lonhomework::history{"$prefix.submission"}; |
} |
} |
$output.='<td>'.$submission.'</td>'; |
if ($is_anon) { |
|
$output.='<td>'.&mt('(only shown to submitter)').'</td>'; |
|
} else { |
|
$output.='<td>'.$submission.'</td>'; |
|
} |
} else { |
} else { |
$output.='<td></td>'; |
$output.='<td></td>'; |
} |
} |
Line 1375 sub previous_tries {
|
Line 1438 sub previous_tries {
|
$output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>'; |
$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 $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
|
my $tries_text = &get_tries_text('link'); |
my $start_page = |
my $start_page = |
&Apache::loncommon::start_page('Previous Tries', undef, |
&Apache::loncommon::start_page($tries_text, undef, |
{'only_body' => 1, |
{'only_body' => 1, |
'bgcolor' => '#FFFFFF', |
'bgcolor' => '#FFFFFF', |
'js_ready' => 1, |
'js_ready' => 1, |
Line 1391 sub previous_tries {
|
Line 1455 sub previous_tries {
|
// <![CDATA[ |
// <![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()} |
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 />"; |
</script><a href=\"javascript:$function_name();void(0);\">".&mt($tries_text)."</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; |
} |
} |
|
|
|
sub get_tries_text { |
|
my ($context) = @_; |
|
my $tries_text; |
|
if ($context eq 'link') { |
|
$tries_text = 'Previous Tries'; |
|
} else { |
|
$tries_text = 'Tries'; |
|
} |
|
if ( $Apache::lonhomework::type eq 'survey' || |
|
$Apache::lonhomework::type eq 'surveycred' || |
|
$Apache::lonhomework::type eq 'anonsurvey' || |
|
$Apache::lonhomework::type eq 'anonsurveycred' || |
|
$Apache::lonhomework::parsing_a_task) { |
|
if ($context eq 'link') { |
|
$tries_text = 'Previous Submissions'; |
|
} else { |
|
$tries_text = 'Submissions'; |
|
} |
|
} |
|
return $tries_text; |
|
} |
|
|
1; |
1; |
__END__ |
__END__ |
|
|