--- loncom/interface/lonquickgrades.pm 2002/11/14 21:36:23 1.1
+++ loncom/interface/lonquickgrades.pm 2003/06/18 19:31:38 1.15
@@ -31,9 +31,15 @@ package Apache::lonquickgrades;
use strict;
use Apache::Constants qw(:common :http);
+use POSIX;
sub handler {
my $r = shift;
+ return real_handler($r);
+}
+
+sub real_handler {
+ my $r = shift;
&Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
@@ -60,40 +66,183 @@ sub handler {
# Create the nav map
my $navmap = Apache::lonnavmaps::navmap->new(
$ENV{"request.course.fn"}.".db",
- $ENV{"request.course.fn"}."_parms.db", 0, 0);
+ $ENV{"request.course.fn"}."_parms.db", 1, 0);
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('Navigate Course Map','',
+ $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
my $iterator = $navmap->getIterator(undef, undef, undef, 1);
my $depth = 1;
$iterator->next(); # ignore first BEGIN_MAP
my $curRes = $iterator->next();
-
+
+ # General overview of the following: Walk along the course resources.
+ # For every problem in the resource, tell its parent maps how many
+ # parts and how many parts correct it has. After that, each map will
+ # have a count of the total parts underneath it, correct and otherwise.
+ # After that, we will walk through the course again and read off
+ # maps in order, with their data.
+ # (If in the future people decide not to be cumulative, only add
+ # 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();
+ $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->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()) {
+ if (!defined($res->{DATA}->{CHILD_PARTS})) {
+ $res->{DATA}->{CHILD_PARTS} = 0;
+ $res->{DATA}->{CHILD_CORRECT} = 0;
+ }
+
+ $res->{DATA}->{CHILD_PARTS} += scalar(@{$parts});
+ $res->{DATA}->{CHILD_CORRECT} += $partsRight;
+ }
+ }
+ }
+ $curRes = $iterator->next();
+ }
+
+ $iterator = $navmap->getIterator(undef, undef, undef, 1);
+ $depth = 1;
+ $iterator->next(); # ignore first BEGIN_MAP
+ $curRes = $iterator->next();
+
+ my @start = (255, 255, 192);
+ my @end = (0, 192, 0);
+
+ my $indentString = ' ';
+
+ # Second pass: Print the maps.
+ $r->print('Sequence | ');
+ $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 $title = $curRes->compTitle();
- $r->print($title . '
' . "\n");
+
+ my $correct = $curRes->{DATA}->{CHILD_CORRECT};
+ my $total = $curRes->{DATA}->{CHILD_PARTS};
+
+ 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();
}
- $r->print("