--- loncom/homework/essayresponse.pm 2003/04/29 20:32:21 1.32 +++ loncom/homework/essayresponse.pm 2005/05/03 19:22:58 1.66 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.32 2003/04/29 20:32:21 www Exp $ +# $Id: essayresponse.pm,v 1.66 2005/05/03 19:22:58 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,13 +25,12 @@ # # http://www.lon-capa.org/ # -# 4/3 Guy -# July, 2002, H. K. Ng -# + package Apache::essayresponse; use strict; -use Apache::lonxml; +use Apache::lonxml(); use Apache::lonnet; +use Apache::lonlocal; BEGIN { &Apache::lonxml::register('Apache::essayresponse',('essayresponse')); @@ -45,41 +44,32 @@ sub start_essayresponse { $result=&Apache::response::meta_package_write('essayresponse'); } elsif ($target eq 'web') { my $part= $Apache::inputtags::part; - my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators"); - my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"}); + 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='
'; $result.=''; + '
'. + ''. + ' '; if ($ncol > 0) { - $result .=''; } - if ($uploadedfiletypes) { - $result.= -''; - } + $result.=&Apache::inputtags::file_selector($part,$id, + $uploadedfiletypes,'both'); $result.='
'. - ''. - ' Submit entries below as answer to receive credit
'. - ''. - ' Save entries below as a draft answer (not submitting them for credit yet) '. - '
'. + $result .='
'.'
'; $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); $result .='
Submit a file:
Allowed filetypes: '.$uploadedfiletypes.'
'; - if ($uploadedfile) { - $result.='Currently submitted: '.$uploadedfile.''; - } else { - $result.='(Hand in a file you have prepared on your computer)'; - } - $result.='
'; } return $result; @@ -92,40 +82,26 @@ sub end_essayresponse { my $increment = 1; my $result; if ( $target eq 'grade' ) { - my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id}; + my $collaborators = $env{'form.HWCOL'.$part.'_'.$id}; if ($collaborators =~ /[^\s]/) { - my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"}); + my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"'); $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'}) ) { - my $response = $ENV{'form.HWVAL_'.$id}; - my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'}; - if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/)) { - my $award; - if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { + } 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='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); - $uploadedflag=1; - } else { - $award='INVALID_FILETYPE'; - } - } + &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); @@ -147,20 +123,23 @@ sub end_essayresponse { &Apache::lonnet::put('nohist_essay_'.$apath, { $akey => $response },$adom,$aname); } - } + } } - } + } } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table(); } elsif ($target eq 'tex') { if ($Apache::lonhomework::type eq 'exam') { my $repetition=&Apache::response::repetition(); $result.='\begin{enumerate}'; + if ($env{'request.state'} eq "construct" ) {$result.='\item[\strut]';} for (my $i=0;$i<$repetition;$i++) { $result.='\item[\textbf{'.($Apache::lonxml::counter+$i). - '}.]\textit{Leave blank on scoring form}\vskip 0 mm'; + '}.]\textit{'.&mt('Leave blank on scoring form'). + '}\vskip 0 mm'; } $result.= '\end{enumerate}'; + $increment=$repetition; } } if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || @@ -168,14 +147,62 @@ sub end_essayresponse { &Apache::lonxml::increment_counter($increment); } &Apache::response::end_response; + 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"); + if ($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', - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); my (@badcollaborators,$result); my (@collaborators) = split(/\,?\s+/,$coll); foreach (@collaborators) { @@ -183,7 +210,7 @@ sub check_collaborators { if (/@/) { $collaborator =~ s/@/:/; } else { - $collaborator = $_.':'.$ENV{'user.domain'}; + $collaborator = $_.':'.$env{'user.domain'}; } push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist); }