--- loncom/interface/lonquickgrades.pm 2003/06/25 18:46:09 1.18
+++ loncom/interface/lonquickgrades.pm 2010/12/03 22:23:21 1.57
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-#
+# $Id: lonquickgrades.pm,v 1.57 2010/12/03 22:23:21 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,13 +25,16 @@
#
# http://www.lon-capa.org/
#
-# Created Nov. 14, 2002 by Jeremy Bowers
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,66 +47,118 @@ 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';
+ my $showPoints =
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
+ my $notshowSPRSlink =
+ (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
+ || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
+ my $notshowTotals=
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+ my $showCategories=
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
+
+
+ my $title = "Grading and Statistics";#$showPoints ? "Points Display" : "Completed Problems Display";
+ my $brcrum = [{href=>"/adm/quickgrades",text => "Points Display"}];
+ $r->print(&Apache::loncommon::start_page($title,undef,
+ {'bread_crumbs' => $brcrum})
+ );
- # Create the nav map
- my $navmap = Apache::lonnavmaps::navmap->new(
- $ENV{"request.course.fn"}.".db",
- $ENV{"request.course.fn"}."_parms.db", 1, 0, 1);
-
- if (!defined($navmap)) {
- my $requrl = $r->uri;
- $ENV{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";
- return HTTP_NOT_ACCEPTABLE;
- }
+ &startGradeScreen($r,'quick');
- # Keep this hash in sync with %statusIconMap in lonnavmaps; they
- # should match color/icon
- 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, '', ''));
+ $r->rflush();
- if ($showPoints) {
- $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
+# my $uname='korte';
+# my $udom='gerd';
+
+ my $uname;
+ my $udom;
+
+ my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
+ &getData($showPoints,$uname,$udom);
+
+ if ($showCategories) {
+ &outputCategories($r,$showPoints,$notshowTotals,
+ $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
} else {
- $r->print(<This screen shows how many points you have. You can also look at
-a detailed score sheet.
-HEADER
+ &outputTable($r,$showPoints,$notshowTotals,
+ $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+ }
+ &endGradeScreen($r);
+ return OK;
+
+}
+
+sub startGradeScreen {
+ my ($r,$mode)=@_;
+
+ my $showPoints =
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
+ my $notshowSPRSlink =
+ (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
+ || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals')
+ || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories'));
+ my $notshowTotals=
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+ my $showCategories=
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
+
+ my $allowed_to_view = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+ my $allowed_to_edit = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+
+ if ($allowed_to_view) {
+ $r->print('');
+ if ($notshowTotals) { $r->print (' '.&mt('Students do not see total points.').' '); }
+ if ($notshowSPRSlink){ $r->print (' '.&mt('Students do not see link to spreadsheet.').' '); }
+ if ($showPoints) { $r->print (' '.&mt('Students will see points based on problem weights.').' '); }
+ if ($showCategories) { $r->print (' '.&mt('Students will see points based on categories.').' '); }
+ $r->print(' '.&Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading').'
');
}
- $r->print("This may take a few moments to display.
");
- $r->rflush();
+ $r->print("\n".''."\n");
+ $r->print('');
+}
- $navmap->init();
+sub endGradeScreen {
+ my ($r)=@_;
+ $r->print('
');
+}
- # End navmap using boilerplate
+
+sub getData {
+
+ my ($showPoints,$uname,$udom)=@_;
+
+ &Apache::lonnet::logthis("About to call with $uname $udom");
+
+ # Create the nav map
+ my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
+
+ my $res = $navmap->firstResource(); # temp resource to access constants
my $iterator = $navmap->getIterator(undef, undef, undef, 1);
my $depth = 1;
@@ -123,8 +178,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 ) {
@@ -135,35 +191,59 @@ HEADER
{
# Get number of correct, incorrect parts
my $parts = $curRes->parts();
- $totalParts += $curRes->countParts();
my $partsRight = 0;
my $partsCount = 0;
+ my $partsAttempted = 0;
my $stack = $iterator->getStack();
for my $part (@{$parts}) {
+ 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();
+ $partsCount += $curRes->weight($part);
if ($curRes->opendate($part) < $now) {
- $totalPossible += $curRes->weight();
+ $totalPossible += $curRes->weight($part);
}
+ $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->EXCUSED ||
- $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++;
if ($curRes->opendate($part) < $now) {
$totalPossible++;
}
@@ -171,9 +251,9 @@ HEADER
}
if ($depth == 1) { # in top-level only
- $topLevelParts += scalar(@{$parts});
+ $topLevelParts += $partsCount;
$topLevelRight += $partsRight;
- $r->print($curRes->compTitle() . '
');
+ $topLevelAttempted += $partsAttempted;
}
# Crawl down stack and record parts correct and total
@@ -182,20 +262,28 @@ 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;
}
}
}
$curRes = $iterator->next();
}
+ return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+}
- $iterator = $navmap->getIterator(undef, undef, undef, 1);
- $depth = 1;
- $iterator->next(); # ignore first BEGIN_MAP
- $curRes = $iterator->next();
+#
+# Outputting everything.
+#
+
+sub outputTable {
+
+ my ($r,$showPoints,$notshowTotals,
+ $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
my @start = (255, 255, 192);
my @end = (0, 192, 0);
@@ -203,8 +291,24 @@ HEADER
my $indentString = ' ';
# Second pass: Print the maps.
- $r->print('Sequence | ');
- $r->print('Done / Total |
' . "\n\n");
+ $r->print(&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .''.&mt('Folder').' | ');
+ my $title = &mt($showPoints ? "Points Scored" : "Done");
+ if ($totalAttempted) {
+ $title .= " / " . &mt("Attempted");
+ }
+ $r->print("$title".($notshowTotals?'':" / ".&mt('Total')).' | '
+ .&Apache::loncommon::end_data_table_header_row());
+#
+# Output of folder scores
+#
+
+ my $iterator = $navmap->getIterator(undef, undef, undef, 1);
+ my $depth = 1;
+ $iterator->next(); # ignore first BEGIN_MAP
+ my $curRes = $iterator->next();
+
while ($depth > 0) {
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
if ($curRes == $iterator->END_MAP()) { $depth--; }
@@ -214,18 +318,35 @@ HEADER
my $correct = $curRes->{DATA}->{CHILD_CORRECT};
my $total = $curRes->{DATA}->{CHILD_PARTS};
+ my $attempted = $curRes->{DATA}->{CHILD_ATTEMPTED};
if ($total > 0) {
my $ratio;
$ratio = $correct / $total;
- my $color = mixColors(\@start, \@end, $ratio);
- $r->print("
");
+ my $color = &mixColors(\@start, \@end, $ratio);
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .' | ');
my $thisIndent = '';
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.($notshowTotals?'':' / '.$total)
+ .' | '
+ .&Apache::loncommon::end_data_table_row()
+ );
+ } else {
+ $r->print(''
+ .$thisIndent
+ .''
+ .$correct.($notshowTotals?'':' / '.$total)
+ .' | '
+ .&Apache::loncommon::end_data_table_row());
+ }
}
}
@@ -236,31 +357,48 @@ HEADER
if ($topLevelParts > 0) {
my $ratio = $topLevelRight / $topLevelParts;
my $color = mixColors(\@start, \@end, $ratio);
- $r->print("");
- $r->print("Problems Not Contained In A Folder | ");
- $r->print("$topLevelRight / $topLevelParts |
");
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .'');
+ $r->print(&mt("Problems Not Contained In A Folder")." | ");
+ $r->print("$topLevelRight / $topLevelParts | "
+ .&Apache::loncommon::end_data_table_row());
}
- my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
+#
+# show totals (if applicable), close table
+#
+ if ($showPoints) {
+ my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
- $title = $showPoints ? "Points" : "Parts Done";
+ $title = $showPoints ? "Points" : "Parts Done";
+ my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .''.$totaltitle.': '.$totalRight.' ');
+ $r->print(&mt('Max Possible To Date')." $maxHelpLink: $totalPossible ");
+ $title = $showPoints ? "Points" : "Parts";
+ $r->print(&mt("Total $title In Course").': '.$totalParts.' | '
+ .&Apache::loncommon::end_data_table_row());
+ }
- $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(&Apache::loncommon::end_data_table()
+ .&Apache::loncommon::end_page());
+}
- $r->print("