--- loncom/interface/lonquickgrades.pm 2005/12/20 15:02:13 1.37 +++ 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.37 2005/12/20 15:02:13 albertel 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; @@ -35,6 +34,7 @@ use POSIX; use Apache::loncommon; use Apache::lonlocal; use Apache::lonnet; +use Apache::grades; sub handler { my $r = shift; @@ -47,29 +47,27 @@ 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 { - &Apache::loncommon::content_type($r,'text/html'); - } - $r->send_http_header; + $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'; 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(); @@ -85,18 +83,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(<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 + $r->print('

' + .&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].' + ,'','') + .'

'); } - $r->print("This may take a few moments to display."); + $r->print('

'.&mt('This may take a few moments to display.').'

'); $r->rflush(); @@ -149,7 +151,8 @@ 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)) { my $status = $curRes->simpleStatus($part); if ($status == $curRes->ATTEMPTED) { @@ -157,7 +160,7 @@ HEADER $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; @@ -226,14 +229,15 @@ HEADER my $indentString = '     '; # Second pass: Print the maps. - $r->print(''); + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .''); $title = &mt($showPoints ? "Points Scored" : "Done"); if ($totalAttempted) { $title .= " / " . &mt("Attempted"); } - $r->print("\n\n"); + $r->print("' + .&Apache::loncommon::end_data_table_header_row()); while ($depth > 0) { if ($curRes == $iterator->BEGIN_MAP()) {$depth++;} if ($curRes == $iterator->END_MAP()) { $depth--; } @@ -249,16 +253,28 @@ HEADER my $ratio; $ratio = $correct / $total; my $color = mixColors(\@start, \@end, $ratio); - $r->print(""); if ($totalAttempted) { - $r->print("\n"); + $r->print('' + .&Apache::loncommon::end_data_table_row() + ); } else { - $r->print("\n"); + $r->print('' + .&Apache::loncommon::end_data_table_row()); } } } @@ -270,23 +286,28 @@ HEADER if ($topLevelParts > 0) { my $ratio = $topLevelRight / $topLevelParts; my $color = mixColors(\@start, \@end, $ratio); - $r->print(""); + $r->print("$topLevelRight / $topLevelParts" + .&Apache::loncommon::end_data_table_row()); } if ($showPoints) { my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct"); $title = $showPoints ? "Points" : "Parts Done"; - - $r->print("\n\n"); + $r->print(&mt("Total $title In Course").': '.$totalParts.'' + .&Apache::loncommon::end_data_table_row()); } - $r->print("
' . - &mt('Folder') . ''.&mt('Folder').'$title / " - . &mt('Total') . "
$title".($notshowTotals?'':" / ".&mt('Total')).'
"); + $r->print(&Apache::loncommon::start_data_table_row() + .''); my $thisIndent = ''; for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; } $r->print("$thisIndent$title$thisIndent$correct / $attempted / $total
' + .$thisIndent + .'' + .$correct.' / '.$attempted.($notshowTotals?'':' / '.$total) + .'$thisIndent$correct / $total
' + .$thisIndent + .'' + .$correct.($notshowTotals?'':' / '.$total) + .'
"); + $r->print(&Apache::loncommon::start_data_table_row() + .''); $r->print(&mt("Problems Not Contained In A Folder").""); - $r->print("$topLevelRight / $topLevelParts
Total $title: $totalRight
"); - $r->print(&mt("Max Possible To Date")." $maxHelpLink: $totalPossible
"); + 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
"); + $r->print(&Apache::loncommon::end_data_table() + .&Apache::loncommon::end_page()); return OK; } 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.