--- loncom/homework/essayresponse.pm	2002/07/25 20:51:39	1.11
+++ loncom/homework/essayresponse.pm	2003/02/27 17:00:08	1.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.11 2002/07/25 20:51:39 ng Exp $
+# $Id: essayresponse.pm,v 1.24 2003/02/27 17:00:08 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,6 +30,8 @@
 #
 package Apache::essayresponse;
 use strict;
+use Apache::lonxml;
+use Apache::lonnet;
 
 BEGIN {
     &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
@@ -38,46 +40,107 @@ 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");
+        $uploadedfiletypes=~s/[^\w\,]//g;
+	my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"});
+	$result='<br /><table border="1">';
+	$result.='<tr><td>'.
+	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked>'.
+	    ' Submit entries below as answer to receive credit <br />'.
+	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no">'.
+	    ' Save entries below as a draft answer (not submitting them for credit yet) '.
+	    '</td></tr>';
 	if ($ncol > 0) {
-	    $result .='<br />Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
-		$id.'" value="'.$coll.'" /><br />'.
+	    $result .='<tr><td>'.
+		'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
+		$part.'_'.$id.'" value="'.$coll.'" /><br />'.
 		'(Enter maximum '.$ncol.' collaborators using username or username@domain, e.g. '.
 		'smithje or smithje@'.$ENV{'user.domain'}.'.)<br />';
 	    $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.'" onFocus="this.form.enctype='.
+"'multipart/form-data'".';" /><br />Allowed filetypes: <b>'.$uploadedfiletypes.'</b><br />';
+           if ($uploadedfile) {
+	       $result.='Currently submitted: <tt><a href="'.
+                &Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).'"><img src="/adm/lonIcons/unknown.gif" border=0"> '.$uploadedfile.'</a></tt>';
+           } else {
+              $result.='(Hand in a file you have prepared on your computer)';
+           }
+           $result.='</td></tr>'; 
+        }
+        $result.='</table>';
     }
     return $result;
 }
 
 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'.$id};	
-    if ($collaborators =~ /[^\s]/) {
-	$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators;
-    }
+    my $part          = $Apache::inputtags::part;
+    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 $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
+	    if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/)) {
+ 		my $award;
+		if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
+		    $award='SUBMITTED';
+		} else {
+		    $award='DRAFT';
+		}
+                my $uploadedflag=0;
+                if ($filename =~ /[^\s]/) {
+ 	           my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
+                   $uploadedfiletypes=~s/[^\w\,]//g;
+                   $uploadedfiletypes=','.$uploadedfiletypes.',';
+                   my ($extension)=($filename=~/\.(\w+)$/);
+	           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);
+                      $uploadedflag=1;
+		   } else {
+		      $award='INVALID_FILETYPE';
+                   }
+	        }
 		$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
-		$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}="SUBMITTED";
+		$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
 		my %previous=&Apache::response::check_for_previous($response,$part,$id);
-		&Apache::response::handle_previous(\%previous,'SUBMITTED');
+		unless ($uploadedflag) { &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{Leave blank on scoring form}\vskip 0 mm';
+	    &Apache::lonxml::increment_counter();
+	    $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm \end{enumerate}';
+	    &Apache::lonxml::increment_counter();
+	}
     }
 
     &Apache::response::end_response;
-    return '';
+    return $result;
 }
 
 sub check_collaborators {