--- loncom/interface/lonquickgrades.pm 2003/06/25 19:01:23 1.19
+++ loncom/interface/lonquickgrades.pm 2003/09/23 22:42:26 1.22.2.2
@@ -63,7 +63,8 @@ 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(
@@ -84,20 +85,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(); @@ -140,30 +136,42 @@ HEADER 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 = $curRes->weight($part) * $curRes->awarded($part); + my $score; + # If we're not telling status and the answer date isn't + # passed yet + if (($curRes->problemstatus($part) eq 'no') && + ($dateStatus != $curRes->ANSWER_OPEN)) { + $score = 0; + } else { + $score = $curRes->weight($part) * + $curRes->awarded($part); + } + $partsRight += $score; $totalRight += $score; $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 $status = $curRes->status($part); my $thisright = 0; $partsCount++; if ($status == $curRes->CORRECT || - $status == $curRes->CORRECT_BY_OVERRIDE || - $status == $curRes->EXCUSED || - $status == $curRes->ANSWER_SUBMITTED) { + $status == $curRes->EXCUSED) { $partsRight++; $totalRight++; $thisright = 1; } - my $dateStatus = $curRes->getDateStatus($part); $totalParts++; if ($curRes->opendate($part) < $now) { $totalPossible++; @@ -174,7 +182,6 @@ HEADER if ($depth == 1) { # in top-level only $topLevelParts += $partsCount; $topLevelRight += $partsRight; - $r->print($curRes->compTitle() . 'Sequence | '); - $r->print('Done / Total |
Folder | '); + $title = $showPoints ? "Points Scored" : "Done"; + $r->print("$title / Total |