--- loncom/interface/lonquickgrades.pm	2002/11/26 14:45:25	1.7
+++ loncom/interface/lonquickgrades.pm	2003/03/23 07:12:41	1.12
@@ -64,7 +64,7 @@ sub real_handler {
     $r->send_http_header;
 
     # Create the nav map
-    my $navmap = Apache::lonnavmaps::navmap->new(
+    my $navmap = Apache::lonnavmaps::navmap->new($r,
                         $ENV{"request.course.fn"}.".db",
                         $ENV{"request.course.fn"}."_parms.db", 1, 0);
 
@@ -77,12 +77,6 @@ sub real_handler {
     # 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','',
@@ -90,7 +84,7 @@ sub real_handler {
 
     $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/classcalc">a detailed
+how many you have not yet done. You can also look at <a href="/adm/studentcalc">a detailed
 score sheet</a>.</p>
 HEADER
 
@@ -159,9 +153,9 @@ HEADER
     }
 
     $iterator = $navmap->getIterator(undef, undef, undef, 1);
-    my $depth = 1;
+    $depth = 1;
     $iterator->next(); # ignore first BEGIN_MAP
-    my $curRes = $iterator->next();
+    $curRes = $iterator->next();
 
     my @start = (255, 255, 192);
     my @end   = (0, 192, 0);
@@ -173,7 +167,7 @@ HEADER
 
     # 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--; }
@@ -221,7 +215,7 @@ HEADER
 
     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");
 
@@ -241,15 +235,16 @@ sub mixColors {
     my $end = shift;
     my $ratio = shift;
     
+    my ($a,$b);
     my $final = "";
-    my $a = $start->[0]; my $b = $end->[0];
+    $a = $start->[0]; $b = $end->[0];
     my $mix1 = POSIX::floor((1-$ratio)*$a + $ratio*$b);
-    my $a = $start->[1]; my $b = $end->[1];
+    $a = $start->[1]; $b = $end->[1];
     my $mix2 = POSIX::floor((1-$ratio)*$a + $ratio*$b);
-    my $a = $start->[2]; my $b = $end->[2];
+    $a = $start->[2]; $b = $end->[2];
     my $mix3 = POSIX::floor((1-$ratio)*$a + $ratio*$b);
 
-    my $final = sprintf "%2x%2x%2x", $mix1, $mix2, $mix3;
+    $final = sprintf "%2x%2x%2x", $mix1, $mix2, $mix3;
     return "#" . $final;
 }