--- loncom/interface/lonquickgrades.pm	2003/06/23 20:01:20	1.16
+++ loncom/interface/lonquickgrades.pm	2003/09/23 01:52:57	1.22.2.1
@@ -63,10 +63,13 @@ sub real_handler {
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
 
+    my $showPoints = 
+        $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard';
+
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new(
                         $ENV{"request.course.fn"}.".db",
-                        $ENV{"request.course.fn"}."_parms.db", 1, 0);
+                        $ENV{"request.course.fn"}."_parms.db", 1, 0, 1);
 
     if (!defined($navmap)) {
         my $requrl = $r->uri;
@@ -79,14 +82,20 @@ sub real_handler {
     my $res = $navmap->firstResource(); # temp resource to access constants
  
     # Header
-    $r->print(&Apache::loncommon::bodytag('Quick Score Display','',
-                                          ''));
+    my $title = $showPoints ? "Quick Points Display" : "Quick Completed Problems Display";
+    $r->print(&Apache::loncommon::bodytag($title, '', ''));
 
-    $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
+    }
+
+    $r->print("This may take a few moments to display.");
+
+    $r->rflush();
 
     $navmap->init();
 
@@ -105,6 +114,9 @@ HEADER
     # maps in order, with their data. 
     # (If in the future people decide not to be cumulative, only add
     #  the counts to the parent map.)
+    # For convenience, "totalParts" is also "totalPoints" when we're looking
+    #  at points; I can't come up with a variable name that makes sense
+    #  equally for both cases.
 
     my $totalParts = 0; my $totalPossible = 0; my $totalRight = 0;
     my $now = time();
@@ -119,30 +131,46 @@ 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 $status = $curRes->getCompletionStatus($part);
-                my $thisright = 0;
-                if ($status == $curRes->CORRECT || $status == $curRes->CORRECT_BY_OVERRIDE
-                    || $status == $curRes->EXCUSED || $status == $curRes->ANSWER_SUBMITTED) {
-                    $partsRight++;
-                    $totalRight++;
-                    $thisright = 1;
-                }
-
-                my $dateStatus = $curRes->getDateStatus($part);
-                if ($curRes->opendate($part) < $now) {
-                    $totalPossible++;
+                if ($curRes->getCompletionStatus($part) == $curRes->EXCUSED()) {
+                    next;
                 }
+		if ($showPoints) {
+		    my $score = $curRes->weight($part) * $curRes->awarded($part);
+		    $partsRight += $score;
+		    $totalRight += $score;
+		    $partsCount += $curRes->weight($part);
+
+		    if ($curRes->opendate($part) < $now) {
+			$totalPossible += $curRes->weight($part);
+		    }
+		    $totalParts += $curRes->weight($part);
+		} else {
+		    my $status = $curRes->status($part);
+		    my $thisright = 0;
+		    $partsCount++;
+		    if ($status == $curRes->CORRECT || 
+			$status == $curRes->EXCUSED) {
+			$partsRight++;
+			$totalRight++;
+			$thisright = 1;
+		    }
+		    
+		    my $dateStatus = $curRes->getDateStatus($part);
+		    $totalParts++;
+		    if ($curRes->opendate($part) < $now) {
+			$totalPossible++;
+		    }
+		}
             }
 
             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
@@ -153,7 +181,7 @@ HEADER
                         $res->{DATA}->{CHILD_CORRECT} = 0;
                     }
                     
-                    $res->{DATA}->{CHILD_PARTS} += scalar(@{$parts});
+                    $res->{DATA}->{CHILD_PARTS} += $partsCount;
                     $res->{DATA}->{CHILD_CORRECT} += $partsRight;
                 }
             }
@@ -172,8 +200,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--; }
@@ -212,9 +241,12 @@ HEADER
 
     my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
 
-    $r->print("<tr><td colspan='2' align='right'>Total Parts Done: <b>$totalRight</b><br>");
+    $title = $showPoints ? "Points" : "Parts Done";
+
+    $r->print("<tr><td colspan='2' align='right'>Total $title: <b>$totalRight</b><br>");
     $r->print("Max Possible To Date $maxHelpLink: <b>$totalPossible</b><br>");
-    $r->print("Total Parts In Course: <b>$totalParts</b></td></tr>\n\n");
+    $title = $showPoints ? "Points" : "Parts";
+    $r->print("Total $title In Course: <b>$totalParts</b></td></tr>\n\n");
 
 
     $r->print("</table></body></html>");