--- loncom/homework/grades.pm 2010/04/25 13:18:32 1.631
+++ loncom/homework/grades.pm 2010/10/22 15:29:57 1.638
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.631 2010/04/25 13:18:32 www Exp $
+# $Id: grades.pm,v 1.638 2010/10/22 15:29:57 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -820,9 +820,7 @@ sub listStudents {
$submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
}
- my $result='
'
- .&mt("View/Grade/Regrade Submissions for a Student or a Group of Students")
- .'
';
+ my $result='';
my $res_error;
my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
@@ -1269,12 +1267,6 @@ sub sub_page_js {
}
}
- if (val == "Grade Student") {
- if (formname.Status.value == "") {
- formname.Status.value = "Active";
- }
- formname.studentNo.value = total;
- }
formname.submit();
}
@@ -1913,7 +1905,6 @@ sub submission {
if ($counter == 0) {
&sub_page_js($request);
&sub_page_kw_js($request);
- $request->print('
'.&mt('Submission Record').'
');
# option to display problem, only once else it cause problems
# with the form later since the problem has a form.
@@ -2217,13 +2208,8 @@ KEYWORDS
$request->print(''."\n");
# return if view submission with no grading option
-# FIXME: the logic seems off here. Why show the grade button if you cannot grade?
if (!&canmodify($usec)) {
- my $toGrade.=' '."\n" if (&canmodify($usec));
- $toGrade.=''."\n";
- $request->print($toGrade);
+ $request->print('
'.&mt('No grading privileges').'
');
return;
} else {
$request->print(''."\n");
@@ -2596,16 +2582,6 @@ sub processHandGrade {
return '';
}
-# Go directly to grade student - from submission or link from chart page
-# FIXME: looks like reading off the button label!
- if ($button eq 'Grade Student') {
- my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};
- ($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
- $env{'form.fullname'} = $$fullname{$processUser};
- &submission($request,0,0,$symb);
- return '';
- }
-
# Get the next/previous one or group of students
my $firststu = $env{'form.unamedom0'};
my $laststu = $env{'form.unamedom'.($ngrade-1)};
@@ -2693,9 +2669,7 @@ sub processHandGrade {
$ctr++;
}
if ($total < 0) {
- my $the_end = '
'.&mt('LON-CAPA User Message').'
'."\n";
- $the_end.=&mt('Message: No more students for this section or class.').'
'."\n";
- $the_end.=&mt('Click on the button below to return to the grading menu.').'
'."\n";
+ my $the_end.=&mt('Message: No more students for this section or class.').'