--- loncom/homework/grades.pm 2008/12/24 07:04:58 1.543
+++ loncom/homework/grades.pm 2009/01/16 10:59:52 1.548
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.543 2008/12/24 07:04:58 raeburn Exp $
+# $Id: grades.pm,v 1.548 2009/01/16 10:59:52 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -779,12 +779,12 @@ sub listStudents {
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
my $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
- my $viewgrade = $env{'form.showgrading'} eq 'yes' ? &mt('View/Grade/Regrade') : &mt('View');
+ my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
- my $result='
'.$viewgrade.
- &mt(' Submissions for a Student or a Group of Students')
+ my $result='
'
+ .&mt("$viewgrade Submissions for a Student or a Group of Students")
.'
';
my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
@@ -889,7 +889,7 @@ LISTJAVASCRIPT
&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).' ';
}
- $gradeTable.=&mt('To [_1] a submission or a group of submissions, click on the check box(es) next to the student\'s name(s). Then click on the Next button.',lc($viewgrade)).' '."\n".
+ $gradeTable.=&mt('To '.lc($viewgrade)." a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button.").' '."\n".
''."\n";
# checkall buttons
@@ -2094,7 +2094,7 @@ KEYWORDS
' ) ';
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
if (@$files) {
- $lastsubonly.=' '.&mt('Like all files provided by users, this file may contain virusses').' ';
+ $lastsubonly.=' '.&mt('Like all files provided by users, this file may contain viruses').' ';
my $file_counter = 0;
foreach my $file (@$files) {
$file_counter++;
@@ -2317,7 +2317,7 @@ sub get_last_submission {
$$returnhash{$version.':keys'}))) {
$lasthash{$key}=$$returnhash{$version.':'.$key};
$timestamp =
- scalar(localtime($$returnhash{$version.':timestamp'}));
+ &Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
}
}
foreach my $key (keys(%lasthash)) {
@@ -7584,7 +7584,7 @@ sub grade_student_bubbles {
'grade_domain' => $udom,
'grade_courseid'=> $env{'request.course.id'},
'grade_symb' => $resource->symb(),
- 'code' => $scancode);
+ 'CODE' => $scancode);
my $result=&ssi_with_retries($resource->src(),$ssi_retries,%form);
return 'ssi_error' if ($ssi_error);
last if (&Apache::loncommon::connection_aborted($r));
@@ -7778,7 +7778,7 @@ sub checkscantron_results {
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron/Submissions Comparison Status',
'Progress of Scantron Data/Submission Records Comparison',$count,
'inline',undef,'checkscantron');
- my ($username,$domain,$uname,$started);
+ my ($username,$domain,$started);
&Apache::grades::scantron_get_maxbubble(); # Need the bubble lines array to parse.