--- loncom/interface/lonquickgrades.pm 2009/02/26 16:17:30 1.47
+++ loncom/interface/lonquickgrades.pm 2009/11/21 18:07:03 1.49
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.47 2009/02/26 16:17:30 schafran Exp $
+# $Id: lonquickgrades.pm,v 1.49 2009/11/21 18:07:03 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,7 +25,6 @@
#
# http://www.lon-capa.org/
#
-# Created Nov. 14, 2002 by Jeremy Bowers
package Apache::lonquickgrades;
@@ -65,7 +64,10 @@ sub real_handler {
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 'external')
+ || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
+ my $notshowTotals=
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
# Create the nav map
my $navmap = Apache::lonnavmaps::navmap->new();
@@ -234,7 +236,7 @@ sub real_handler {
if ($totalAttempted) {
$title .= " / " . &mt("Attempted");
}
- $r->print("
$title / ".&mt('Total').''
+ $r->print(" | $title".($notshowTotals?'':" / ".&mt('Total')).' | '
.&Apache::loncommon::end_data_table_header_row());
while ($depth > 0) {
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
@@ -262,7 +264,7 @@ sub real_handler {
$r->print(''
.$thisIndent
.''
- .$correct.' / '.$attempted.' / '.$total
+ .$correct.' / '.$attempted.($notshowTotals?'':' / '.$total)
.' | '
.&Apache::loncommon::end_data_table_row()
);
@@ -270,7 +272,7 @@ sub real_handler {
$r->print(''
.$thisIndent
.''
- .$correct.' / '.$total
+ .$correct.($notshowTotals?'':' / '.$total)
.' | '
.&Apache::loncommon::end_data_table_row());
}
@@ -297,8 +299,8 @@ sub real_handler {
$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 ");
+ .' | '.$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());