--- loncom/homework/grades.pm	2008/12/21 22:01:35	1.539
+++ loncom/homework/grades.pm	2009/04/15 17:02:35	1.561
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.539 2008/12/21 22:01:35 riegler Exp $
+# $Id: grades.pm,v 1.561 2009/04/15 17:02:35 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -234,28 +234,54 @@ sub reset_caches {
 
 {
     my %analyze_cache;
+    my %analyze_cache_formkeys;
 
     sub reset_analyze_cache {
 	undef(%analyze_cache);
+        undef(%analyze_cache_formkeys);
     }
 
     sub get_analyze {
-	my ($symb,$uname,$udom,$no_increment)=@_;
+	my ($symb,$uname,$udom,$no_increment,$add_to_hash)=@_;
 	my $key = "$symb\0$uname\0$udom";
-	return $analyze_cache{$key} if (exists($analyze_cache{$key}));
+	if (exists($analyze_cache{$key})) {
+            my $getupdate = 0;
+            if (ref($add_to_hash) eq 'HASH') {
+                foreach my $item (keys(%{$add_to_hash})) {
+                    if (ref($analyze_cache_formkeys{$key}) eq 'HASH') {
+                        if (!exists($analyze_cache_formkeys{$key}{$item})) {
+                            $getupdate = 1;
+                            last;
+                        }
+                    } else {
+                        $getupdate = 1;
+                    }
+                }
+            }
+            if (!$getupdate) {
+                return $analyze_cache{$key};
+            }
+        }
 
 	my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
 	$url=&Apache::lonnet::clutter($url);
-	my $subresult=&ssi_with_retries($url, $ssi_retries,
-					   ('grade_target' => 'analyze',
-					    'grade_domain' => $udom,
-					    'grade_symb' => $symb,
-					    'grade_courseid' => 
-					    $env{'request.course.id'},
-					    'grade_username' => $uname,
-                                            'grade_noincrement' => $no_increment));
+        my %form = ('grade_target'      => 'analyze',
+                    'grade_domain'      => $udom,
+                    'grade_symb'        => $symb,
+                    'grade_courseid'    =>  $env{'request.course.id'},
+                    'grade_username'    => $uname,
+                    'grade_noincrement' => $no_increment);
+        if (ref($add_to_hash)) {
+            %form = (%form,%{$add_to_hash});
+        } 
+	my $subresult=&ssi_with_retries($url, $ssi_retries,%form);
 	(undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
 	my %analyze=&Apache::lonnet::str2hash($subresult);
+        if (ref($add_to_hash) eq 'HASH') {
+            $analyze_cache_formkeys{$key} = $add_to_hash;
+        } else {
+            $analyze_cache_formkeys{$key} = {};
+        }
 	return $analyze_cache{$key} = \%analyze;
     }
 
@@ -268,12 +294,41 @@ sub reset_caches {
     sub get_radiobutton_correct_foil {
 	my ($partid,$respid,$symb,$uname,$udom)=@_;
 	my $analyze = &get_analyze($symb,$uname,$udom);
-	foreach my $foil (@{&get_order($partid,$respid,$symb,$uname,$udom)}) {
-	    if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {
-		return $foil;
+        my $foils = &get_order($partid,$respid,$symb,$uname,$udom);
+        if (ref($foils) eq 'ARRAY') {
+	    foreach my $foil (@{$foils}) {
+	        if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {
+		    return $foil;
+	        }
 	    }
 	}
     }
+
+    sub scantron_partids_tograde {
+        my ($resource,$cid,$uname,$udom,$check_for_randomlist) = @_;
+        my (%analysis,@parts);
+        if (ref($resource)) {
+            my $symb = $resource->symb();
+            my $add_to_form;
+            if ($check_for_randomlist) {
+                $add_to_form = { 'check_parts_withrandomlist' => 1,};
+            }
+            my $analyze = &get_analyze($symb,$uname,$udom,undef,$add_to_form);
+            if (ref($analyze) eq 'HASH') {
+                %analysis = %{$analyze};
+            }
+            if (ref($analysis{'parts'}) eq 'ARRAY') {
+                foreach my $part (@{$analysis{'parts'}}) {
+                    my ($id,$respid) = split(/\./,$part);
+                    if (!&Apache::loncommon::check_if_partid_hidden($id,$symb,$udom,$uname)) {
+                        push(@parts,$part);
+                    }
+                }
+            }
+        }
+        return (\%analysis,\@parts);
+    }
+
 }
 
 #--- Clean response type for display
@@ -699,7 +754,7 @@ sub verifyreceipt {
 
     my $title.=
 	'<h3><span class="LC_info">'.
-	&mt('Verifying Submission Receipt [_1]',$receipt).
+	&mt('Verifying  Receipt No. [_1]',$receipt).
 	'</span></h3>'."\n".
 	'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
 	'</h4>'."\n";
@@ -779,22 +834,20 @@ 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='<h3><span class="LC_info">&nbsp;'.$viewgrade.
-	&mt(' Submissions for a Student or a Group of Students')
+    my $result='<h3><span class="LC_info">&nbsp;'
+	.&mt("$viewgrade Submissions for a Student or a Group of Students")
 	.'</span></h3>';
 
     my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
 
-    my %lt = ( 'multiple' =>
-	       &mt("Please select a student or group of students before clicking on the Next button."),
-	       'single'   =>
-	       &mt("Please select the student before clicking on the Next button."),
-	       );
-    %lt = &Apache::lonlocal::texthash(%lt);
+    my %lt = &Apache::lonlocal::texthash (
+		'multiple' => 'Please select a student or group of students before clicking on the Next button.',
+		'single'   => 'Please select the student before clicking on the Next button.',
+	     );
     $request->print(<<LISTJAVASCRIPT);
 <script type="text/javascript" language="javascript">
     function checkSelect(checkBox) {
@@ -836,16 +889,17 @@ LISTJAVASCRIPT
     my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
 	"\n".$table;
 	
-    $gradeTable .= 
-	'&nbsp;<b>'.&mt('View Problem Text').': </b>'.
-	    '<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
-	    '<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n".
-	    '<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label><br />'."\n";
-    $gradeTable .= 
-	'&nbsp;<b>'.&mt('View Answer').': </b>'.
-	    '<label><input type="radio" name="vAns" value="no"  /> '.&mt('no').' </label>'."\n".
-	    '<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n".
-	    '<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n";
+    $gradeTable .= &Apache::lonhtmlcommon::start_pick_box();
+    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))
+                  .'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n"
+                  .'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n"
+                  .'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label><br />'."\n"
+                  .&Apache::lonhtmlcommon::row_closure();
+    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Answer'))
+                  .'<label><input type="radio" name="vAns" value="no"  /> '.&mt('no').' </label>'."\n"
+                  .'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n"
+                  .'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n"
+                  .&Apache::lonhtmlcommon::row_closure();
 
     my $submission_options;
     if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
@@ -860,19 +914,20 @@ LISTJAVASCRIPT
 	'<label><input type="radio" name="lastSub" value="last" /> '.&mt('last submission &amp; parts info').' </label>'."\n".
 	'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n".
 	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>';
-    $gradeTable .= 
-	'&nbsp;<b>'.&mt('Submissions').': </b>'.$submission_options.'<br />'."\n";
+    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))
+                  .$submission_options
+                  .&Apache::lonhtmlcommon::row_closure();
+
+    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
+                  .'<select name="increment">'
+                  .'<option value="1">'.&mt('Whole Points').'</option>'
+                  .'<option value=".5">'.&mt('Half Points').'</option>'
+                  .'<option value=".25">'.&mt('Quarter Points').'</option>'
+                  .'<option value=".1">'.&mt('Tenths of a Point').'</option>'
+                  .'</select>'
+                  .&Apache::lonhtmlcommon::row_closure();
 
     $gradeTable .= 
-        '&nbsp;<b>'.&mt('Grading Increments').': </b>'.
-	    '<select name="increment">'.
-	    '<option value="1">'.&mt('Whole Points').'</option>'.
-	    '<option value=".5">'.&mt('Half Points').'</option>'.
-	    '<option value=".25">'.&mt('Quarter Points').'</option>'.
-	    '<option value=".1">'.&mt('Tenths of a Point').'</option>'.
-	    '</select>';
-    
-    $gradeTable .= 
         &build_section_inputs().
 	'<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
 	'<input type="hidden" name="handgrade"   value="'.$env{'form.handgrade'}.'" /><br />'."\n".
@@ -883,14 +938,23 @@ LISTJAVASCRIPT
 	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
 
     if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
-	$gradeTable.='<input type="hidden" name="Status"   value="'.$stu_status.'" />'."\n";
+	$gradeTable .= '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";
     } else {
-	$gradeTable.=&mt('<b>Student Status:</b> [_1]',
-			 &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />';
+        $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status'))
+                      .&Apache::lonhtmlcommon::StatusOptions(
+                           $saveStatus,undef,1,'javascript:reLoadList(this.form);')
+                      .&Apache::lonhtmlcommon::row_closure();
     }
 
-    $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)).'<br />'."\n".
-	'<input type="hidden" name="command" value="processGroup" />'."\n";
+    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))
+                  .'<input type="checkbox" name="checkPlag" checked="checked" />'
+                  .&Apache::lonhtmlcommon::row_closure(1)
+                  .&Apache::lonhtmlcommon::end_pick_box();
+
+    $gradeTable .= '<p>'
+                  .&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"
+                  .'<input type="hidden" name="command" value="processGroup" />'
+                  .'</p>';
 
 # checkall buttons
     $gradeTable.=&check_script('gradesub', 'stuinfo');
