--- loncom/interface/lonquickgrades.pm 2020/09/08 04:24:18 1.49.6.6.2.1
+++ loncom/interface/lonquickgrades.pm 2021/03/04 01:42:20 1.49.6.7
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Quick Student Grades Display
#
-# $Id: lonquickgrades.pm,v 1.49.6.6.2.1 2020/09/08 04:24:18 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.49.6.7 2021/03/04 01:42:20 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -64,27 +64,9 @@ sub real_handler {
my $reinitresult;
- if ($env{'request.course.id'}) {
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my ($blocked,$blocktext) =
- &Apache::loncommon::blocking_status('grades',$cnum,$cdom);
- if ($blocked) {
- my $checkrole = "cm./$cdom/$cnum";
- if ($env{'request.course.sec'} ne '') {
- $checkrole .= "/$env{'request.course.sec'}";
- }
- unless ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) &&
- ($env{'request.role'} !~ m{^st\./$cdom/$cnum})) {
- &grades_blocked($r,$blocktext,$showPoints);
- return OK;
- }
- }
- }
-
unless ($cangrade) {
# Check for critical messages and redirect if present.
- my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'grades');
+ my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
if ($redirect) {
&Apache::loncommon::content_type($r,'text/html');
$r->header_out(Location => $url);
@@ -110,13 +92,13 @@ sub real_handler {
my $preamble = '
'.
'
'.
&mt('Your course session is being updated because of recent changes by course personnel.').
- ' '.&mt('Please be patient.').'
'.
+ ' '.&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::Update_PrgWin($r,\%prog_state,&mt('Finished!'));
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
my $closure = <
@@ -206,29 +188,6 @@ ENDCLOSE
return OK;
}
-sub grades_blocked {
- my ($r,$blocktext,$caller) = @_;
- my $title = 'Points Display';
- if ($caller eq 'spreadsheet') {
- $title = 'Spreadsheet';
- } elsif ($env{'course.'.$env{'request.course.id'}.'.grading'} ne 'standard') {
- $title = 'Completed Problems Display';
- }
- my $brcrum = [{href=>"/adm/quickgrades",text => $title}];
- &Apache::lonhtmlcommon::clear_breadcrumbs();
- &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/quickgrades',
- text=> $title});
- my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs($title);
- &Apache::loncommon::content_type($r,'text/html');
- &Apache::loncommon::no_cache($r);
- $r->send_http_header;
- $r->print(&Apache::loncommon::start_page($title).
- $breadcrumbs.
- $blocktext.
- &Apache::loncommon::end_page());
- return;
-}
-
#
# Go through the complete course and collect data
#