--- loncom/homework/grades.pm 2003/12/05 19:40:56 1.168
+++ loncom/homework/grades.pm 2004/02/09 21:13:50 1.172
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.168 2003/12/05 19:40:56 albertel Exp $
+# $Id: grades.pm,v 1.172 2004/02/09 21:13:50 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -49,7 +49,7 @@ use Apache::loncoursedata;
use Apache::lonmsg qw(:user_normal_msg);
use Apache::Constants qw(:common);
use Apache::lonlocal;
-#use String::Similarity;
+use String::Similarity;
my %oldessays=();
my %perm=();
@@ -738,9 +738,12 @@ LISTJAVASCRIPT
if ($num_students eq 0) {
$gradeTable='
There are no students currently enrolled.';
} else {
+ my $submissions='submissions';
+ if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; }
+ if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; }
$gradeTable='
'.
- 'No submissions found for this resource for any students. ('.$num_students.
- ' checked for submissions)
';
+ 'No '.$submissions.' found for this resource for any students. ('.$num_students.
+ ' students checked for '.$submissions.')
';
}
} elsif ($ctr == 1) {
$gradeTable =~ s/type=checkbox/type=checkbox checked/;
@@ -1679,10 +1682,11 @@ KEYWORDS
my $toGrade.=' '."\n" if (&canmodify($usec));
- $toGrade.=''."\n";
- $toGrade.=&show_grading_menu_form($symb,$url)
- if (($ENV{'form.command'} eq 'submission') ||
- ($ENV{'form.command'} eq 'processGroup' && $counter == $total));
+ $toGrade.=''."\n";
+ if (($ENV{'form.command'} eq 'submission') ||
+ ($ENV{'form.command'} eq 'processGroup' && $counter == $total)) {
+ $toGrade.=''.&show_grading_menu_form($symb,$url)
+ }
$request = print($toGrade);
return;
}
@@ -4151,11 +4155,11 @@ SCANTRONFORM
'last student');
}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- my $lasttime = &Time::HiRes::time()-$start;
- $r->print("
took $lasttime
"); +# my $lasttime = &Time::HiRes::time()-$start; +# $r->print("took $lasttime
"); $navmap->untieHashes(); - $r->print("Done
"); + $r->print("Done
"); $r->print(&show_grading_menu_form($symb,$url)); return ''; }