@@ -898,7 +962,6 @@ LISTJAVASCRIPT
 	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
 	'value="'.&mt('Next').' &rarr;" /> <br />'."\n";
     $gradeTable.=&check_buttons();
-    $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />'.&mt('Check For Plagiarism').'</label>';
     my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup);
     $gradeTable.= &Apache::loncommon::start_data_table().
 	&Apache::loncommon::start_data_table_header_row();
@@ -1656,7 +1719,7 @@ sub gradeBox {
 	$wgt.')" /></td>'."\n";
     $line.='<td>/'.$wgt.' '.$wgtmsg.
 	($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? '&nbsp;'.$checkIcon : '').
-	' </td><td>'."\n";
+	' </td><td><b>'.&mt('Grade Status').':</b>'."\n";
     $line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
 	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
     if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
@@ -1669,9 +1732,9 @@ sub gradeBox {
     $line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";
 
 
+	#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
     $result .= 
-	&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
-
+	    '<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
     
     $result.='</tr></table>'."\n";
     $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
@@ -2094,7 +2157,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++;
@@ -2105,7 +2168,7 @@ KEYWORDS
 			}
 			$lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.
 			    &cleanRecord($subval,$responsetype,$symb,$partid,
-					 $respid,\%record,$order);
+					 $respid,\%record,$order,undef,$uname,$udom);
 			if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
 			$lastsubonly.='</div>';
 		    }
@@ -2234,7 +2297,7 @@ KEYWORDS
 	    '<option>7</option><option>10</option></select>'."\n";
 	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
 	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
-	$endform.=&mt('[_1]student(s)',$ntstu);
+	$endform.=&mt('[quant,_1,student]',$ntstu);
 	$endform.='&nbsp;&nbsp;<input type="button" value="'.&mt('Previous').'" '.
 	    'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> &nbsp;'."\n".
 	    '<input type="button" value="'.&mt('Next').'" '.
