--- loncom/homework/grades.pm 2010/04/22 13:00:24 1.630 +++ loncom/homework/grades.pm 2010/08/30 09:47:32 1.636 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.630 2010/04/22 13:00:24 www Exp $ +# $Id: grades.pm,v 1.636 2010/08/30 09:47:32 wenzelju 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('No grading privileges').'
'); return; } else { $request->print(''."\n"); @@ -2344,7 +2330,7 @@ sub check_collaborators { (split(/[,;\s]+/,$record->{'resource.'.$part.'.collaborators'})) { $possible_collaborator =~ s/[\$\^\(\)]//g; next if ($possible_collaborator eq ''); - my ($co_name,$co_dom) = split(/\@|:/,$possible_collaborator); + my ($co_name,$co_dom) = split(/:/,$possible_collaborator); $co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i); next if ($co_name eq $uname && $co_dom eq $udom); # Doing this grep allows 'fuzzy' specification @@ -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 = '