--- loncom/interface/lonquickgrades.pm 2002/11/22 20:07:11 1.5 +++ loncom/interface/lonquickgrades.pm 2003/09/22 20:05:20 1.26 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Quick Student Grades Display # -# +# $Id: lonquickgrades.pm,v 1.26 2003/09/22 20:05:20 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,6 +32,8 @@ package Apache::lonquickgrades; use strict; use Apache::Constants qw(:common :http); use POSIX; +use Apache::loncommon; +use Apache::lonlocal; sub handler { my $r = shift; @@ -46,9 +48,9 @@ sub real_handler { # Handle header-only request if ($r->header_only) { if ($ENV{'browser.mathml'}) { - $r->content_type('text/xml'); + &Apache::loncommon::content_type($r,'text/xml'); } else { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); } $r->send_http_header; return OK; @@ -56,33 +58,44 @@ sub real_handler { # Send header, don't cache this page if ($ENV{'browser.mathml'}) { - $r->content_type('text/xml'); + &Apache::loncommon::content_type($r,'text/xml'); } else { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); } &Apache::loncommon::no_cache($r); $r->send_http_header; - # Create the nav map - my $navmap = Apache::lonnavmaps::navmap->new( - $ENV{"request.course.fn"}.".db", - $ENV{"request.course.fn"}."_parms.db", 1, 0); + my $showPoints = + $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard'; - # Keep this hash in sync with %statusIconMap in lonnavmaps; they - # should match color/icon - my $res = $navmap->firstResource(); # temp resource to access constants + # Create the nav map + my $navmap = Apache::lonnavmaps::navmap->new(); if (!defined($navmap)) { my $requrl = $r->uri; - $ENV{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized"; + $ENV{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed."; return HTTP_NOT_ACCEPTABLE; } + + # Keep this hash in sync with %statusIconMap in lonnavmaps; they + # should match color/icon + my $res = $navmap->firstResource(); # temp resource to access constants # 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, '', '')); + + if (!$showPoints) { + $r->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 +score sheet.

+HEADER + } + + $r->print("This may take a few moments to display."); - $navmap->init(); + $r->rflush(); # End navmap using boilerplate @@ -99,37 +112,66 @@ sub real_handler { # 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 ) { if ($curRes == $iterator->BEGIN_MAP()) {$depth++;} if ($curRes == $iterator->END_MAP()) { $depth--; } - if (ref($curRes) && $curRes->is_problem()) + if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) { # Get number of correct, incorrect parts my $parts = $curRes->parts(); - if (scalar(@{$parts}) > 1) { shift @{$parts}; } # lose the first "0" - $totalParts += scalar(@{$parts}); 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 ($curRes->getCompletionStatus($part) == $curRes->EXCUSED()) { + next; } + if ($showPoints) { + my $score = $curRes->weight($part) * $curRes->awarded($part); + $partsRight += $score; + $totalRight += $score; + $partsCount += $curRes->weight($part); + + if ($curRes->opendate($part) < $now) { + $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->ANSWER_SUBMITTED) { + $partsRight++; + $totalRight++; + $thisright = 1; + } + + my $dateStatus = $curRes->getDateStatus($part); + $totalParts++; + if ($curRes->opendate($part) < $now) { + $totalPossible++; + } + } } - + + if ($depth == 1) { # in top-level only + $topLevelParts += $partsCount; + $topLevelRight += $partsRight; + } + # Crawl down stack and record parts correct and total for my $res (@{$stack}) { if (ref($res) && $res->is_map()) { @@ -138,7 +180,7 @@ sub real_handler { $res->{DATA}->{CHILD_CORRECT} = 0; } - $res->{DATA}->{CHILD_PARTS} += scalar(@{$parts}); + $res->{DATA}->{CHILD_PARTS} += $partsCount; $res->{DATA}->{CHILD_CORRECT} += $partsRight; } } @@ -147,55 +189,63 @@ sub real_handler { } $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, 0); + my @start = (255, 255, 192); my @end = (0, 192, 0); my $indentString = '     '; # Second pass: Print the maps. - $r->print(''); - $r->print('' . "\n\n"); + $r->print('
SequenceCorrect / Total
'); + $title =&mt($showPoints ? "Points Scored" : "Done"); + $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}; - my $ratio; - $ratio = $total==0 ? 1 : $correct / $total; - my $color = mixColors(\@start, \@end, $ratio); - $r->print(""); - $r->print("\n"); + if ($total > 0) { + my $ratio; + $ratio = $correct / $total; + my $color = mixColors(\@start, \@end, $ratio); + $r->print(""); + $r->print("\n"); + } } $curRes = $iterator->next(); } + # If there were any problems at the top level, print an extra "catchall" + if ($topLevelParts > 0) { + my $ratio = $topLevelRight / $topLevelParts; + my $color = mixColors(\@start, \@end, $ratio); + $r->print(""); + } + + my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct"); - $r->print("\n\n\n"); + $title = $showPoints ? "Points" : "Parts Done"; - $r->print("\n\n"); + $r->print("\n\n"); $r->print("
Folder$title / Total
"); - - for (my $i = 1; $i < $depth; $i++) { $r->print($indentString); } - - $r->print("$title$correct / $total
"); + + my $thisIndent = ''; + for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; } + + $r->print("$thisIndent$title$thisIndent$correct / $total
"); + $r->print(&mt("Problems Not Contained In A Folder").""); + $r->print("$topLevelRight / $topLevelParts
Total Parts Correct: $totalRight
"); - $r->print("Number Of Parts Possibly Correct: $totalPossible
"); - $r->print("Total Parts In Course: $totalParts
Total $title: $totalRight
"); + $r->print(&mt("Max Possible To Date")." $maxHelpLink: $totalPossible
"); + $title = $showPoints ? "Points" : "Parts"; + $r->print(&mt("Total $title In Course").": $totalParts
"); @@ -213,15 +263,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; }