--- loncom/interface/lonquickgrades.pm 2002/11/22 20:39:14 1.6
+++ loncom/interface/lonquickgrades.pm 2003/03/10 06:42:32 1.11
@@ -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
@@ -107,7 +113,7 @@ sub real_handler {
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();
@@ -147,11 +153,11 @@ 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 = ' ';
@@ -161,7 +167,7 @@ sub real_handler {
# 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--; }
@@ -209,7 +215,7 @@ sub real_handler {
my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
- $r->print("
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 |
\n\n");
@@ -229,15 +235,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;
}