--- loncom/interface/lonquickgrades.pm 2002/11/26 14:45:25 1.7 +++ loncom/interface/lonquickgrades.pm 2003/06/25 18:30:27 1.17 @@ -63,10 +63,12 @@ sub real_handler { &Apache::loncommon::no_cache($r); $r->send_http_header; + 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); + $ENV{"request.course.fn"}."_parms.db", 1, 0, 1); if (!defined($navmap)) { my $requrl = $r->uri; @@ -77,22 +79,27 @@ 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','', - '')); + my $title = $showPoints ? "Quick Points Display" : "Quick Completed Problems Display"; + $r->print(&Apache::loncommon::bodytag($title, '', '')); - $r->print(<print(<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 detailed +how many you have not yet done. You can also look at a detailed score sheet.

HEADER + } else { + $r->print(<This screen shows how many points you have. You can also look at +a detailed score sheet.

+HEADER + } + + $r->print("

This may take a few moments to display.

"); + + $r->rflush(); $navmap->init(); @@ -111,8 +118,13 @@ HEADER # 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 $now = time(); + my $topLevelParts = 0; my $topLevelRight = 0; # Pre-run: Count parts correct while ( $depth > 0 ) { @@ -123,25 +135,47 @@ 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 $partsCount = 0; my $stack = $iterator->getStack(); for my $part (@{$parts}) { - my $status = $curRes->getCompletionStatus($part); - if ($status == $curRes->CORRECT || $status == $curRes->CORRECT_BY_OVERRIDE - || $status == $curRes->EXCUSED) { - $partsRight++; - $totalRight++; - } - - my $dateStatus = $curRes->getDateStatus($part); - if ($status != $curRes->OPEN_LATER) { - $totalPossible++; - } + if ($showPoints) { + my $score = $curRes->weight() * $curRes->awarded(); + $partsRight += $score; + $totalRight += $score; + $partsCount += $curRes->weight(); + + if ($curRes->opendate($part) < $now) { + $totalPossible += $curRes->weight(); + } + } 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++; + $thisright = 1; + } + + my $dateStatus = $curRes->getDateStatus($part); + if ($curRes->opendate($part) < $now) { + $totalPossible++; + } + } } - + + if ($depth == 1) { # in top-level only + $topLevelParts += scalar(@{$parts}); + $topLevelRight += $partsRight; + $r->print($curRes->compTitle() . '
'); + } + # Crawl down stack and record parts correct and total for my $res (@{$stack}) { if (ref($res) && $res->is_map()) { @@ -150,7 +184,7 @@ HEADER $res->{DATA}->{CHILD_CORRECT} = 0; } - $res->{DATA}->{CHILD_PARTS} += scalar(@{$parts}); + $res->{DATA}->{CHILD_PARTS} += $partsCount; $res->{DATA}->{CHILD_CORRECT} += $partsRight; } } @@ -159,51 +193,39 @@ 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); my $indentString = '     '; - my $unaccountedTotal = $totalParts; - my $unaccountedCorrect = $totalRight; - # Second pass: Print the maps. $r->print(''); - $r->print('' . "\n\n"); + $r->print('' . "\n\n"); while ($depth > 0) { if ($curRes == $iterator->BEGIN_MAP()) {$depth++;} if ($curRes == $iterator->END_MAP()) { $depth--; } if (ref($curRes) && $curRes->is_map()) { - my $stack = $iterator->getStack(); - my $src = Apache::lonnavmaps::getLinkForResource($stack); - my $srcHasQuestion = $src =~ /\?/; - my $link = $src. - ($srcHasQuestion?'&':'?') . - 'symb='.&Apache::lonnet::escape($curRes->symb()). - '"'; my $title = $curRes->compTitle(); my $correct = $curRes->{DATA}->{CHILD_CORRECT}; my $total = $curRes->{DATA}->{CHILD_PARTS}; - $unaccountedTotal -= $total; - $unaccountedCorrect -= $correct; - if ($total > 0) { my $ratio; $ratio = $correct / $total; my $color = mixColors(\@start, \@end, $ratio); $r->print(""); - $r->print("\n"); + $r->print("$thisIndent$title"); + $r->print("\n"); } } @@ -211,19 +233,22 @@ HEADER } # If there were any problems at the top level, print an extra "catchall" - if ($unaccountedTotal > 0) { - my $ratio = $unaccountedCorrect / $unaccountedTotal; + if ($topLevelParts > 0) { + my $ratio = $topLevelRight / $topLevelParts; my $color = mixColors(\@start, \@end, $ratio); $r->print(""); + $r->print("Problems Not Contained In A Folder"); } my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct"); - $r->print("\n\n"); + $title = $showPoints ? "Points" : "Parts"; + $r->print("Total $title In Course: $totalParts\n\n"); $r->print("
SequenceCorrect / Total
Done / Total
"); - for (my $i = 1; $i < $depth; $i++) { $r->print($indentString); } + my $thisIndent = ''; + for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; } - $r->print("$title$correct / $total
$thisIndent$correct / $total
"); - $r->print("Problems Not Contained In Sequences"); - $r->print("$unaccountedCorrect / $unaccountedTotal
"); + $r->print("$topLevelRight / $topLevelParts
Total Parts Correct: $totalRight
"); + $title = $showPoints ? "Points" : "Parts Done"; + + $r->print("
Total $title: $totalRight
"); $r->print("Max Possible To Date $maxHelpLink: $totalPossible
"); - $r->print("Total Parts In Course: $totalParts
"); @@ -241,15 +266,16 @@ sub mixColors { my $end = shift; my $ratio = shift; + my ($a,$b); my $final = ""; - my $a = $start->[0]; my $b = $end->[0]; + $a = $start->[0]; $b = $end->[0]; my $mix1 = POSIX::floor((1-$ratio)*$a + $ratio*$b); - my $a = $start->[1]; my $b = $end->[1]; + $a = $start->[1]; $b = $end->[1]; my $mix2 = POSIX::floor((1-$ratio)*$a + $ratio*$b); - my $a = $start->[2]; my $b = $end->[2]; + $a = $start->[2]; $b = $end->[2]; my $mix3 = POSIX::floor((1-$ratio)*$a + $ratio*$b); - my $final = sprintf "%2x%2x%2x", $mix1, $mix2, $mix3; + $final = sprintf "%02x%02x%02x", $mix1, $mix2, $mix3; return "#" . $final; }