--- loncom/homework/grades.pm	2008/06/24 18:54:36	1.524
+++ loncom/homework/grades.pm	2009/06/17 18:41:31	1.528.2.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.524 2008/06/24 18:54:36 raeburn Exp $
+# $Id: grades.pm,v 1.528.2.14 2009/06/17 18:41:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -255,9 +255,9 @@ sub showResourceInfo {
 		$partsseen{$partID}=1;
 	    }
 	    my $display_part=&get_display_part($partID,$symb);
-	    $result.='<td>'.&mt('<b>Part: </b>[_1]',$display_part).' <span class="LC_internal_info">'.
-		$resID.'</span></td>'.
-		'<td>'.&mt('<b>Type: </b>[_1]',$responsetype).'</td></tr>';
+	    $result.='<td><b>'.&mt('Part').': </b>'.$display_part.
+                     ' <span class="LC_internal_info">'.$resID.'</span></td>'.
+		     '<td><b>'.&mt('Type').': </b>'.$responsetype.'</td></tr>';
 #	    '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';
 	}
     }
@@ -278,7 +278,7 @@ sub reset_caches {
     }
 
     sub get_analyze {
-	my ($symb,$uname,$udom)=@_;
+	my ($symb,$uname,$udom,$no_increment)=@_;
 	my $key = "$symb\0$uname\0$udom";
 	return $analyze_cache{$key} if (exists($analyze_cache{$key}));
 
@@ -290,26 +290,30 @@ sub reset_caches {
 					    'grade_symb' => $symb,
 					    'grade_courseid' => 
 					    $env{'request.course.id'},
-					    'grade_username' => $uname));
+					    'grade_username' => $uname,
+                                            'grade_noincrement' => $no_increment));
 	(undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
 	my %analyze=&Apache::lonnet::str2hash($subresult);
 	return $analyze_cache{$key} = \%analyze;
     }
 
     sub get_order {
-	my ($partid,$respid,$symb,$uname,$udom)=@_;
-	my $analyze = &get_analyze($symb,$uname,$udom);
+	my ($partid,$respid,$symb,$uname,$udom,$no_increment)=@_;
+	my $analyze = &get_analyze($symb,$uname,$udom,$no_increment);
 	return $analyze->{"$partid.$respid.shown"};
     }
 
     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;
+                }
+            }
+        }
     }
 }
 
