--- loncom/interface/lonquickgrades.pm 2003/09/22 00:48:32 1.25
+++ loncom/interface/lonquickgrades.pm 2003/09/25 19:22:14 1.28
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.25 2003/09/22 00:48:32 www Exp $
+# $Id: lonquickgrades.pm,v 1.28 2003/09/25 19:22:14 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -58,9 +58,9 @@ sub real_handler {
# Send header, don't cache this page
if ($ENV{'browser.mathml'}) {
- &Apache::loncommon::content_type('text/xml');
+ &Apache::loncommon::content_type($r, 'text/xml');
} else {
- &Apache::loncommon::content_type('text/html');
+ &Apache::loncommon::content_type($r, 'text/html');
}
&Apache::loncommon::no_cache($r);
$r->send_http_header;
@@ -117,8 +117,9 @@ HEADER
# equally for both cases.
my $totalParts = 0; my $totalPossible = 0; my $totalRight = 0;
+ my $totalAttempted = 0;
my $now = time();
- my $topLevelParts = 0; my $topLevelRight = 0;
+ my $topLevelParts = 0; my $topLevelRight = 0; my $topLevelAttempted = 0;
# Pre-run: Count parts correct
while ( $depth > 0 ) {
@@ -131,14 +132,27 @@ HEADER
my $parts = $curRes->parts();
my $partsRight = 0;
my $partsCount = 0;
+ my $partsAttempted = 0;
my $stack = $iterator->getStack();
for my $part (@{$parts}) {
- if ($curRes->getCompletionStatus($part) == $curRes->EXCUSED()) {
+ my $completionStatus = $curRes->getCompletionStatus($part);
+ my $dateStatus = $curRes->getDateStatus($part);
+
+ if ($completionStatus == $curRes->EXCUSED()) {
next;
}
if ($showPoints) {
- my $score = $curRes->weight($part) * $curRes->awarded($part);
+ my $score = 0;
+ # If we're not telling status and the answer date isn't passed yet,
+ # it's an "attempted" point
+ if ($curRes->problemstatus($part) eq 'no' &&
+ ($dateStatus != $curRes->ANSWER_OPEN)) {
+ $partsAttempted += $curRes->weight($part);
+ $totalAttempted += $partsAttempted;
+ } else {
+ $score = $curRes->weight($part) * $curRes->awarded($part);
+ }
$partsRight += $score;
$totalRight += $score;
$partsCount += $curRes->weight($part);
@@ -148,16 +162,20 @@ HEADER
}
$totalParts += $curRes->weight($part);
} else {
- my $status = $curRes->getCompletionStatus($part);
+ my $status = $curRes->simpleStatus($part);
my $thisright = 0;
$partsCount++;
if ($status == $curRes->CORRECT ||
- $status == $curRes->CORRECT_BY_OVERRIDE ||
- $status == $curRes->ANSWER_SUBMITTED) {
+ $status == $curRes->INCORRECT ) {
$partsRight++;
$totalRight++;
$thisright = 1;
}
+
+ if ($status == $curRes->ATTEMPTED) {
+ $partsAttempted++;
+ $totalAttempted++;
+ }
my $dateStatus = $curRes->getDateStatus($part);
$totalParts++;
@@ -170,6 +188,7 @@ HEADER
if ($depth == 1) { # in top-level only
$topLevelParts += $partsCount;
$topLevelRight += $partsRight;
+ $topLevelAttempted += $partsAttempted;
}
# Crawl down stack and record parts correct and total
@@ -178,10 +197,12 @@ HEADER
if (!defined($res->{DATA}->{CHILD_PARTS})) {
$res->{DATA}->{CHILD_PARTS} = 0;
$res->{DATA}->{CHILD_CORRECT} = 0;
+ $res->{DATA}->{CHILD_ATTEMPTED} = 0;
}
$res->{DATA}->{CHILD_PARTS} += $partsCount;
$res->{DATA}->{CHILD_CORRECT} += $partsRight;
+ $res->{DATA}->{CHILD_ATTEMPTED} += $partsAttempted;
}
}
}
@@ -199,9 +220,14 @@ HEADER
my $indentString = ' ';
# Second pass: Print the maps.
- $r->print('
Folder | ');
- $title =&mt($showPoints ? "Points Scored" : "Done");
- $r->print("$title / Total |
" . "\n\n");
+ $r->print('' .
+ &mt('Folder') . ' | ');
+ $title = &mt($showPoints ? "Points Scored" : "Done");
+ if ($totalAttempted) {
+ $title .= " / " . &mt("Attempted");
+ }
+ $r->print("$title / "
+ . &mt('Total') . " |
\n\n");
while ($depth > 0) {
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
if ($curRes == $iterator->END_MAP()) { $depth--; }
@@ -211,6 +237,7 @@ HEADER
my $correct = $curRes->{DATA}->{CHILD_CORRECT};
my $total = $curRes->{DATA}->{CHILD_PARTS};
+ my $attempted = $curRes->{DATA}->{CHILD_ATTEMPTED};
if ($total > 0) {
my $ratio;
@@ -222,7 +249,11 @@ HEADER
for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }
$r->print("$thisIndent$title");
- $r->print("$thisIndent$correct / $total |
\n");
+ if ($totalAttempted) {
+ $r->print("$thisIndent$correct / $attempted / $total | \n");
+ } else {
+ $r->print("$thisIndent$correct / $total | \n");
+ }
}
}