--- loncom/interface/lonquickgrades.pm	2021/03/04 01:42:20	1.49.6.7
+++ loncom/interface/lonquickgrades.pm	2023/09/07 23:53:42	1.49.6.8.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.49.6.7 2021/03/04 01:42:20 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.49.6.8.2.3 2023/09/07 23:53:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -64,9 +64,28 @@ 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 $clientip = &Apache::lonnet::get_requestor_ip($r);
+        my ($blocked,$blocktext) =
+            &Apache::loncommon::blocking_status('grades',$clientip,$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);
+        my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'grades');
         if ($redirect) {
             &Apache::loncommon::content_type($r,'text/html');
             $r->header_out(Location => $url);
@@ -82,10 +101,14 @@ sub real_handler {
             $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'};
+        }
+        my ($cid,$cnum,$cdom);
+        if ($reinitresult) {
+            $cid = $env{'request.course.id'};
+            $cnum = $env{'course.'.$cid.'.num'};
+            $cdom = $env{'course.'.$cid.'.domain'};
+        }
+        if (($reinitresult eq 'main') || ($reinitresult eq 'both')) {        
             &Apache::loncommon::content_type($r,'text/html');
             $r->send_http_header;
             &startpage($r,$showPoints);
@@ -117,9 +140,19 @@ ENDCLOSE
                $r->print($closure);
             }
         }
+        if (($reinitresult eq 'supp') || ($reinitresult eq 'both')) {
+            my $possdel;
+            if ($reinitresult eq 'supp') {
+                $possdel = 1;
+            }
+            my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel);
+            unless ($refs_updated) {
+                &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental);
+            }
+        }
     }
 
-    unless ($reinitresult eq 'update') {
+    unless (($reinitresult eq 'main') || ($reinitresult eq 'both')) {
         # Send header, don't cache this page
         &Apache::loncommon::no_cache($r);
         $r->send_http_header;
@@ -188,6 +221,29 @@ 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
 #
@@ -232,7 +288,7 @@ sub getData {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
         if ($curRes == $iterator->END_MAP()) { $depth--; }
 
-        if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout)
+        if (ref($curRes) && $curRes->is_gradable() && !$curRes->randomout)
         {
             # Get number of correct, incorrect parts
             my $parts = $curRes->parts();