--- loncom/homework/essayresponse.pm 2004/12/06 18:09:54 1.52
+++ loncom/homework/essayresponse.pm 2005/04/05 15:38:57 1.61
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# essay (ungraded) style responses
#
-# $Id: essayresponse.pm,v 1.52 2004/12/06 18:09:54 banghart Exp $
+# $Id: essayresponse.pm,v 1.61 2005/04/05 15:38:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -48,7 +48,6 @@ sub start_essayresponse {
my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
$uploadedfiletypes=~s/[^\w\,]//g;
- my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
$result='<br /><table border="1">';
$result.='<tr><td>'.
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
@@ -64,34 +63,8 @@ sub start_essayresponse {
$result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
$result .='</td></tr>';
}
- if ($uploadedfiletypes) {
- $result.='<tr><td>'.&mt('Submit a file:').
- ' <br /><input type="file" size="50" name="HWFILE'.
- $part.'_'.$id.'" onFocus="this.form.enctype='.
- "'multipart/form-data'".';" /><br />'.
- &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'.
- '<strong>OR:</strong><br /><a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname=HWPORT'.$part.'_'.$id.'","cat","height=600,'.
- 'width=600,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>Select Portfolio Files</a>'.
- '<br />'.
- '<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.
- '<br />';
- if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
- $result.="Portfolio files previously selected: <strong>".&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"})."</strong><br />";
- }
-
- if ($uploadedfile) {
- my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
- push (@Apache::lonxml::extlinks,$url);
- &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
- my $curfile='<a href="'.$url.
- '"><img src="/adm/lonIcons/unknown.gif" border=0" /> '.
- $uploadedfile.'</a>';
- $result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile);
- } else {
- $result.=&mt('(Hand in a file you have prepared on your computer)');
- }
- $result.='</td></tr>';
- }
+ $result.=&Apache::inputtags::file_selector($part,$id,
+ $uploadedfiletypes,'both');
$result.='</table>';
}
return $result;
@@ -110,45 +83,20 @@ sub end_essayresponse {
$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
if ($collaborators ne $previous_list);
}
- if ( defined($ENV{'form.submitted'}) &&
- $ENV{'form.submitted'} eq 'scantron' ) {
+ if ( &Apache::response::submitted('scantron') ) {
$increment=&Apache::response::scored_response($part,$id);
- } elsif ( defined($ENV{'form.submitted'}) ) {
+ } elsif ( &Apache::response::submitted() ) {
my $response = $ENV{'form.HWVAL_'.$id};
my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id};
if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {
- my $award;
+ my $award='DRAFT';
if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
$award='SUBMITTED';
- } else {
- $award='DRAFT';
}
my $uploadedflag=0;
- if ($filename =~ /[^\s]/) {
- my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
- $uploadedfiletypes=~s/[^\w\,]//g;
- $uploadedfiletypes=','.$uploadedfiletypes.',';
- my ($extension)=($filename=~/\.(\w+)$/);
- if ($uploadedfiletypes=~/\,$extension\,/i) {
- $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;
- $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
- &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,'essayresponse');
- $uploadedflag=1;
- } else {
- $award='INVALID_FILETYPE';
- }
- }
- if ($portfiles =~ /[^\s]/) {
- $portfiles =~s/,$//;
- $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
- my @submitted_files = split /,/,$portfiles;
- my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
- &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
- &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid);
- &Apache::lonnet::clear_selected_files($name);
- $uploadedflag=1;
- }
+ &file_submission($part,$id,'filename',$award,\$uploadedflag);
+ &file_submission($part,$id,'portfiles',$award,\$uploadedflag);
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
my %previous=&Apache::response::check_for_previous($response,$part,$id);
@@ -198,6 +146,51 @@ sub end_essayresponse {
return $result;
}
+sub file_submission {
+ my ($part,$id,$which,$award,$uploadedflag)=@_;
+ my $files;
+ if ($which eq 'portfiles') { $files= $ENV{'form.HWPORT'.$part.'_'.$id}; }
+ if ($which eq 'filename') {
+ $files = $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
+ }
+
+ if ($files =~ /[^\s]/) {
+ $files =~s/,$//;
+ $Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;
+ my @submitted_files = split(/,/,$files);
+ my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
+ $uploadedfiletypes=~s/[^\w\,]//g;
+ $uploadedfiletypes=','.$uploadedfiletypes.',';
+ foreach my $file (@submitted_files) {
+ my ($extension)=($file=~/\.(\w+)$/);
+ unless ($uploadedfiletypes=~/\,$extension\,/i) {
+ $award='INVALID_FILETYPE';
+ }
+ }
+ if ($award ne 'INVALID_FILETYPE' && ref($uploadedflag)) {
+ $$uploadedflag=1;
+ }
+ if ($award ne 'INVALID_FILETYPE' && $which eq 'portfiles') {
+ my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+ &Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid);
+ &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$symb.$crsid);
+ &Apache::lonnet::clear_selected_files($name);
+ }
+ if ($award ne 'INVALID_FILETYPE' && $which eq 'filename') {
+ $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=
+ $files;
+ $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
+ &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,
+ 'essayresponse');
+ }
+ } elsif ($which eq 'portfiles' &&
+ $Apache::lonhomework::history{"resource.$part.$id.$which"}) {
+ my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+ &Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid);
+ $Apache::lonhomework::results{"resource.$part.$id.$which"}="";
+ }
+}
+
sub check_collaborators {
my ($ncol,$coll) = @_;
my %classlist=&Apache::lonnet::dump('classlist',