--- loncom/interface/lonquickgrades.pm 2003/08/07 14:29:43 1.23
+++ loncom/interface/lonquickgrades.pm 2008/08/17 23:25:40 1.42
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-#
+# $Id: lonquickgrades.pm,v 1.42 2008/08/17 23:25:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,6 +32,10 @@ package Apache::lonquickgrades;
use strict;
use Apache::Constants qw(:common :http);
use POSIX;
+use Apache::loncommon;
+use Apache::lonlocal;
+use Apache::lonnet;
+use Apache::grades;
sub handler {
my $r = shift;
@@ -44,34 +48,31 @@ sub real_handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
# Handle header-only request
+ if ($env{'browser.mathml'}) {
+ &Apache::loncommon::content_type($r,'text/xml');
+ } else {
+ &Apache::loncommon::content_type($r,'text/html');
+ }
if ($r->header_only) {
- if ($ENV{'browser.mathml'}) {
- $r->content_type('text/xml');
- } else {
- $r->content_type('text/html');
- }
- $r->send_http_header;
+ $r->send_http_header;
return OK;
}
# Send header, don't cache this page
- if ($ENV{'browser.mathml'}) {
- $r->content_type('text/xml');
- } else {
- $r->content_type('text/html');
- }
&Apache::loncommon::no_cache($r);
$r->send_http_header;
my $showPoints =
- $ENV{'course.'.$ENV{'request.course.id'}.'.grading'} eq 'standard';
+ $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(1, 0, 1);
+ my $navmap = Apache::lonnavmaps::navmap->new();
if (!defined($navmap)) {
my $requrl = $r->uri;
- $ENV{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";
+ $env{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";
return HTTP_NOT_ACCEPTABLE;
}
@@ -80,10 +81,10 @@ sub real_handler {
my $res = $navmap->firstResource(); # temp resource to access constants
# Header
- my $title = $showPoints ? "Quick Points Display" : "Quick Completed Problems Display";
- $r->print(&Apache::loncommon::bodytag($title, '', ''));
+ my $title = $showPoints ? "Points Display" : "Completed Problems Display";
+ $r->print(&Apache::loncommon::start_page($title));
- if (!$showPoints) {
+ if (!$showPoints && !$notshowSPRSlink ) {
$r->print(<
HEADER
}
- $r->print("This may take a few moments to display.");
+ $r->print(&mt('This may take a few moments to display.'));
$r->rflush();
- $navmap->init();
-
# End navmap using boilerplate
my $iterator = $navmap->getIterator(undef, undef, undef, 1);
@@ -117,8 +116,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 +131,31 @@ 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') ||
+ ($curRes->problemstatus($part) eq 'no_feedback_ever')) &&
+ ($dateStatus != $curRes->ANSWER_OPEN)) {
+ my $status = $curRes->simpleStatus($part);
+ if ($status == $curRes->ATTEMPTED) {
+ $partsAttempted += $curRes->weight($part);
+ $totalAttempted += $partsAttempted;
+ }
+ } else {
+ $score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));
+ }
$partsRight += $score;
$totalRight += $score;
$partsCount += $curRes->weight($part);
@@ -148,16 +165,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) {
+ if ($status == $curRes->CORRECT ||
+ $status == $curRes->PARTIALLY_CORRECT ) {
$partsRight++;
$totalRight++;
$thisright = 1;
}
+
+ if ($status == $curRes->ATTEMPTED) {
+ $partsAttempted++;
+ $totalAttempted++;
+ }
my $dateStatus = $curRes->getDateStatus($part);
$totalParts++;
@@ -170,6 +191,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 +200,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 +223,14 @@ HEADER
my $indentString = ' ';
# Second pass: Print the maps.
- $r->print('Folder | ');
- $title = $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 +240,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 +252,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");
+ }
}
}
@@ -234,23 +268,22 @@ HEADER
my $ratio = $topLevelRight / $topLevelParts;
my $color = mixColors(\@start, \@end, $ratio);
$r->print("");
- $r->print("Problems Not Contained In A Folder | ");
+ $r->print(&mt("Problems Not Contained In A Folder")." | ");
$r->print("$topLevelRight / $topLevelParts |
");
}
- my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
+ if ($showPoints) {
+ my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
- $title = $showPoints ? "Points" : "Parts Done";
-
- $r->print("Total $title: $totalRight ");
- $r->print("Max Possible To Date $maxHelpLink: $totalPossible ");
- $title = $showPoints ? "Points" : "Parts";
- $r->print("Total $title In Course: $totalParts |
\n\n");
-
-
- $r->print("