--- loncom/interface/lonquickgrades.pm	2003/06/25 18:46:09	1.18
+++ loncom/interface/lonquickgrades.pm	2003/09/23 22:42:26	1.22.2.2
@@ -63,7 +63,8 @@ sub real_handler {
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
 
-    my $showPoints = $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard';
+    my $showPoints = 
+        $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard';
 
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new(
@@ -84,20 +85,15 @@ sub real_handler {
     my $title = $showPoints ? "Quick Points Display" : "Quick Completed Problems Display";
     $r->print(&Apache::loncommon::bodytag($title, '', ''));
 
-    if ($showPoints) {
-	$r->print(<<HEADER);
+    if (!$showPoints) {
+        $r->print(<<HEADER); 
 <p>This screen shows how many problems (or problem parts) you have completed, and
 how many you have not yet done. You can also look at <a href="/adm/studentcalc">a detailed
 score sheet</a>.</p>
 HEADER
-    } else {
-        $r->print(<<HEADER); 
-<p>This screen shows how many points you have. You can also look at 
-<a href="/adm/studentcalc">a detailed score sheet</a>.</p>
-HEADER
     }
 
-    $r->print("<p>This may take a few moments to display.</p>");
+    $r->print("This may take a few moments to display.");
 
     $r->rflush();
 
@@ -135,35 +131,48 @@ HEADER
         {
             # Get number of correct, incorrect parts
             my $parts = $curRes->parts();
-            $totalParts += $curRes->countParts();
             my $partsRight = 0;
 	    my $partsCount = 0;
             my $stack = $iterator->getStack();
             
             for my $part (@{$parts}) {
+		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();
+		    $partsCount += $curRes->weight($part);
 
 		    if ($curRes->opendate($part) < $now) {
-			$totalPossible += $curRes->weight();
+			$totalPossible += $curRes->weight($part);
 		    }
+		    $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->EXCUSED || 
-			$status == $curRes->ANSWER_SUBMITTED) {
+			$status == $curRes->EXCUSED) {
 			$partsRight++;
 			$totalRight++;
 			$thisright = 1;
 		    }
 		    
-		    my $dateStatus = $curRes->getDateStatus($part);
+		    $totalParts++;
 		    if ($curRes->opendate($part) < $now) {
 			$totalPossible++;
 		    }
@@ -171,9 +180,8 @@ HEADER
             }
 
             if ($depth == 1) { # in top-level only
-		$topLevelParts += scalar(@{$parts});
+		$topLevelParts += $partsCount;
 		$topLevelRight += $partsRight;
-		$r->print($curRes->compTitle() . '<br>');
 	    }
 
             # Crawl down stack and record parts correct and total
@@ -203,8 +211,9 @@ HEADER
     my $indentString = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 
     # Second pass: Print the maps.
-    $r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>Sequence</b></td>');
-    $r->print('<td align="center">Done / Total</td><tr>' . "\n\n");
+    $r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>Folder</b></td>');
+    $title = $showPoints ? "Points Scored" : "Done";
+    $r->print("<td align='center'>$title / Total</td><tr>" . "\n\n");
     while ($depth > 0) {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
         if ($curRes == $iterator->END_MAP()) { $depth--; }