--- loncom/interface/lonquickgrades.pm 2003/11/21 18:21:02 1.30
+++ loncom/interface/lonquickgrades.pm 2017/04/02 13:42:06 1.49.6.3
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.30 2003/11/21 18:21:02 albertel Exp $
+# $Id: lonquickgrades.pm,v 1.49.6.3 2017/04/02 13:42:06 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,15 +25,17 @@
#
# http://www.lon-capa.org/
#
-# Created Nov. 14, 2002 by Jeremy Bowers
package Apache::lonquickgrades;
use strict;
-use Apache::Constants qw(:common :http);
+use Apache::Constants qw(:common :http REDIRECT);
use POSIX;
use Apache::loncommon;
use Apache::lonlocal;
+use Apache::lonnet;
+use Apache::grades;
+use Apache::lonuserstate;
sub handler {
my $r = shift;
@@ -46,36 +48,65 @@ 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'}) {
- &Apache::loncommon::content_type($r,'text/xml');
- } else {
+ $r->send_http_header;
+ return OK;
+ }
+
+ unless (&Apache::lonnet::allowed('mgr')) {
+ # Check for critical messages and redirect if present.
+ my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
+ if ($redirect) {
&Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location => $url);
+ return REDIRECT;
+ }
+
+ # Check if course needs to be re-initialized
+ my $loncaparev = $r->dir_config('lonVersion');
+ my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
+
+ if ($result eq 'switch') {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ $r->print(&Apache::loncommon::check_release_result(@reinit));
+ return OK;
+ } elsif ($result eq 'update') {
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
+ if ($ferr) {
+ my $requrl = $r->uri;
+ $env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
+ $env{'user.reinit'} = 1;
+ return HTTP_NOT_ACCEPTABLE;
+ }
}
- $r->send_http_header;
- return OK;
}
# Send header, don't cache this page
- if ($ENV{'browser.mathml'}) {
- &Apache::loncommon::content_type($r, 'text/xml');
- } else {
- &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';
+ $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();
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;
}
@@ -84,18 +115,22 @@ sub real_handler {
my $res = $navmap->firstResource(); # temp resource to access constants
# Header
- my $title = $showPoints ? "Points Display" : "Completed Problems Display";
- $r->print(&Apache::loncommon::bodytag($title, '', ''));
+ 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})
+ );
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
-score sheet</a>.</p>
-HEADER
+ $r->print('<p>'
+ .&mt('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 [_1]a detailed score sheet[_2].'
+ ,'<a href="/adm/studentcalc">','</a>')
+ .'</p>');
}
- $r->print("This may take a few moments to display.");
+ $r->print('<p class="LC_info">'.&mt('This may take a few moments to display.').'</p>');
$r->rflush();
@@ -148,12 +183,16 @@ HEADER
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' &&
+ if ((($curRes->problemstatus($part) eq 'no') ||
+ ($curRes->problemstatus($part) eq 'no_feedback_ever')) &&
($dateStatus != $curRes->ANSWER_OPEN)) {
- $partsAttempted += $curRes->weight($part);
- $totalAttempted += $partsAttempted;
+ my $status = $curRes->simpleStatus($part);
+ if ($status == $curRes->ATTEMPTED) {
+ $partsAttempted += $curRes->weight($part);
+ $totalAttempted += $partsAttempted;
+ }
} else {
- $score = $curRes->weight($part) * $curRes->awarded($part);
+ $score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));
}
$partsRight += $score;
$totalRight += $score;
@@ -167,8 +206,8 @@ HEADER
my $status = $curRes->simpleStatus($part);
my $thisright = 0;
$partsCount++;
- if ($status == $curRes->CORRECT ||
- $status == $curRes->INCORRECT ) {
+ if ($status == $curRes->CORRECT ||
+ $status == $curRes->PARTIALLY_CORRECT ) {
$partsRight++;
$totalRight++;
$thisright = 1;
@@ -222,14 +261,15 @@ HEADER
my $indentString = ' ';
# Second pass: Print the maps.
- $r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>' .
- &mt('Folder') . '</b></td>');
+ $r->print(&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.&mt('Folder').'</th>');
$title = &mt($showPoints ? "Points Scored" : "Done");
if ($totalAttempted) {
$title .= " / " . &mt("Attempted");
}
- $r->print("<td align='center'>$title / "
- . &mt('Total') . "</td><tr>\n\n");
+ $r->print("<th>$title".($notshowTotals?'':" / ".&mt('Total')).'</th>'
+ .&Apache::loncommon::end_data_table_header_row());
while ($depth > 0) {
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
if ($curRes == $iterator->END_MAP()) { $depth--; }
@@ -245,16 +285,28 @@ HEADER
my $ratio;
$ratio = $correct / $total;
my $color = mixColors(\@start, \@end, $ratio);
- $r->print("<tr><td bgcolor='$color'>");
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .'<td style="background-color:'.$color.';">');
my $thisIndent = '';
for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }
$r->print("$thisIndent$title</td>");
if ($totalAttempted) {
- $r->print("<td valign='top'>$thisIndent<nobr>$correct / $attempted / $total</nobr></td></tr>\n");
+ $r->print('<td valign="top">'
+ .$thisIndent
+ .'<span class="LC_nobreak">'
+ .$correct.' / '.$attempted.($notshowTotals?'':' / '.$total)
+ .'</span></td>'
+ .&Apache::loncommon::end_data_table_row()
+ );
} else {
- $r->print("<td valign='top'>$thisIndent<nobr>$correct / $total</nobr></td></tr>\n");
+ $r->print('<td valign="top">'
+ .$thisIndent
+ .'<span class="LC_nobreak">'
+ .$correct.($notshowTotals?'':' / '.$total)
+ .'</span></td>'
+ .&Apache::loncommon::end_data_table_row());
}
}
}
@@ -266,24 +318,28 @@ HEADER
if ($topLevelParts > 0) {
my $ratio = $topLevelRight / $topLevelParts;
my $color = mixColors(\@start, \@end, $ratio);
- $r->print("<tr><td bgcolor='$color'>");
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .'<td style="background-color:'.$color.';">');
$r->print(&mt("Problems Not Contained In A Folder")."</td><td>");
- $r->print("$topLevelRight / $topLevelParts</td></tr>");
+ $r->print("$topLevelRight / $topLevelParts</td>"
+ .&Apache::loncommon::end_data_table_row());
}
- 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("<tr><td colspan='2' align='right'>Total $title: <b>$totalRight</b><br>");
- $r->print(&mt("Max Possible To Date")." $maxHelpLink: <b>$totalPossible</b><br>");
- $title = $showPoints ? "Points" : "Parts";
- $r->print(&mt("Total $title In Course").": <b>$totalParts</b></td></tr>\n\n");
-
-
- $r->print("</table></body></html>");
+ $title = $showPoints ? "Points" : "Parts Done";
+ my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .'<td colspan="2" align="right">'.$totaltitle.': <b>'.$totalRight.'</b><br />');
+ $r->print(&mt('Max Possible To Date')." $maxHelpLink: <b>$totalPossible</b><br />");
+ $title = $showPoints ? "Points" : "Parts";
+ $r->print(&mt("Total $title In Course").': <b>'.$totalParts.'</b></td>'
+ .&Apache::loncommon::end_data_table_row());
+ }
- $navmap->untieHashes();
+ $r->print(&Apache::loncommon::end_data_table()
+ .&Apache::loncommon::end_page());
return OK;
}