--- loncom/homework/grades.pm 2008/12/24 07:06:08 1.528.2.4
+++ loncom/homework/grades.pm 2009/01/07 21:33:25 1.528.2.9
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.528.2.4 2008/12/24 07:06:08 raeburn Exp $
+# $Id: grades.pm,v 1.528.2.9 2009/01/07 21:33:25 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2135,7 +2135,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++;
@@ -2358,7 +2358,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)) {
@@ -6214,16 +6214,21 @@ sub scantron_validate_file {
}
}
if (!$stop) {
- my $warning=&scantron_warning_screen('Start Grading');
- $r->print(&mt('Validation process complete.').'
-'.$warning.'
-
-
-');
-
+ my $warning=&scantron_warning_screen('Start Grading');
+ $r->print(&mt('Validation process complete.').' '.
+ $warning.
+ &mt('Perform verification for each student after storage of submissions?').
+ ' '.
+ (' 'x3).' '.
+ &mt('Grading will take longer if you use verification.').' '. &mt("Alternatively, the 'Review scantron data' utility (see grading menu) can be used for all students after grading is complete.").'
'.
+ ''.
+ ''."\n");
} else {
- $r->print('');
- $r->print("");
+ $r->print('');
+ $r->print("");
}
if ($stop) {
if ($validate_phases[$currentphase] eq 'sequence') {
@@ -7349,11 +7354,11 @@ sub scantron_get_maxbubble {
my ($numbub,$numshown);
if ($analysis->{$part_id.'.type'} eq 'optionresponse') {
if (ref($analysis->{$part_id.'.options'}) eq 'ARRAY') {
- $numbub = scalar(@{$analysis{$part_id.'.options'}});
+ $numbub = scalar(@{$analysis->{$part_id.'.options'}});
}
} elsif ($analysis->{$part_id.'.type'} eq 'matchresponse') {
- if (ref($analysis{$part_id.'.items'}) eq 'ARRAY') {
- $numbub = scalar(@{$analysis{$part_id.'.items'}});
+ if (ref($analysis->{$part_id.'.items'}) eq 'ARRAY') {
+ $numbub = scalar(@{$analysis->{$part_id.'.items'}});
}
} elsif ($analysis->{$part_id.'.type'} eq 'rankresponse') {
if (ref($analysis->{$part_id.'.foils'}) eq 'ARRAY') {
@@ -7933,7 +7938,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.