--- loncom/homework/essayresponse.pm	2004/10/19 19:14:51	1.41
+++ loncom/homework/essayresponse.pm	2004/12/14 18:44:56	1.53
@@ -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.53 2004/12/14 18:44:56 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,13 +51,9 @@ 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> '.
+	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
 	    &mt('Submit entries below as answer to receive credit').' <br />'.
-	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no"> '.
+	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.
 	    &mt('Save entries below as a draft answer (not submitting them for credit yet)').
 	    ' </td></tr>';
 	if ($ncol > 0) {
@@ -70,12 +66,20 @@ sub start_essayresponse {
 	}
         if ($uploadedfiletypes) {
 	    $result.='<tr><td>'.&mt('Submit a file:').
-		' <input type="file" size="50" name="HWFILE'.
-		$part.'_'.$id.'" onFocus="this.form.enctype='.
-		"'multipart/form-data'".';" /><br />'.
-		&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).
+		' <br /><input type="file" size="50" name="HWFILE'.
+#		$part.'_'.$id.'" onFocus="this.form.enctype='.
+#		"'multipart/form-data'".';" /><br />'.
+		$part.'_'.$id.'" '.
+		&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'.
+                '<strong>OR:</strong><br /><a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$part.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>Select Portfolio Files</a>'.
+                '<br />'.
+                '<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.
 		'<br />';
-           if ($uploadedfile) {
+	    if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
+	        $result.="Portfolio files previously selected: <strong>".&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"})."</strong><br />";
+	    }
+
+            if ($uploadedfile) {
 	       my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
 	       push (@Apache::lonxml::extlinks,$url);
 	       &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
@@ -112,16 +116,18 @@ 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};
+            &Apache::lonnet::logthis("portfiles now $portfiles");
+	    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';
 		}
                 my $uploadedflag=0;
                 if ($filename =~ /[^\s]/) {
+                   &Apache::lonnet::logthis("the file to upload is $filename");
  	           my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
                    $uploadedfiletypes=~s/[^\w\,]//g;
                    $uploadedfiletypes=','.$uploadedfiletypes.',';
@@ -134,12 +140,23 @@ sub end_essayresponse {
 		   } else {
 		      $award='INVALID_FILETYPE';
                    }
+	        } else {
+	           $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}="";
+                   $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}="";
 	        }
-                if ($portfiles != "Selected files will appear here.") {
+                if ($portfiles =~ /[^\s]/) {
+                    $portfiles =~s/,$//;
                     $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
-                }
+                    my @submitted_files = split /,/,$portfiles;
+		    my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+		    &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
+                    &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid);
+                    &Apache::lonnet::clear_selected_files($name);
+                    $uploadedflag=1;
+    	        } else {
+    	            $Apache::lonhomework::results{"resource.$part.$id.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); }
@@ -160,9 +177,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 +201,7 @@ sub end_essayresponse {
 	&Apache::lonxml::increment_counter($increment);
     }
     &Apache::response::end_response;
+
     return $result;
 }