--- loncom/homework/essayresponse.pm	2002/08/01 15:20:34	1.13
+++ loncom/homework/essayresponse.pm	2003/01/22 17:29:21	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.13 2002/08/01 15:20:34 ng Exp $
+# $Id: essayresponse.pm,v 1.17 2003/01/22 17:29:21 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,6 +30,7 @@
 #
 package Apache::essayresponse;
 use strict;
+use Apache::lonxml;
 
 BEGIN {
     &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
@@ -38,13 +39,16 @@ BEGIN {
 sub start_essayresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
-
-    if ($target eq 'web') {
+    my $id = &Apache::response::start_response($parstack,$safeeval);
+    if ($target eq 'meta') {
+	$result=&Apache::response::meta_package_write('essayresponse');
+    } elsif ($target eq 'web') {
 	my $part= $Apache::inputtags::part;
-	my $id  = &Apache::response::start_response($parstack,$safeeval);
 
 	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");
+	my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"});
 	$result='<br /><table border="1">';
 	if ($ncol > 0) {
 	    $result .='<tr><td>'.
@@ -55,6 +59,12 @@ sub start_essayresponse {
 	    $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
 	    $result .='</td></tr>';
 	}
+        if ($uploadedfiletypes) {
+           $result.=
+'<tr><td>Submit a file: <input type="file" size="50" name="HWFILE'.
+		$part.'_'.$id.'" value="'.$uploadedfile.'" onChange="this.form.enctype='.
+"'multipart/form-data'".';" /><br />Allowed filetypes: <b>'.$uploadedfiletypes.'</b><br />(Hand in a file you have prepared on your computer)</td></tr>'; 
+        }
 	$result.='<tr><td>'.
 	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked>'.
 	    ' Submit text below as answer to receive credit <br />'.
@@ -68,29 +78,43 @@ sub start_essayresponse {
 sub end_essayresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $part          = $Apache::inputtags::part;
-    my $id            = &Apache::response::start_response($parstack,$safeeval);
-    my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};	
-    if ($collaborators =~ /[^\s]/) {
-	my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});
-
-	$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
-	    if ($collaborators ne $previous_list);
-    }
+    my $id            = $Apache::inputtags::response[-1];
+    my $result;
     if ( $target eq 'grade' ) {
+	my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};	
+	if ($collaborators =~ /[^\s]/) {
+	    my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});
+	    $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
+		if ($collaborators ne $previous_list);
+	}
 	if ( defined $ENV{'form.submitted'}) {
 	    my $response      = $ENV{'form.HWVAL'.$id};
 	    if ( $response =~ /[^\s]/) {
+		my $award;
+		if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
+		    $award='SUBMITTED';
+		} else {
+		    $award='DRAFT';
+		}
 		$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
-		$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
-		    $ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes' ? 'SUBMITTED' : 'DRAFT';
+		$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
 		my %previous=&Apache::response::check_for_previous($response,$part,$id);
-		&Apache::response::handle_previous(\%previous,'SUBMITTED');
+		&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();
+	}
     }
 
     &Apache::response::end_response;
-    return '';
+    return $result;
 }
 
 sub check_collaborators {