@@ -2317,7 +2380,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)) {
@@ -3173,19 +3236,19 @@ sub viewgrades {
 	'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".
 	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
 
-    my $sectionClass;
-    my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
+    my ($common_header,$specific_header);
     if ($env{'form.section'} eq 'all') {
-	$sectionClass=&mt('Class');
+	$common_header = &mt('Assign Common Grade to Class');
+        $specific_header = &mt('Assign Grade to Specific Students in Class');
     } elsif ($env{'form.section'} eq 'none') {
-	$sectionClass=&mt('Students in no Section');
+        $common_header = &mt('Assign Common Grade to Students in no Section');
+	$specific_header = &mt('Assign Grade to Specific Students in no Section');
     } else {
-	$sectionClass=&mt('Students in Section(s) [_1]');
+        my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
+        $common_header = &mt('Assign Common Grade to Students in Section(s) [_1]',$section_display);
+	$specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1]',$section_display);
     }
-    $result.=
-	'<h3>'.
-	&mt("Assign Common Grade to [_1]",$sectionClass,$section_display).'</h3>';
-    $result.= &Apache::loncommon::start_data_table();
+    $result.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table();
     #radio buttons/text box for assigning points for a section or class.
     #handles different parts of a problem
     my ($partlist,$handgrade,$responseType) = &response_type($symb);
@@ -3230,7 +3293,6 @@ sub viewgrades {
 	$line.='<input type="hidden" name="weight_'.
 	    $partid.'" value="'.$weight{$partid}.'" />'."\n";
 
-	    #&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line).
 	$result.=
 	    &Apache::loncommon::start_data_table_row()."\n".
 	    '<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
@@ -3244,12 +3306,11 @@ sub viewgrades {
 
     #table listing all the students in a section/class
     #header of table
-    $result.= '<h3>'.&mt('Assign Grade to Specific Students in ').$sectionClass,
-			 $section_display.'</h3>';
-    $result.= &Apache::loncommon::start_data_table().
-	&Apache::loncommon::start_data_table_header_row().
-	'<th>'.&mt('No.').'</th>'.
-	'<th>'.&nameUserString('header')."</th>\n";
+    $result.= '<h3>'.$specific_header.'</h3>'.
+              &Apache::loncommon::start_data_table().
+	      &Apache::loncommon::start_data_table_header_row().
+	      '<th>'.&mt('No.').'</th>'.
+	      '<th>'.&nameUserString('header')."</th>\n";
     my (@parts) = sort(&getpartlist($symb));
     my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
     my @partids = ();
@@ -3427,7 +3488,7 @@ sub editgrades {
 	    if ($part !~ m/^\Q$partid\E/) { next;}
 	    if ($type eq 'awarded' || $type eq 'solved') { next; }
 	    my $display=&Apache::lonnet::metadata($url,$stores.'.display');
-	    $display =~ s/\[Part: (\w)+\]//;
+	    $display =~ s/\[Part: \Q$part\E\]//;
             my $narrowtext = &mt('Tries');
 	    $display =~ s/Number of Attempts/$narrowtext/;
 	    $header .= '<th align="center">'.&mt('Old').' '.$display.'</th>'.
@@ -3743,7 +3804,7 @@ ENDPICK
 sub csvupload_fields {
     my ($symb) = @_;
     my (@parts) = &getpartlist($symb);
-    my @fields=(['ID','Student ID'],
+    my @fields=(['ID','Student/Employee ID'],
 		['username','Student Username'],
 		['domain','Student Domain']);
     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
@@ -4656,10 +4717,10 @@ Next each scanline is checked for any er
 bubbles' (it's an error because it may have been mis-scanned
 because too light bubbling), 'double bubble' (each bubble line should
 have no more that one letter picked), invalid or duplicated CODE,
-invalid student ID
+invalid student/employee ID
 
 If the CODE option is used that determines the randomization of the
-homework problems, either way the student ID is looked up into a
+homework problems, either way the student/employee ID is looked up into a
 username:domain.
 
 During the validation phase the instructor can choose to skip scanlines. 
@@ -4729,7 +4790,7 @@ sub getSequenceDropDown {
 }
 
 my %bubble_lines_per_response;     # no. bubble lines for each response.
-                                   # index is "symb.part_id"
+                                   # key is zero-based index - 0, 1, 2 ...
 
 my %first_bubble_line;             # First bubble line no. for each bubble.
 
@@ -4770,7 +4831,6 @@ sub restore_bubble_lines {
             $env{"form.scantron.responsetype.$line"};
 	$line++;
     }
-
 }
 
 #  Given the parsed scanline, get the response for 
@@ -4779,7 +4839,6 @@ sub restore_bubble_lines {
 sub get_response_bubbles {
     my ($parsed_line, $response)  = @_;
 
-
     my $bubble_line = $first_bubble_line{$response-1} +1;
     my $bubble_lines= $bubble_lines_per_response{$response-1};
     
@@ -5135,6 +5194,10 @@ sub scantron_selectphase {
               '<td> '.$format_selector.' </td>'."\n".
               &Apache::loncommon::end_data_table_row()."\n".
               &Apache::loncommon::start_data_table_row()."\n".
+              '<td> '.&mt('Options').' </td>'."\n".
+              '<td> <label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> '.&mt('Skip hidden resources').'</label></td>'.
+              &Apache::loncommon::end_data_table_row()."\n".
+              &Apache::loncommon::start_data_table_row()."\n".
               '<td colspan="2">'."\n".
               '<input type="hidden" name="command" value="checksubmissions" />'."\n".
               '<input type="submit" value="'.&mt('Review Scantron Data and Submission Records').'" />'."\n".
@@ -5178,8 +5241,8 @@ sub scantron_selectphase {
       CODEstart   - (only matter if a CODE exists) column in the line where
                      the CODE starts
       CODElength  - length of the CODE
-      IDstart     - column where the student ID number starts
-      IDlength    - length of the student ID info
+      IDstart     - column where the student/employee ID number starts
+      IDlength    - length of the student/employee ID info
       Qstart      - column where the information from the bubbled
                     'questions' start
       Qlength     - number of columns comprising a single bubble line from
@@ -5239,7 +5302,7 @@ sub get_scantron_config {
 
 =item username_to_idmap
 
-    creates a hash keyed by student id with values of the corresponding
+    creates a hash keyed by student/employee ID with values of the corresponding
     student username:domain.
 
   Arguments:
@@ -5278,7 +5341,7 @@ sub username_to_idmap {
     $whichline         - line number of the passed in scanline
     $field             - type of change to process 
                          (either 
-                          'ID'     -> correct the student ID number
+                          'ID'     -> correct the student/employee ID number
                           'CODE'   -> correct the CODE
                           'answer' -> fixup the submitted answers)
     
@@ -5452,7 +5515,7 @@ sub digits_to_letters {
        CODE_ignore_dup - 1 if the CODE is a duplicated use when unique
                             CODEs were selected, but the usage has been
                             forced by the operator
-       ID  - student ID
+       ID  - student/employee ID
        PaperID - if used, the ID number printed on the sheet when the 
                  paper was scanned
        FirstName - first name from the sheet
@@ -5488,7 +5551,8 @@ sub scantron_parse_scanline {
     my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_;
 
     my %record;
-    my $questions=substr($line,$$scantron_config{'Qstart'}-1);  # Answers
+    my $lastpos = $env{'form.scantron_maxbubble'}*$$scantron_config{'Qlength'};
+    my $questions=substr($line,$$scantron_config{'Qstart'}-1,$lastpos);  # Answers
     my $data=substr($line,0,$$scantron_config{'Qstart'}-1);     # earlier stuff
     if (!($$scantron_config{'CODElocation'} eq 0 ||
 	  $$scantron_config{'CODElocation'} eq 'none')) {
@@ -6178,12 +6242,18 @@ 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" />
-');
-
+	$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."' />");
@@ -6755,7 +6825,7 @@ ENDSCRIPT
        ".&mt("[_1]Select[_2] a CODE from the list of all CODEs and use it.",
 	     "<a target='_blank' href='$href'>","</a>")."
     </label> 
-    ".&mt("Selected CODE is [_1]","<input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />"));
+    ".&mt("Selected CODE is [_1]",'<input readonly="readonly" type="text" size="8" name="scantron_CODE_selectedvalue" onfocus="javascript:change_radio(\'use_found\')" onchange="javascript:change_radio(\'use_found\')" />'));
 	    $r->print("\n<br />");
 	}
 	$r->print("
@@ -7229,124 +7299,74 @@ sub scantron_get_maxbubble {
 
     &Apache::lonxml::clear_problem_counter();
 
-    my $uname       = $env{'form.student'};
-    my $udom        = $env{'form.userdom'};
+    my $uname       = $env{'user.name'};
+    my $udom        = $env{'user.domain'};
     my $cid         = $env{'request.course.id'};
     my $total_lines = 0;
     %bubble_lines_per_response = ();
     %first_bubble_line         = ();
     %subdivided_bubble_lines   = ();
     %responsetype_per_response = ();
-  
+
     my $response_number = 0;
     my $bubble_line     = 0;
     foreach my $resource (@resources) {
-        my $symb = $resource->symb();
-
-        my (@parts,@allparts,@possible_parts);
-
-        # Need to retrieve part IDs and response IDs because essayresponse,
-        # reactionresponse and organicresponse items are not included in 
-        # $analysis{'parts'} from lonnet::ssi.  
-        if (ref($resource->parts()) eq 'ARRAY') {
-            foreach my $part (@{$resource->parts()}) {
-                if (!&Apache::loncommon::check_if_partid_hidden($part,$symb,$udom,$uname)) {
-                    my @resp_ids = $resource->responseIds($part);
-                    foreach my $id (@resp_ids) {
-                        my $part_id = $part.'.'.$id;
-                        push(@possible_parts,$part_id);
+        my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom);
+        if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {
+	    foreach my $part_id (@{$parts}) {
+                my $lines;
+
+	        # TODO - make this a persistent hash not an array.
+
+                # optionresponse, matchresponse and rankresponse type items 
+                # render as separate sub-questions in exam mode.
+                if (($analysis->{$part_id.'.type'} eq 'optionresponse') ||
+                    ($analysis->{$part_id.'.type'} eq 'matchresponse') ||
+                    ($analysis->{$part_id.'.type'} eq 'rankresponse')) {
+                    my ($numbub,$numshown);
+                    if ($analysis->{$part_id.'.type'} eq 'optionresponse') {
+                        if (ref($analysis->{$part_id.'.options'}) eq 'ARRAY') {
+                            $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'}});
+                        }
+                    } elsif ($analysis->{$part_id.'.type'} eq 'rankresponse') {
+                        if (ref($analysis->{$part_id.'.foils'}) eq 'ARRAY') {
+                            $numbub = scalar(@{$analysis->{$part_id.'.foils'}});
+                        }
                     }
-                }
-            }
-        }
-
-        my $result=&ssi_with_retries($resource->src(), $ssi_retries,
-                                        ('symb' => $symb,
-                                         'grade_target' => 'analyze',
-                                         'grade_courseid' => $cid,
-                                         'grade_domain' => $udom,
-                                         'grade_username' => $uname));
-        my (undef, $an) =
-            split(/_HASH_REF__/,$result, 2);
-
-	my %analysis = &Apache::lonnet::str2hash($an);
-
-        if (ref($analysis{'parts'}) eq 'ARRAY') {
-            foreach my $part (@{$analysis{'parts'}}) {
-                my ($id,$respid) = split(/\./,$part);
-                if (!&Apache::loncommon::check_if_partid_hidden($id,$symb,$udom,$uname)) {
-                    push(@parts,$part);
-                }
-            }
-        }
-        # Add part_ids for any essayresponse, reactionresponse or 
-        # organicresponse items. 
-        foreach my $part_id (@possible_parts) {
-            if (grep(/^\Q$part_id\E$/,@parts)) {
-                push(@allparts,$part_id);
-            } else {
-                if (($analysis{$part_id.'.type'} eq 'essayresponse') ||
-                    ($analysis{$part_id.'.type'} eq 'reactionresponse') ||
-                    ($analysis{$part_id.'.type'} eq 'organicresponse')) {
-                    push(@allparts,$part_id);
-                }
-            }
-        }
-
-	foreach my $part_id (@allparts) {
-            my $lines;
-
-	    # TODO - make this a persistent hash not an array.
-
-            # optionresponse, matchresponse and rankresponse type items 
-            # render as separate sub-questions in exam mode.
-            if (($analysis{$part_id.'.type'} eq 'optionresponse') ||
-                ($analysis{$part_id.'.type'} eq 'matchresponse') ||
-                ($analysis{$part_id.'.type'} eq 'rankresponse')) {
-                my ($numbub,$numshown);
-                if ($analysis{$part_id.'.type'} eq 'optionresponse') {
-                    if (ref($analysis{$part_id.'.options'}) eq 'ARRAY') {
-                        $numbub = scalar(@{$analysis{$part_id.'.options'}});
+                    if (ref($analysis->{$part_id.'.shown'}) eq 'ARRAY') {
+                        $numshown = scalar(@{$analysis->{$part_id.'.shown'}});
                     }
-                } elsif ($analysis{$part_id.'.type'} eq 'matchresponse') {
-                    if (ref($analysis{$part_id.'.items'}) eq 'ARRAY') {
-                        $numbub = scalar(@{$analysis{$part_id.'.items'}});
+                    my $bubbles_per_line = 10;
+                    my $inner_bubble_lines = int($numbub/$bubbles_per_line);
+                    if (($numbub % $bubbles_per_line) != 0) {
+                        $inner_bubble_lines++;
                     }
-                } elsif ($analysis{$part_id.'.type'} eq 'rankresponse') {
-                    if (ref($analysis{$part_id.'.foils'}) eq 'ARRAY') {
-                        $numbub = scalar(@{$analysis{$part_id.'.foils'}});
+                    for (my $i=0; $i<$numshown; $i++) {
+                        $subdivided_bubble_lines{$response_number} .= 
+                            $inner_bubble_lines.',';
                     }
-                }
-                if (ref($analysis{$part_id.'.shown'}) eq 'ARRAY') {
-                    $numshown = scalar(@{$analysis{$part_id.'.shown'}});
-                }
-                my $bubbles_per_line = 10;
-                my $inner_bubble_lines = int($numbub/$bubbles_per_line);
-                if (($numbub % $bubbles_per_line) != 0) {
-                    $inner_bubble_lines++;
-                }
-                for (my $i=0; $i<$numshown; $i++) {
-                    $subdivided_bubble_lines{$response_number} .= 
-                        $inner_bubble_lines.',';
-                }
-                $subdivided_bubble_lines{$response_number} =~ s/,$//;
-                $lines = $numshown * $inner_bubble_lines;
-            } else {
-                $lines = $analysis{"$part_id.bubble_lines"};
-            } 
-
-            $first_bubble_line{$response_number} = $bubble_line;
-	    $bubble_lines_per_response{$response_number} = $lines;
-            $responsetype_per_response{$response_number} = 
-                $analysis{$part_id.'.type'};
-	    $response_number++;
+                    $subdivided_bubble_lines{$response_number} =~ s/,$//;
+                    $lines = $numshown * $inner_bubble_lines;
+                } else {
+                    $lines = $analysis->{"$part_id.bubble_lines"};
+                } 
 
-	    $bubble_line +=  $lines;
-	    $total_lines +=  $lines;
-	}
+                $first_bubble_line{$response_number} = $bubble_line;
+	        $bubble_lines_per_response{$response_number} = $lines;
+                $responsetype_per_response{$response_number} = 
+                    $analysis->{$part_id.'.type'};
+	        $response_number++;
 
+	        $bubble_line +=  $lines;
+	        $total_lines +=  $lines;
+	    }
+        }
     }
-    &Apache::lonnet::delenv('scantron\.');
+    &Apache::lonnet::delenv('scantron.');
 
     &save_bubble_lines();
     $env{'form.scantron_maxbubble'} =
@@ -7354,7 +7374,6 @@ sub scantron_get_maxbubble {
     return $env{'form.scantron_maxbubble'};
 }
 
-
 sub scantron_validate_missingbubbles {
     my ($r,$currentphase) = @_;
     #get student info
@@ -7426,7 +7445,24 @@ sub scantron_process_students {
     my $navmap=Apache::lonnavmaps::navmap->new();
     my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
-#    $r->print("geto ".scalar(@resources)."<br />");
+    my (%grader_partids_by_symb,%grader_randomlists_by_symb);
+    &graders_resources_pass(\@resources,\%grader_partids_by_symb,
+                            \%grader_randomlists_by_symb);
+    foreach my $resource (@resources) {
+        my $ressymb = $resource->symb();
+        my ($analysis,$parts) =
+            &scantron_partids_tograde($resource,$env{'request.course.id'},
+                                      $env{'user.name'},$env{'user.domain'},1);
+        $grader_partids_by_symb{$ressymb} = $parts;
+        if (ref($analysis) eq 'HASH') {
+            if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {
+                $grader_randomlists_by_symb{$ressymb} = 
+                    $analysis->{'parts_withrandomlist'};
+            }
+        }
+    }
+
+    my ($uname,$udom);
     my $result= <<SCANTRONFORM;
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
   <input type="hidden" name="command" value="scantron_configphase" />
@@ -7435,7 +7471,7 @@ SCANTRONFORM
     $r->print($result);
 
     my @delayqueue;
-    my %completedstudents;
+    my (%completedstudents,%scandata);
     
     my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));
     my $count=&get_todo_count($scanlines,$scan_data);
@@ -7444,12 +7480,12 @@ SCANTRONFORM
 				    'inline',undef,'scantronupload');
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
 					  'Processing first student');
+    $r->print('<br />');
     my $start=&Time::HiRes::time();
     my $i=-1;
-    my ($uname,$udom,$started);
+    my $started;
 
     &scantron_get_maxbubble();	# Need the bubble lines array to parse.
-    
 
     # If an ssi failed in scantron_get_maxbubble, put an error message out to
     # the user and return.
@@ -7462,6 +7498,9 @@ SCANTRONFORM
 	return '';		# Dunno why the other returns return '' rather than just returning.
     }
 
+    my %lettdig = &letter_to_digits();
+    my $numletts = scalar(keys(%lettdig));
+
     while ($i<$scanlines->{'count'}) {
  	($uname,$udom)=('','');
  	$i++;
@@ -7487,6 +7526,19 @@ SCANTRONFORM
  	}
   	($uname,$udom)=split(/:/,$uname);
 
+        my %partids_by_symb;
+        foreach my $resource (@resources) {
+            my $ressymb = $resource->symb();
+            if ((exists($grader_randomlists_by_symb{$ressymb})) ||
+                (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
+                my ($analysis,$parts) =
+                    &scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom);
+                $partids_by_symb{$ressymb} = $parts;
+            } else {
+                $partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb};
+            }
+        }
+
 	&Apache::lonxml::clear_problem_counter();
   	&Apache::lonnet::appenv($scan_record);
 
@@ -7494,39 +7546,96 @@ SCANTRONFORM
 	    &scantron_putfile($scanlines,$scan_data);
 	}
 	
-	my $i=0;
-	foreach my $resource (@resources) {
-	    $i++;
-	    my %form=('submitted'     =>'scantron',
-		      'grade_target'  =>'grade',
-		      'grade_username'=>$uname,
-		      'grade_domain'  =>$udom,
-		      'grade_courseid'=>$env{'request.course.id'},
-		      'grade_symb'    =>$resource->symb());
-	    if (exists($scan_record->{'scantron.CODE'})
-		&& 
-		&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'})) {
-		$form{'CODE'}=$scan_record->{'scantron.CODE'};
-	    } else {
-		$form{'CODE'}='';
-	    } 
-	    my $result=&ssi_with_retries($resource->src(), $ssi_retries, %form);
-	    if ($ssi_error) {
-		$ssi_error = 0;	# So end of handler error message does not trigger.
-		$r->print("</form>");
-		&ssi_print_error($r);
-		$r->print(&show_grading_menu_form($symb));
-                &Apache::lonnet::remove_lock($lock);
-		return '';	# Why return ''?  Beats me.
-	    }
+        my $scancode;
+        if ((exists($scan_record->{'scantron.CODE'})) &&
+            (&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {
+            $scancode = $scan_record->{'scantron.CODE'};
+        } else {
+            $scancode = '';
+        }
+
+        if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
+                                   \@resources,\%partids_by_symb) eq 'ssi_error') {
+            $ssi_error = 0; # So end of handler error message does not trigger.
+            $r->print("</form>");
+            &ssi_print_error($r);
+            $r->print(&show_grading_menu_form($symb));
+            &Apache::lonnet::remove_lock($lock);
+            return '';      # Why return ''?  Beats me.
+        }
 
-	    if (&Apache::loncommon::connection_aborted($r)) { last; }
-	}
 	$completedstudents{$uname}={'line'=>$line};
-	if (&Apache::loncommon::connection_aborted($r)) { last; }
+        if ($env{'form.verifyrecord'}) {
+            my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'};
+            my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos);
+            chomp($studentdata);
+            $studentdata =~ s/\r$//;
+            my $studentrecord = '';
+            my $counter = -1;
+            foreach my $resource (@resources) {
+                my $ressymb = $resource->symb();
+                ($counter,my $recording) =
+                    &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
+                                             $counter,$studentdata,$partids_by_symb{$ressymb},
+                                             \%scantron_config,\%lettdig,$numletts);
+                $studentrecord .= $recording;
+            }
+            if ($studentrecord ne $studentdata) {
+                &Apache::lonxml::clear_problem_counter();
+                if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
+                                           \@resources,\%partids_by_symb) eq 'ssi_error') {
+                    $ssi_error = 0; # So end of handler error message does not trigger.
+                    $r->print("</form>");
+                    &ssi_print_error($r);
+                    $r->print(&show_grading_menu_form($symb));
+                    &Apache::lonnet::remove_lock($lock);
+                    delete($completedstudents{$uname});
+                    return '';
+                }
+                $counter = -1;
+                $studentrecord = '';
+                foreach my $resource (@resources) {
+                    my $ressymb = $resource->symb();
+                    ($counter,my $recording) =
+                        &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
+                                                 $counter,$studentdata,$partids_by_symb{$ressymb},
+                                                 \%scantron_config,\%lettdig,$numletts);
+                    $studentrecord .= $recording;
+                }
+                if ($studentrecord ne $studentdata) {
+                    $r->print('<p><span class="LC_error">');
+                    if ($scancode eq '') {
+                        $r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2].',
+                                  $uname.':'.$udom,$scan_record->{'scantron.ID'}));
+                    } else {
+                        $r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2] and CODE: [_3].',
+                                  $uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode));
+                    }
+                    $r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n".
+                              &Apache::loncommon::start_data_table_header_row()."\n".
+                              '<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'.
+                              &Apache::loncommon::end_data_table_header_row()."\n".
+                              &Apache::loncommon::start_data_table_row().
+                              '<td>'.&mt('Bubble Sheet').'</td>'.
+                              '<td><span class="LC_nobreak">'.$studentdata.'</span></td>'.
+                              &Apache::loncommon::end_data_table_row().
+                              &Apache::loncommon::start_data_table_row().
+                              '<td>Stored submissions</td>'.
+                              '<td><span class="LC_nobreak">'.$studentrecord.'</span></td>'."\n".
+                              &Apache::loncommon::end_data_table_row().
+                              &Apache::loncommon::end_data_table().'</p>');
+                } else {
+                    $r->print('<br /><span class="LC_warning">'.
+                             &mt('A second grading pass was needed for user: [_1] with ID: [_2], because a mismatch was seen on the first pass.',$uname.':'.$udom,$scan_record->{'scantron.ID'}).'<br />'.
+                             &mt("As a consequence, this user's submission history records two tries.").
+                                 '</span><br />');
+                }
+            }
+        }
+        if (&Apache::loncommon::connection_aborted($r)) { last; }
     } continue {
 	&Apache::lonxml::clear_problem_counter();
-	&Apache::lonnet::delenv('scantron\.');
+	&Apache::lonnet::delenv('scantron.');
     }
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     &Apache::lonnet::remove_lock($lock);
@@ -7538,6 +7647,58 @@ SCANTRONFORM
     return '';
 }
 
