--- loncom/interface/lonquickgrades.pm	2020/05/25 04:17:47	1.116
+++ loncom/interface/lonquickgrades.pm	2020/09/01 03:35:54	1.118
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.116 2020/05/25 04:17:47 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.118 2020/09/01 03:35:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -83,6 +83,24 @@ 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');
@@ -204,6 +222,10 @@ ENDCLOSE
             $r->print('<p><span class="LC_warning">'.&mt("Unknown Student/Employee ID: [_1]",$stdid).'</span></p>');
             $stdid='';
         }
+        if (($uname eq '') && ($udom eq '')) {
+            $uname = $env{'user.name'};
+            $udom = $env{'user.domain'};
+        }
         $r->print('<form method="post" name="quickform" action="/adm/quickgrades">');
         my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
            &Apache::loncommon::selectstudent_link('quickform','uname','udom');
@@ -219,9 +241,6 @@ ENDCLOSE
     }
     $r->rflush();
 
-    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=
@@ -230,12 +249,19 @@ ENDCLOSE
     my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
        &getData($showPoints,$uname,$udom);
 
-    if ($showCategories) {
-       &outputCategories($r,$showPoints,$notshowTotals,
-                 $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+    if (ref($navmap)) {
+        if ($showCategories) {
+            &outputCategories($r,$showPoints,$notshowTotals,
+                $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+        } else {
+            &outputTable($r,$showPoints,$notshowTotals,
+                $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+        }
     } else {
-       &outputTable($r,$showPoints,$notshowTotals,
-                 $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+        if ($cangrade) { $r->print("\n</form>\n"); }
+        my $requrl = $r->uri;
+        $env{'user.error.msg'} = "$requrl:bre:0:0:Navmap initialization failed.";
+        return HTTP_NOT_ACCEPTABLE;
     }
     if ($cangrade) { $r->print("\n</form>\n"); }
     &endGradeScreen($r);
@@ -243,6 +269,29 @@ ENDCLOSE
 
 }
 
+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;
+}
+
 sub getStudentCatGrade {
     my ($uname,$udom,%categories)=@_;
     my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
@@ -291,6 +340,8 @@ sub startGradeScreen {
       || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories'));
     my $notshowTotals=
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
+    my $showSPRSlink =
+        $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet';
     my $showCategories=
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
  
@@ -312,6 +363,7 @@ sub startGradeScreen {
        push(@notes,&mt('Students do not see link to spreadsheet.')) if ($notshowSPRSlink);
        push(@notes,&mt('Students will see points based on problem weights.')) if ($showPoints);
        push(@notes,&mt('Students will see points based on categories.')) if ($showCategories);
+       push(@notes,&mt('Students will see link to spreadsheet.')) if ($showSPRSlink);
        push(@notes, &Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading'));
        $r->print(&Apache::loncommon::head_subbox(join('&nbsp;&nbsp;',@notes)));
     }
@@ -352,6 +404,7 @@ sub startGradeScreen {
 sub endGradeScreen {
    my ($r)=@_;
    $r->print('</div></div></div>'.&Apache::loncommon::end_page());
+   return;
 }
 
 # -----------
@@ -424,6 +477,10 @@ sub getData {
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
 
+    if (!defined($navmap)) {
+        return ();
+    }
+
     my $res = $navmap->firstResource(); # temp resource to access constants
 
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);
@@ -652,6 +709,7 @@ sub outputTable {
     }
 
     $r->print(&Apache::loncommon::end_data_table());
+    return;
 }
 
 #