--- loncom/interface/lonquickgrades.pm 2006/03/15 22:11:04 1.40 +++ loncom/interface/lonquickgrades.pm 2018/12/01 16:38:06 1.49.6.5 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Quick Student Grades Display # -# $Id: lonquickgrades.pm,v 1.40 2006/03/15 22:11:04 albertel Exp $ +# $Id: lonquickgrades.pm,v 1.49.6.5 2018/12/01 16:38:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,17 +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; @@ -58,14 +58,79 @@ sub real_handler { return OK; } - # Send header, don't cache this page - &Apache::loncommon::no_cache($r); - $r->send_http_header; - - my $showPoints = + my $showPoints = $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard'; + + my $reinitresult; + + 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'); + ($reinitresult,my @reinit) = &Apache::loncommon::needs_coursereinit($loncaparev); + + if ($reinitresult eq 'switch') { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + $r->print(&Apache::loncommon::check_release_result(@reinit)); + return OK; + } elsif ($reinitresult eq 'update') { + my $cid = $env{'request.course.id'}; + my $cnum = $env{'course.'.$cid.'.num'}; + my $cdom = $env{'course.'.$cid.'.domain'}; + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &startpage($r,$showPoints); + my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'. + '<br />'. + &mt('Your course session is being updated because of recent changes by course personnel.'). + ' '.&mt('Please be patient.').'<br /></div>'. + '<div style="padding:0;clear:both;margin:0;border:0"></div>'; + my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course')); + $r->rflush(); + my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum"); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished')); + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + my $closure = <<ENDCLOSE; +<script type="text/javascript"> +// <![CDATA[ +\$("#LC_update_$cid").hide('slow'); +// ]]> +</script> +ENDCLOSE + if ($ferr) { + $r->print($closure.&Apache::loncommon::end_page()); + my $requrl = $r->uri; + $env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized"; + $env{'user.reinit'} = 1; + return HTTP_NOT_ACCEPTABLE; + } else { + $r->print($closure); + } + } + } + + unless ($reinitresult eq 'update') { + # Send header, don't cache this page + &Apache::loncommon::no_cache($r); + $r->send_http_header; + &startpage($r,$showPoints); + } + $r->rflush(); + 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(); @@ -80,19 +145,16 @@ sub real_handler { # should match color/icon my $res = $navmap->firstResource(); # temp resource to access constants - # Header - my $title = $showPoints ? "Points Display" : "Completed Problems Display"; - $r->print(&Apache::loncommon::start_page($title)); - 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(); @@ -145,7 +207,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) { @@ -222,14 +285,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>'); - $title = &mt($showPoints ? "Points Scored" : "Done"); + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .'<th>'.&mt('Folder').'</th>'); + my $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--; } @@ -244,17 +308,29 @@ HEADER if ($total > 0) { my $ratio; $ratio = $correct / $total; - my $color = mixColors(\@start, \@end, $ratio); - $r->print("<tr><td bgcolor='$color'>"); + my $color = &mixColors(\@start, \@end, $ratio); + $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()); } } } @@ -265,28 +341,42 @@ HEADER # If there were any problems at the top level, print an extra "catchall" if ($topLevelParts > 0) { my $ratio = $topLevelRight / $topLevelParts; - my $color = mixColors(\@start, \@end, $ratio); - $r->print("<tr><td bgcolor='$color'>"); + my $color = &mixColors(\@start, \@end, $ratio); + $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()); } if ($showPoints) { - my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct"); + 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>"); + 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></tr>\n\n"); + $r->print(&mt("Total $title In Course").': <b>'.$totalParts.'</b></td>' + .&Apache::loncommon::end_data_table_row()); } - $r->print("</table>".&Apache::loncommon::end_page()); + $r->print(&Apache::loncommon::end_data_table() + .&Apache::loncommon::end_page()); return OK; } +sub startpage { + my ($r,$showPoints) = @_; + 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}) + ); +} + # Pass this two refs to arrays for the start and end color, and a number # from 0 to 1 for how much of the latter you want to mix in. It will # return a string ready to show ("#FFC309");