--- loncom/interface/lonquickgrades.pm 2018/12/01 16:38:06 1.49.6.5
+++ loncom/interface/lonquickgrades.pm 2010/11/27 20:51:26 1.50
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.49.6.5 2018/12/01 16:38:06 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.50 2010/11/27 20:51:26 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,13 +29,12 @@
package Apache::lonquickgrades;
use strict;
-use Apache::Constants qw(:common :http REDIRECT);
+use Apache::Constants qw(:common :http);
use POSIX;
use Apache::loncommon;
use Apache::lonlocal;
use Apache::lonnet;
use Apache::grades;
-use Apache::lonuserstate;
sub handler {
my $r = shift;
@@ -58,79 +57,20 @@ sub real_handler {
return OK;
}
- 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 = '
'.
- '
'.
- &mt('Your course session is being updated because of recent changes by course personnel.').
- ' '.&mt('Please be patient.').'
'.
- '';
- 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
- 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();
+ # Send header, don't cache this page
+ &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 'externalnototals'));
my $notshowTotals=
$env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+ my $showCategories=
+ $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
+
# Create the nav map
my $navmap = Apache::lonnavmaps::navmap->new();
@@ -145,6 +85,13 @@ ENDCLOSE
# should match color/icon
my $res = $navmap->firstResource(); # temp resource to access constants
+ # Header
+ 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(''
.&mt('This screen shows how many problems (or problem parts) you have completed'
@@ -288,7 +235,7 @@ ENDCLOSE
$r->print(&Apache::loncommon::start_data_table()
.&Apache::loncommon::start_data_table_header_row()
.'
'.&mt('Folder').' | ');
- my $title = &mt($showPoints ? "Points Scored" : "Done");
+ $title = &mt($showPoints ? "Points Scored" : "Done");
if ($totalAttempted) {
$title .= " / " . &mt("Attempted");
}
@@ -308,7 +255,7 @@ ENDCLOSE
if ($total > 0) {
my $ratio;
$ratio = $correct / $total;
- my $color = &mixColors(\@start, \@end, $ratio);
+ my $color = mixColors(\@start, \@end, $ratio);
$r->print(&Apache::loncommon::start_data_table_row()
.'');
@@ -341,7 +288,7 @@ ENDCLOSE
# 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);
+ my $color = mixColors(\@start, \@end, $ratio);
$r->print(&Apache::loncommon::start_data_table_row()
.' | ');
$r->print(&mt("Problems Not Contained In A Folder")." | ");
@@ -350,7 +297,7 @@ ENDCLOSE
}
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";
my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
@@ -368,15 +315,6 @@ ENDCLOSE
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");
|