--- loncom/interface/lonquickgrades.pm 2002/11/22 20:07:11 1.5
+++ loncom/interface/lonquickgrades.pm 2003/06/18 19:31:38 1.15
@@ -68,20 +68,26 @@ sub real_handler {
$ENV{"request.course.fn"}.".db",
$ENV{"request.course.fn"}."_parms.db", 1, 0);
- # 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";
+ $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','',
''));
+ $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
+
$navmap->init();
# End navmap using boilerplate
@@ -101,35 +107,44 @@ sub real_handler {
# the counts to the parent map.)
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});
+ $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++;
}
}
-
+
+ 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()) {
@@ -147,54 +162,58 @@ 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('Sequence | ');
- $r->print('Correct / Total |
' . "\n\n");
+ $r->print('Done / Total |
' . "\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("
");
-
- for (my $i = 1; $i < $depth; $i++) { $r->print($indentString); }
-
- $r->print("$title | ");
- $r->print("$correct / $total |
\n");
+ if ($total > 0) {
+ my $ratio;
+ $ratio = $correct / $total;
+ my $color = mixColors(\@start, \@end, $ratio);
+ $r->print("");
+
+ my $thisIndent = '';
+ for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }
+
+ $r->print("$thisIndent$title | ");
+ $r->print("$thisIndent$correct / $total |
\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("");
+ $r->print("Problems Not Contained In A Folder | ");
+ $r->print("$topLevelRight / $topLevelParts |
");
+ }
- $r->print("\n\n\n");
+ my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
- $r->print("Total Parts Correct: $totalRight ");
- $r->print("Number Of Parts Possibly Correct: $totalPossible ");
+ $r->print(" |
Total Parts Done: $totalRight ");
+ $r->print("Max Possible To Date $maxHelpLink: $totalPossible ");
$r->print("Total Parts In Course: $totalParts |
\n\n");
@@ -213,15 +232,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 "%2x%2x%2x", $mix1, $mix2, $mix3;
return "#" . $final;
}