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

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 10 Nov 2003 16:39:41 -0000


albertel		Mon Nov 10 11:39:41 2003 EDT

  Modified files:              
    /loncom/homework	grades.pm 
  Log:
  - added another search option for regrading 'incorrect with submissions' it works the same as 'ungraded with submissions' but sounds different BUG#2102
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.155 loncom/homework/grades.pm:1.156
--- loncom/homework/grades.pm:1.155	Mon Nov 10 11:38:06 2003
+++ loncom/homework/grades.pm	Mon Nov 10 11:39:41 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.155 2003/11/10 16:38:06 albertel Exp $
+# $Id: grades.pm,v 1.156 2003/11/10 16:39:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -691,8 +691,11 @@
 			$status{'resource.'.$partid.'.submitted_by'}.'" />';
 		}
 	    }
-	    next if (!$submitted && ($submitonly eq 'yes' || $submitonly eq 'graded'));
-	    next if (!$graded && $submitonly eq 'graded');
+	    next if (!$submitted && ($submitonly eq 'yes' ||
+				     $submitonly eq 'incorrect' ||
+				     $submitonly eq 'graded'));
+	    next if (!$graded && ($submitonly eq 'graded' ||
+				  $submitonly eq 'incorrect'));
 	}
 
 	$ctr++;
@@ -1950,7 +1953,7 @@
     foreach my $student (@parsedlist) {
 	my $submitonly=$ENV{'form.submitonly'};
 	my ($uname,$udom) = split(/:/,$student);
-	if ($submitonly =~ /^(yes|graded)$/) {
+	if ($submitonly =~ /^(yes|graded|incorrect)$/) {
 #	    my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
 	    my %status=&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
 	    my $submitted = 0;
@@ -1963,8 +1966,11 @@
 		    $submitted = 0;
 		}
 	    }
-	    next if (!$submitted && ($submitonly eq 'yes' || $submitonly eq 'graded'));
-	    next if (!$graded && $submitonly eq 'graded');
+	    next if (!$submitted && ($submitonly eq 'yes' ||
+				     $submitonly eq 'incorrect' ||
+				     $submitonly eq 'graded'));
+	    next if (!$graded && ($submitonly eq 'graded' ||
+				  $submitonly eq 'incorrect'));
 	}
 	push @nextlist,$student if ($ctr < $ntstu);
 	last if ($ctr == $ntstu);
@@ -3800,6 +3806,8 @@
 	($saveSub eq 'yes' ? 'selected="on"' : '').'>with submissions</option>'.
 	'<option value="graded" '.
 	($saveSub eq 'graded' ? 'selected="on"' : '').'>with ungraded submissions</option>'.
+	'<option value="incorrect" '.
+	($saveSub eq 'incorrect' ? 'selected="on"' : '').'>with incorrect submissions</option>'.
 	'<option value="all" '.
 	($saveSub eq 'all' ? 'selected="on"' : '').'>with any status</option></select></td></tr>'."\n";