--- loncom/homework/essayresponse.pm 2002/08/07 16:23:05 1.15
+++ loncom/homework/essayresponse.pm 2003/04/18 22:27:28 1.29
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# essay (ungraded) style responses
#
-# $Id: essayresponse.pm,v 1.15 2002/08/07 16:23:05 albertel Exp $
+# $Id: essayresponse.pm,v 1.29 2003/04/18 22:27:28 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'));
@@ -46,7 +48,16 @@ sub start_essayresponse {
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.='
'.
+ ''.
+ ' Submit entries below as answer to receive credit '.
+ ''.
+ ' Save entries below as a draft answer (not submitting them for credit yet) '.
+ '
';
if ($ncol > 0) {
$result .='
'.
'Collaborators: '.
- ' Submit text below as answer to receive credit '.
- ''.
- ' Save text below as a draft answer (not submitting it for credit yet) '.
- '
';
+ if ($uploadedfiletypes) {
+ $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.='
';
+ }
+ $result.='';
}
return $result;
}
@@ -70,6 +89,7 @@ sub end_essayresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $part = $Apache::inputtags::part;
my $id = $Apache::inputtags::response[-1];
+ my $increment = 1;
my $result;
if ( $target eq 'grade' ) {
my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};
@@ -78,25 +98,67 @@ sub end_essayresponse {
$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
if ($collaborators ne $previous_list);
}
- if ( defined $ENV{'form.submitted'}) {
- my $response = $ENV{'form.HWVAL'.$id};
- if ( $response =~ /[^\s]/) {
- my $award;
+ 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"}=$pcr;
+ } 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"}=$award;
my %previous=&Apache::response::check_for_previous($response,$part,$id);
- &Apache::response::handle_previous(\%previous,$award);
+ 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}';
+ }
+ }
+ 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 $result;
}
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.
'.$uploadedfile.'';
+ } else {
+ $result.='(Hand in a file you have prepared on your computer)';
+ }
+ $result.='