';
+ if ($uploadedfiletypes ne '*') {
+ $result.=
+ &mt('Allowed filetypes: [_1]',$uploadedfiletypes).' ';
+ }
if ($which eq 'uploadonly' || $which eq 'both') {
$result.=&mt('Submit a file: (only one file can be uploaded)').
' '.
' ';
if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
- my $filelist;
+ my @filelist;
foreach my $file (split(',',&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
my $url="/uploaded/$domain/$user/portfolio$file";
my $icon=&Apache::loncommon::icon($url);
- $filelist.=''.$file.'';
+ push(@filelist,''.$file.'');
}
- $result.=&mt("Portfolio files previously selected: [_1]",$filelist);
+ $result.=&mt("Portfolio files previously selected: [_1]",join(', ',@filelist));
}
}
$result.='
';
@@ -418,8 +422,8 @@ sub decideoutput {
$message.=" ".&mt("Computer's answer now shown above.");
}
$added_computer_text=1;
- unless ($ENV{'course.'.
- $ENV{'request.course.id'}.
+ unless ($env{'course.'.
+ $env{'request.course.id'}.
'.disable_receipt_display'} eq 'yes') {
$message.=(($target eq 'web')?' ':' ').
&mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
@@ -451,8 +455,8 @@ sub decideoutput {
$message.=" ".&mt("Computer's answer now shown above.");
}
$added_computer_text=1;
- unless ($ENV{'course.'.
- $ENV{'request.course.id'}.
+ unless ($env{'course.'.
+ $env{'request.course.id'}.
'.disable_receipt_display'} eq 'yes') {
$message.=(($target eq 'web')?' ':' ').
'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part).
@@ -606,10 +610,10 @@ sub hidealldata {
sub setgradedata {
my ($award,$msg,$id,$previously_used) = @_;
if ($Apache::lonhomework::scantronmode &&
- &Apache::lonnet::validCODE($ENV{'form.CODE'})) {
- $Apache::lonhomework::results{"resource.CODE"}=$ENV{'form.CODE'};
+ &Apache::lonnet::validCODE($env{'form.CODE'})) {
+ $Apache::lonhomework::results{"resource.CODE"}=$env{'form.CODE'};
} elsif ($Apache::lonhomework::scantronmode &&
- $ENV{'form.CODE'} eq '' &&
+ $env{'form.CODE'} eq '' &&
$Apache::lonhomework::history{"resource.CODE"} ne '') {
$Apache::lonhomework::results{"resource.CODE"}='';
}
@@ -726,7 +730,7 @@ sub grade {
my ($target) = @_;
my $id = $Apache::inputtags::part;
my $response='';
- if ( defined $ENV{'form.submitted'}) {
+ if ( defined $env{'form.submitted'}) {
my (@awards,@msgs);
foreach $response (@Apache::inputtags::response) {
&Apache::lonxml::debug("looking for response.$id.$response.awarddetail");
@@ -805,17 +809,21 @@ sub gradestatus {
if ( $maxtries eq '' ) { $maxtries = '2'; }
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }
my $tries_text=&mt('Tries');
- if ( $Apache::lonhomework::type eq 'survey') { $tries_text=&mt('Submissions'); }
+ 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') {
+ 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 = "
".$tries_text." $tries";
- if($ENV{'request.state'} ne 'construct') {
+ if ($Apache::lonhomework::parsing_a_task) {
+ } elsif($env{'request.state'} ne 'construct') {
$trystr.="/$maxtries";
} else {
if (defined($Apache::inputtags::params{'maxtries'})) {
@@ -833,10 +841,9 @@ sub gradestatus {
}
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
#last submissions was after due date
- if ($target eq 'tex') {
- $latemessage=' The last submission was after the Due Date ';
- } else {
- $latemessage="
The last submission was after the Due Date
";
+ $latemessage=&mt(' The last submission was after the Due Date ');;
+ if ($target eq 'web') {
+ $latemessage='