--- loncom/interface/lonquickgrades.pm	2004/10/07 22:12:47	1.32
+++ loncom/interface/lonquickgrades.pm	2009/05/16 23:21:00	1.48
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.32 2004/10/07 22:12:47 albertel Exp $
+# $Id: lonquickgrades.pm,v 1.48 2009/05/16 23:21:00 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,8 @@ 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;
@@ -46,36 +48,31 @@ sub real_handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
 
     # Handle header-only request
+    if ($env{'browser.mathml'}) {
+	&Apache::loncommon::content_type($r,'text/xml');
+    } else {
+	&Apache::loncommon::content_type($r,'text/html');
+    }
     if ($r->header_only) {
-        if ($ENV{'browser.mathml'}) {
-            &Apache::loncommon::content_type($r,'text/xml');
-        } else {
-            &Apache::loncommon::content_type($r,'text/html');
-        }
-        $r->send_http_header;
+	$r->send_http_header;
         return OK;
     }
 
     # Send header, don't cache this page
-    if ($ENV{'browser.mathml'}) {
-        &Apache::loncommon::content_type($r, 'text/xml');
-    } else {
-        &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';
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
     my $notshowSPRSlink = 
-        $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'external';
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external';
 
     # Create the nav map
     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;
     }
 
@@ -84,18 +81,22 @@ sub real_handler {
     my $res = $navmap->firstResource(); # temp resource to access constants
  
     # Header
-    my $title = $showPoints ? "Points Display" : "Completed Problems Display";
-    $r->print(&Apache::loncommon::bodytag($title, '', ''));
+    my $title = "Grading and Statistics";#$showPoints ? "Points Display" : "Completed Problems Display";
+    my $brcrum = [{href=>"/adm/quickgrades",text => "Points Display"}];
+    $r->print(&Apache::loncommon::start_page($title,undef,
+                                            {'bread_crumbs' => $brcrum})
+             );
 
     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('<p>'
+                 .&mt('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 [_1]a detailed score sheet[_2].'
+                     ,'<a href="/adm/studentcalc">','</a>')
+                 .'</p>');
     }
 
-    $r->print("This may take a few moments to display.");
+    $r->print('<p class="LC_info">'.&mt('This may take a few moments to display.').'</p>');
 
     $r->rflush();
 
@@ -148,7 +149,8 @@ HEADER
 		    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' &&
+		    if ((($curRes->problemstatus($part) eq 'no') ||
+                        ($curRes->problemstatus($part) eq 'no_feedback_ever')) &&
 			($dateStatus != $curRes->ANSWER_OPEN)) {
 			my $status = $curRes->simpleStatus($part);
 			if ($status == $curRes->ATTEMPTED) {
@@ -156,7 +158,7 @@ HEADER
 			    $totalAttempted += $partsAttempted;
 			}
 		    } else {
-			$score = $curRes->weight($part) * $curRes->awarded($part);
+			$score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));
 		    }
 		    $partsRight += $score;
 		    $totalRight += $score;
@@ -170,8 +172,8 @@ HEADER
 		    my $status = $curRes->simpleStatus($part);
 		    my $thisright = 0;
 		    $partsCount++;
-		    if ($status == $curRes->CORRECT || 
-			$status == $curRes->INCORRECT ) {
+		    if ($status == $curRes->CORRECT ||
+			$status == $curRes->PARTIALLY_CORRECT ) {
 			$partsRight++;
 			$totalRight++;
 			$thisright = 1;
@@ -225,14 +227,15 @@ 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>' .
-	      &mt('Folder') . '</b></td>');
+    $r->print(&Apache::loncommon::start_data_table()
+             .&Apache::loncommon::start_data_table_header_row()
+             .'<th>'.&mt('Folder').'</th>');
     $title = &mt($showPoints ? "Points Scored" : "Done");
     if ($totalAttempted) {
 	$title .= " / " . &mt("Attempted");
     }
-    $r->print("<td align='center'>$title / "
-	      . &mt('Total') . "</td><tr>\n\n");
+    $r->print("<th>$title / ".&mt('Total').'</td>'
+             .&Apache::loncommon::end_data_table_header_row());
     while ($depth > 0) {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
         if ($curRes == $iterator->END_MAP()) { $depth--; }
@@ -248,16 +251,28 @@ HEADER
                 my $ratio;
                 $ratio = $correct / $total;
                 my $color = mixColors(\@start, \@end, $ratio);
-                $r->print("<tr><td bgcolor='$color'>");
+                $r->print(&Apache::loncommon::start_data_table_row()
+                         .'<td style="background-color:'.$color.';">');
                 
 		my $thisIndent = '';
                 for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }
                 
                 $r->print("$thisIndent$title</td>");
 		if ($totalAttempted) {
-		    $r->print("<td valign='top'>$thisIndent<nobr>$correct / $attempted / $total</nobr></td></tr>\n");
+		    $r->print('<td valign="top">'
+                             .$thisIndent
+                             .'<span class="LC_nobreak">'
+                             .$correct.' / '.$attempted.' / '.$total
+                             .'</span></td>'
+                             .&Apache::loncommon::end_data_table_row()
+                    );
 		} else {
-		    $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n");
+		    $r->print('<td valign="top">'
+                             .$thisIndent
+                             .'<span class="LC_nobreak">'
+                             .$correct.' / '.$total
+                             .'</span></td>'
+                             .&Apache::loncommon::end_data_table_row());
 		}
             }
         }
@@ -269,22 +284,28 @@ HEADER
     if ($topLevelParts > 0) {
         my $ratio = $topLevelRight / $topLevelParts;
         my $color = mixColors(\@start, \@end, $ratio);
-        $r->print("<tr><td bgcolor='$color'>");
+        $r->print(&Apache::loncommon::start_data_table_row()
+                 .'<td style="background-color:'.$color.';">');
         $r->print(&mt("Problems Not Contained In A Folder")."</td><td>");
-        $r->print("$topLevelRight / $topLevelParts</td></tr>");
+        $r->print("$topLevelRight / $topLevelParts</td>"
+                 .&Apache::loncommon::end_data_table_row());
     }
 
-    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");
+    if ($showPoints) {
+	my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
 
+	$title = $showPoints ? "Points" : "Parts Done";
+	my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
+	$r->print(&Apache::loncommon::start_data_table_row()
+                 .'<td colspan="2" align="right">'.$totaltitle.': <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>'
+                 .&Apache::loncommon::end_data_table_row());
+    }
 
-    $r->print("</table></body></html>");
+    $r->print(&Apache::loncommon::end_data_table()
+             .&Apache::loncommon::end_page());
 
     return OK;
 }