version 1.22.2.2, 2003/09/23 22:42:26
|
version 1.23, 2003/08/07 14:29:43
|
Line 67 sub real_handler {
|
Line 67 sub real_handler {
|
$ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard'; |
$ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard'; |
|
|
# Create the nav map |
# Create the nav map |
my $navmap = Apache::lonnavmaps::navmap->new( |
my $navmap = Apache::lonnavmaps::navmap->new(1, 0, 1); |
$ENV{"request.course.fn"}.".db", |
|
$ENV{"request.course.fn"}."_parms.db", 1, 0, 1); |
|
|
|
if (!defined($navmap)) { |
if (!defined($navmap)) { |
my $requrl = $r->uri; |
my $requrl = $r->uri; |
Line 136 HEADER
|
Line 134 HEADER
|
my $stack = $iterator->getStack(); |
my $stack = $iterator->getStack(); |
|
|
for my $part (@{$parts}) { |
for my $part (@{$parts}) { |
my $completionStatus = $curRes->getCompletionStatus($part); |
if ($curRes->getCompletionStatus($part) == $curRes->EXCUSED()) { |
my $dateStatus = $curRes->getDateStatus($part); |
|
if ($completionStatus == $curRes->EXCUSED()) { |
|
next; |
next; |
} |
} |
if ($showPoints) { |
if ($showPoints) { |
my $score; |
my $score = $curRes->weight($part) * $curRes->awarded($part); |
# If we're not telling status and the answer date isn't |
|
# passed yet |
|
if (($curRes->problemstatus($part) eq 'no') && |
|
($dateStatus != $curRes->ANSWER_OPEN)) { |
|
$score = 0; |
|
} else { |
|
$score = $curRes->weight($part) * |
|
$curRes->awarded($part); |
|
} |
|
|
|
$partsRight += $score; |
$partsRight += $score; |
$totalRight += $score; |
$totalRight += $score; |
$partsCount += $curRes->weight($part); |
$partsCount += $curRes->weight($part); |
Line 162 HEADER
|
Line 148 HEADER
|
} |
} |
$totalParts += $curRes->weight($part); |
$totalParts += $curRes->weight($part); |
} else { |
} else { |
my $status = $curRes->status($part); |
my $status = $curRes->getCompletionStatus($part); |
my $thisright = 0; |
my $thisright = 0; |
$partsCount++; |
$partsCount++; |
if ($status == $curRes->CORRECT || |
if ($status == $curRes->CORRECT || |
$status == $curRes->EXCUSED) { |
$status == $curRes->CORRECT_BY_OVERRIDE || |
|
$status == $curRes->ANSWER_SUBMITTED) { |
$partsRight++; |
$partsRight++; |
$totalRight++; |
$totalRight++; |
$thisright = 1; |
$thisright = 1; |
} |
} |
|
|
|
my $dateStatus = $curRes->getDateStatus($part); |
$totalParts++; |
$totalParts++; |
if ($curRes->opendate($part) < $now) { |
if ($curRes->opendate($part) < $now) { |
$totalPossible++; |
$totalPossible++; |