--- loncom/homework/inputtags.pm 2005/03/01 03:23:16 1.158
+++ loncom/homework/inputtags.pm 2005/04/08 19:39:32 1.166
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.158 2005/03/01 03:23:16 albertel Exp $
+# $Id: inputtags.pm,v 1.166 2005/04/08 19:39:32 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,6 +30,7 @@ use HTML::Entities();
use strict;
use Apache::loncommon;
use Apache::lonlocal;
+use Apache::lonnet;
BEGIN {
&Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
@@ -148,9 +149,9 @@ sub start_textfield {
}
} elsif ($target eq 'grade') {
my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser);
- if ($seedtext eq $ENV{'form.HWVAL_'.$resid}) {
+ if ($seedtext eq $env{'form.HWVAL_'.$resid}) {
# if the seed text is still there it wasn't a real submission
- $ENV{'form.HWVAL_'.$resid}='';
+ $env{'form.HWVAL_'.$resid}='';
}
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
@@ -294,6 +295,65 @@ sub end_hiddenline {
return "";
}
+# $part -> partid
+# $id -> responseid
+# $uploadefiletypes -> comma seperated list of extensions allowed or * for any
+# $which -> 'uploadedonly' -> only newly uploaded files
+# 'portfolioonly' -> only allow files from portfolio
+# 'both' -> allow files from either location
+# returns a table row
+sub file_selector {
+ my ($part,$id,$uploadedfiletypes,$which)=@_;
+ if (!$uploadedfiletypes) { return ''; }
+ my $result;
+
+ $result.='
';
+ 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)').
+ '
';
+ my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
+
+ if ($uploadedfile) {
+ my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+ push (@Apache::lonxml::extlinks,$url);
+ &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
+ my $icon=&Apache::loncommon::icon($url);
+ my $curfile=''.$uploadedfile.'';
+ $result.=&mt('Currently submitted: [_1]',$curfile);
+ } else {
+ #$result.=&mt('(Hand in a file you have prepared on your computer)');
+ }
+ }
+ if ( $which eq 'both') {
+ $result.=' '.''.&mt('OR:').' ';
+ }
+ if ($which eq 'portfolioonly' || $which eq 'both') {
+ $result.=''.
+ &mt('Select Portfolio Files').' '.
+ ''.
+ ' ';
+ if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
+ 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);
+ push(@filelist,''.$file.'');
+ }
+ $result.=&mt("Portfolio files previously selected: [_1]",join(', ',@filelist));
+ }
+ }
+ $result.='
';
+ return $result;
+}
+
sub checkstatus {
my ($value,$awardref,$msgref)=@_;
for (my $i=0;$i<=$#$awardref;$i++) {
@@ -362,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).
@@ -395,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).
@@ -429,12 +489,12 @@ sub decideoutput {
} elsif ($award eq 'MISORDERED_RANK') {
$message = &mt('You have provided an invalid ranking');
if ($target ne 'tex') {
- $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
+ $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems');
}
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'INVALID_FILETYPE') {
- $message = &mt('The filetype extension of the file you uploaded is not allowed.');
+ $message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'SIG_FAIL') {
@@ -550,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"}='';
}
@@ -670,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");
@@ -749,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'})) {
@@ -777,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='