version 1.247, 2008/09/11 14:47:17
|
version 1.258, 2009/05/23 18:11:06
|
Line 25
|
Line 25
|
# |
# |
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
|
|
|
=pod |
|
|
|
=head1 NAME |
|
|
|
Apache::inputtags |
|
|
|
=head1 SYNOPSIS |
|
|
|
|
|
|
|
This is part of the LearningOnline Network with CAPA project |
|
described at http://www.lon-capa.org. |
|
|
|
|
|
=head1 NOTABLE SUBROUTINES |
|
|
|
=over |
|
|
|
=item |
|
|
|
=back |
|
|
|
=cut |
|
|
package Apache::inputtags; |
package Apache::inputtags; |
use HTML::Entities(); |
use HTML::Entities(); |
use strict; |
use strict; |
Line 38 BEGIN {
|
Line 62 BEGIN {
|
&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); |
&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline')); |
} |
} |
|
|
# Initializes a set of global variables used during the parse of the problem. |
=pod |
# |
|
# @Apache::inputtags::input - List of current input ids. |
=item initialize_inputtags() |
# @Apache::inputtags::inputlist - List of all input ids seen this problem. |
|
# @Apache::inputtags::response - List of all current resopnse ids. |
Initializes a set of global variables used during the parse of the problem. |
# @Apache::inputtags::responselist - List of all response ids seen this |
|
# problem. |
@Apache::inputtags::input - List of current input ids. |
# @Apache::inputtags::hint - List of all hint ids. |
@Apache::inputtags::inputlist - List of all input ids seen this problem. |
# @Apache::inputtags::hintlist - List of all hint ids seen this problem. |
@Apache::inputtags::response - List of all current resopnse ids. |
# @Apache::inputtags::previous - List describing if specific responseds |
@Apache::inputtags::responselist - List of all response ids seen this |
# have been used |
problem. |
# @Apache::inputtags::previous_version - Submission responses were used in. |
@Apache::inputtags::hint - List of all hint ids. |
# $Apache::inputtags::part - Current part id (valid only in |
@Apache::inputtags::hintlist - List of all hint ids seen this problem. |
# <problem>) |
@Apache::inputtags::previous - List describing if specific responseds |
# 0 if not in a part. |
have been used |
# @Apache::inputtags::partlist - List of part ids seen in the current |
@Apache::inputtags::previous_version - Submission responses were used in. |
# <problem> |
$Apache::inputtags::part - Current part id (valid only in |
# @Apache::inputtags::status - List of problem statuses. First |
<problem>) |
# element is the status of the <problem> |
0 if not in a part. |
# the remainder are for individual <part>s. |
@Apache::inputtags::partlist - List of part ids seen in the current |
# %Apache::inputtags::params - Hash of defined parameters for the |
<problem> |
# current response. |
@Apache::inputtags::status - List of problem statuses. First |
# @Apache::inputtags::import - List of all ids for <import> thes get |
element is the status of the <problem> |
# join()ed and prepended. |
the remainder are for individual <part>s. |
# @Apache::inputtags::importlist - List of all import ids seen. |
%Apache::inputtags::params - Hash of defined parameters for the |
# $Apache::inputtags::response_with_no_part |
current response. |
# - Flag set true if we have seen a response |
@Apache::inputtags::import - List of all ids for <import> thes get |
# that is not inside a <part> |
join()ed and prepended. |
# %Apache::inputtags::answertxt - <*response> tags store correct |
@Apache::inputtags::importlist - List of all import ids seen. |
# answer strings for display by <textline/> |
$Apache::inputtags::response_with_no_part |
# in this hash. |
- Flag set true if we have seen a response |
# %Apache::inputtags::submission_display |
that is not inside a <part> |
# - <*response> tags store improved display |
%Apache::inputtags::answertxt - <*response> tags store correct |
# of submission strings for display by part |
answer strings for display by <textline/> |
# end. |
in this hash. |
|
%Apache::inputtags::submission_display |
|
- <*response> tags store improved display |
|
of submission strings for display by part |
|
end. |
|
|
|
=cut |
|
|
sub initialize_inputtags { |
sub initialize_inputtags { |
@Apache::inputtags::input=(); |
@Apache::inputtags::input=(); |
Line 358 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'. |
Line 424 sub end_hiddenline {
|
Line 455 sub end_hiddenline {
|
return ""; |
return ""; |
} |
} |
|
|
# $part -> partid |
=pod |
# $id -> responseid |
|
# $uploadefiletypes -> comma seperated list of extensions allowed or * for any |
=item file_selector() |
# $which -> 'uploadedonly' -> only newly uploaded files |
|
# 'portfolioonly' -> only allow files from portfolio |
$part -> partid |
# 'both' -> allow files from either location |
$id -> responseid |
# $extratext -> additional text to go between the link and the input box |
$uploadefiletypes -> comma seperated list of extensions allowed or * for any |
# returns a table row <tr> |
$which -> 'uploadonly' -> only newly uploaded files |
|
'portfolioonly' -> only allow files from portfolio |
|
'both' -> allow files from either location |
|
$extratext -> additional text to go between the link and the input box |
|
$maxfilesize -> maximum cumulative filesize for submitted files (in MB). |
|
returns a table row <tr> |
|
|
|
=cut |
|
|
sub file_selector { |
sub file_selector { |
my ($part,$id,$uploadedfiletypes,$which,$extratext)=@_; |
my ($part,$id,$uploadedfiletypes,$which,$extratext,$maxfilesize)=@_; |
if (!$uploadedfiletypes) { return ''; } |
if (!$uploadedfiletypes) { return ''; } |
|
|
my $jspart=$part; |
my $jspart=$part; |
Line 442 sub file_selector {
|
Line 481 sub file_selector {
|
my $result; |
my $result; |
|
|
$result.='<tr><td>'; |
$result.='<tr><td>'; |
if ($uploadedfiletypes ne '*') { |
if (($uploadedfiletypes ne '*') || ($maxfilesize)) { |
$result.= |
if ($uploadedfiletypes ne '*') { |
&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'; |
$result.= |
|
&mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />'; |
|
} |
|
if ($maxfilesize) { |
|
$result.=&mt('Combined size of files not to exceed: [_1] MB[_2].', |
|
'<b>'.$maxfilesize.'</b>').'<br />'; |
|
} |
|
$result .= '<br />'; |
} |
} |
if ($which eq 'uploadonly' || $which eq 'both') { |
if ($which eq 'uploadonly' || $which eq 'both') { |
$result.=&mt('Submit a file: (only one file can be uploaded)'). |
$result.=&mt('Submit a file: (only one file can be uploaded)'). |
Line 461 sub file_selector {
|
Line 507 sub file_selector {
|
'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'. |
'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'. |
'<br />'; |
'<br />'; |
$result .= &show_past_portfile_submission($part,$id); |
$result .= &show_past_portfile_submission($part,$id); |
|
|
} |
} |
$result.='</td></tr>'; |
$result.='</td></tr>'; |
return $result; |
return $result; |
Line 479 sub show_past_file_submission {
|
Line 524 sub show_past_file_submission {
|
my $icon=&Apache::loncommon::icon($url); |
my $icon=&Apache::loncommon::icon($url); |
my $curfile='<a href="'.$url.'"><img src="'.$icon. |
my $curfile='<a href="'.$url.'"><img src="'.$icon. |
'" border="0" />'.$uploadedfile.'</a>'; |
'" border="0" />'.$uploadedfile.'</a>'; |
return &mt('Currently submitted: <tt>[_1]</tt>',$curfile); |
return &mt('Currently submitted: [_1]','<tt>'.$curfile.'</tt>'); |
|
|
} |
} |
|
|
Line 509 sub show_past_portfile_submission {
|
Line 554 sub show_past_portfile_submission {
|
my $bad_files = '<span class="LC_filename">'. |
my $bad_files = '<span class="LC_filename">'. |
join('</span>, <span class="LC_filename">',@bad_file_list). |
join('</span>, <span class="LC_filename">',@bad_file_list). |
'</span>'; |
'</span>'; |
$result.='<br />'.&mt('<span class="LC_error">These file(s) don\'t exist:</span> [_1]',$bad_files); |
$result.='<p><span class="LC_error">' |
|
.&mt("These file(s) don't exist: [_1]",$bad_files) |
|
.'</span></p>'; |
} |
} |
return $result; |
return $result; |
|
|
Line 523 sub valid_award {
|
Line 570 sub valid_award {
|
'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', |
'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', |
'UNIT_FAIL', 'NO_UNIT', |
'UNIT_FAIL', 'NO_UNIT', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', |
'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', |
'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', |
'EXCESS_FILESIZE', 'DRAFT', |
|
'SUBMITTED', 'ASSIGNED_SCORE', |
'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') { |
'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') { |
if ($award eq $possibleaward) { return 1; } |
if ($award eq $possibleaward) { return 1; } |
} |
} |
Line 537 sub valid_award {
|
Line 585 sub valid_award {
|
'TOO_LONG', |
'TOO_LONG', |
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', |
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', |
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR', |
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', |
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', |
'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', |
'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED', |
'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; |
my $max=scalar(@awards); |
my $max=scalar(@awards); |
Line 585 sub finalizeawards {
|
Line 633 sub finalizeawards {
|
return ('NO_RESPONSE'); |
return ('NO_RESPONSE'); |
} |
} |
} |
} |
|
|
|
if ($Apache::lonxml::internal_error) { $result='INTERNAL_ERROR'; } |
|
|
if (!$final_scantron && defined($result)) { return ($result); } |
if (!$final_scantron && defined($result)) { return ($result); } |
|
|
# if in scantron mode, if the award for any response is |
# if in scantron mode, if the award for any response is |
Line 631 sub finalizeawards {
|
Line 682 sub finalizeawards {
|
|
|
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; |
Line 684 sub decideoutput {
|
Line 736 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 761 sub decideoutput {
|
Line 813 sub decideoutput {
|
} |
} |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
|
} elsif ($award eq 'EXCESS_FILESIZE') { |
|
$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.'); |
|
$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') { |
my ($used,$min,$max)=split(':',$awardmsg); |
my ($used,$min,$max)=split(':',$awardmsg); |
my $word = ($used < $min) ? 'more' : 'fewer'; |
my $word = ($used < $min) ? 'more' : 'fewer'; |
$message = &mt("Submission not graded. Use $word digits.",$used); |
$message = &mt("Submission not graded. Use $word digits.",$used); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') { |
} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') { |
Line 804 sub decideoutput {
|
Line 860 sub decideoutput {
|
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')}; |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')}; |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
|
} elsif ($award eq 'INTERNAL_ERROR') { |
|
$message = &mt("An internal error occurred while processing your answer. Please try again later."); |
|
$css_class=$possible_class{'not_charged_try'}; |
|
$button=1; |
} elsif ($award eq 'INCORRECT') { |
} elsif ($award eq 'INCORRECT') { |
$message = &mt("Incorrect").'.'; |
$message = &mt("Incorrect").'.'; |
$css_class=$possible_class{'charged_try'}; |
$css_class=$possible_class{'charged_try'}; |
Line 813 sub decideoutput {
|
Line 873 sub decideoutput {
|
$css_class=$possible_class{'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("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 835 sub decideoutput {
|
Line 895 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 1164 sub get_grade_messages {
|
Line 1237 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">'.$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 1173 sub get_grade_messages {
|
Line 1246 sub get_grade_messages {
|
$trystr.="/".$Apache::inputtags::params{'maxtries'}; |
$trystr.="/".$Apache::inputtags::params{'maxtries'}; |
} |
} |
} |
} |
$trystr.="</nobr></td>"; |
$trystr.="</span></td>"; |
} |
} |
} |
} |
|
|
Line 1340 sub previous_tries {
|
Line 1413 sub previous_tries {
|
|
|
1; |
1; |
__END__ |
__END__ |
|
|
|
=pod |
|
|
|
=back |
|
|
|
=cut |
|
|