@@ -736,7 +740,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";
@@ -821,17 +825,15 @@ sub listStudents {
 	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
 
     my $result='<h3><span class="LC_info">&nbsp;'.
-	&mt($viewgrade.' Submissions for a Student or a Group of Students')
+	&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' =>
-	       "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.",
-	       );
-    %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) {
@@ -874,17 +876,15 @@ LISTJAVASCRIPT
 	"\n".$table;
 	
     $gradeTable .= 
-	'&nbsp;'.
-	&mt('<b>View Problem Text: </b>[_1]',
+	'&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";
+	    '<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label><br />'."\n";
     $gradeTable .= 
-	'&nbsp;'.
-	&mt('<b>View Answer: </b>[_1]',
+	'&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";
+	    '<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n";
 
     my $submission_options;
     if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
@@ -900,18 +900,16 @@ LISTJAVASCRIPT
 	'<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;'.
-	&mt('<b>Submissions: </b>[_1]',$submission_options).'<br />'."\n";
+	'&nbsp;<b>'.&mt('Submissions').': </b>'.$submission_options.'<br />'."\n";
 
     $gradeTable .= 
-        '&nbsp;'.
-	&mt('<b>Grading Increments:</b> [_1]',
+        '&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>');
+	    '</select>';
     
     $gradeTable .= 
         &build_section_inputs().
@@ -930,15 +928,14 @@ LISTJAVASCRIPT
 			 &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />';
     }
 
-    $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.').'<br />'."\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.").'<br />'."\n".
 	'<input type="hidden" name="command" value="processGroup" />'."\n";
 
 # checkall buttons
     $gradeTable.=&check_script('gradesub', 'stuinfo');
     $gradeTable.='<input type="button" '."\n".
 	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
-	'value="'.&mt('Next-&gt;').'" /> <br />'."\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);
@@ -1058,7 +1055,7 @@ LISTJAVASCRIPT
     $gradeTable.=&Apache::loncommon::end_data_table()."\n".
 	'<input type="button" '.
 	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
-	'value="'.&mt('Next-&gt;').'" /></form>'."\n";
+	'value="'.&mt('Next').' &rarr;" /></form>'."\n";
     if ($ctr == 0) {
 	my $num_students=(scalar(keys(%$fullname)));
 	if ($num_students eq 0) {
@@ -1154,6 +1151,7 @@ sub processGroup {
 #--- Javascript to handle the submission page functionality ---
 sub sub_page_js {
     my $request = shift;
+    my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
     $request->print(<<SUBJAVASCRIPT);
 <script type="text/javascript" language="javascript">
     function updateRadio(formname,id,weight) {
@@ -1164,7 +1162,7 @@ sub sub_page_js {
 	gradeBox.value = pts;
 	var resetbox = false;
 	if (isNaN(pts) || pts < 0) {
-	    alert("A number equal or greater than 0 is expected. Entered value = "+pts);
+	    alert("$alertmsg"+pts);
 	    for (var i=0; i<radioButton.length; i++) {
 		if (radioButton[i].checked) {
 		    gradeBox.value = i;
@@ -1409,6 +1407,7 @@ INNERJS
 
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
     $docopen=~s/^document\.//;
+    my $alertmsg = &mt('Please select a word or group of words from document and then click this link.');
     $request->print(<<SUBJAVASCRIPT);
 <script type="text/javascript" language="javascript">
 
@@ -1441,7 +1440,7 @@ INNERJS
     else return;
     var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
     if (cleantxt=="") {
-	alert("Please select a word or group of words from document and then click this link.");
+	alert("$alertmsg");
 	return;
     }
     var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);
@@ -1680,7 +1679,7 @@ sub gradeBox {
 
     my $radio.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
     while ($thisweight<=$wgt) {
-	$radio.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+	$radio.= '<td><span class="LC_nobreak"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
 	    'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
 	    $thisweight.')" value="'.$thisweight.'" '.
 	    ($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n";
@@ -1696,7 +1695,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') {
@@ -1710,8 +1709,7 @@ sub gradeBox {
 
 
     $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".
@@ -2093,7 +2091,7 @@ KEYWORDS
 		    $lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '.
 			$display_part.' <span class="LC_internal_info">( ID '.$respid.
 			' )</span>&nbsp; &nbsp;'.
-			'<span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br /><br /></div>';
+			'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
 		    next;
 		}
 		foreach my $submission (@$string) {
@@ -2134,7 +2132,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++;
@@ -2145,7 +2143,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>';
 		    }
@@ -2274,7 +2272,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('[_1]student(s)',$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').'" '.
@@ -2357,7 +2355,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)) {
@@ -2795,8 +2793,10 @@ sub handback_files {
             	                                $newflg.'_'.$part_resp.'_returndoc'.$file_counter,
             	                                $save_file_name);
                     if ($result !~ m|^/uploaded/|) {
-                        $request->print('<span class="LC_error">An error occurred ('.$result.
-                        ') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</span><br />');
+                        $request->print('<br /><span class="LC_error">'.
+                            &mt('An error occurred ([_1]) while trying to upload [_2].',
+                                $result,$newflg.'_'.$part_resp.'_returndoc'.$file_counter).
+                                        '</span>');
                     } else {
                         # mark the file as read only
                         my @files = ($save_file_name);
@@ -3015,6 +3015,7 @@ sub file_name_version_ext {
 sub viewgrades_js {
     my ($request) = shift;
 
+    my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
     $request->print(<<VIEWJAVASCRIPT);
 <script type="text/javascript" language="javascript">
    function writePoint(partid,weight,point) {
@@ -3023,7 +3024,7 @@ sub viewgrades_js {
 	if (point == "textval") {
 	    point = document.classgrade["TEXTVAL_"+partid].value;
 	    if (isNaN(point) || parseFloat(point) < 0) {
-		alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
+		alert("$alertmsg"+parseFloat(point));
 		var resetbox = false;
 		for (var i=0; i<radioButton.length; i++) {
 		    if (radioButton[i].checked) {
@@ -3121,7 +3122,7 @@ sub viewgrades_js {
 	var weight = document.classgrade["weight_"+partid].value;
 
 	if (isNaN(point) || parseFloat(point) < 0) {
-	    alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
+	    alert("$alertmsg"+parseFloat(point));
 	    textbox.value = "";
 	    return;
 	}
@@ -3210,19 +3211,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='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='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='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 $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);
@@ -3253,8 +3254,8 @@ sub viewgrades {
 	my $line = '<input type="text" name="TEXTVAL_'.
 	    $partid.'" size="4" '.'onChange="javascript:writePoint(\''.
 		$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.
-	    $weight{$partid}.' (problem weight)</td>'."\n";
-	$line.= '<td><select name="SELVAL_'.$partid.'"'.
+	    $weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n";
+	$line.= '<td><b>'.&mt('Grade Status').':</b><select name="SELVAL_'.$partid.'"'.
 	    'onChange="javascript:writeRadText(\''.$partid.'\','.
 		$weight{$partid}.')"> '.
 	    '<option selected="selected"> </option>'.
@@ -3269,7 +3270,7 @@ sub viewgrades {
 
 	$result.=
 	    &Apache::loncommon::start_data_table_row()."\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).
+            '<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>'.
 	    &Apache::loncommon::end_data_table_row()."\n";
 	$ctsparts++;
     }
@@ -3280,32 +3281,32 @@ 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 = ();
     foreach my $part (@parts) {
 	my $display=&Apache::lonnet::metadata($url,$part.'.display');
-	$display =~ s|^Number of Attempts|Tries<br />|; # makes the column narrower
+        my $narrowtext = &mt('Tries').'<br />';
+	$display =~ s{^Number of Attempts}{$narrowtext}; # makes the column narrower
 	if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
 	my ($partid) = &split_part_type($part);
         push(@partids,$partid);
 	my $display_part=&get_display_part($partid,$symb);
 	if ($display =~ /^Partial Credit Factor/) {
 	    $result.='<th>'.
-		&mt('Score Part: [_1]<br /> (weight = [_2])',
-		    $display_part,$weight{$partid}).'</th>'."\n";
+		&mt('Score Part: [_1] (weight = [_2])',
+		    $display_part.'<br />',$weight{$partid}).'</th>'."\n";
 	    next;
 	    
 	} else {
 	    if ($display =~ /Problem Status/) {
-		my $grade_status_mt = &mt('Grade Status');
-		$display =~ s{Problem Status}{$grade_status_mt<br />};
+		my $grade_status_mt = &mt('Grade Status').'<br />';
+		$display =~ s{Problem Status}{$grade_status_mt};
 	    }
 	    my $part_mt = &mt('Part:');
 	    $display =~s{\[Part: \Q$partid\E\]}{$part_mt $display_part};
@@ -3462,10 +3463,11 @@ 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/Number of Attempts/Tries/;
-	    $header .= '<th align="center">'.&mt('Old '.$display).'</th>'.
-		'<th align="center">'.&mt('New '.$display).'</th>';
+	    $display =~ s/\[Part: \Q$part\E\]//;
+            my $narrowtext = &mt('Tries');
+	    $display =~ s{Number of Attempts}{$narrowtext};
+	    $header .= '<th align="center">'.&mt('Old').' '.$display.'</th>'.
+		'<th align="center">'.&mt('New').' '.$display.'</th>';
 	    $columns{$partid}+=2;
 	}
     }
@@ -3807,11 +3809,12 @@ ENDPICK
 }
 
 sub checkforfile_js {
+    my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
     my $result =<<CSVFORMJS;
 <script type="text/javascript" language="javascript">
     function checkUpload(formname) {
 	if (formname.upfile.value == "") {
-	    alert("Please use the browse button to select a file from your local directory.");
+	    alert("$alertmsg");
 	    return false;
 	}
 	formname.submit();
@@ -3831,7 +3834,7 @@ sub upcsvScores_form {
     $result.=$table;
     $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
     $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
-    $result.='&nbsp;<b>'.&mt('Specify a file containing the class scores for current resource').
+    $result.='&nbsp;<b>'.&mt('Specify a file containing the class scores for current resource.').
 	'.</b></td></tr>'."\n";
     $result.='<tr bgcolor=#ffffe6><td>'."\n";
     my $upload=&mt("Upload Scores");
@@ -4085,12 +4088,13 @@ sub csvuploadassign {
 sub pickStudentPage {
     my ($request) = shift;
 
+    my $alertmsg = &mt('Please select the student you wish to grade.');
     $request->print(<<LISTJAVASCRIPT);
 <script type="text/javascript" language="javascript">
 
 function checkPickOne(formname) {
     if (radioSelection(formname.student) == null) {
-	alert("Please select the student you wish to grade.");
+	alert("$alertmsg");
 	return;
     }
     ptr = pullDownSelection(formname.selectpage);
@@ -4125,7 +4129,7 @@ LISTJAVASCRIPT
 	$ctr++;
     }
     $select.= '</select>';
-    $result.=&mt('&nbsp;<b>Problems from:</b> [_1]',$select)."<br />\n";
+    $result.='&nbsp;<b>'.&mt('Problems from').":</b> $select<br />\n";
 
     $ctr=0;
     foreach (@$titles) {
@@ -4140,13 +4144,13 @@ LISTJAVASCRIPT
     my $options =
 	'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
 	'<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n";
-    $result.='&nbsp;'.&mt('<b>View Problems Text: </b> [_1]',$options);
+    $result.='&nbsp;<b>'.&mt('View Problem Text').": </b> $options";
 
     $options =
 	'<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n".
 	'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n".
 	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n";
-    $result.='&nbsp;'.&mt('<b>Submission Details: </b>[_1]',$options);
+    $result.='&nbsp;>b>'.&mt('Submissions').": </b>$options";
     
     $result.=&build_section_inputs();
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
@@ -4155,12 +4159,10 @@ LISTJAVASCRIPT
 	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
 	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
 
-    $result.='&nbsp;'.&mt('<b>Use CODE: [_1] </b>',
-			  '<input type="text" name="CODE" value="" />').
-			      '<br />'."\n";
+    $result.='&nbsp;<b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /><br />'."\n";
 
     $result.='&nbsp;<input type="button" '.
-	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next-&gt;').'" /><br />'."\n";
+	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' &rarr;" /><br />'."\n";
 
     $request->print($result);
 
@@ -4336,7 +4338,7 @@ sub displayPage {
 #		    $request->print('match='.$1."<br />\n");
 #		}
 #		$companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
-		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br />&nbsp;'.&mt('<b>Correct answer:</b><br />[_1]',$companswer);
+		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br />&nbsp;<b>'.&mt('Correct answer').':</b><br />'.$companswer;
 	    }
 
 	    my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
@@ -4406,10 +4408,11 @@ sub displaySubByDates {
     my %orders;
     $mark{'correct_by_student'} = $checkIcon;
     if (!exists($$record{'1:timestamp'})) {
-	return '<br />&nbsp;<span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br />';
+	return '<br />&nbsp;<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />';
     }
 
     my $interaction;
+    my $no_increment = 1;
     for ($version=1;$version<=$$record{'version'};$version++) {
 	my $timestamp = 
 	    &Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});
@@ -4453,7 +4456,8 @@ sub displaySubByDates {
 		    if (!exists($orders{$partid})) { $orders{$partid}={}; }
 		    if (!exists($orders{$partid}->{$responseId})) {
 			$orders{$partid}->{$responseId}=
-			    &get_order($partid,$responseId,$symb,$uname,$udom);
+			    &get_order($partid,$responseId,$symb,$uname,$udom,
+                                       $no_increment);
 		    }
 		    $displaySub[0].='</b>&nbsp; '.
 			&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
@@ -4506,12 +4510,12 @@ sub updateGradeByPage {
     my ($uname,$udom) = split(/:/,$env{'form.student'});
     my $usec=$classlist->{$env{'form.student'}}[5];
     if (!&canmodify($usec)) {
-	$request->print('<span class="LC_warning">Unable to modify requested student.('.$env{'form.student'}.'</span>');
+	$request->print('<span class="LC_warning">'.&mt('Unable to modify requested student ([_1])',$env{'form.student'}).'</span>');
 	$request->print(&show_grading_menu_form($env{'form.symb'}));
 	return;
     }
     my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
-    $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
+    $result.='<h3>&nbsp;'.&mt('Student: ').&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
 	'</h3>'."\n";
 
     $request->print($result);
@@ -4520,7 +4524,7 @@ sub updateGradeByPage {
     my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
     if (!$map) {
-	$request->print('<span class="LC_warning">Unable to grade requested sequence. ('.$resUrl.')</span>');
+	$request->print('<span class="LC_warning">'.&mt('Unable to grade requested sequence ([_1]).',$resUrl).'</span>');
 	my ($symb)=&get_symb($request);
 	$request->print(&show_grading_menu_form($symb));
 	return; 
@@ -4552,8 +4556,8 @@ sub updateGradeByPage {
 		&Apache::loncommon::start_data_table_row().
 		'<td align="center" valign="top" >'.$prob.
 		(scalar(@{$parts}) == 1 ? '' 
-                                        : '<br />('.&mt('[quant,_1,&nbsp;parts]',scalar(@{$parts}))
-		 ).')</td>';
+                                        : '<br />('.&mt('[quant,_1,&nbsp;part]',scalar(@{$parts}))
+		.')').'</td>';
 	    $studentTable.='<td valign="top">&nbsp;<b>'.$title.'</b>&nbsp;</td>';
 
 	    my %newrecord=();
@@ -4597,10 +4601,10 @@ sub updateGradeByPage {
 		}
 		my $display_part=&get_display_part($partid,$curRes->symb());
 		my $oldstatus = $env{'form.solved'.$question.'_'.$partid};
-		$displayPts[0].='&nbsp;<b>Part:</b> '.$display_part.' = '.
+		$displayPts[0].='&nbsp;<b>'.&mt('Part').':</b> '.$display_part.' = '.
 		    (($oldstatus eq 'excused') ? 'excused' : $oldpts).
 		    '&nbsp;<br />';
-		$displayPts[1].='&nbsp;<b>Part:</b> '.$display_part.' = '.
+		$displayPts[1].='&nbsp;<b>'.&mt('Part').':</b> '.$display_part.' = '.
 		     (($score eq 'excused') ? 'excused' : $newpts).
 		    '&nbsp;<br />';
 		$question++;
@@ -4649,9 +4653,9 @@ sub updateGradeByPage {
 
     $studentTable.=&Apache::loncommon::end_data_table();
     $studentTable.=&show_grading_menu_form($env{'form.symb'});
-    my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
-		  'The scores were changed for '.
-		  $changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));
+    my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') :
+		  &mt('The scores were changed for [quant,_1,problem].',
+		  $changeflag));
     $request->print($grademsg.$studentTable);
 
     return '';
@@ -4982,11 +4986,11 @@ sub scantron_CODElist {
 =cut
 
 sub scantron_CODEunique {
-    my $result='<span style="white-space: nowrap;">
+    my $result='<span class="LC_nobreak">
                  <label><input type="radio" name="scantron_CODEunique"
                         value="yes" checked="checked" />'.&mt('Yes').' </label>
                 </span>
-                <span style="white-space: nowrap;">
+                <span class="LC_nobreak">
                  <label><input type="radio" name="scantron_CODEunique"
                         value="no" />'.&mt('No').' </label>
                 </span>';
@@ -5146,7 +5150,7 @@ sub scantron_selectphase {
 
     &Apache::lonpickcode::code_list($r,2);
 
-    $r>print('<br /><form method="post" name="checkscantron">'.
+    $r->print('<br /><form method="post" name="checkscantron">'.
              $default_form_data."\n".
              &Apache::loncommon::start_data_table('LC_scantron_action')."\n".
              &Apache::loncommon::start_data_table_header_row()."\n".
@@ -5520,7 +5524,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')) {
@@ -6209,28 +6214,33 @@ 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') {
-	    $r->print('<input type="submit" name="submit" value="'.&mt('Ignore -&gt;').' " />');
+	    $r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' &rarr;" />');
 	    $r->print(' '.&mt('this error').' <br />');
 
 	    $r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>");
 	} else {
             if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') {
-	        $r->print('<input type="button" name="submitbutton" value="'.&mt('Continue -&gt;').'" onclick="javascript:verify_bubble_radio(this.form)" />');
+	        $r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' &rarr;" onclick="javascript:verify_bubble_radio(this.form)" />');
             } else {
-                $r->print('<input type="submit" name="submit" value="'.&mt('Continue -&gt;').'" />');
+                $r->print('<input type="submit" name="submit" value="'.&mt('Continue').' &rarr;" />');
             }
 	    $r->print(' '.&mt('using corrected info').' <br />');
 	    $r->print("<input type='submit' value='".&mt("Skip")."' name='scantron_skip_record' />");
@@ -6823,7 +6833,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("
@@ -7328,35 +7338,84 @@ sub scantron_get_maxbubble {
     my $response_number = 0;
     my $bubble_line     = 0;
     foreach my $resource (@resources) {
-        my $symb = $resource->symb();
+        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'}});
+                        }
+                    }
+                    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"};
+                } 
 
-        my (@parts,@allparts,@possible_parts);
+                $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++;
 
-        # 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);
-                    }
-                }
-            }
+	        $bubble_line +=  $lines;
+	        $total_lines +=  $lines;
+	    }
         }
+    }
+    &Apache::lonnet::delenv('scantron.');
+
+    &save_bubble_lines();
+    $env{'form.scantron_maxbubble'} =
+	$total_lines;
+    return $env{'form.scantron_maxbubble'};
+}
+
+sub scantron_partids_tograde {
+    my ($resource,$cid,$uname,$udom) = @_;
+    my (%analysis,@parts);
 
+    if (ref($resource)) {
+        my $symb = $resource->symb();
         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);
+        my (undef, $an) = split(/_HASH_REF__/,$result, 2);
+        %analysis = &Apache::lonnet::str2hash($an);
 
         if (ref($analysis{'parts'}) eq 'ARRAY') {
             foreach my $part (@{$analysis{'parts'}}) {
@@ -7366,79 +7425,8 @@ sub scantron_get_maxbubble {
                 }
             }
         }
-        # 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'}});
-                    }
-                } 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'}});
-                    }
-                }
-                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++;
-
-	    $bubble_line +=  $lines;
-	    $total_lines +=  $lines;
-	}
-
     }
-    &Apache::lonnet::delenv('scantron\.');
-
-    &save_bubble_lines();
-    $env{'form.scantron_maxbubble'} =
-	$total_lines;
-    return $env{'form.scantron_maxbubble'};
+    return (\%analysis,\@parts);
 }
 
 =pod
@@ -7545,6 +7533,14 @@ sub scantron_process_students {
     my $navmap=Apache::lonnavmaps::navmap->new();
     my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
+
+    my ($uname,$udom,%partids_by_symb);
+    foreach my $resource (@resources) {
+        my $ressymb = $resource->symb();
+        my ($analysis,$parts) =
+            &scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom);
+        $partids_by_symb{$ressymb} = $parts;
+    }
 #    $r->print("geto ".scalar(@resources)."<br />");
     my $result= <<SCANTRONFORM;
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
@@ -7554,7 +7550,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);
@@ -7563,9 +7559,10 @@ 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.
     
@@ -7581,6 +7578,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++;
@@ -7612,40 +7612,95 @@ SCANTRONFORM
 	if (&scantron_clear_skip($scanlines,$scan_data,$i)) {
 	    &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.
-	    }
 
-	    if (&Apache::loncommon::connection_aborted($r)) { last; }
-	}
+        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) 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.
+        }
+
 	$completedstudents{$uname}={'line'=>$line};
+        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) {
+                ($counter,my $recording) =
+                    &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
+                                             $counter,$studentdata,\%partids_by_symb,
+                                             \%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) 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) {
+                    ($counter,my $recording) =
+                        &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
+                                                 $counter,$studentdata,\%partids_by_symb,
+                                                 \%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);
@@ -7657,6 +7712,23 @@ SCANTRONFORM
     return '';
 }
 
+sub grade_student_bubbles {
+    my ($r,$uname,$udom,$scan_record,$scancode,@resources) = @_;
+    foreach my $resource (@resources) {
+        my %form = ('submitted'     => 'scantron',
+                    'grade_target'  => 'grade',
+                    'grade_username'=> $uname,
+                    'grade_domain'  => $udom,
+                    'grade_courseid'=> $env{'request.course.id'},
+                    'grade_symb'    => $resource->symb(),
+                    '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));
+    }
+    return;
+}
+
 =pod
 
 =item scantron_upload_scantron_data
@@ -7678,7 +7750,7 @@ sub scantron_upload_scantron_data {
 <script type="text/javascript" language="javascript">
     function checkUpload(formname) {
 	if (formname.upfile.value == "") {
-	    alert("Please use the browse button to select a file from your local directory.");
+	    alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
 	    return false;
 	}
 	formname.submit();
@@ -7845,18 +7917,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'};
@@ -7870,6 +7931,13 @@ sub checkscantron_results {
     my $navmap=Apache::lonnavmaps::navmap->new();
     my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,undef,1,0);
+    my ($uname,$udom,%partids_by_symb);
+    foreach my $resource (@resources) {
+        my $ressymb = $resource->symb();
+        my ($analysis,$parts) =
+            &scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom);
+        $partids_by_symb{$ressymb} = $parts;
+    }
     my (%scandata,%lastname,%bylast);
     $r->print('
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="checkscantron">'."\n");
@@ -7881,7 +7949,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.
 
@@ -7923,126 +7991,12 @@ 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};
-                }
-            }
+            ($counter,my $recording) =
+                &verify_scantron_grading($resource,$domain,$username,$cid,$counter,
+                                         $scandata{$pid},\%partids_by_symb,
+                                         \%scantron_config,\%lettdig,$numletts);
+            $record{$pid} .= $recording;
         }
     }
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
@@ -8104,6 +8058,138 @@ sub checkscantron_results {
     return;
 }
 
+sub verify_scantron_grading {
+    my ($resource,$domain,$username,$cid,$counter,$scandata,$partids_by_symb,
+        $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_by_symb) ne 'HASH');
+    return ($counter,$record) if (ref($partids_by_symb->{$symb}) ne 'ARRAY');
+    foreach my $part_id (@{$partids_by_symb->{$symb}}) {
+        $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_by_symb->{$symb}}) {
+            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;
+}
+
 =pod
 
 =back
@@ -8217,6 +8303,7 @@ sub grading_menu {
             "\n";
     }
     $Str .="</form>\n";
+    my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");
     $request->print(<<GRADINGMENUJS);
 <script type="text/javascript" language="javascript">
     function checkChoice(formname,val,cmdx) {
@@ -8244,7 +8331,7 @@ sub grading_menu {
 	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
 	if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
 	if (checkOpt) {
-	    alert("Please enter a receipt number given by a student in the receipt box.");
+	    alert("$receiptalert$receiptalert");
 	    formname.receipt.value = "";
 	    formname.receipt.focus();
 	    return false;
@@ -8265,6 +8352,7 @@ sub submit_options {
     if (!$symb) {return '';}
     my $probTitle = &Apache::lonnet::gettitle($symb);
 
+    my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box."); 
     $request->print(<<GRADINGMENUJS);
 <script type="text/javascript" language="javascript">
     function checkChoice(formname,val,cmdx) {
@@ -8292,7 +8380,7 @@ sub submit_options {
 	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
 	if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
 	if (checkOpt) {
-	    alert("Please enter a receipt number given by a student in the receipt box.");
+	    alert("$receiptalert");
 	    formname.receipt.value = "";
 	    formname.receipt.focus();
 	    return false;
@@ -8392,7 +8480,7 @@ GRADINGMENUJS
               </label>
             </div>
             <div class="LC_grade_select_mode_type">
-	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
+	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' &rarr;" />
             </div>
           </div>
         </div>
@@ -8411,7 +8499,7 @@ GRADINGMENUJS
               </label>
             </div>
             <div class="LC_grade_select_mode_type">
-	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
+	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' &rarr;" />
             </div>
           </div>
         </div>
@@ -8515,7 +8603,7 @@ sub process_clicker {
     $result.=$table;
     $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
     $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
-    $result.='&nbsp;<b>'.&mt('Specify a file containing the clicker information for this resource').
+    $result.='&nbsp;<b>'.&mt('Specify a file containing the clicker information for this resource.').
         '.</b></td></tr>'."\n";
     $result.='<tr bgcolor=#ffffe6><td>'."\n";
 # Attempt to restore parameters from last session, set defaults if not present
@@ -8951,7 +9039,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);