+sub graders_resources_pass {
+    my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb) = @_;
+    if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) && 
+        (ref($grader_randomlists_by_symb) eq 'HASH')) {
+        foreach my $resource (@{$resources}) {
+            my $ressymb = $resource->symb();
+            my ($analysis,$parts) =
+                &scantron_partids_tograde($resource,$env{'request.course.id'},
+                                          $env{'user.name'},$env{'user.domain'},1);
+            $grader_partids_by_symb->{$ressymb} = $parts;
+            if (ref($analysis) eq 'HASH') {
+                if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {
+                    $grader_randomlists_by_symb->{$ressymb} =
+                        $analysis->{'parts_withrandomlist'};
+                }
+            }
+        }
+    }
+    return;
+}
+
+sub grade_student_bubbles {
+    my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts) = @_;
+    if (ref($resources) eq 'ARRAY') {
+        my $count = 0;
+        foreach my $resource (@{$resources}) {
+            my $ressymb = $resource->symb();
+            my %form = ('submitted'      => 'scantron',
+                        'grade_target'   => 'grade',
+                        'grade_username' => $uname,
+                        'grade_domain'   => $udom,
+                        'grade_courseid' => $env{'request.course.id'},
+                        'grade_symb'     => $ressymb,
+                        'CODE'           => $scancode
+                       );
+            if (ref($parts) eq 'HASH') {
+                if (ref($parts->{$ressymb}) eq 'ARRAY') {
+                    foreach my $part (@{$parts->{$ressymb}}) {
+                        $form{'scantron_questnum_start.'.$part} =
+                            1+$env{'form.scantron.first_bubble_line.'.$count};
+                        $count++;
+                    }
+                }
+            }
+            my $result=&ssi_with_retries($resource->src(),$ssi_retries,%form);
+            return 'ssi_error' if ($ssi_error);
+            last if (&Apache::loncommon::connection_aborted($r));
+        }
+    }
+    return;
+}
+
 sub scantron_upload_scantron_data {
     my ($r)=@_;
     $r->print(&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}));
