--- loncom/interface/lonquickgrades.pm 2003/07/17 14:34:02 1.22
+++ loncom/interface/lonquickgrades.pm 2004/10/07 22:12:47 1.32
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-#
+# $Id: lonquickgrades.pm,v 1.32 2004/10/07 22:12:47 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,6 +32,8 @@ package Apache::lonquickgrades;
use strict;
use Apache::Constants qw(:common :http);
use POSIX;
+use Apache::loncommon;
+use Apache::lonlocal;
sub handler {
my $r = shift;
@@ -46,9 +48,9 @@ sub real_handler {
# Handle header-only request
if ($r->header_only) {
if ($ENV{'browser.mathml'}) {
- $r->content_type('text/xml');
+ &Apache::loncommon::content_type($r,'text/xml');
} else {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
}
$r->send_http_header;
return OK;
@@ -56,20 +58,20 @@ sub real_handler {
# Send header, don't cache this page
if ($ENV{'browser.mathml'}) {
- $r->content_type('text/xml');
+ &Apache::loncommon::content_type($r, 'text/xml');
} else {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r, 'text/html');
}
&Apache::loncommon::no_cache($r);
$r->send_http_header;
my $showPoints =
$ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard';
+ my $notshowSPRSlink =
+ $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'external';
# Create the nav map
- my $navmap = Apache::lonnavmaps::navmap->new(
- $ENV{"request.course.fn"}.".db",
- $ENV{"request.course.fn"}."_parms.db", 1, 0, 1);
+ my $navmap = Apache::lonnavmaps::navmap->new();
if (!defined($navmap)) {
my $requrl = $r->uri;
@@ -82,10 +84,10 @@ sub real_handler {
my $res = $navmap->firstResource(); # temp resource to access constants
# Header
- my $title = $showPoints ? "Quick Points Display" : "Quick Completed Problems Display";
+ my $title = $showPoints ? "Points Display" : "Completed Problems Display";
$r->print(&Apache::loncommon::bodytag($title, '', ''));
- if (!$showPoints) {
+ if (!$showPoints && !$notshowSPRSlink ) {
$r->print(<<HEADER);
<p>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 href="/adm/studentcalc">a detailed
@@ -97,8 +99,6 @@ HEADER
$r->rflush();
- $navmap->init();
-
# End navmap using boilerplate
my $iterator = $navmap->getIterator(undef, undef, undef, 1);
@@ -119,8 +119,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 ) {
@@ -133,14 +134,30 @@ 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)) {
+ my $status = $curRes->simpleStatus($part);
+ if ($status == $curRes->ATTEMPTED) {
+ $partsAttempted += $curRes->weight($part);
+ $totalAttempted += $partsAttempted;
+ }
+ } else {
+ $score = $curRes->weight($part) * $curRes->awarded($part);
+ }
$partsRight += $score;
$totalRight += $score;
$partsCount += $curRes->weight($part);
@@ -150,16 +167,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++;
@@ -172,6 +193,7 @@ HEADER
if ($depth == 1) { # in top-level only
$topLevelParts += $partsCount;
$topLevelRight += $partsRight;
+ $topLevelAttempted += $partsAttempted;
}
# Crawl down stack and record parts correct and total
@@ -180,10 +202,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;
}
}
}
@@ -201,9 +225,14 @@ HEADER
my $indentString = ' ';
# Second pass: Print the maps.
- $r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>Folder</b></td>');
- $title = $showPoints ? "Points Scored" : "Done";
- $r->print("<td align='center'>$title / Total</td><tr>" . "\n\n");
+ $r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>' .
+ &mt('Folder') . '</b></td>');
+ $title = &mt($showPoints ? "Points Scored" : "Done");
+ if ($totalAttempted) {
+ $title .= " / " . &mt("Attempted");
+ }
+ $r->print("<td align='center'>$title / "
+ . &mt('Total') . "</td><tr>\n\n");
while ($depth > 0) {
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
if ($curRes == $iterator->END_MAP()) { $depth--; }
@@ -213,6 +242,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;
@@ -224,7 +254,11 @@ HEADER
for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }
$r->print("$thisIndent$title</td>");
- $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n");
+ if ($totalAttempted) {
+ $r->print("<td valign='top'>$thisIndent<nobr>$correct / $attempted / $total</nobr></td></tr>\n");
+ } else {
+ $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n");
+ }
}
}
@@ -236,7 +270,7 @@ HEADER
my $ratio = $topLevelRight / $topLevelParts;
my $color = mixColors(\@start, \@end, $ratio);
$r->print("<tr><td bgcolor='$color'>");
- $r->print("Problems Not Contained In A Folder</td><td>");
+ $r->print(&mt("Problems Not Contained In A Folder")."</td><td>");
$r->print("$topLevelRight / $topLevelParts</td></tr>");
}
@@ -245,15 +279,13 @@ HEADER
$title = $showPoints ? "Points" : "Parts Done";
$r->print("<tr><td colspan='2' align='right'>Total $title: <b>$totalRight</b><br>");
- $r->print("Max Possible To Date $maxHelpLink: <b>$totalPossible</b><br>");
+ $r->print(&mt("Max Possible To Date")." $maxHelpLink: <b>$totalPossible</b><br>");
$title = $showPoints ? "Points" : "Parts";
- $r->print("Total $title In Course: <b>$totalParts</b></td></tr>\n\n");
+ $r->print(&mt("Total $title In Course").": <b>$totalParts</b></td></tr>\n\n");
$r->print("</table></body></html>");
- $navmap->untieHashes();
-
return OK;
}