--- loncom/interface/lonquickgrades.pm	2002/12/06 19:29:28	1.9
+++ loncom/interface/lonquickgrades.pm	2006/02/27 02:11:27	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# 
+# $Id: lonquickgrades.pm,v 1.38 2006/02/27 02:11:27 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,6 +32,10 @@ package Apache::lonquickgrades;
 use strict;
 use Apache::Constants qw(:common :http);
 use POSIX;
+use Apache::loncommon;
+use Apache::lonlocal;
+use Apache::lonnet;
+use Apache::grades;
 
 sub handler {
     my $r = shift;
@@ -45,56 +49,57 @@ sub real_handler {
 
     # Handle header-only request
     if ($r->header_only) {
-        if ($ENV{'browser.mathml'}) {
-            $r->content_type('text/xml');
+        if ($env{'browser.mathml'}) {
+            &Apache::loncommon::content_type($r,'text/xml');
         } else {
-            $r->content_type('text/html');
+            &Apache::loncommon::content_type($r,'text/html');
         }
         $r->send_http_header;
         return OK;
     }
 
     # Send header, don't cache this page
-    if ($ENV{'browser.mathml'}) {
-        $r->content_type('text/xml');
+    if ($env{'browser.mathml'}) {
+        &Apache::loncommon::content_type($r, 'text/xml');
     } else {
-        $r->content_type('text/html');
+        &Apache::loncommon::content_type($r, 'text/html');
     }
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
 
+    my $showPoints = 
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
+    my $notshowSPRSlink = 
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external';
+
     # Create the nav map
-    my $navmap = Apache::lonnavmaps::navmap->new(
-                        $ENV{"request.course.fn"}.".db",
-                        $ENV{"request.course.fn"}."_parms.db", 1, 0);
+    my $navmap = Apache::lonnavmaps::navmap->new();
 
     if (!defined($navmap)) {
         my $requrl = $r->uri;
-        $ENV{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";
+        $env{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";
         return HTTP_NOT_ACCEPTABLE;
     }
 
     # Keep this hash in sync with %statusIconMap in lonnavmaps; they
     # should match color/icon
     my $res = $navmap->firstResource(); # temp resource to access constants
-
-    if (!defined($navmap)) {
-        my $requrl = $r->uri;
-        $ENV{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
-        return HTTP_NOT_ACCEPTABLE;
-    }
  
     # Header
-    $r->print(&Apache::loncommon::bodytag('Quick Score Display','',
-                                          ''));
+    my $title = $showPoints ? "Points Display" : "Completed Problems Display";
+    $r->print(&Apache::loncommon::bodytag($title, '', ''));
 
-    $r->print(<<HEADER);
+    if (!$showPoints && !$notshowSPRSlink ) {
+        $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.");
 
-    $navmap->init();
+    $r->rflush();
 
     # End navmap using boilerplate
 
@@ -111,8 +116,14 @@ 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 $totalAttempted = 0;
+    my $now = time();
+    my $topLevelParts = 0; my $topLevelRight = 0; my $topLevelAttempted = 0;
 
     # Pre-run: Count parts correct
     while ( $depth > 0 ) {
@@ -123,35 +134,82 @@ HEADER
         {
             # Get number of correct, incorrect parts
             my $parts = $curRes->parts();
-            if (scalar(@{$parts}) > 1) { shift @{$parts}; } # lose the first "0"
-            $totalParts += scalar(@{$parts});
             my $partsRight = 0;
+	    my $partsCount = 0;
+	    my $partsAttempted = 0;
             my $stack = $iterator->getStack();
             
             for my $part (@{$parts}) {
-                my $status = $curRes->getCompletionStatus($part);
-                if ($status == $curRes->CORRECT || $status == $curRes->CORRECT_BY_OVERRIDE
-                    || $status == $curRes->EXCUSED) {
-                    $partsRight++;
-                    $totalRight++;
-                }
-
-                my $dateStatus = $curRes->getDateStatus($part);
-                if ($status != $curRes->OPEN_LATER) {
-                    $totalPossible++;
+		my $completionStatus = $curRes->getCompletionStatus($part);
+		my $dateStatus = $curRes->getDateStatus($part);
+		
+                if ($completionStatus == $curRes->EXCUSED()) {
+                    next;
                 }
+		if ($showPoints) {
+		    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)) {
+			my $status = $curRes->simpleStatus($part);
+			if ($status == $curRes->ATTEMPTED) {
+			    $partsAttempted += $curRes->weight($part);
+			    $totalAttempted += $partsAttempted;
+			}
+		    } else {
+			$score = Apache::grades::compute_points($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->simpleStatus($part);
+		    my $thisright = 0;
+		    $partsCount++;
+		    if ($status == $curRes->CORRECT ||
+			$status == $curRes->PARTIALLY_CORRECT ) {
+			$partsRight++;
+			$totalRight++;
+			$thisright = 1;
+		    }
+
+		    if ($status == $curRes->ATTEMPTED) {
+			$partsAttempted++;
+			$totalAttempted++;
+		    }
+		    
+		    my $dateStatus = $curRes->getDateStatus($part);
+		    $totalParts++;
+		    if ($curRes->opendate($part) < $now) {
+			$totalPossible++;
+		    }
+		}
             }
-            
+
+            if ($depth == 1) { # in top-level only
+		$topLevelParts += $partsCount;
+		$topLevelRight += $partsRight;
+		$topLevelAttempted += $partsAttempted;
+	    }
+
             # Crawl down stack and record parts correct and total
             for my $res (@{$stack}) {
                 if (ref($res) && $res->is_map()) {
                     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} += scalar(@{$parts});
+                    $res->{DATA}->{CHILD_PARTS} += $partsCount;
                     $res->{DATA}->{CHILD_CORRECT} += $partsRight;
+		    $res->{DATA}->{CHILD_ATTEMPTED} += $partsAttempted;
                 }
             }
         }
@@ -168,31 +226,25 @@ 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('<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--; }
 
         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;
+	    my $attempted = $curRes->{DATA}->{CHILD_ATTEMPTED};
 
             if ($total > 0) {
                 my $ratio;
@@ -200,10 +252,15 @@ HEADER
                 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>");
+		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");
+		}
             }
         }
 
@@ -211,25 +268,27 @@ 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(&mt("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("Max Possible To Date $maxHelpLink: <b>$totalPossible</b><br>");
-    $r->print("Total Parts In Course: <b>$totalParts</b></td></tr>\n\n");
+    if ($showPoints) {
+	my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
 
+	$title = $showPoints ? "Points" : "Parts Done";
+	
+	$r->print("<tr><td colspan='2' align='right'>Total $title: <b>$totalRight</b><br>");
+	$r->print(&mt("Max Possible To Date")." $maxHelpLink: <b>$totalPossible</b><br>");
+	$title = $showPoints ? "Points" : "Parts";
+	$r->print(&mt("Total $title In Course").": <b>$totalParts</b></td></tr>\n\n");
+    }
 
     $r->print("</table></body></html>");
 
-    $navmap->untieHashes();
-
     return OK;
 }
 
@@ -250,7 +309,7 @@ sub mixColors {
     $a = $start->[2]; $b = $end->[2];
     my $mix3 = POSIX::floor((1-$ratio)*$a + $ratio*$b);
 
-    $final = sprintf "%2x%2x%2x", $mix1, $mix2, $mix3;
+    $final = sprintf "%02x%02x%02x", $mix1, $mix2, $mix3;
     return "#" . $final;
 }