--- loncom/homework/inputtags.pm 2008/11/25 13:16:17 1.249
+++ loncom/homework/inputtags.pm 2010/06/17 00:13:20 1.264
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.249 2008/11/25 13:16:17 jms Exp $
+# $Id: inputtags.pm,v 1.264 2010/06/17 00:13:20 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -388,12 +388,13 @@ sub start_textline {
&& $Apache::lonhomework::type ne 'exam') {
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
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'}.
'&part_'. $Apache::inputtags::part.
'&textresponse'.
'&HWVAL_' . $Apache::inputtags::response['-1'];
- $result="\n\\\\\n".'\textField{'.$fieldname.'}{'.$size.'}{12 bp}';
+ $result='\textField{'.$fieldname.'}{'.$size.'}{12 bp}';
} else {
$result='\framebox['.$size.'][s]{\tiny\strut}';
}
@@ -461,16 +462,17 @@ sub end_hiddenline {
$part -> partid
$id -> responseid
$uploadefiletypes -> comma seperated list of extensions allowed or * for any
-$which -> 'uploadedonly' -> only newly uploaded files
+$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
=cut
sub file_selector {
- my ($part,$id,$uploadedfiletypes,$which,$extratext)=@_;
+ my ($part,$id,$uploadedfiletypes,$which,$extratext,$maxfilesize)=@_;
if (!$uploadedfiletypes) { return ''; }
my $jspart=$part;
@@ -479,9 +481,16 @@ sub file_selector {
my $result;
$result.=' ';
- if ($uploadedfiletypes ne '*') {
- $result.=
- &mt('Allowed filetypes: [_1] ',$uploadedfiletypes).' ';
+ if (($uploadedfiletypes ne '*') || ($maxfilesize)) {
+ if ($uploadedfiletypes ne '*') {
+ $result.=
+ &mt('Allowed filetypes: [_1]',''.$uploadedfiletypes.' ').' ';
+ }
+ if ($maxfilesize) {
+ $result.=&mt('Combined size of files not to exceed: [_1] MB[_2].',
+ ''.$maxfilesize.' ').' ';
+ }
+ $result .= ' ';
}
if ($which eq 'uploadonly' || $which eq 'both') {
$result.=&mt('Submit a file: (only one file can be uploaded)').
@@ -498,7 +507,6 @@ sub file_selector {
' '.
' ';
$result .= &show_past_portfile_submission($part,$id);
-
}
$result.=' ';
return $result;
@@ -516,7 +524,7 @@ sub show_past_file_submission {
my $icon=&Apache::loncommon::icon($url);
my $curfile=' '.$uploadedfile.' ';
- return &mt('Currently submitted: [_1] ',$curfile);
+ return &mt('Currently submitted: [_1]',''.$curfile.' ');
}
@@ -546,7 +554,9 @@ sub show_past_portfile_submission {
my $bad_files = ''.
join(' , ',@bad_file_list).
' ';
- $result.=' '.&mt('These file(s) don\'t exist: [_1]',$bad_files);
+ $result.=''
+ .&mt("These file(s) don't exist: [_1]",$bad_files)
+ .'
';
}
return $result;
@@ -560,11 +570,13 @@ sub valid_award {
'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',
'UNIT_FAIL', 'NO_UNIT',
'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
- 'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT',
+ 'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT',
'MISORDERED_RANK', 'INVALID_FILETYPE',
- 'EXCESS_FILESIZE', 'DRAFT',
- 'SUBMITTED', 'ASSIGNED_SCORE',
- 'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
+ 'EXCESS_FILESIZE', 'FILENAME_INUSE',
+ 'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT',
+ 'ANONYMOUS', 'ANONYMOUS_CREDIT',
+ 'ASSIGNED_SCORE', 'APPROX_ANS',
+ 'EXACT_ANS','COMMA_FAIL') {
if ($award eq $possibleaward) { return 1; }
}
return 0;
@@ -575,9 +587,11 @@ sub valid_award {
'TOO_LONG',
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
'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',
- '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');
my $i=0;
my %fwd_awards = map { ($_,$i++) } @awards;
@@ -601,7 +615,7 @@ sub hide_award {
return 1;
}
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 0;
@@ -623,6 +637,9 @@ sub finalizeawards {
return ('NO_RESPONSE');
}
}
+
+ if ($Apache::lonxml::internal_error) { $result='INTERNAL_ERROR'; }
+
if (!$final_scantron && defined($result)) { return ($result); }
# if in scantron mode, if the award for any response is
@@ -669,6 +686,7 @@ sub finalizeawards {
sub decideoutput {
my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_;
+
my $message='';
my $button=0;
my $previousmsg;
@@ -722,7 +740,7 @@ sub decideoutput {
'.disable_receipt_display'} ne 'yes') &&
($Apache::lonhomework::type ne 'practice')) {
$message.=(($target eq 'web')?' ':' ').
- &mt('Your receipt is [_1]',
+ &mt('Your receipt no. is [_1]',
(&Apache::lonnet::receipt($Apache::inputtags::part).
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
}
@@ -803,15 +821,24 @@ sub decideoutput {
$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 'FILENAME_INUSE') {
+ $message = &mt('You have already uploaded a file with that filename.');
+ if ($target eq 'tex') {
+ $message.= "\\\\\n";
+ } else {
+ $message .= ' ';
+ }
+ $message .= &mt('Please use a different file name.');
+ $css_class=$possible_class{'not_charged_try'};
+ $button=1;
} 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'};
$button=1;
} elsif ($award eq 'SIG_FAIL') {
my ($used,$min,$max)=split(':',$awardmsg);
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'};
$button=1;
} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
@@ -847,6 +874,10 @@ sub decideoutput {
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')};
$css_class=$possible_class{'not_charged_try'};
$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') {
$message = &mt("Incorrect").'.';
$css_class=$possible_class{'charged_try'};
@@ -855,8 +886,19 @@ sub decideoutput {
$message = &mt("Your submission has been recorded.");
$css_class=$possible_class{'no_grade'};
$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') {
- $message = &mt("A draft copy has been saved.");
+ $message = &mt("Copy saved but not submitted.");
$css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'ASSIGNED_SCORE') {
@@ -878,14 +920,27 @@ sub decideoutput {
my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
foreach my $resid(@Apache::inputtags::response){
if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {
- $message.=' ';
+ if ($target eq 'tex') {
+ $message.= "\\\\\n";
+ } else {
+ $message.=' ';
+ }
my @files = split(/\s*,\s*/,
$Apache::lonhomework::history{"resource.$part.$resid.handback"});
my $file_msg;
foreach my $file (@files) {
- $file_msg.= ''.$file.' ';
+ if ($target eq 'tex') {
+ $file_msg.= "\\\\\n".$file;
+ } else {
+ $file_msg.= ''.$file.' ';
+ }
}
$message .= &mt('Returned file(s): [_1]',$file_msg);
+ if ($target eq 'tex') {
+ $message.= "\\\\\n";
+ } else {
+ $message.=' ';
+ }
}
}
@@ -1005,6 +1060,18 @@ sub setgradedata {
$Apache::lonhomework::results{"resource.$id.solved"} =
$solvemsg;
$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' ) {
$Apache::lonhomework::results{"resource.$id.tries"} =
$Apache::lonhomework::history{"resource.$id.tries"} + 1;
@@ -1019,6 +1086,11 @@ sub setgradedata {
$Apache::lonhomework::history{"resource.$id.tries"} + 1;
$Apache::lonhomework::results{"resource.$id.solved"} =
'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' ) {
$Apache::lonhomework::results{"resource.$id.solved"} = '';
} elsif ( $award eq 'NO_RESPONSE' ) {
@@ -1078,6 +1150,10 @@ sub setgradedata {
if ($award eq 'SUBMITTED') {
&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 {
@@ -1190,12 +1266,7 @@ sub get_grade_messages {
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');
- }
-
+ my $tries_text= &get_tries_text();;
if ($showbutton) {
if ($target eq 'tex') {
if ($env{'request.state'} ne "construct"
@@ -1207,7 +1278,7 @@ sub get_grade_messages {
$trystr = '\vskip 0 mm ';
}
} else {
- $trystr = "".$tries_text." $tries";
+ $trystr = ''.&mt($tries_text)." $tries";
if ($Apache::lonhomework::parsing_a_task) {
} elsif($env{'request.state'} ne 'construct') {
$trystr.="/$maxtries";
@@ -1216,7 +1287,7 @@ sub get_grade_messages {
$trystr.="/".$Apache::inputtags::params{'maxtries'};
}
}
- $trystr.=" ";
+ $trystr.=" ";
}
}
@@ -1259,11 +1330,9 @@ sub gradestatus {
if ( $showbutton ) {
if ($target ne 'tex') {
$button =
- ' ';
+ ' ';
}
}
@@ -1296,7 +1365,13 @@ sub previous_tries {
foreach my $i (1..$Apache::lonhomework::history{'version'}) {
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"}));
$count++;
$count_lookup{$i} = $count;
@@ -1341,7 +1416,11 @@ sub previous_tries {
$submission =
$Apache::lonhomework::history{"$prefix.submission"};
}
- $output.=''.$submission.' ';
+ if ($is_anon) {
+ $output.=''.&mt('(only shown to submitter)').' ';
+ } else {
+ $output.=''.$submission.' ';
+ }
} else {
$output.=' ';
}
@@ -1359,8 +1438,9 @@ sub previous_tries {
$output.=' ';
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
+ my $tries_text = &get_tries_text('link');
my $start_page =
- &Apache::loncommon::start_page('Previous Tries', undef,
+ &Apache::loncommon::start_page($tries_text, undef,
{'only_body' => 1,
'bgcolor' => '#FFFFFF',
'js_ready' => 1,
@@ -1375,12 +1455,34 @@ sub previous_tries {
//
-".&mt("Previous Tries")." ";
+".&mt($tries_text)." ";
#use Data::Dumper;
#&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
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;
__END__