--- loncom/homework/essayresponse.pm 2002/07/09 17:18:25 1.8 +++ loncom/homework/essayresponse.pm 2003/01/23 22:28:55 1.19 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.8 2002/07/09 17:18:25 ng Exp $ +# $Id: essayresponse.pm,v 1.19 2003/01/23 22:28:55 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,46 +26,136 @@ # http://www.lon-capa.org/ # # 4/3 Guy +# July, 2002, H. K. Ng +# package Apache::essayresponse; use strict; +use Apache::lonxml; BEGIN { - &Apache::lonxml::register('Apache::essayresponse',('essayresponse')); + &Apache::lonxml::register('Apache::essayresponse',('essayresponse')); } sub start_essayresponse { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result; - my $id = &Apache::response::start_response($parstack,$safeeval); - if ($target eq 'meta') { - $result=&Apache::response::meta_package_write('essayresponse'); - } -# if ($target eq 'web') { -# $result='
Collaborators: '; -# } - return $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + 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 $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"); + my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}); + $result='
'; + if ($ncol > 0) { + $result .=''; + } + if ($uploadedfiletypes) { + $result.= +''; + } + $result.='
'. + '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.='
'. + ''. + ' Submit text below as answer to receive credit
'. + ''. + ' Save text below as a draft answer (not submitting it for credit yet) '. + '
'; + } + return $result; } sub end_essayresponse { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - if ( $target eq 'grade' ) { - if ( defined $ENV{'form.submitted'}) { - my $id = $Apache::inputtags::response['-1']; - my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}; - my $collaborators = $ENV{'form.HWCOL'.$Apache::inputtags::response['-1']}; - if ( $response =~ /[^\s]/) { - my $part=$Apache::inputtags::part; - $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response; - $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}="SUBMITTED"; -# $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators; - my %previous=&Apache::response::check_for_previous($response,$part,$id); - &Apache::response::handle_previous(\%previous,'SUBMITTED'); - } + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $part = $Apache::inputtags::part; + my $id = $Apache::inputtags::response[-1]; + my $result; + if ( $target eq 'grade' ) { + 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); + } + my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'}; + if ($filename =~ /[^\s]/) { + $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename; + } + if ( defined $ENV{'form.submitted'}) { + my $response = $ENV{'form.HWVAL'.$id}; + if ( $response =~ /[^\s]/) { + my $award; + if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { + $award='SUBMITTED'; + } else { + $award='DRAFT'; + } + $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); + &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') { + $result.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Live blank on scoring form}\vskip 0 mm'; + &Apache::lonxml::increment_counter(); + $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm \end{enumerate}'; + &Apache::lonxml::increment_counter(); + } + } + + &Apache::response::end_response; + return $result; +} + +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'}); + my (@badcollaborators,$result); + my (@collaborators) = split(/\,?\s+/,$coll); + foreach (@collaborators) { + my $collaborator = $_; + if (/@/) { + $collaborator =~ s/@/:/; + } else { + $collaborator = $_.':'.$ENV{'user.domain'}; + } + push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist); + } + + if (scalar(@badcollaborators)) { + $result = '
The following user'. + (scalar(@badcollaborators) > 1 ? 's are' : ' is').' invalid: '. + join(', ',@badcollaborators).'. Please correct.
'; + } + my $toomany = scalar(@collaborators) - $ncol; + if ($toomany > 0) { + $result .= '
'. + 'You have too many collaborators. Please remove '.$toomany.' collaborator'. + ($toomany > 1 ? 's' :'').'.
'; } - } - &Apache::response::end_response; - return ''; + return $result; } 1;