--- loncom/interface/lonquickgrades.pm	2003/09/23 22:42:26	1.22.2.2
+++ loncom/interface/lonquickgrades.pm	2009/11/21 18:07:03	1.49
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# 
+# $Id: lonquickgrades.pm,v 1.49 2009/11/21 18:07:03 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,13 +25,16 @@
 #
 # http://www.lon-capa.org/
 #
-# Created Nov. 14, 2002 by Jeremy Bowers
 
 package Apache::lonquickgrades;
 
 use strict;
 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;
@@ -44,36 +47,34 @@ 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'}) {
-            $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');
-    }
     &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 '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, 1);
+    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;
     }
 
@@ -82,23 +83,25 @@ sub real_handler {
     my $res = $navmap->firstResource(); # temp resource to access constants
  
     # Header
-    my $title = $showPoints ? "Quick Points Display" : "Quick Completed Problems Display";
-    $r->print(&Apache::loncommon::bodytag($title, '', ''));
-
-    if (!$showPoints) {
-        $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
+    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>');
     }
 
-    $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();
 
-    $navmap->init();
-
     # End navmap using boilerplate
 
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);
@@ -119,8 +122,9 @@ HEADER
     #  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 $topLevelParts = 0; my $topLevelRight = 0; my $topLevelAttempted = 0;
 
     # Pre-run: Count parts correct
     while ( $depth > 0 ) {
@@ -133,26 +137,31 @@ HEADER
             my $parts = $curRes->parts();
             my $partsRight = 0;
 	    my $partsCount = 0;
+	    my $partsAttempted = 0;
             my $stack = $iterator->getStack();
             
             for my $part (@{$parts}) {
 		my $completionStatus = $curRes->getCompletionStatus($part);
 		my $dateStatus = $curRes->getDateStatus($part);
+		
                 if ($completionStatus == $curRes->EXCUSED()) {
                     next;
                 }
 		if ($showPoints) {
-		    my $score;
-		    # If we're not telling status and the answer date isn't
-		    # passed yet
-		    if (($curRes->problemstatus($part) eq 'no') &&
+		    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)) {
-			$score = 0;
+			my $status = $curRes->simpleStatus($part);
+			if ($status == $curRes->ATTEMPTED) {
+			    $partsAttempted += $curRes->weight($part);
+			    $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;
 		    $partsCount += $curRes->weight($part);
@@ -162,16 +171,22 @@ HEADER
 		    }
 		    $totalParts += $curRes->weight($part);
 		} else {
-		    my $status = $curRes->status($part);
+		    my $status = $curRes->simpleStatus($part);
 		    my $thisright = 0;
 		    $partsCount++;
-		    if ($status == $curRes->CORRECT || 
-			$status == $curRes->EXCUSED) {
+		    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++;
@@ -182,6 +197,7 @@ HEADER
             if ($depth == 1) { # in top-level only
 		$topLevelParts += $partsCount;
 		$topLevelRight += $partsRight;
+		$topLevelAttempted += $partsAttempted;
 	    }
 
             # Crawl down stack and record parts correct and total
@@ -190,10 +206,12 @@ HEADER
                     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;
                 }
             }
         }
@@ -211,9 +229,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>Folder</b></td>');
-    $title = $showPoints ? "Points Scored" : "Done";
-    $r->print("<td align='center'>$title / Total</td><tr>" . "\n\n");
+    $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--; }
@@ -223,18 +247,35 @@ HEADER
             
             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("<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>");
-                $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n");
+		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());
+		}
             }
         }
 
@@ -245,24 +286,28 @@ HEADER
     if ($topLevelParts > 0) {
         my $ratio = $topLevelRight / $topLevelParts;
         my $color = mixColors(\@start, \@end, $ratio);
-        $r->print("<tr><td bgcolor='$color'>");
-        $r->print("Problems Not Contained In A Folder</td><td>");
-        $r->print("$topLevelRight / $topLevelParts</td></tr>");
+        $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());
     }
 
-    my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
+    if ($showPoints) {
+	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("Max Possible To Date $maxHelpLink: <b>$totalPossible</b><br>");
-    $title = $showPoints ? "Points" : "Parts";
-    $r->print("Total $title In Course: <b>$totalParts</b></td></tr>\n\n");
-
-
-    $r->print("</table></body></html>");
+	$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());
+    }
 
-    $navmap->untieHashes();
+    $r->print(&Apache::loncommon::end_data_table()
+             .&Apache::loncommon::end_page());
 
     return OK;
 }