--- loncom/interface/lonquickgrades.pm	2003/02/06 14:37:34	1.10
+++ loncom/interface/lonquickgrades.pm	2003/06/18 19:31:38	1.15
@@ -107,6 +107,8 @@ HEADER
     #  the counts to the parent map.)
 
     my $totalParts = 0; my $totalPossible = 0; my $totalRight = 0;
+    my $now = time();
+    my $topLevelParts = 0; my $topLevelRight = 0;
 
     # Pre-run: Count parts correct
     while ( $depth > 0 ) {
@@ -117,25 +119,32 @@ HEADER
         {
             # Get number of correct, incorrect parts
             my $parts = $curRes->parts();
-            if (scalar(@{$parts}) > 1) { shift @{$parts}; } # lose the first "0"
-            $totalParts += scalar(@{$parts});
+            $totalParts += $curRes->countParts();
             my $partsRight = 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->EXCUSED || $status == $curRes->ANSWER_SUBMITTED) {
                     $partsRight++;
                     $totalRight++;
+                    $thisright = 1;
                 }
 
                 my $dateStatus = $curRes->getDateStatus($part);
-                if ($status != $curRes->OPEN_LATER) {
+                if ($curRes->opendate($part) < $now) {
                     $totalPossible++;
                 }
             }
-            
+
+            if ($depth == 1) { # in top-level only
+		$topLevelParts += scalar(@{$parts});
+		$topLevelRight += $partsRight;
+		$r->print($curRes->compTitle() . '<br>');
+	    }
+
             # Crawl down stack and record parts correct and total
             for my $res (@{$stack}) {
                 if (ref($res) && $res->is_map()) {
@@ -162,42 +171,30 @@ HEADER
 
     my $indentString = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 
-    my $unaccountedTotal = $totalParts;
-    my $unaccountedCorrect = $totalRight;
-
     # 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">Correct / Total</td><tr>' . "\n\n");
+    $r->print('<td align="center">Done / Total</td><tr>' . "\n\n");
     while ($depth > 0) {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
         if ($curRes == $iterator->END_MAP()) { $depth--; }
 
         if (ref($curRes) && $curRes->is_map()) {
-            my $stack = $iterator->getStack();
-            my $src = Apache::lonnavmaps::getLinkForResource($stack);
-            my $srcHasQuestion = $src =~ /\?/;
-            my $link = $src.
-                ($srcHasQuestion?'&':'?') .
-                'symb='.&Apache::lonnet::escape($curRes->symb()).
-                '"';
             my $title = $curRes->compTitle();
             
             my $correct = $curRes->{DATA}->{CHILD_CORRECT};
             my $total = $curRes->{DATA}->{CHILD_PARTS};
 
-            $unaccountedTotal -= $total;
-            $unaccountedCorrect -= $correct;
-
             if ($total > 0) {
                 my $ratio;
                 $ratio = $correct / $total;
                 my $color = mixColors(\@start, \@end, $ratio);
                 $r->print("<tr><td bgcolor='$color'>");
                 
-                for (my $i = 1; $i < $depth; $i++) { $r->print($indentString); }
+		my $thisIndent = '';
+                for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }
                 
-                $r->print("<a href='$link'>$title</a></td>");
-                $r->print("<td align='center'>$correct / $total</td></tr>\n");
+                $r->print("$thisIndent$title</td>");
+                $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n");
             }
         }
 
@@ -205,17 +202,17 @@ HEADER
     }
 
     # If there were any problems at the top level, print an extra "catchall"
-    if ($unaccountedTotal > 0) {
-        my $ratio = $unaccountedCorrect / $unaccountedTotal;
+    if ($topLevelParts > 0) {
+        my $ratio = $topLevelRight / $topLevelParts;
         my $color = mixColors(\@start, \@end, $ratio);
         $r->print("<tr><td bgcolor='$color'>");
-        $r->print("Problems Not Contained In Sequences</td><td align='center'>");
-        $r->print("$unaccountedCorrect / $unaccountedTotal</td></tr>");
+        $r->print("Problems Not Contained In A Folder</td><td>");
+        $r->print("$topLevelRight / $topLevelParts</td></tr>");
     }
 
     my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
 
-    $r->print("<tr><td colspan='2' align='right'>Total Parts Correct: <b>$totalRight</b><br>");
+    $r->print("<tr><td colspan='2' align='right'>Total Parts Done: <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");