--- loncom/interface/lonquickgrades.pm	2003/06/25 19:01:23	1.19
+++ loncom/interface/lonquickgrades.pm	2003/07/17 14:31:17	1.21
@@ -63,7 +63,11 @@ 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 = 1;
+    if (defined($ENV{'course.'.$ENV{'request.course.id'}.'.grading'}) &&
+        $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} ne 'standard') {
+        $showPoints = 0;
+    }
 
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new(
@@ -84,20 +88,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();
 
@@ -140,6 +139,9 @@ HEADER
             my $stack = $iterator->getStack();
             
             for my $part (@{$parts}) {
+                if ($curRes->getCompletionStatus($part) == $curRes->EXCUSED()) {
+                    next;
+                }
 		if ($showPoints) {
 		    my $score = $curRes->weight($part) * $curRes->awarded($part);
 		    $partsRight += $score;
@@ -147,7 +149,7 @@ HEADER
 		    $partsCount += $curRes->weight($part);
 
 		    if ($curRes->opendate($part) < $now) {
-			$totalPossible += $curRes->weight();
+			$totalPossible += $curRes->weight($part);
 		    }
 		    $totalParts += $curRes->weight($part);
 		} else {
@@ -156,7 +158,6 @@ HEADER
 		    $partsCount++;
 		    if ($status == $curRes->CORRECT || 
 			$status == $curRes->CORRECT_BY_OVERRIDE || 
-			$status == $curRes->EXCUSED || 
 			$status == $curRes->ANSWER_SUBMITTED) {
 			$partsRight++;
 			$totalRight++;
@@ -174,7 +175,6 @@ HEADER
             if ($depth == 1) { # in top-level only
 		$topLevelParts += $partsCount;
 		$topLevelRight += $partsRight;
-		$r->print($curRes->compTitle() . '<br>');
 	    }
 
             # Crawl down stack and record parts correct and total
@@ -204,8 +204,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--; }