--- loncom/homework/essayresponse.pm 2003/01/13 21:24:02 1.16
+++ loncom/homework/essayresponse.pm 2003/02/27 21:20:48 1.25
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# essay (ungraded) style responses
#
-# $Id: essayresponse.pm,v 1.16 2003/01/13 21:24:02 sakharuk Exp $
+# $Id: essayresponse.pm,v 1.25 2003/02/27 21:20:48 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,6 +31,7 @@
package Apache::essayresponse;
use strict;
use Apache::lonxml;
+use Apache::lonnet;
BEGIN {
&Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
@@ -47,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;
}
@@ -81,27 +99,49 @@ sub end_essayresponse {
}
if ( defined $ENV{'form.submitted'}) {
my $response = $ENV{'form.HWVAL'.$id};
- if ( $response =~ /[^\s]/) {
- my $award;
+ 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') {
- $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{Live blank on scoring form}\vskip 0 mm \end{enumerate}';
- &Apache::lonxml::increment_counter();
+ my $id = $Apache::inputtags::part;
+ my $weight = &Apache::lonnet::EXT("resource.$id.weight");
+ my $repetition = int $weight/9;
+ if ($weight % 9 != 0) {$repetition++;}
+ $result.='\begin{enumerate}';
+ for (my $i=0;$i<$repetition;$i++) {
+ $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm';
+ &Apache::lonxml::increment_counter();
+ }
+ $result.= '\end{enumerate}';
}
}