--- loncom/interface/lonquickgrades.pm	2003/07/17 14:34:02	1.22
+++ loncom/interface/lonquickgrades.pm	2003/09/23 22:42:26	1.22.2.2
@@ -136,11 +136,23 @@ HEADER
             my $stack = $iterator->getStack();
             
             for my $part (@{$parts}) {
-                if ($curRes->getCompletionStatus($part) == $curRes->EXCUSED()) {
+		my $completionStatus = $curRes->getCompletionStatus($part);
+		my $dateStatus = $curRes->getDateStatus($part);
+                if ($completionStatus == $curRes->EXCUSED()) {
                     next;
                 }
 		if ($showPoints) {
-		    my $score = $curRes->weight($part) * $curRes->awarded($part);
+		    my $score;
+		    # If we're not telling status and the answer date isn't
+		    # passed yet
+		    if (($curRes->problemstatus($part) eq 'no') &&
+			($dateStatus != $curRes->ANSWER_OPEN)) {
+			$score = 0;
+		    } else {
+			$score = $curRes->weight($part) * 
+			    $curRes->awarded($part);
+		    }
+
 		    $partsRight += $score;
 		    $totalRight += $score;
 		    $partsCount += $curRes->weight($part);
@@ -150,18 +162,16 @@ HEADER
 		    }
 		    $totalParts += $curRes->weight($part);
 		} else {
-		    my $status = $curRes->getCompletionStatus($part);
+		    my $status = $curRes->status($part);
 		    my $thisright = 0;
 		    $partsCount++;
 		    if ($status == $curRes->CORRECT || 
-			$status == $curRes->CORRECT_BY_OVERRIDE || 
-			$status == $curRes->ANSWER_SUBMITTED) {
+			$status == $curRes->EXCUSED) {
 			$partsRight++;
 			$totalRight++;
 			$thisright = 1;
 		    }
 		    
-		    my $dateStatus = $curRes->getDateStatus($part);
 		    $totalParts++;
 		    if ($curRes->opendate($part) < $now) {
 			$totalPossible++;