--- loncom/interface/lonquickgrades.pm	2003/09/22 21:05:15	1.27
+++ loncom/interface/lonquickgrades.pm	2003/09/25 19:22:14	1.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.27 2003/09/22 21:05:15 bowersj2 Exp $
+# $Id: lonquickgrades.pm,v 1.28 2003/09/25 19:22:14 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -117,8 +117,9 @@ HEADER
     #  equally for both cases.
 
     my $totalParts = 0; my $totalPossible = 0; my $totalRight = 0;
+    my $totalAttempted = 0;
     my $now = time();
-    my $topLevelParts = 0; my $topLevelRight = 0;
+    my $topLevelParts = 0; my $topLevelRight = 0; my $topLevelAttempted = 0;
 
     # Pre-run: Count parts correct
     while ( $depth > 0 ) {
@@ -131,14 +132,27 @@ HEADER
             my $parts = $curRes->parts();
             my $partsRight = 0;
 	    my $partsCount = 0;
+	    my $partsAttempted = 0;
             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 = 0;
+		    # If we're not telling status and the answer date isn't passed yet, 
+		    # it's an "attempted" point
+		    if ($curRes->problemstatus($part) eq 'no' &&
+			($dateStatus != $curRes->ANSWER_OPEN)) {
+			$partsAttempted += $curRes->weight($part);
+			$totalAttempted += $partsAttempted;
+		    } else {
+			$score = $curRes->weight($part) * $curRes->awarded($part);
+		    }
 		    $partsRight += $score;
 		    $totalRight += $score;
 		    $partsCount += $curRes->weight($part);
@@ -152,12 +166,16 @@ HEADER
 		    my $thisright = 0;
 		    $partsCount++;
 		    if ($status == $curRes->CORRECT || 
-			$status == $curRes->INCORRECT || 
-			$status == $curRes->ATTEMPTED) {
+			$status == $curRes->INCORRECT ) {
 			$partsRight++;
 			$totalRight++;
 			$thisright = 1;
 		    }
+
+		    if ($status == $curRes->ATTEMPTED) {
+			$partsAttempted++;
+			$totalAttempted++;
+		    }
 		    
 		    my $dateStatus = $curRes->getDateStatus($part);
 		    $totalParts++;
@@ -170,6 +188,7 @@ HEADER
             if ($depth == 1) { # in top-level only
 		$topLevelParts += $partsCount;
 		$topLevelRight += $partsRight;
+		$topLevelAttempted += $partsAttempted;
 	    }
 
             # Crawl down stack and record parts correct and total
@@ -178,10 +197,12 @@ HEADER
                     if (!defined($res->{DATA}->{CHILD_PARTS})) {
                         $res->{DATA}->{CHILD_PARTS} = 0;
                         $res->{DATA}->{CHILD_CORRECT} = 0;
+			$res->{DATA}->{CHILD_ATTEMPTED} = 0;
                     }
                     
                     $res->{DATA}->{CHILD_PARTS} += $partsCount;
                     $res->{DATA}->{CHILD_CORRECT} += $partsRight;
+		    $res->{DATA}->{CHILD_ATTEMPTED} += $partsAttempted;
                 }
             }
         }
@@ -199,9 +220,14 @@ HEADER
     my $indentString = '     ';
 
     # Second pass: Print the maps.
-    $r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>Folder</b></td>');
-    $title =&mt($showPoints ? "Points Scored" : "Done");
-    $r->print("<td align='center'>$title / Total</td><tr>" . "\n\n");
+    $r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>' .
+	      &mt('Folder') . '</b></td>');
+    $title = &mt($showPoints ? "Points Scored" : "Done");
+    if ($totalAttempted) {
+	$title .= " / " . &mt("Attempted");
+    }
+    $r->print("<td align='center'>$title / "
+	      . &mt('Total') . "</td><tr>\n\n");
     while ($depth > 0) {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
         if ($curRes == $iterator->END_MAP()) { $depth--; }
@@ -211,6 +237,7 @@ HEADER
             
             my $correct = $curRes->{DATA}->{CHILD_CORRECT};
             my $total = $curRes->{DATA}->{CHILD_PARTS};
+	    my $attempted = $curRes->{DATA}->{CHILD_ATTEMPTED};
 
             if ($total > 0) {
                 my $ratio;
@@ -222,7 +249,11 @@ HEADER
                 for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }
                 
                 $r->print("$thisIndent$title</td>");
-                $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n");
+		if ($totalAttempted) {
+		    $r->print("<td valign='top'>$thisIndent<nobr>$correct / $attempted / $total</nobr></td></tr>\n");
+		} else {
+		    $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n");
+		}
             }
         }