--- loncom/homework/grades.pm	2008/12/24 12:33:28	1.528.2.5
+++ loncom/homework/grades.pm	2009/01/16 02:36:30	1.528.2.10
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.528.2.5 2008/12/24 12:33:28 raeburn Exp $
+# $Id: grades.pm,v 1.528.2.10 2009/01/16 02:36:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2135,7 +2135,7 @@ KEYWORDS
 			    ' )</span>&nbsp; &nbsp;';
 			my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
 			if (@$files) {
-			    $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain virusses').'</span><br />';
+			    $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';
 			    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.').'<br />
-'.$warning.'
-<input type="submit" name="submit" value="'.&mt('Start Grading').'" />
-<input type="hidden" name="command" value="scantron_process" />
-');
-
+        my $warning=&scantron_warning_screen('Start Grading');
+        $r->print(&mt('Validation process complete.').'<br />'.
+                  $warning.
+                  &mt('Perform verification for each student after storage of submissions?').
+                  '&nbsp;<span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="verifyrecord" value="1" />'.&mt('Yes').'</label>'.
+                  ('&nbsp;'x3).'<label>'.
+                  '<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No').
+                  '</label></span><br />'.
+                  &mt('Grading will take longer if you use verification.').'<br />'.                  &mt("Alternatively, the 'Review scantron data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'.
+                  '<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'.
+                  '<input type="hidden" name="command" value="scantron_process" />'."\n");
     } else {
-	$r->print('<input type="hidden" name="command" value="scantron_validate" />');
-	$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
+        $r->print('<input type="hidden" name="command" value="scantron_validate" />');
+        $r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
     }
     if ($stop) {
 	if ($validate_phases[$currentphase] eq 'sequence') {
@@ -7705,7 +7710,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));
@@ -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.