--- loncom/interface/lonquickgrades.pm 2002/12/02 10:14:57 1.8 +++ loncom/interface/lonquickgrades.pm 2003/06/13 19:11:56 1.14 @@ -77,12 +77,6 @@ sub real_handler { # Keep this hash in sync with %statusIconMap in lonnavmaps; they # should match color/icon my $res = $navmap->firstResource(); # temp resource to access constants - - if (!defined($navmap)) { - my $requrl = $r->uri; - $ENV{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized"; - return HTTP_NOT_ACCEPTABLE; - } # Header $r->print(&Apache::loncommon::bodytag('Quick Score Display','', @@ -113,6 +107,7 @@ HEADER # the counts to the parent map.) my $totalParts = 0; my $totalPossible = 0; my $totalRight = 0; + my $now = time(); # Pre-run: Count parts correct while ( $depth > 0 ) { @@ -123,21 +118,22 @@ HEADER { # Get number of correct, incorrect parts my $parts = $curRes->parts(); - if (scalar(@{$parts}) > 1) { shift @{$parts}; } # lose the first "0" - $totalParts += scalar(@{$parts}); + $totalParts += $curRes->countParts(); my $partsRight = 0; my $stack = $iterator->getStack(); for my $part (@{$parts}) { my $status = $curRes->getCompletionStatus($part); + my $thisright = 0; if ($status == $curRes->CORRECT || $status == $curRes->CORRECT_BY_OVERRIDE - || $status == $curRes->EXCUSED) { + || $status == $curRes->EXCUSED || $status == $curRes->ANSWER_SUBMITTED) { $partsRight++; $totalRight++; + $thisright = 1; } my $dateStatus = $curRes->getDateStatus($part); - if ($status != $curRes->OPEN_LATER) { + if ($curRes->opendate($part) < $now) { $totalPossible++; } } @@ -159,9 +155,9 @@ HEADER } $iterator = $navmap->getIterator(undef, undef, undef, 1); - my $depth = 1; + $depth = 1; $iterator->next(); # ignore first BEGIN_MAP - my $curRes = $iterator->next(); + $curRes = $iterator->next(); my @start = (255, 255, 192); my @end = (0, 192, 0); @@ -173,19 +169,12 @@ HEADER # Second pass: Print the maps. $r->print('
Sequence | '); - $r->print('Correct / Total | |
Done / Total | ||
$correct / $total | ||
"); - $r->print("Problems Not Contained In Sequences | "); + $r->print("Problems Not Contained In A Folder | "); $r->print("$unaccountedCorrect / $unaccountedTotal |
Total Parts Correct: $totalRight "); + $r->print(" | ||
Total Parts Done: $totalRight "); $r->print("Max Possible To Date $maxHelpLink: $totalPossible "); $r->print("Total Parts In Course: $totalParts |