--- loncom/interface/lonquickgrades.pm 2003/06/25 18:46:09 1.18
+++ loncom/interface/lonquickgrades.pm 2003/08/07 14:29:43 1.23
@@ -63,12 +63,11 @@ sub real_handler {
&Apache::loncommon::no_cache($r);
$r->send_http_header;
- my $showPoints = $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard';
+ my $showPoints =
+ $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard';
# 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(1, 0, 1);
if (!defined($navmap)) {
my $requrl = $r->uri;
@@ -84,20 +83,15 @@ sub real_handler {
my $title = $showPoints ? "Quick Points Display" : "Quick Completed Problems Display";
$r->print(&Apache::loncommon::bodytag($title, '', ''));
- if ($showPoints) {
- $r->print(<
This may take a few moments to display.
"); + $r->print("This may take a few moments to display."); $r->rflush(); @@ -135,28 +129,30 @@ HEADER { # Get number of correct, incorrect parts my $parts = $curRes->parts(); - $totalParts += $curRes->countParts(); my $partsRight = 0; my $partsCount = 0; my $stack = $iterator->getStack(); for my $part (@{$parts}) { + if ($curRes->getCompletionStatus($part) == $curRes->EXCUSED()) { + next; + } if ($showPoints) { my $score = $curRes->weight($part) * $curRes->awarded($part); $partsRight += $score; $totalRight += $score; - $partsCount += $curRes->weight(); + $partsCount += $curRes->weight($part); if ($curRes->opendate($part) < $now) { - $totalPossible += $curRes->weight(); + $totalPossible += $curRes->weight($part); } + $totalParts += $curRes->weight($part); } else { my $status = $curRes->getCompletionStatus($part); my $thisright = 0; $partsCount++; if ($status == $curRes->CORRECT || $status == $curRes->CORRECT_BY_OVERRIDE || - $status == $curRes->EXCUSED || $status == $curRes->ANSWER_SUBMITTED) { $partsRight++; $totalRight++; @@ -164,6 +160,7 @@ HEADER } my $dateStatus = $curRes->getDateStatus($part); + $totalParts++; if ($curRes->opendate($part) < $now) { $totalPossible++; } @@ -171,9 +168,8 @@ HEADER } if ($depth == 1) { # in top-level only - $topLevelParts += scalar(@{$parts}); + $topLevelParts += $partsCount; $topLevelRight += $partsRight; - $r->print($curRes->compTitle() . 'Sequence | '); - $r->print('Done / Total |
Folder | '); + $title = $showPoints ? "Points Scored" : "Done"; + $r->print("$title / Total |