@@ -7692,18 +7853,7 @@ sub checkscantron_results {
     if (!$symb) {return '';}
     my $grading_menu_button=&show_grading_menu_form($symb);
     my $cid = $env{'request.course.id'};
-    my %lettdig = (
-                    A => 1,
-                    B => 2,
-                    C => 3,
-                    D => 4,
-                    E => 5,
-                    F => 6,
-                    G => 7,
-                    H => 8,
-                    I => 9,
-                    J => 0,
-                  );
+    my %lettdig = &letter_to_digits();
     my $numletts = scalar(keys(%lettdig));
     my $cnum = $env{'course.'.$cid.'.num'};
     my $cdom = $env{'course.'.$cid.'.domain'};
@@ -7716,7 +7866,11 @@ sub checkscantron_results {
     my %idmap=&Apache::grades::username_to_idmap($classlist);
     my $navmap=Apache::lonnavmaps::navmap->new();
     my $map=$navmap->getResourceByUrl($sequence);
-    my @resources=$navmap->retrieveResources($map,undef,1,0);
+    my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
+    my (%grader_partids_by_symb,%grader_randomlists_by_symb);
+    &graders_resources_pass(\@resources,\%grader_partids_by_symb,                             \%grader_randomlists_by_symb);
+
+    my ($uname,$udom);
     my (%scandata,%lastname,%bylast);
     $r->print('
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="checkscantron">'."\n");
@@ -7728,9 +7882,9 @@ 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.
+    &scantron_get_maxbubble();  # Need the bubble lines array to parse.
 
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           'Processing first student');
@@ -7770,126 +7924,21 @@ sub checkscantron_results {
         $scandata{$pid} =~ s/\r$//;
         ($username,$domain)=split(/:/,$uname);
         my $counter = -1;
-        my (%expected,%startpos);
         foreach my $resource (@resources) {
-            next if (!$resource->is_problem());
-            my $symb = $resource->symb();
-            my $partsref = $resource->parts();
-            my @parts;
-            my @part_ids = ();
-            if (ref($partsref) eq 'ARRAY') {
-               @parts = @{$partsref};
-               foreach my $part (@parts) {
-                   my @resp_ids = $resource->responseIds($part);
-                   foreach my $resp (@resp_ids) {
-                       $counter ++;
-                       my $part_id = $part.'.'.$resp;
-                       $expected{$part_id} = 0;
-                       push(@part_ids,$part_id);
-                       if ($env{"form.scantron.sub_bubblelines.$counter"}) {
-                           my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$counter"});
-                           foreach my $item (@sub_lines) {
-                               $expected{$part_id} += $item;
-                           }
-                       } else {
-                           $expected{$part_id} = $env{"form.scantron.bubblelines.$counter"};
-                       }
-                       $startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"};
-                   }
-                }
-            }
-            if ($symb) {
-                my %recorded;
-                my (%returnhash) =
-                    &Apache::lonnet::restore($symb,$cid,$domain,$username);
-                if ($returnhash{'version'}) {
-                    my %lasthash=();
-                    my $version;
-                    for ($version=1;$version<=$returnhash{'version'};$version++) {
-                        foreach my $key (sort(split(/\:/,$returnhash{$version.':keys'}))) {
-                            $lasthash{$key}=$returnhash{$version.':'.$key};
-                        }
-                    }
-                    foreach my $key (keys(%lasthash)) {
-                        if ($key =~ /\.scantron$/) {
-                            my $value = &unescape($lasthash{$key});
-                            my ($part_id) = ($key =~ /^resource\.(.+)\.scantron$/);
-                            if ($value eq '') {
-                                for (my $i=0; $i<$expected{$part_id}; $i++) {
-                                    for (my $j=0; $j<$scantron_config{'length'}; $j++) {
-                                        $recorded{$part_id} .= $;
-                                    }
-                                }
-                            } else {
-                                my @tocheck;
-                                my @items = split(//,$value);
-                                if (($scantron_config{'Qon'} eq 'letter') ||
-                                    ($scantron_config{'Qon'} eq 'number')) {
-                                    if (@items < $expected{$part_id}) {
-                                        my $fragment = substr($scandata{$pid},$startpos{$part_id},$expected{$part_id});
-                                        my @singles = split(//,$fragment);
-                                        foreach my $pos (@singles) {
-                                            if ($pos eq ' ') {
-                                                push(@tocheck,$pos);
-                                            } else {
-                                                my $next = shift(@items);
-                                                push(@tocheck,$next);
-                                            }
-                                        }
-                                    } else {
-                                        @tocheck = @items;
-                                    }
-                                    foreach my $letter (@tocheck) {
-                                        if ($scantron_config{'Qon'} eq 'letter') {
-                                            if ($letter !~ /^[A-J]$/) {
-                                                $letter = $scantron_config{'Qoff'};
-                                            }
-                                            $recorded{$part_id} .= $letter;
-                                        } elsif ($scantron_config{'Qon'} eq 'number') {
-                                            my $digit;
-                                            if ($letter !~ /^[A-J]$/) {
-                                                $digit = $scantron_config{'Qoff'};
-                                            } else {
-                                                $digit = $lettdig{$letter};
-                                            }
-                                            $recorded{$part_id} .= $digit;
-                                        }
-                                    }
-                                } else {
-                                    @tocheck = @items;
-                                    for (my $i=0; $i<$expected{$part_id}; $i++) {
-                                        my $curr_sub = shift(@tocheck);
-                                        my $digit;
-                                        if ($curr_sub =~ /^[A-J]$/) {
-                                            $digit = $lettdig{$curr_sub}-1;
-                                        }
-                                        if ($curr_sub eq 'J') {
-                                            $digit += scalar($numletts);
-                                        }
-                                        for (my $j=0; $j<$scantron_config{'Qlength'}; $j++) {
-                                            if ($j == $digit) {
-                                                $recorded{$part_id} .= $scantron_config{'Qon'};
-                                            } else {
-                                                $recorded{$part_id} .= $scantron_config{'Qoff'};
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                foreach my $part_id (@part_ids) {
-                    if ($recorded{$part_id} eq '') {
-                        for (my $i=0; $i<$expected{$part_id}; $i++) {
-                            for (my $j=0; $j<$scantron_config{'Qlength'}; $j++) {
-                                $recorded{$part_id} .= $scantron_config{'Qoff'};
-                            }
-                        }
-                    }
-                    $record{$pid} .= $recorded{$part_id};
-                }
+            my $parts;
+            my $ressymb = $resource->symb();
+            if ((exists($grader_randomlists_by_symb{$ressymb})) ||
+                (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
+                (my $analysis,$parts) =
+                    &scantron_partids_tograde($resource,$env{'request.course.id'},$username,$domain);
+            } else {
+                $parts = $grader_partids_by_symb{$ressymb};
             }
+            ($counter,my $recording) =
+                &verify_scantron_grading($resource,$domain,$username,$cid,$counter,
+                                         $scandata{$pid},$parts,
+                                         \%scantron_config,\%lettdig,$numletts);
+            $record{$pid} .= $recording;
         }
     }
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
@@ -7951,6 +8000,137 @@ sub checkscantron_results {
     return;
 }
 
+sub verify_scantron_grading {
+    my ($resource,$domain,$username,$cid,$counter,$scandata,$partids,
+        $scantron_config,$lettdig,$numletts) = @_;
+    my ($record,%expected,%startpos);
+    return ($counter,$record) if (!ref($resource));
+    return ($counter,$record) if (!$resource->is_problem());
+    my $symb = $resource->symb();
+    return ($counter,$record) if (ref($partids) ne 'ARRAY');
+    foreach my $part_id (@{$partids}) {
+        $counter ++;
+        $expected{$part_id} = 0;
+        if ($env{"form.scantron.sub_bubblelines.$counter"}) {
+            my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$counter"});
+            foreach my $item (@sub_lines) {
+                $expected{$part_id} += $item;
+            }
+        } else {
+            $expected{$part_id} = $env{"form.scantron.bubblelines.$counter"};
+        }
+        $startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"};
+    }
+    if ($symb) {
+        my %recorded;
+        my (%returnhash) = &Apache::lonnet::restore($symb,$cid,$domain,$username);
+        if ($returnhash{'version'}) {
+            my %lasthash=();
+            my $version;
+            for ($version=1;$version<=$returnhash{'version'};$version++) {
+                foreach my $key (sort(split(/\:/,$returnhash{$version.':keys'}))) {
+                    $lasthash{$key}=$returnhash{$version.':'.$key};
+                }
+            }
+            foreach my $key (keys(%lasthash)) {
+                if ($key =~ /\.scantron$/) {
+                    my $value = &unescape($lasthash{$key});
+                    my ($part_id) = ($key =~ /^resource\.(.+)\.scantron$/);
+                    if ($value eq '') {
+                        for (my $i=0; $i<$expected{$part_id}; $i++) {
+                            for (my $j=0; $j<$scantron_config->{'length'}; $j++) {
+                                $recorded{$part_id} .= $scantron_config->{'Qoff'};
+                            }
+                        }
+                    } else {
+                        my @tocheck;
+                        my @items = split(//,$value);
+                        if (($scantron_config->{'Qon'} eq 'letter') ||
+                            ($scantron_config->{'Qon'} eq 'number')) {
+                            if (@items < $expected{$part_id}) {
+                                my $fragment = substr($scandata,$startpos{$part_id},$expected{$part_id});
+                                my @singles = split(//,$fragment);
+                                foreach my $pos (@singles) {
+                                    if ($pos eq ' ') {
+                                        push(@tocheck,$pos);
+                                    } else {
+                                        my $next = shift(@items);
+                                        push(@tocheck,$next);
+                                    }
+                                }
+                            } else {
+                                @tocheck = @items;
+                            }
+                            foreach my $letter (@tocheck) {
+                                if ($scantron_config->{'Qon'} eq 'letter') {
+                                    if ($letter !~ /^[A-J]$/) {
+                                        $letter = $scantron_config->{'Qoff'};
+                                    }
+                                    $recorded{$part_id} .= $letter;
+                                } elsif ($scantron_config->{'Qon'} eq 'number') {
+                                    my $digit;
+                                    if ($letter !~ /^[A-J]$/) {
+                                        $digit = $scantron_config->{'Qoff'};
+                                    } else {
+                                        $digit = $lettdig->{$letter};
+                                    }
+                                    $recorded{$part_id} .= $digit;
+                                }
+                            }
+                        } else {
+                            @tocheck = @items;
+                            for (my $i=0; $i<$expected{$part_id}; $i++) {
+                                my $curr_sub = shift(@tocheck);
+                                my $digit;
+                                if ($curr_sub =~ /^[A-J]$/) {
+                                    $digit = $lettdig->{$curr_sub}-1;
+                                }
+                                if ($curr_sub eq 'J') {
+                                    $digit += scalar($numletts);
+                                }
+                                for (my $j=0; $j<$scantron_config->{'Qlength'}; $j++) {
+                                    if ($j == $digit) {
+                                        $recorded{$part_id} .= $scantron_config->{'Qon'};
+                                    } else {
+                                        $recorded{$part_id} .= $scantron_config->{'Qoff'};
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        foreach my $part_id (@{$partids}) {
+            if ($recorded{$part_id} eq '') {
+                for (my $i=0; $i<$expected{$part_id}; $i++) {
+                    for (my $j=0; $j<$scantron_config->{'Qlength'}; $j++) {
+                        $recorded{$part_id} .= $scantron_config->{'Qoff'};
+                    }
+                }
+            }
+            $record .= $recorded{$part_id};
+        }
+    }
+    return ($counter,$record);
+}
+
+sub letter_to_digits { 
+    my %lettdig = (
+                    A => 1,
+                    B => 2,
+                    C => 3,
+                    D => 4,
+                    E => 5,
+                    F => 6,
+                    G => 7,
+                    H => 8,
+                    I => 9,
+                    J => 0,
+                  );
+    return %lettdig;
+}
+
 
 #-------- end of section for handling grading scantron forms -------
 #
@@ -8796,7 +8976,7 @@ ENDHEADER
        }
     }
 # We are done
-    $result.='<br />'.&mt('Successfully stored grades for [_1] student(s).',$storecount).
+    $result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount).
              '</td></tr></table>'."\n".
              '</td></tr></table><br /><br />'."\n";
     return $result.&show_grading_menu_form($symb);
@@ -9090,7 +9270,7 @@ ssi_with_retries()
 =item  scantron_validate_ID() : 
 
    Validates all scanlines in the selected file to not have any
-   invalid or underspecified student IDs
+   invalid or underspecified student/employee IDs
 
 =back