--- loncom/homework/essayresponse.pm 2002/07/24 16:58:08 1.10 +++ loncom/homework/essayresponse.pm 2003/04/18 08:00:04 1.28 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.10 2002/07/24 16:58:08 ng Exp $ +# $Id: essayresponse.pm,v 1.28 2003/04/18 08:00:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,6 +30,8 @@ # package Apache::essayresponse; use strict; +use Apache::lonxml; +use Apache::lonnet; BEGIN { &Apache::lonxml::register('Apache::essayresponse',('essayresponse')); @@ -38,55 +40,131 @@ BEGIN { sub start_essayresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - - if ($target eq 'web') { + my $id = &Apache::response::start_response($parstack,$safeeval); + if ($target eq 'meta') { + $result=&Apache::response::meta_package_write('essayresponse'); + } elsif ($target eq 'web') { my $part= $Apache::inputtags::part; - my $id = &Apache::response::start_response($parstack,$safeeval); my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators"); 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 .='
Collaborators:
'. + $result .=''; } + if ($uploadedfiletypes) { + $result.= +''; + } + $result.='
'. + ''. + ' Submit entries below as answer to receive credit
'. + ''. + ' Save entries below as a draft answer (not submitting them for credit yet) '. + '
'. + 'Collaborators:
'. '(Enter maximum '.$ncol.' collaborators using username or username@domain, e.g. '. 'smithje or smithje@'.$ENV{'user.domain'}.'.)
'; $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; } sub end_essayresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $part=$Apache::inputtags::part; - my $id = &Apache::response::start_response($parstack,$safeeval); + my $part = $Apache::inputtags::part; + my $id = $Apache::inputtags::response[-1]; + my $increment = 1; + my $result; if ( $target eq 'grade' ) { - if ( defined $ENV{'form.submitted'}) { - my $response = $ENV{'form.HWVAL'.$id}; - if ( $response =~ /[^\s]/) { + my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id}; + if ($collaborators =~ /[^\s]/) { + 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' ) { + my $repetition=&Apache::response::repetition(); + $increment=$repetition; + my $score=0; + for (my $i=0;$i<$repetition;$i++) { + my $increase=&Apache::response::getresponse($i+1); + if ($increase ne '') { $score+=$increase+1; } + } + my $weight = &Apache::lonnet::EXT("resource.$id.weight"); + my $pcr=$score/$weight; + #FIXME, won't work for multiple essay in a single part + $Apache::lonhomewok::results{"resource.$id.awarded"}; + } 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') { + $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'; + } + } $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response; - $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}="SUBMITTED"; + $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award; my %previous=&Apache::response::check_for_previous($response,$part,$id); - &Apache::response::handle_previous(\%previous,'SUBMITTED'); + unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); } } } + } 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}'; + for (my $i=0;$i<$repetition;$i++) { + $result.='\item[\textbf{'.($Apache::lonxml::counter+$i). + '}.]\textit{Leave blank on scoring form}\vskip 0 mm'; + } + $result.= '\end{enumerate}'; + } } - my $collaborators = $ENV{'form.HWCOL'.$id}; - if ($collaborators =~ /[^\s]/) { - my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators"); - my ($badlist,$toomany) = &check_collaborators($ncol,$collaborators,'yes'); - $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators; - $Apache::lonhomework::results{"resource.$part.$id.badcollaborators"}=(join(', ',@$badlist)) - if (scalar(@$badlist) > 0); - $Apache::lonhomework::results{"resource.$part.$id.toomanycollaborators"}=$$toomany - if ($toomany > 0); + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::lonxml::increment_counter($increment); } &Apache::response::end_response; - return ''; + return $result; } sub check_collaborators { - my ($ncol,$coll,$retbad) = @_; + my ($ncol,$coll) = @_; my %classlist=&Apache::lonnet::dump('classlist', $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); @@ -103,10 +181,9 @@ sub check_collaborators { } if (scalar(@badcollaborators)) { - my $badlist = sprintf ("The following user%s invalid: ", - (scalar(@badcollaborators) > 1 ? 's are' : ' is')); - $result .= '
'. - $badlist.join(', ',@badcollaborators).'. Please correct.
'; + $result = '
The following user'. + (scalar(@badcollaborators) > 1 ? 's are' : ' is').' invalid: '. + join(', ',@badcollaborators).'. Please correct.
'; } my $toomany = scalar(@collaborators) - $ncol; if ($toomany > 0) { @@ -114,7 +191,6 @@ sub check_collaborators { 'You have too many collaborators. Please remove '.$toomany.' collaborator'. ($toomany > 1 ? 's' :'').'.'; } - return (\@badcollaborators,\$toomany) if ($retbad eq 'yes'); return $result; }