--- loncom/homework/grades.pm	2020/11/12 01:37:12	1.596.2.12.2.55
+++ loncom/homework/grades.pm	2021/01/05 22:01:28	1.596.2.12.2.56
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.596.2.12.2.55 2020/11/12 01:37:12 raeburn Exp $
+# $Id: grades.pm,v 1.596.2.12.2.56 2021/01/05 22:01:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1143,8 +1143,31 @@ LISTJAVASCRIPT
         $nocompmsg = '';
     }
     $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))
-                  .$submission_options
-                  .&Apache::lonhtmlcommon::row_closure()
+                  .$submission_options;
+# Check if any gradable
+    my $showmore;
+    if ($perm{'mgr'}) {
+        my @sections;
+        if ($env{'request.course.sec'} ne '') {
+            @sections = ($env{'request.course.sec'});
+        } else {
+            @sections = &Apache::loncommon::get_env_multiple('form.section');
+        }
+        if (grep(/^all$/,@sections)) {
+            $showmore = 1;
+        } else {
+            foreach my $sec (@sections) {
+                if (&canmodify($sec)) {
+                    $showmore = 1;
+                    last;
+                }
+            }
+        }
+    }
+
+    if ($showmore) {
+        $gradeTable .=
+                   &Apache::lonhtmlcommon::row_closure()
                   .&Apache::lonhtmlcommon::row_title(&mt('Send Messages'))
                   .'<span class="LC_nobreak">'
                   .'<label><input type="radio" name="compmsg" value="0"'.$nocompmsg.' />'
@@ -1153,13 +1176,15 @@ LISTJAVASCRIPT
                   .&mt('Yes').('&nbsp;'x2).'</label>'
                   .&Apache::lonhtmlcommon::row_closure();
 
-    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
+        $gradeTable .= 
+                   &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
                   .'<select name="increment">'
                   .'<option value="1">'.&mt('Whole Points').'</option>'
                   .'<option value=".5">'.&mt('Half Points').'</option>'
                   .'<option value=".25">'.&mt('Quarter Points').'</option>'
                   .'<option value=".1">'.&mt('Tenths of a Point').'</option>'
                   .'</select>';
+    }
     $gradeTable .= 
         &build_section_inputs().
 	'<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
@@ -3993,7 +4018,26 @@ sub viewgrades {
     }
 
     my ($common_header,$specific_header,@sections,$section_display);
-    @sections = &Apache::loncommon::get_env_multiple('form.section');
+    if ($env{'request.course.sec'} ne '') {
+        @sections = ($env{'request.course.sec'});
+    } else {
+        @sections = &Apache::loncommon::get_env_multiple('form.section');
+    }
+
+# Check if Save button should be usable
+    my $disabled = ' disabled="disabled"';
+    if ($perm{'mgr'}) {
+        if (grep(/^all$/,@sections)) {
+            undef($disabled);
+        } else {
+            foreach my $sec (@sections) {
+                if (&canmodify($sec)) {
+                    undef($disabled);
+                    last;
+                }
+            }
+        }
+    }
     if (grep(/^all$/,@sections)) {
         @sections = ('all');
         if ($group_display) {
@@ -4168,7 +4212,7 @@ sub viewgrades {
     }
     $result.=&Apache::loncommon::end_data_table();
     $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
-    $result.='<input type="button" value="'.&mt('Save').'" '.
+    $result.='<input type="button" value="'.&mt('Save').'"'.$disabled.' '.
 	'onclick="javascript:submit();" target="_self" /></form>'."\n";
     if ($ctr == 0) {
         my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
@@ -5364,10 +5408,14 @@ sub displayPage {
 	}
         $curRes = $iterator->next();
     }
+    my $disabled;
+    unless (&canmodify($usec)) {
+        $disabled = ' disabled="disabled"';
+    }
 
     $studentTable.=
         '</table>'."\n".
-        '<input type="button" value="'.&mt('Save').'" '.
+        '<input type="button" value="'.&mt('Save').'"'.$disabled.' '.
         'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
         '</form>'."\n";
     $request->print($studentTable);
@@ -9873,37 +9921,47 @@ sub grading_menu {
 
     $fields{'command'} = 'initialverifyreceipt';
     my $url5 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    
+
+    my %permissions;
+    if ($perm{'mgr'}) {
+        $permissions{'either'} = 'F';
+        $permissions{'mgr'} = 'F';
+    }
+    if ($perm{'vgr'}) {
+        $permissions{'either'} = 'F';
+        $permissions{'vgr'} = 'F';
+    }
+
     my @menu = ({	categorytitle=>'Hand Grading',
             items =>[
                         {       linktext => 'Select individual students to grade',
                                 url => $url1a,
-                                permission => 'F',
+                                permission => $permissions{'either'},
                                 icon => 'grade_students.png',
                                 linktitle => 'Grade current resource for a selection of students.'
                         },
                         {       linktext => 'Grade ungraded submissions',
                                 url => $url1b,
-                                permission => 'F',
+                                permission => $permissions{'either'},
                                 icon => 'ungrade_sub.png',
                                 linktitle => 'Grade all submissions that have not been graded yet.'
                         },
 
                         {       linktext => 'Grading table',
                                 url => $url1c,
-                                permission => 'F',
+                                permission => $permissions{'either'},
                                 icon => 'grading_table.png',
                                 linktitle => 'Grade current resource for all students.'
                         },
                         {       linktext => 'Grade page/folder for one student',
                                 url => $url1d,
-                                permission => 'F',
+                                permission => $permissions{'either'},
                                 icon => 'grade_PageFolder.png',
                                 linktitle => 'Grade all resources in current page/sequence/folder for one student.'
                         },
                         {       linktext => 'Download submitted files',
                                 url => $url1e,
-                                permission => 'F',
+                                permission => $permissions{'either'},
                                 icon => 'download_sub.png',
                                 linktitle => 'Download all files submitted by students.'
                         }]},
@@ -9912,25 +9970,25 @@ sub grading_menu {
 
                 	    {	linktext => 'Upload Scores',
                     		url => $url2,
-                    		permission => 'F',
+                    		permission => $permissions{'mgr'},
                     		icon => 'uploadscores.png',
                     		linktitle => 'Specify a file containing the class scores for current resource.'
                 	    },
                 	    {	linktext => 'Process Clicker',
                     		url => $url3,
-                    		permission => 'F',
+                    		permission => $permissions{'mgr'},
                     		icon => 'addClickerInfoFile.png',
                     		linktitle => 'Specify a file containing the clicker information for this resource.'
                 	    },
                 	    {	linktext => 'Grade/Manage/Review Bubblesheets',
                     		url => $url4,
-                    		permission => 'F',
+                    		permission => $permissions{'mgr'},
                     		icon => 'bubblesheet.png',
                     		linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.'
                 	    },
                             {   linktext => 'Verify Receipt Number',
                                 url => $url5,
-                                permission => 'F',
+                                permission => $permissions{'either'},
                                 icon => 'receipt_number.png',
                                 linktitle => 'Verify a system-generated receipt number for correct problem solution.'
                             }