--- loncom/homework/essayresponse.pm 2004/03/31 05:23:59 1.34
+++ loncom/homework/essayresponse.pm 2004/10/18 22:14:15 1.40
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# essay (ungraded) style responses
#
-# $Id: essayresponse.pm,v 1.34 2004/03/31 05:23:59 albertel Exp $
+# $Id: essayresponse.pm,v 1.40 2004/10/18 22:14:15 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,7 +44,6 @@ 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 $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
@@ -52,6 +51,10 @@ sub start_essayresponse {
my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
$result='
';
$result.=''.
+ 'Select Portfolio Files'.
+ ' '.
+ ' '.
' '.
&mt('Submit entries below as answer to receive credit').' '.
' '.
@@ -73,7 +76,10 @@ sub start_essayresponse {
&mt('Allowed filetypes: [_1]',$uploadedfiletypes).
' ';
if ($uploadedfile) {
- my $curfile=' '.
$uploadedfile.'';
$result.=&mt('Currently submitted: [_1]',$curfile);
@@ -106,6 +112,7 @@ sub end_essayresponse {
} elsif ( defined($ENV{'form.submitted'}) ) {
my $response = $ENV{'form.HWVAL_'.$id};
my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
+ my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id.'.filename'};
if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/)) {
my $award;
if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
@@ -122,7 +129,7 @@ sub end_essayresponse {
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);
+ &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,'essayresponse');
$uploadedflag=1;
} else {
$award='INVALID_FILETYPE';
@@ -158,12 +165,14 @@ sub end_essayresponse {
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{'.&mt('Leave blank on scoring form').
'}\vskip 0 mm';
}
$result.= '\end{enumerate}';
+ $increment=$repetition;
}
}
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
|