--- loncom/interface/lonquickgrades.pm	2017/11/16 13:41:56	1.111
+++ loncom/interface/lonquickgrades.pm	2020/05/20 16:55:52	1.115
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.111 2017/11/16 13:41:56 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.115 2020/05/20 16:55:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -293,9 +293,18 @@ sub startGradeScreen {
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
     my $showCategories=
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
+ 
+    my $allowed_to_view = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+    if ((!$allowed_to_view) && ($env{'request.course.sec'} ne '')) {
+        $allowed_to_view = &Apache::lonnet::allowed('vgr',
+                               "$env{'request.course.id'}/$env{'request.course.sec'}");
+    }
 
-    my $allowed_to_view =  &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
-    my $allowed_to_edit =  &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+    my $allowed_to_edit = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+    if (!$allowed_to_edit) && ($env{'request.course.sec'} ne '')) {
+        $allowed_to_edit = &Apache::lonnet::allowed('mgr',
+                               "$env{'request.course.id'}/$env{'request.course.sec'}");
+    }
 
     if ($allowed_to_view) {
        my @notes;
@@ -322,7 +331,7 @@ sub startGradeScreen {
                                                                  &mt('Statistics and Reports').'</b></a></li>');
 
        $r->print("\n".'<li'.($mode eq 'chart'?' class="active"':'').'><a href="/adm/statistics?reportSelected=student_assessment"><b>'.
-                                                                 &mt('Assessment Overview Chart').'</b></a></li>');
+                                                                 &mt('Assessment Chart').'</b></a></li>');
 
     }
     if ($allowed_to_edit) {
@@ -444,7 +453,8 @@ 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 && 
+            ($curRes->deeplink ne 'absent'))
         {
             # Get number of correct, incorrect parts
             my $parts = $curRes->parts();