--- loncom/interface/lonquickgrades.pm	2002/11/15 20:08:18	1.3
+++ loncom/interface/lonquickgrades.pm	2015/03/13 22:40:35	1.49.6.2
@@ -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 $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,116 +25,343 @@
 #
 # 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;
+use Apache::lonnet;
+use Apache::grades;
 
 sub handler {
     my $r = shift;
+    return real_handler($r);
+}
+
+sub real_handler {
+    my $r = shift;
 
     &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'}) {
-            $r->content_type('text/xml');
-        } else {
-            $r->content_type('text/html');
-        }
-        $r->send_http_header;
+	$r->send_http_header;
         return OK;
     }
 
-    # Send header, don't cache this page
-    if ($ENV{'browser.mathml'}) {
-        $r->content_type('text/xml');
-    } else {
-        $r->content_type('text/html');
+    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;
 
+    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 'externalnototals'));
+    my $notshowTotals=
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+
     # 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:Course not initialized";
+        $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
-    $r->print(&Apache::loncommon::bodytag('Quick Score Display','',
-                                          ''));
+    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>'
+                 .&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>');
+    }
 
-    $navmap->init();
+    $r->print('<p class="LC_info">'.&mt('This may take a few moments to display.').'</p>');
 
-    # End navmap using boilerplate
+    $r->rflush();
 
-    # Col labels
-    $r->print(<<TABLETOP);
-<table border="1" cellpadding="3" cellspacing="0">
-  <tr>
-    <td align="center"><b>Problem</b></td>
-    <td align="center"><b>Score</b></td>
-  </tr>
-TABLETOP
+    # End navmap using boilerplate
 
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);
     my $depth = 1;
     $iterator->next(); # ignore first BEGIN_MAP
     my $curRes = $iterator->next();
-    my $totalAvailable = 0;
-    my $total = 0;
-   
+    
+    # General overview of the following: Walk along the course resources.
+    # For every problem in the resource, tell its parent maps how many
+    # parts and how many parts correct it has. After that, each map will
+    # have a count of the total parts underneath it, correct and otherwise.
+    # After that, we will walk through the course again and read off
+    # 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 ) {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
         if ($curRes == $iterator->END_MAP()) { $depth--; }
 
-        if (ref($curRes) && $curRes->is_problem()) {
-            my $title = $curRes->compTitle();
-            $r->print('    <tr>');
+        if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout)
+        {
+            # Get number of correct, incorrect parts
+            my $parts = $curRes->parts();
+            my $partsRight = 0;
+	    my $partsCount = 0;
+	    my $partsAttempted = 0;
             my $stack = $iterator->getStack();
-            my $src = Apache::lonnavmaps::getLinkForResource($stack);
-            my $srcHasQuestion = $src =~ /\?/;
-            my $link = $src.
-                ($srcHasQuestion?'&':'?') .
-                'symb='.&Apache::lonnet::escape($curRes->symb()).
-                '"';
-            $r->print("<td><a href=\"$link\">$title</td>");
             
-            my $avail = 0;
-            my $score = 0;
-            my $parts = $curRes->parts();
             for my $part (@{$parts}) {
-                my $partAvail = $curRes->weight($part);
-                my $partScore = $curRes->awarded($part) * $partAvail;
-                $avail += $partAvail;
-                $score += $partScore;
+		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') ||
+                        ($curRes->problemstatus($part) eq 'no_feedback_ever')) &&
+			($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} += $partsCount;
+                    $res->{DATA}->{CHILD_CORRECT} += $partsRight;
+		    $res->{DATA}->{CHILD_ATTEMPTED} += $partsAttempted;
+                }
+            }
+        }
+        $curRes = $iterator->next();
+    }
+
+    $iterator = $navmap->getIterator(undef, undef, undef, 1);
+    $depth = 1;
+    $iterator->next(); # ignore first BEGIN_MAP
+    $curRes = $iterator->next();
+
+    my @start = (255, 255, 192);
+    my @end   = (0, 192, 0);
+
+    my $indentString = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+
+    # Second pass: Print the maps.
+    $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("<th>$title".($notshowTotals?'':" / ".&mt('Total')).'</th>'
+             .&Apache::loncommon::end_data_table_header_row());
+    while ($depth > 0) {
+        if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
+        if ($curRes == $iterator->END_MAP()) { $depth--; }
+
+        if (ref($curRes) && $curRes->is_map()) {
+            my $title = $curRes->compTitle();
             
-            $r->print("<td align=\"right\">$score / $avail</td></tr>\n");
-            $totalAvailable += $avail;
-            $total += $score;
+            my $correct = $curRes->{DATA}->{CHILD_CORRECT};
+            my $total = $curRes->{DATA}->{CHILD_PARTS};
+	    my $attempted = $curRes->{DATA}->{CHILD_ATTEMPTED};
+
+            if ($total > 0) {
+                my $ratio;
+                $ratio = $correct / $total;
+                my $color = mixColors(\@start, \@end, $ratio);
+                $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
+                             .'<span class="LC_nobreak">'
+                             .$correct.' / '.$attempted.($notshowTotals?'':' / '.$total)
+                             .'</span></td>'
+                             .&Apache::loncommon::end_data_table_row()
+                    );
+		} else {
+		    $r->print('<td valign="top">'
+                             .$thisIndent
+                             .'<span class="LC_nobreak">'
+                             .$correct.($notshowTotals?'':' / '.$total)
+                             .'</span></td>'
+                             .&Apache::loncommon::end_data_table_row());
+		}
+            }
         }
 
         $curRes = $iterator->next();
     }
 
-    $r->print("<td colspan=\"2\" align=\"right\">Total Points Scored: <b>$total</b>");
-    $r->print("<br />Total Points Available: <b>$totalAvailable</b>");
-    $r->print("</td></tr></table>\n\n");
+    # If there were any problems at the top level, print an extra "catchall"
+    if ($topLevelParts > 0) {
+        my $ratio = $topLevelRight / $topLevelParts;
+        my $color = mixColors(\@start, \@end, $ratio);
+        $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>"
+                 .&Apache::loncommon::end_data_table_row());
+    }
 
-    $r->print("</body></html>");
+    if ($showPoints) {
+	my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
 
-    $navmap->untieHashes();
+	$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(&Apache::loncommon::end_data_table()
+             .&Apache::loncommon::end_page());
 
     return OK;
 }
 
+# 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;
+    my $ratio = shift;
+    
+    my ($a,$b);
+    my $final = "";
+    $a = $start->[0]; $b = $end->[0];
+    my $mix1 = POSIX::floor((1-$ratio)*$a + $ratio*$b);
+    $a = $start->[1]; $b = $end->[1];
+    my $mix2 = POSIX::floor((1-$ratio)*$a + $ratio*$b);
+    $a = $start->[2]; $b = $end->[2];
+    my $mix3 = POSIX::floor((1-$ratio)*$a + $ratio*$b);
+
+    $final = sprintf "%02x%02x%02x", $mix1, $mix2, $mix3;
+    return "#" . $final;
+}
+
 1;