[LON-CAPA-cvs] cvs: loncom /homework essayresponse.pm

[ng]

ng		Thu Jul 25 16:51:39 2002 EDT

  Modified files:              
    /loncom/homework	essayresponse.pm 
  Log:
  Clean up some codes on checking collaborators on submission by students.
  The checking is now done when an instructor grades the problem.
  
  
Index: loncom/homework/essayresponse.pm
diff -u loncom/homework/essayresponse.pm:1.10 loncom/homework/essayresponse.pm:1.11
--- loncom/homework/essayresponse.pm:1.10	Wed Jul 24 12:58:08 2002
+++ loncom/homework/essayresponse.pm	Thu Jul 25 16:51:39 2002
@@ -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.11 2002/07/25 20:51:39 ng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,6 +60,10 @@
     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;
+    }
     if ( $target eq 'grade' ) {
 	if ( defined $ENV{'form.submitted'}) {
 	    my $response      = $ENV{'form.HWVAL'.$id};
@@ -71,22 +75,13 @@
 	    }
 	}
     }
-    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 +98,9 @@
     }
     
     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 +108,6 @@
 	    'You have too many collaborators. Please remove '.$toomany.' collaborator'.
 	    ($toomany > 1 ? 's' :'').'.</td></tr></table>';
     }
-    return (\@badcollaborators,\$toomany) if ($retbad eq 'yes');
     return $result;
 }