--- loncom/homework/essayresponse.pm	2002/07/19 20:43:11	1.9
+++ 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.9 2002/07/19 20:43:11 ng Exp $
+# $Id: essayresponse.pm,v 1.14 2002/08/01 19:16:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,54 +26,107 @@
 # http://www.lon-capa.org/
 #
 # 4/3 Guy
+# July, 2002, H. K. Ng
+#
 package Apache::essayresponse;
 use strict;
 
 BEGIN {
-  &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
+    &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
 }
 
 sub start_essayresponse {
-  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  my $result;
-  my $id = &Apache::response::start_response($parstack,$safeeval);
-  if ($target eq 'meta') {
-    $result=&Apache::response::meta_package_write('essayresponse');
-  }
-  if ($target eq 'web') {
-      my $id  = $Apache::inputtags::response['-1'];
-      my $part= $Apache::inputtags::part;
-      my $symb= &Apache::lonnet::symbread($ENV{'form.url'});
-#      my $ncol= &Apache::lonnet::EXT('parameter\_$part\_$id\_maxcollaborators',$symb);
-      my $ncol= &Apache::lonnet::get($symb,['parameter\_$part\_$id\_maxcollaborators']);
-      $result ='<br />Collaborators: <input type="text" size="40" max="70" name="HWCOL'.
-              $Apache::inputtags::response['-1'].'" /><br />'.$ncol.':<br>'.
-	      '(Enter collaborators using username or username@domain, e.g. smithje or doej@msu or smithje@fsu.)';
-  }
-  return $result;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result;
+    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 $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 .='<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)=@_;
-  if ( $target eq 'grade' ) {
-    if ( defined $ENV{'form.submitted'}) {
-      my $id            = $Apache::inputtags::response['-1'];
-      my $response      = $ENV{'form.HWVAL'.$id};
-      my $collaborators = $ENV{'form.HWCOL'.$id};
-#      my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
-#      my $collaborators = $ENV{'form.HWCOL'.$Apache::inputtags::response['-1']};
-      if ( $response =~ /[^\s]/) {
-	my $part=$Apache::inputtags::part;
-	$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
-	$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}="SUBMITTED";
-	$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators;
-	my %previous=&Apache::response::check_for_previous($response,$part,$id);
-	&Apache::response::handle_previous(\%previous,'SUBMITTED');
-      }
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    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"}=$award;
+		my %previous=&Apache::response::check_for_previous($response,$part,$id);
+		&Apache::response::handle_previous(\%previous,$award);
+	    }
+	}
+    }
+
+    &Apache::response::end_response;
+    return '';
+}
+
+sub check_collaborators {
+    my ($ncol,$coll) = @_;
+    my %classlist=&Apache::lonnet::dump('classlist',
+					$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+					$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+    my (@badcollaborators,$result);
+    my (@collaborators) = split(/\,?\s+/,$coll);
+    foreach (@collaborators) {
+	my $collaborator = $_;
+	if (/@/) {
+	    $collaborator =~ s/@/:/;
+	} else {
+	    $collaborator = $_.':'.$ENV{'user.domain'};
+	}
+	push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);
+    }
+    
+    if (scalar(@badcollaborators)) {
+	$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) {
+	$result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>'.
+	    'You have too many collaborators. Please remove '.$toomany.' collaborator'.
+	    ($toomany > 1 ? 's' :'').'.</td></tr></table>';
     }
-  }
-  &Apache::response::end_response;
-  return '';
+    return $result;
 }
 
 1;