--- loncom/homework/essayresponse.pm	2004/03/31 05:23:59	1.34
+++ loncom/homework/essayresponse.pm	2004/10/19 19:14:51	1.41
@@ -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.41 2004/10/19 19:14:51 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='<br /><table border="1">';
 	$result.='<tr><td>'.
+        '<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname=HWPORT'.$part.'_'.$id.'","cat","height=400,'.
+        'width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'."'".'>Select Portfolio Files</a>'.
+        '<br />'.
+            '<input type="text" name="HWPORT'.$part.'_'.$id.'" value="Selected files will appear here." /><br />'.
 	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked> '.
 	    &mt('Submit entries below as answer to receive credit').' <br />'.
 	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no"> '.
@@ -73,7 +76,10 @@ sub start_essayresponse {
 		&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).
 		'<br />';
            if ($uploadedfile) {
-	       my $curfile='<a href="'.&Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).
+	       my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+	       push (@Apache::lonxml::extlinks,$url);
+	       &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
+	       my $curfile='<a href="'.$url.
 		   '"><img src="/adm/lonIcons/unknown.gif" border=0" /> '.
 		   $uploadedfile.'</a>';
 	       $result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile);
@@ -106,7 +112,8 @@ sub end_essayresponse {
 	} 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 $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id.'.filename'};
+	    if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles != "Selected files will appear here.")) {
  		my $award;
 		if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
 		    $award='SUBMITTED';
@@ -122,13 +129,17 @@ 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';
                    }
 	        }
+                if ($portfiles != "Selected files will appear here.") {
+                    $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
+                }
 		$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
+		$Apache::lonhomework::results{"resource.$part.$id.submission"}=$portfiles;
 		$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
 		my %previous=&Apache::response::check_for_previous($response,$part,$id);
 		unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); }
@@ -158,12 +169,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' ||