--- loncom/homework/essayresponse.pm	2002/07/24 16:58:08	1.10
+++ loncom/homework/essayresponse.pm	2002/08/01 19:16:45	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.10 2002/07/24 16:58:08 ng Exp $
+# $Id: essayresponse.pm,v 1.14 2002/08/01 19:16:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,55 +38,68 @@ 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"});
+	$result='<br /><table border="1">';
 	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>';
 	}
+	$result.='<tr><td>'.
+	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked>'.
+	    ' Submit text below as answer to receive credit <br />'.
+	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no">'.
+	    ' Save text below as a draft answer (not submitting it for credit yet) '.
+	    '</td></tr></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 $part          = $Apache::inputtags::part;
+    my $id            = $Apache::inputtags::response[-1];
     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"}="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');
+		&Apache::response::handle_previous(\%previous,$award);
 	    }
 	}
     }
-    my $collaborators = $ENV{'form.HWCOL'.$id};	
-    if ($collaborators =~ /[^\s]/) {
-	my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
-	my ($badlist,$toomany) = &check_collaborators($ncol,$collaborators,'yes');
-	$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators;
-	$Apache::lonhomework::results{"resource.$part.$id.badcollaborators"}=(join(', ',@$badlist)) 
-	    if (scalar(@$badlist) > 0);
-	$Apache::lonhomework::results{"resource.$part.$id.toomanycollaborators"}=$$toomany 
-	    if ($toomany > 0);
-    }
+
     &Apache::response::end_response;
     return '';
 }
 
 sub check_collaborators {
-    my ($ncol,$coll,$retbad) = @_;
+    my ($ncol,$coll) = @_;
     my %classlist=&Apache::lonnet::dump('classlist',
 					$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 					$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
@@ -103,10 +116,9 @@ sub check_collaborators {
     }
     
     if (scalar(@badcollaborators)) {
-	my $badlist = sprintf ("The following user%s invalid: ",
-			       (scalar(@badcollaborators) > 1 ? 's are' : ' is'));
-	$result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>'.
-	    $badlist.join(', ',@badcollaborators).'. Please correct.</td></tr></table>';
+	$result = '<table border="0"><tr bgcolor="#ffbbbb"><td> The following user'.
+	    (scalar(@badcollaborators) > 1 ? 's are' : ' is').' invalid: '.
+	    join(', ',@badcollaborators).'. Please correct.</td></tr></table>';
     }
     my $toomany = scalar(@collaborators) - $ncol;
     if ($toomany > 0) {
@@ -114,7 +126,6 @@ sub check_collaborators {
 	    'You have too many collaborators. Please remove '.$toomany.' collaborator'.
 	    ($toomany > 1 ? 's' :'').'.</td></tr></table>';
     }
-    return (\@badcollaborators,\$toomany) if ($retbad eq 'yes');
     return $result;
 }