--- loncom/interface/lonquickgrades.pm	2008/12/11 14:55:15	1.45
+++ loncom/interface/lonquickgrades.pm	2014/05/22 12:44:24	1.49.6.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.45 2008/12/11 14:55:15 bisitz Exp $
+# $Id: lonquickgrades.pm,v 1.49.6.1 2014/05/22 12:44:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,12 +25,11 @@
 #
 # http://www.lon-capa.org/
 #
-# Created Nov. 14, 2002 by Jeremy Bowers
 
 package Apache::lonquickgrades;
 
 use strict;
-use Apache::Constants qw(:common :http);
+use Apache::Constants qw(:common :http REDIRECT);
 use POSIX;
 use Apache::loncommon;
 use Apache::lonlocal;
@@ -45,6 +44,14 @@ sub handler {
 sub real_handler {
     my $r = shift;
 
+    # Check for critical messages and redirect if present.
+    my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
+    if ($redirect) {
+        &Apache::loncommon::content_type($r,'text/html');
+        $r->header_out(Location => $url);
+        return REDIRECT;
+    }
+
     &Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
 
     # Handle header-only request
@@ -65,7 +72,10 @@ sub real_handler {
     my $showPoints = 
         $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')
+      || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
+    my $notshowTotals=
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
 
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -81,9 +91,11 @@ sub real_handler {
     my $res = $navmap->firstResource(); # temp resource to access constants
  
     # Header
-    my $title = $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}));
+    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('<p>'
@@ -232,7 +244,7 @@ sub real_handler {
     if ($totalAttempted) {
 	$title .= " / " . &mt("Attempted");
     }
-    $r->print("<th>$title / ".&mt('Total').'</td>'
+    $r->print("<th>$title".($notshowTotals?'':" / ".&mt('Total')).'</th>'
              .&Apache::loncommon::end_data_table_header_row());
     while ($depth > 0) {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
@@ -260,7 +272,7 @@ sub real_handler {
 		    $r->print('<td valign="top">'
                              .$thisIndent
                              .'<span class="LC_nobreak">'
-                             .$correct.' / '.$attempted.' / '.$total
+                             .$correct.' / '.$attempted.($notshowTotals?'':' / '.$total)
                              .'</span></td>'
                              .&Apache::loncommon::end_data_table_row()
                     );
@@ -268,7 +280,7 @@ sub real_handler {
 		    $r->print('<td valign="top">'
                              .$thisIndent
                              .'<span class="LC_nobreak">'
-                             .$correct.' / '.$total
+                             .$correct.($notshowTotals?'':' / '.$total)
                              .'</span></td>'
                              .&Apache::loncommon::end_data_table_row());
 		}
@@ -295,8 +307,8 @@ sub real_handler {
 	$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>");
+                 .'<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());