--- loncom/interface/lonquickgrades.pm	2015/03/13 22:40:35	1.49.6.2
+++ loncom/interface/lonquickgrades.pm	2010/12/03 15:21:35	1.54
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.49.6.2 2015/03/13 22:40:35 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.54 2010/12/03 15:21:35 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,7 +29,7 @@
 package Apache::lonquickgrades;
 
 use strict;
-use Apache::Constants qw(:common :http REDIRECT);
+use Apache::Constants qw(:common :http);
 use POSIX;
 use Apache::loncommon;
 use Apache::lonlocal;
@@ -57,37 +57,6 @@ sub real_handler {
         return OK;
     }
 
-    unless (&Apache::lonnet::allowed('mgr')) {
-        # 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;
-        }
-
-        # Check if course needs to be re-initialized
-        my $loncaparev = $r->dir_config('lonVersion');
-        my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
-
-        if ($result eq 'switch') {
-            &Apache::loncommon::content_type($r,'text/html');
-            $r->send_http_header;
-            $r->print(&Apache::loncommon::check_release_result(@reinit));
-            return OK;
-        } elsif ($result eq 'update') {
-            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-            my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
-            if ($ferr) {
-                my $requrl = $r->uri;
-                $env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
-                $env{'user.reinit'} = 1;
-                return HTTP_NOT_ACCEPTABLE;
-            }
-        }
-    }
-
     # Send header, don't cache this page
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
@@ -99,20 +68,10 @@ sub real_handler {
       || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
     my $notshowTotals=
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+    my $showCategories=
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
 
-    # 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.";
-        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
- 
     # Header
     my $title = "Grading and Statistics";#$showPoints ? "Points Display" : "Completed Problems Display";
     my $brcrum = [{href=>"/adm/quickgrades",text => "Points Display"}];
@@ -120,6 +79,8 @@ sub real_handler {
                                             {'bread_crumbs' => $brcrum})
              );
 
+    $r->print(&Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading'));
+
     if (!$showPoints && !$notshowSPRSlink ) {
         $r->print('<p>'
                  .&mt('This screen shows how many problems (or problem parts) you have completed'
@@ -133,7 +94,36 @@ sub real_handler {
 
     $r->rflush();
 
-    # End navmap using boilerplate
+#    my $uname='korte';
+#    my $udom='gerd';
+
+    my $uname;
+    my $udom;
+
+    my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
+       &getData($showPoints,$uname,$udom);
+
+    if ($showCategories) {
+       &outputCategories($r,$showPoints,$notshowTotals,
+                 $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+    } else {
+       &outputTable($r,$showPoints,$notshowTotals,
+                 $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+    }
+    return OK;
+
+}
+
+sub getData {
+
+    my ($showPoints,$uname,$udom)=@_;
+
+    &Apache::lonnet::logthis("About to call with $uname $udom");
+
+    # Create the nav map
+    my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
+
+    my $res = $navmap->firstResource(); # temp resource to access constants
 
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);
     my $depth = 1;
@@ -248,11 +238,17 @@ sub real_handler {
         }
         $curRes = $iterator->next();
     }
+    return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+}
 
-    $iterator = $navmap->getIterator(undef, undef, undef, 1);
-    $depth = 1;
-    $iterator->next(); # ignore first BEGIN_MAP
-    $curRes = $iterator->next();
+#
+# Outputting everything.
+#
+
+sub outputTable {
+
+    my ($r,$showPoints,$notshowTotals,
+           $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
 
     my @start = (255, 255, 192);
     my @end   = (0, 192, 0);
@@ -263,12 +259,21 @@ sub real_handler {
     $r->print(&Apache::loncommon::start_data_table()
              .&Apache::loncommon::start_data_table_header_row()
              .'<th>'.&mt('Folder').'</th>');
-    $title = &mt($showPoints ? "Points Scored" : "Done");
+    my $title = &mt($showPoints ? "Points Scored" : "Done");
     if ($totalAttempted) {
-	$title .= " / " . &mt("Attempted");
+        $title .= " / " . &mt("Attempted");
     }
     $r->print("<th>$title".($notshowTotals?'':" / ".&mt('Total')).'</th>'
              .&Apache::loncommon::end_data_table_header_row());
+#
+# Output of folder scores
+#
+
+    my $iterator = $navmap->getIterator(undef, undef, undef, 1);
+    my $depth = 1;
+    $iterator->next(); # ignore first BEGIN_MAP
+    my $curRes = $iterator->next();
+
     while ($depth > 0) {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
         if ($curRes == $iterator->END_MAP()) { $depth--; }
@@ -283,7 +288,7 @@ sub real_handler {
             if ($total > 0) {
                 my $ratio;
                 $ratio = $correct / $total;
-                my $color = mixColors(\@start, \@end, $ratio);
+                my $color = &mixColors(\@start, \@end, $ratio);
                 $r->print(&Apache::loncommon::start_data_table_row()
                          .'<td style="background-color:'.$color.';">');
                 
@@ -324,28 +329,41 @@ sub real_handler {
                  .&Apache::loncommon::end_data_table_row());
     }
 
+#
+# show totals (if applicable), close table
+#
     if ($showPoints) {
-	my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
+        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()
+        $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>'
+        $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(&Apache::loncommon::end_data_table()
              .&Apache::loncommon::end_page());
 
-    return OK;
+}
+
+#
+# Outputting category-based grades.
+#
+
+sub outputCategories {
+
+    my ($r,$showPoints,$notshowTotals,
+           $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
 }
 
 # Pass this two refs to arrays for the start and end color, and a number
 # from 0 to 1 for how much of the latter you want to mix in. It will
 # return a string ready to show ("#FFC309");
+
 sub mixColors {
     my $start = shift;
     my $end = shift;