--- loncom/homework/essayresponse.pm	2004/10/19 19:14:51	1.41
+++ loncom/homework/essayresponse.pm	2004/10/25 21:41:58	1.42
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.41 2004/10/19 19:14:51 banghart Exp $
+# $Id: essayresponse.pm,v 1.42 2004/10/25 21:41:58 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,10 +51,6 @@ 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"> '.
@@ -70,10 +66,14 @@ sub start_essayresponse {
 	}
         if ($uploadedfiletypes) {
 	    $result.='<tr><td>'.&mt('Submit a file:').
-		' <input type="file" size="50" name="HWFILE'.
+		' <br /><input type="file" size="50" name="HWFILE'.
 		$part.'_'.$id.'" onFocus="this.form.enctype='.
 		"'multipart/form-data'".';" /><br />'.
-		&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).
+		&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'.
+                '<strong>OR:</strong><br /><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" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.
 		'<br />';
            if ($uploadedfile) {
 	       my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
@@ -112,10 +112,10 @@ 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]/) || ($portfiles != "Selected files will appear here.")) {
+            my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id};
+	    if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {
  		my $award;
-		if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
+        	if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
 		    $award='SUBMITTED';
 		} else {
 		    $award='DRAFT';
@@ -135,11 +135,12 @@ sub end_essayresponse {
 		      $award='INVALID_FILETYPE';
                    }
 	        }
-                if ($portfiles != "Selected files will appear here.") {
+                if ($portfiles =~ /[^\s]/) {
                     $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
-                }
+                    $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=$portfiles;
+                    $uploadedflag=1;
+    	        }
 		$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); }
@@ -160,9 +161,9 @@ sub end_essayresponse {
 			&Apache::lonnet::put('nohist_essay_'.$apath,
 					 { $akey => $response },$adom,$aname);
 		    }
-               }
+                }
 	    }
-	}
+	} 
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::end_table();
     } elsif ($target eq 'tex') {
@@ -184,6 +185,7 @@ sub end_essayresponse {
 	&Apache::lonxml::increment_counter($increment);
     }
     &Apache::response::end_response;
+
     return $result;
 }