--- loncom/interface/lonquickgrades.pm 2003/08/07 17:26:45 1.24 +++ loncom/interface/lonquickgrades.pm 2003/09/22 21:05:15 1.27 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Quick Student Grades Display # -# +# $Id: lonquickgrades.pm,v 1.27 2003/09/22 21:05:15 bowersj2 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,9 +58,9 @@ 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; @@ -146,12 +148,12 @@ 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 || + $status == $curRes->ATTEMPTED) { $partsRight++; $totalRight++; $thisright = 1; @@ -198,7 +200,7 @@ HEADER # Second pass: Print the maps. $r->print('
Folder | '); - $title = $showPoints ? "Points Scored" : "Done"; + $title =&mt($showPoints ? "Points Scored" : "Done"); $r->print("$title / Total | |
"); - $r->print("Problems Not Contained In A Folder | "); + $r->print(&mt("Problems Not Contained In A Folder")." | "); $r->print("$topLevelRight / $topLevelParts |
Total $title: $totalRight "); - $r->print("Max Possible To Date $maxHelpLink: $totalPossible "); + $r->print(&mt("Max Possible To Date")." $maxHelpLink: $totalPossible "); $title = $showPoints ? "Points" : "Parts"; - $r->print("Total $title In Course: $totalParts |