--- loncom/interface/lonquickgrades.pm 2015/03/13 22:34:00 1.106 +++ loncom/interface/lonquickgrades.pm 2017/06/26 01:56:58 1.110 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Quick Student Grades Display # -# $Id: lonquickgrades.pm,v 1.106 2015/03/13 22:34:00 raeburn Exp $ +# $Id: lonquickgrades.pm,v 1.110 2017/06/26 01:56:58 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,6 +37,7 @@ use Apache::lonnet; use Apache::grades; use Apache::loncoursedata; use Apache::lonstudentassessment; +use Apache::lonuserstate; use Time::HiRes; use Spreadsheet::WriteExcel; @@ -79,7 +80,7 @@ sub real_handler { unless ($cangrade) { # Check for critical messages and redirect if present. - my ($redirect,$url) = &Apache::loncommon::critical_redirect(300); + my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'grades'); if ($redirect) { &Apache::loncommon::content_type($r,'text/html'); $r->header_out(Location => $url); @@ -105,6 +106,12 @@ sub real_handler { $env{'user.reinit'} = 1; return HTTP_NOT_ACCEPTABLE; } + } elsif ((&Apache::loncommon::course_type() eq 'Placement') && + (!$env{'request.role.adv'})) { + my $furl = &Apache::lonpageflip::first_accessible_resource(); + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => $furl); + return REDIRECT; } } @@ -176,7 +183,7 @@ sub real_handler { if ($env{'form.udom'}) { $udom=$env{'form.udom'}; } if ($env{'form.id'}) { $stdid=$env{'form.id'}; } if (($stdid) && ($udom)) { - $uname=(&Apache::lonnet::idget($udom,$stdid))[1]; + $uname=(&Apache::lonnet::idget($udom,[$stdid],'ids'))[1]; } if (($stdid) && (!$uname)) { $r->print('

'.&mt("Unknown Student/Employee ID: [_1]",$stdid).'

');