loncom/homework/grades.pm - diff

Return to grades.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/grades.pm between versions 1.530 and 1.574

-version 1.530, 2008/11/18 19:14:28
+version 1.574, 2009/05/14 14:24:07
  Line 26
  # http://www.lon-capa.org/
  #
- =head1 NAME
- Apache::grades
- =head1 SYNOPSIS
- Handles the viewing of grades.
- This is part of the LearningOnline Network with CAPA project
- described at http://www.lon-capa.org.
- =head1 OVERVIEW
- Do an ssi with retries:
- While I'd love to factor out this with the vesrion in lonprintout,
- that would either require a data coupling between modules, which I refuse to perpetuate (there's quite enough of that already), or would require the invention of another infrastructure
- I'm not quite ready to invent (e.g. an ssi_with_retry object).
- At least the logic that drives this has been pulled out into loncommon.
- ssi_with_retries - Does the server side include of a resource.
-                      if the ssi call returns an error we'll retry it up to
-                      the number of times requested by the caller.
-                      If we still have a proble, no text is appended to the
-                      output and we set some global variables.
-                      to indicate to the caller an SSI error occurred.
-                      All of this is supposed to deal with the issues described
-                      in LonCAPA BZ 5631 see:
-                      http://bugs.lon-capa.org/show_bug.cgi?id=5631
-                      by informing the user that this happened.
- Parameters:
-   resource   - The resource to include.  This is passed directly, without
-                interpretation to lonnet::ssi.
-   form       - The form hash parameters that guide the interpretation of the resource
-   retries    - Number of retries allowed before giving up completely.
- Returns:
-   On success, returns the rendered resource identified by the resource parameter.
- Side Effects:
-   The following global variables can be set:
-    ssi_error                - If an unrecoverable error occurred this becomes true.
-                               It is up to the caller to initialize this to false
-                               if desired.
-    ssi_error_resource  - If an unrecoverable error occurred, this is the value
-                               of the resource that could not be rendered by the ssi
-                               call.
-    ssi_error_message   - The error string fetched from the ssi response
-                               in the event of an error.
- =head1 HANDLER SUBROUTINE
- ssi_with_retries()
- =head1 SUBROUTINES
- =over
- =item scantron_get_correction() :
-    Builds the interface screen to interact with the operator to fix a
-    specific error condition in a specific scanline
-  Arguments:
-     $r           - Apache request object
-     $i           - number of the current scanline
-     $scan_record - hash ref as returned from &scantron_parse_scanline()
-     $scan_config - hash ref as returned from &get_scantron_config()
-     $line        - full contents of the current scanline
-     $error       - error condition, valid values are
-                    'incorrectCODE', 'duplicateCODE',
-                    'doublebubble', 'missingbubble',
-                    'duplicateID', 'incorrectID'
-     $arg         - extra information needed
-        For errors:
-          - duplicateID   - paper number that this studentID was seen before on
-          - duplicateCODE - array ref of the paper numbers this CODE was
-                            seen on before
-          - incorrectCODE - current incorrect CODE
-          - doublebubble  - array ref of the bubble lines that have double
-                            bubble errors
-          - missingbubble - array ref of the bubble lines that have missing
-                            bubble errors
- =item  scantron_get_maxbubble() :
-    Returns the maximum number of bubble lines that are expected to
-    occur. Does this by walking the selected sequence rendering the
-    resource and then checking &Apache::lonxml::get_problem_counter()
-    for what the current value of the problem counter is.
-    Caches the results to $env{'form.scantron_maxbubble'},
-    $env{'form.scantron.bubble_lines.n'},
-    $env{'form.scantron.first_bubble_line.n'} and
-    $env{"form.scantron.sub_bubblelines.n"}
-    which are the total number of bubble, lines, the number of bubble
-    lines for response n and number of the first bubble line for response n,
-    and a comma separated list of numbers of bubble lines for sub-questions
-    (for optionresponse, matchresponse, and rankresponse items), for response n.
- =item  scantron_validate_missingbubbles() :
-    Validates all scanlines in the selected file to not have any
-     answers that don't have bubbles that have not been verified
-     to be bubble free.
- =item  scantron_process_students() :
-    Routine that does the actual grading of the bubble sheet information.
-    The parsed scanline hash is added to %env
-    Then foreach unskipped scanline it does an &Apache::lonnet::ssi()
-    foreach resource , with the form data of
- 	'submitted'     =>'scantron'
- 	'grade_target'  =>'grade',
- 	'grade_username'=> username of student
- 	'grade_domain'  => domain of student
- 	'grade_courseid'=> of course
- 	'grade_symb'    => symb of resource to grade
-     This triggers a grading pass. The problem grading code takes care
-     of converting the bubbled letter information (now in %env) into a
-     valid submission.
- =item  scantron_upload_scantron_data() :
-     Creates the screen for adding a new bubble sheet data file to a course.
- =item  scantron_upload_scantron_data_save() :
-    Adds a provided bubble information data file to the course if user
-    has the correct privileges to do so.
- =item  valid_file() :
-    Validates that the requested bubble data file exists in the course.
- =item  scantron_download_scantron_data() :
-    Shows a list of the three internal files (original, corrected,
-    skipped) for a specific bubble sheet data file that exists in the
-    course.
- =item  scantron_validate_ID() :
-    Validates all scanlines in the selected file to not have any
-    invalid or underspecified student IDs
- =back
- =cut
  package Apache::grades;
  use strict;
- Line 373  sub showResourceInfo {
+ Line 217  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">'.
+ 	    $result.='<td><b>'.&mt('Part').': </b>'.$display_part.
- 		$resID.'</span></td>'.
+                 ' <span class="LC_internal_info">'.$resID.'</span></td>'.
- 		'<td>'.&mt('<b>Type: </b>[_1]',$responsetype).'</td></tr>';
+ 		'<td><b>'.&mt('Type').': </b>'.$responsetype.'</td></tr>';
  #	    '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';
  	}
      }
- Line 390  sub reset_caches {
+ Line 234  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,
+         my %form = ('grade_target'      => 'analyze',
- 					   ('grade_target' => 'analyze',
+                     'grade_domain'      => $udom,
- 					    'grade_domain' => $udom,
+                     'grade_symb'        => $symb,
- 					    'grade_symb' => $symb,
+                     'grade_courseid'    =>  $env{'request.course.id'},
- 					    'grade_courseid' =>
+                     'grade_username'    => $uname,
- 					    $env{'request.course.id'},
+                     'grade_noincrement' => $no_increment);
- 					    'grade_username' => $uname,
+         if (ref($add_to_hash)) {
-                                             'grade_noincrement' => $no_increment));
+             %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;
      }
- Line 424  sub reset_caches {
+ Line 294  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)}) {
+         my $foils = &get_order($partid,$respid,$symb,$uname,$udom);
- 	    if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {
+         if (ref($foils) eq 'ARRAY') {
- 		return $foil;
+ 	    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
- Line 855  sub verifyreceipt {
+ Line 754  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";
- Line 939  sub listStudents {
+ Line 838  sub listStudents {
      $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
  	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
-     my $result='<h3><span class="LC_info">&nbsp;'.
+     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' =>
+     my %lt = &Apache::lonlocal::texthash (
- 	       "Please select a student or group of students before clicking on the Next button.",
+ 		'multiple' => 'Please select a student or group of students before clicking on the Next button.',
- 	       'single'   =>
+ 		'single'   => 'Please select the student before clicking on the Next button.',
- 	       "Please select the student before clicking on the Next button.",
+ 	     );
- 	       );
-     %lt = &Apache::lonlocal::texthash(%lt);
      $request->print(<<LISTJAVASCRIPT);
  <script type="text/javascript" language="javascript">
      function checkSelect(checkBox) {
- Line 992  LISTJAVASCRIPT
+ Line 889  LISTJAVASCRIPT
      my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
  	"\n".$table;
-     $gradeTable .=
+     $gradeTable .= &Apache::lonhtmlcommon::start_pick_box();
- 	'&nbsp;'.
+     $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))
- 	&mt('<b>View Problem Text: </b>[_1]',
+                   .'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n"
- 	    '<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="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";
+                   .&Apache::lonhtmlcommon::row_closure();
-     $gradeTable .=
+     $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Answer'))
- 	'&nbsp;'.
+                   .'<label><input type="radio" name="vAns" value="no"  /> '.&mt('no').' </label>'."\n"
- 	&mt('<b>View Answer: </b>[_1]',
+                   .'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n"
- 	    '<label><input type="radio" name="vAns" value="no"  /> '.&mt('no').' </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="yes" /> '.&mt('one student').' </label>'."\n".
+                   .&Apache::lonhtmlcommon::row_closure();
- 	    '<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) {
- Line 1018  LISTJAVASCRIPT
+ Line 914  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 .=
+     $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))
- 	'&nbsp;'.
+                   .$submission_options
- 	&mt('<b>Submissions: </b>[_1]',$submission_options).'<br />'."\n";
+                   .&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;'.
- 	&mt('<b>Grading Increments:</b> [_1]',
- 	    '<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".
- Line 1043  LISTJAVASCRIPT
+ Line 938  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]',
+         $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status'))
- 			 &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />';
+                       .&Apache::lonhtmlcommon::StatusOptions(
+                            $saveStatus,undef,1,'javascript:reLoadList(this.form);')
+                       .&Apache::lonhtmlcommon::row_closure();
      }
-     $gradeTable.=&mt('To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
+     $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))
- 	'next to the student\'s name(s). Then click on the Next button.').'<br />'."\n".
+                   .'<input type="checkbox" name="checkPlag" checked="checked" />'
- 	'<input type="hidden" name="command" value="processGroup" />'."\n";
+                   .&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');
      $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);
      $gradeTable.= &Apache::loncommon::start_data_table().
  	&Apache::loncommon::start_data_table_header_row();
- Line 1142  LISTJAVASCRIPT
+ Line 1044  LISTJAVASCRIPT
  		$gradeTable.= &Apache::loncommon::start_data_table_row();
  	    }
  	    $gradeTable.='<td align="right">'.$ctr.'&nbsp;</td>'.
-                '<td align="center"><label><input type=checkbox name="stuinfo" value="'.
+                '<td align="center"><label><input type="checkbox" name="stuinfo" value="'.
                 $student.':'.$$fullname{$student}.':::SECTION'.$section.
  	       ')&nbsp;" />&nbsp;&nbsp;</label></td>'."\n".'<td>'.
  	       &nameUserString(undef,$$fullname{$student},$uname,$udom).
- Line 1177  LISTJAVASCRIPT
+ Line 1079  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) {
- Line 1273  sub processGroup {
+ Line 1175  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) {
- Line 1283  sub sub_page_js {
+ Line 1186  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;
- Line 1528  INNERJS
+ Line 1431  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">
- Line 1560  INNERJS
+ Line 1464  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);
- Line 1647  INNERJS
+ Line 1551  INNERJS
      pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
      pDoc.write("<h3><span class=\\"LC_info\\">&nbsp;Compose Message for \"+fullname+\"<\\/span><\\/h3><br /><br />");
-     pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
+     pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">');
-     pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
+     pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">');
      pDoc.write("<td><b>Type<\\/b><\\/td><td><b>Include<\\/b><\\/td><td><b>Message<\\/td><\\/tr>");
  }
      function displaySubject(msg,shwsel) {
- Line 1732  INNERJS
+ Line 1636  INNERJS
      hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
      hDoc.write("<h3><span class=\\"LC_info\\">&nbsp;Keyword Highlight Options<\\/span><\\/h3><br /><br />");
-     hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
+     hDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">');
-     hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
+     hDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">');
      hDoc.write("<td><b>Text Color<\\/b><\\/td><td><b>Font Size<\\/b><\\/td><td><b>Font Style<\\/td><\\/tr>");
    }
- Line 1799  sub gradeBox {
+ Line 1703  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";
- Line 1815  sub gradeBox {
+ Line 1719  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') {
- Line 1828  sub gradeBox {
+ Line 1732  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".
- Line 2212  KEYWORDS
+ Line 2116  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) {
- Line 2231  KEYWORDS
+ Line 2135  KEYWORDS
  								   {'one_time' => 1});
  			    $similar="<hr /><h3><span class=\"LC_warning\">".
- 				&mt('Essay is [_1]% similar to an essay by [_2] ([_3]:[_4]) in course [_5] (course id [_6]:[_7])',
+ 				&mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',
  				    $osim,
- 				    &Apache::loncommon::plainname($oname,$odom),
+ 				    &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',
- 				    $oname,$odom,
  				    $old_course_desc{'description'},
  				    $old_course_desc{'num'},
  				    $old_course_desc{'domain'}).
- Line 2253  KEYWORDS
+ Line 2156  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++;
  				&Apache::lonnet::allowuploaded('/adm/grades',$file);
- 				$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
+ 				$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" /> '.$file.'</a>';
  			    }
  			    $lastsubonly.='<br />';
  			}
  			$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>';
  		    }
- Line 2393  KEYWORDS
+ Line 2296  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').'" '.
- Line 2476  sub get_last_submission {
+ Line 2379  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)) {
- Line 2490  sub get_last_submission {
+ Line 2393  sub get_last_submission {
      }
      if (!@string) {
  	$string[0] =
- 	    '<span class="LC_warning">Nothing submitted - no attempts.</span>';
+ 	    '<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span>';
      }
      return (\@string,\$timestamp);
  }
- Line 2559  sub processHandGrade {
+ Line 2462  sub processHandGrade {
                                                       undef,$feedurl,undef,
                                                       undef,undef,$showsymb,
                                                       $restitle);
- 		$request->print('<br />'.&mt('Sending message to [_1]:[_2]',$uname,$udom).': '.
+ 		$request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '.
  				$msgstatus);
  	    }
  	    if ($env{'form.collaborator'.$ctr}) {
- Line 2914  sub handback_files {
+ Line 2817  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.
+                         $request->print('<br /><span class="LC_error">'.
-                         ') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</span><br />');
+                             &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);
- Line 3134  sub file_name_version_ext {
+ Line 3039  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) {
- Line 3142  sub viewgrades_js {
+ Line 3048  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) {
- Line 3240  sub viewgrades_js {
+ Line 3146  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;
  	}
- Line 3329  sub viewgrades {
+ Line 3235  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 ($common_header,$specific_header);
-     my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
      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.=
+     $result.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table();
- 	'<h3>'.
- 	&mt("Assign Common Grade To $sectionClass",$section_display).'</h3>';
-     $result.= &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);
- Line 3372  sub viewgrades {
+ Line 3278  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";
+ 	    $weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n";
- 	$line.= '<td><select name="SELVAL_'.$partid.'"'.
+ 	$line.= '<td><b>'.&mt('Grade Status').':</b><select name="SELVAL_'.$partid.'"'.
  	    'onChange="javascript:writeRadText(\''.$partid.'\','.
  		$weight{$partid}.')"> '.
  	    '<option selected="selected"> </option>'.
- Line 3388  sub viewgrades {
+ Line 3294  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++;
      }
- Line 3399  sub viewgrades {
+ Line 3305  sub viewgrades {
      #table listing all the students in a section/class
      #header of table
-     $result.= '<h3>'.&mt('Assign Grade to Specific Students in '.$sectionClass,
+     $result.= '<h3>'.$specific_header.'</h3>'.
- 			 $section_display).'</h3>';
+               &Apache::loncommon::start_data_table().
-     $result.= &Apache::loncommon::start_data_table().
+ 	      &Apache::loncommon::start_data_table_header_row().
- 	&Apache::loncommon::start_data_table_header_row().
+ 	      '<th>'.&mt('No.').'</th>'.
- 	'<th>'.&mt('No.').'</th>'.
+ 	      '<th>'.&nameUserString('header')."</th>\n";
- 	'<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');
+ 	$display =~ s|^Number of Attempts|$narrowtext <br />|; # makes the column narrower
  	if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
  	my ($partid) = &split_part_type($part);
          push(@partids,$partid);
- Line 3581  sub editgrades {
+ Line 3487  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\]//;
- 	    $display =~ s/Number of Attempts/Tries/;
+             my $narrowtext = &mt('Tries');
- 	    $header .= '<th align="center">'.&mt('Old '.$display).'</th>'.
+ 	    $display =~ s/Number of Attempts/$narrowtext/;
- 		'<th align="center">'.&mt('New '.$display).'</th>';
+ 	    $header .= '<th align="center">'.&mt('Old').' '.$display.'</th>'.
+ 		'<th align="center">'.&mt('New').' '.$display.'</th>';
  	    $columns{$partid}+=2;
  	}
      }
- Line 3773  sub split_part_type {
+ Line 3680  sub split_part_type {
  #
  #--- Javascript to handle csv upload
  sub csvupload_javascript_reverse_associate {
-     my $error1=&mt('You need to specify the username or ID');
+     my $error1=&mt('You need to specify the username or the student/employee ID');
      my $error2=&mt('You need to specify at least one grading field');
    return(<<ENDPICK);
    function verify(vf) {
- Line 3813  ENDPICK
+ Line 3720  ENDPICK
  }
  sub csvupload_javascript_forward_associate {
-     my $error1=&mt('You need to specify the username or ID');
+     my $error1=&mt('You need to specify the username or the student/employee ID');
      my $error2=&mt('You need to specify at least one grading field');
    return(<<ENDPICK);
    function verify(vf) {
- Line 3896  ENDPICK
+ Line 3803  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);
- Line 3926  ENDPICK
+ Line 3833  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();
- Line 3950  sub upcsvScores_form {
+ Line 3858  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";
+ 	'</b></td></tr>'."\n";
      $result.='<tr bgcolor=#ffffe6><td>'."\n";
      my $upload=&mt("Upload Scores");
      my $upfile_select=&Apache::loncommon::upfile_select_html();
- Line 4181  sub csvuploadassign {
+ Line 4089  sub csvuploadassign {
  	   $countdone++;
          }
      }
-     $request->print('<br /><span class="LC_info">'.&mt("Saved [_1] students",$countdone)."</span>\n");
+     $request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0));
      if (@skipped) {
- 	$request->print('<p><span class="LC_warning">'.&mt('Skipped Students').'</span></p>');
+ 	$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('No scores stored for the following username(s):'),1).'<br />');
- 	foreach my $student (@skipped) { $request->print("$student<br />\n"); }
+         $request->print(join(', ',@skipped));
      }
      if (@notallowed) {
- 	$request->print('<p><span class="LC_error">'.&mt('Students Not Allowed to Modify').'</span></p>');
+ 	$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('Modification of scores not allowed for the following username(s):'),1).'<br />');
- 	foreach my $student (@notallowed) { $request->print("$student<br />\n"); }
+ 	$request->print(join(', ',@notallowed));
      }
      $request->print("<br />\n");
      $request->print(&show_grading_menu_form($symb));
- Line 4204  sub csvuploadassign {
+ Line 4112  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);
- Line 4244  LISTJAVASCRIPT
+ Line 4153  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) {
- Line 4259  LISTJAVASCRIPT
+ Line 4168  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'));
- Line 4274  LISTJAVASCRIPT
+ Line 4183  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>',
+     $result.='&nbsp;<b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n";
- 			  '<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);
- Line 4318  LISTJAVASCRIPT
+ Line 4225  LISTJAVASCRIPT
      }
      $studentTable.=&Apache::loncommon::end_data_table()."\n";
      $studentTable.='<input type="button" '.
- 	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next-&gt;').'" /></form>'."\n";
+ 	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' &rarr;" /></form>'."\n";
      $studentTable.=&show_grading_menu_form($symb);
      $request->print($studentTable);
- Line 4455  sub displayPage {
+ Line 4362  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);
- Line 4525  sub displaySubByDates {
+ Line 4432  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;
- Line 4809  Next each scanline is checked for any er
+ Line 4716  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.
- Line 4882  sub getSequenceDropDown {
+ Line 4789  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.
- Line 4923  sub restore_bubble_lines {
+ Line 4830  sub restore_bubble_lines {
              $env{"form.scantron.responsetype.$line"};
  	$line++;
      }
  }
  #  Given the parsed scanline, get the response for
- Line 4932  sub restore_bubble_lines {
+ Line 4838  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};
- Line 5103  sub scantron_CODElist {
+ Line 5008  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>';
- Line 5163  sub scantron_selectphase {
+ Line 5068  sub scantron_selectphase {
              <td> '.&mt('Sequence to grade:').' </td><td> '.$sequence_selector.' </td>
         '.&Apache::loncommon::end_data_table_row().'
         '.&Apache::loncommon::start_data_table_row().'
-             <td> '.&mt('Filename of scoring office file:').' </td><td> '.$file_selector.' </td>
+             <td> '.&mt('Filename of bubblesheet data file:').' </td><td> '.$file_selector.' </td>
         '.&Apache::loncommon::end_data_table_row().'
         '.&Apache::loncommon::start_data_table_row().'
-             <td> '.&mt('Format of data file:').' </td><td> '.$format_selector.' </td>
+             <td> '.&mt('Format of bubblesheet data file:').' </td><td> '.$format_selector.' </td>
         '.&Apache::loncommon::end_data_table_row().'
         '.&Apache::loncommon::start_data_table_row().'
              <td> '.&mt('Saved CODEs to validate against:').' </td><td> '.$CODE_selector.' </td>
- Line 5184  sub scantron_selectphase {
+ Line 5089  sub scantron_selectphase {
         '.&Apache::loncommon::end_data_table_row().'
         '.&Apache::loncommon::start_data_table_row().'
              <td colspan="2">
-               <input type="submit" value="'.&mt('Grading: Validate Scantron Records').'" />
+               <input type="submit" value="'.&mt('Grading: Validate Bubblesheet Records').'" />
              </td>
         '.&Apache::loncommon::end_data_table_row().'
      '.&Apache::loncommon::end_data_table().'
- Line 5203  sub scantron_selectphase {
+ Line 5108  sub scantron_selectphase {
      '.&Apache::loncommon::start_data_table('LC_scantron_action').'
         '.&Apache::loncommon::start_data_table_header_row().'
              <th>
-               &nbsp;'.&mt('Specify a Scantron data file to upload.').'
+               &nbsp;'.&mt('Specify a bubblesheet data file to upload.').'
              </th>
         '.&Apache::loncommon::end_data_table_header_row().'
         '.&Apache::loncommon::start_data_table_row().'
- Line 5230  sub scantron_selectphase {
+ Line 5135  sub scantron_selectphase {
                  <input name="command" value="scantronupload_save" type="hidden" />
                  '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
                  <br />
-                 <input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />
+                 <input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
                </form>
  ');
- Line 5272  sub scantron_selectphase {
+ Line 5177  sub scantron_selectphase {
               &Apache::loncommon::start_data_table('LC_scantron_action')."\n".
               &Apache::loncommon::start_data_table_header_row()."\n".
               '<th colspan="2">
-               &nbsp;'.&mt('Review scantron data and submissions for a previously graded folder/sequence')."\n".
+               &nbsp;'.&mt('Review bubblesheet data and submissions for a previously graded folder/sequence')."\n".
               '</th>'."\n".
                &Apache::loncommon::end_data_table_header_row()."\n".
                &Apache::loncommon::start_data_table_row()."\n".
- Line 5288  sub scantron_selectphase {
+ Line 5193  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".
- Line 5331  sub scantron_selectphase {
+ Line 5240  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
+       IDstart     - column where the student/employee ID starts
-       IDlength    - length of the student ID info
+       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
- Line 5392  sub get_scantron_config {
+ Line 5301  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:
- Line 5431  sub username_to_idmap {
+ Line 5340  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
                            'CODE'   -> correct the CODE
                            'answer' -> fixup the submitted answers)
- Line 5605  sub digits_to_letters {
+ Line 5514  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
- Line 5641  sub scantron_parse_scanline {
+ Line 5550  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')) {
- Line 6331  sub scantron_validate_file {
+ Line 6241  sub scantron_validate_file {
      }
      if (!$stop) {
  	my $warning=&scantron_warning_screen('Start Grading');
- 	$r->print(&mt('Validation process complete.').'<br />
+ 	$r->print(&mt('Validation process complete.').'<br />'.
- '.$warning.'
+                   $warning.
- <input type="submit" name="submit" value="'.&mt('Start Grading').'" />
+                   &mt('Perform verification for each student after storage of submissions?').
- <input type="hidden" name="command" value="scantron_process" />
+                   '&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 bubblesheet 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."' />");
      }
      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' />");
- Line 6860  sub scantron_get_correction {
+ Line 6776  sub scantron_get_correction {
  	    if ($closest > 0) {
  		foreach my $testcode (@{$closest}) {
  		    my $checked='';
- 		    if (!$i) { $checked=' checked="checked" '; }
+ 		    if (!$i) { $checked=' checked="checked"'; }
  		    $r->print("
     <label>
-        <input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked />
+        <input type='radio' name='scantron_CODE_resolution' value='use_closest_$i'$checked />
         ".&mt("Use the similar CODE [_1] instead.",
  	    "<b><tt>".$testcode."</tt></b>")."
      </label>
- Line 6874  sub scantron_get_correction {
+ Line 6790  sub scantron_get_correction {
  	    }
  	}
  	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
- 	    my $checked; if (!$i) { $checked=' checked="checked" '; }
+ 	    my $checked; if (!$i) { $checked=' checked="checked"'; }
  	    $r->print("
      <label>
-         <input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked />
+         <input type='radio' name='scantron_CODE_resolution' value='use_unfound'$checked />
         ".&mt("Use the CODE [_1] that is was on the paper, ignoring the error.",
  	     "<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")."
      </label>");
- Line 6908  ENDSCRIPT
+ Line 6824  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("
- Line 7101  sub prompt_for_corrections {
+ Line 7017  sub prompt_for_corrections {
              ($responsetype_per_response{$question-1} eq 'imageresponse') ||
              ($responsetype_per_response{$question-1} eq 'reactionresponse') ||
              ($responsetype_per_response{$question-1} eq 'organicresponse')) {
-             $r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the exam directed students to leave [quant,_1,line] blank on their scantron sheets.",$lines).'<br /><br />'.&mt('A non-zero score can be assigned to the student during scantron grading by selecting a bubble in at least one line.').'<br />'.&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.').'<br />'.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'<br /><br />');
+             $r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the exam directed students to leave [quant,_1,line] blank on their bubblesheets.",$lines).'<br /><br />'.&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.').'<br />'.&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.').'<br />'.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'<br /><br />');
          } else {
              $r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />");
          }
- Line 7382  sub scantron_get_maxbubble {
+ Line 7298  sub scantron_get_maxbubble {
      &Apache::lonxml::clear_problem_counter();
-     my $uname       = $env{'form.student'};
+     my $uname       = $env{'user.name'};
-     my $udom        = $env{'form.userdom'};
+     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 ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom);
+         if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {
-         my (@parts,@allparts,@possible_parts);
+ 	    foreach my $part_id (@{$parts}) {
+                 my $lines;
-         # Need to retrieve part IDs and response IDs because essayresponse,
-         # reactionresponse and organicresponse items are not included in
+ 	        # TODO - make this a persistent hash not an array.
-         # $analysis{'parts'} from lonnet::ssi.
-         if (ref($resource->parts()) eq 'ARRAY') {
+                 # optionresponse, matchresponse and rankresponse type items
-             foreach my $part (@{$resource->parts()}) {
+                 # render as separate sub-questions in exam mode.
-                 if (!&Apache::loncommon::check_if_partid_hidden($part,$symb,$udom,$uname)) {
+                 if (($analysis->{$part_id.'.type'} eq 'optionresponse') ||
-                     my @resp_ids = $resource->responseIds($part);
+                     ($analysis->{$part_id.'.type'} eq 'matchresponse') ||
-                     foreach my $id (@resp_ids) {
+                     ($analysis->{$part_id.'.type'} eq 'rankresponse')) {
-                         my $part_id = $part.'.'.$id;
+                     my ($numbub,$numshown);
-                         push(@possible_parts,$part_id);
+                     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 $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'}});
                      }
-                 } elsif ($analysis{$part_id.'.type'} eq 'matchresponse') {
+                     my $bubbles_per_line = 10;
-                     if (ref($analysis{$part_id.'.items'}) eq 'ARRAY') {
+                     my $inner_bubble_lines = int($numbub/$bubbles_per_line);
-                         $numbub = scalar(@{$analysis{$part_id.'.items'}});
+                     if (($numbub % $bubbles_per_line) != 0) {
+                         $inner_bubble_lines++;
                      }
-                 } elsif ($analysis{$part_id.'.type'} eq 'rankresponse') {
+                     for (my $i=0; $i<$numshown; $i++) {
-                     if (ref($analysis{$part_id.'.foils'}) eq 'ARRAY') {
+                         $subdivided_bubble_lines{$response_number} .=
-                         $numbub = scalar(@{$analysis{$part_id.'.foils'}});
+                             $inner_bubble_lines.',';
                      }
-                 }
+                     $subdivided_bubble_lines{$response_number} =~ s/,$//;
-                 if (ref($analysis{$part_id.'.shown'}) eq 'ARRAY') {
+                     $lines = $numshown * $inner_bubble_lines;
-                     $numshown = scalar(@{$analysis{$part_id.'.shown'}});
+                 } else {
-                 }
+                     $lines = $analysis->{"$part_id.bubble_lines"};
-                 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;
+                 $first_bubble_line{$response_number} = $bubble_line;
- 	    $total_lines +=  $lines;
+ 	        $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'} =
- Line 7507  sub scantron_get_maxbubble {
+ Line 7373  sub scantron_get_maxbubble {
      return $env{'form.scantron_maxbubble'};
  }
  sub scantron_validate_missingbubbles {
      my ($r,$currentphase) = @_;
      #get student info
- Line 7579  sub scantron_process_students {
+ Line 7444  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" />
- Line 7588  SCANTRONFORM
+ Line 7470  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);
- Line 7597  SCANTRONFORM
+ Line 7479  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.
- Line 7615  SCANTRONFORM
+ Line 7497  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++;
- Line 7640  SCANTRONFORM
+ Line 7525  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);
- Line 7647  SCANTRONFORM
+ Line 7545  SCANTRONFORM
  	    &scantron_putfile($scanlines,$scan_data);
  	}
- 	my $i=0;
+         my $scancode;
- 	foreach my $resource (@resources) {
+         if ((exists($scan_record->{'scantron.CODE'})) &&
- 	    $i++;
+             (&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {
- 	    my %form=('submitted'     =>'scantron',
+             $scancode = $scan_record->{'scantron.CODE'};
- 		      'grade_target'  =>'grade',
+         } else {
- 		      'grade_username'=>$uname,
+             $scancode = '';
- 		      'grade_domain'  =>$udom,
+         }
- 		      'grade_courseid'=>$env{'request.course.id'},
- 		      'grade_symb'    =>$resource->symb());
+         if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
- 	    if (exists($scan_record->{'scantron.CODE'})
+                                    \@resources,\%partids_by_symb) eq 'ssi_error') {
- 		&&
+             $ssi_error = 0; # So end of handler error message does not trigger.
- 		&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'})) {
+             $r->print("</form>");
- 		$form{'CODE'}=$scan_record->{'scantron.CODE'};
+             &ssi_print_error($r);
- 	    } else {
+             $r->print(&show_grading_menu_form($symb));
- 		$form{'CODE'}='';
+             &Apache::lonnet::remove_lock($lock);
- 	    }
+             return '';      # Why return ''?  Beats me.
- 	    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; }
- 	}
  	$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);
- Line 7691  SCANTRONFORM
+ Line 7646  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} =
++$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'}));
+     my $dom = $env{'request.role.domain'};
+     my $domdesc = &Apache::lonnet::domain($dom,'description');
+     $r->print(&Apache::loncommon::coursebrowser_javascript($dom));
      my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
  							  'domainid',
- 							  'coursename');
+ 							  'coursename',$dom);
-     my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},
+     my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.
- 						   'domainid');
+                        ('&nbsp'x2).&mt('(shows course personnel)');
      my $default_form_data=&defaultFormData(&get_symb($r,1));
      $r->print('
  <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;
  	}
+         if (formname.courseid.value == "") {
+             alert("'.&mt('Please use the \"Select Course\" link to open a separate window where you can search for a course to which a file can be uploaded.').'");
+             return false;
+         }
  	formname.submit();
      }
+     function ToSyllabus() {
+         var cdom = '."'$dom'".';
+         var cnum = document.rules.courseid.value;
+         if (cdom == "" || cdom == null) {
+             return;
+         }
+         if (cnum == "" || cnum == null) {
+            return;
+         }
+         syllwin=window.open("/public/"+cdom+"/"+cnum+"/syllabus","LONCAPASyllabus",
+                             "height=350,width=350,scrollbars=yes,menubar=no");
+         return;
+     }
  </script>
+ <h3>'.&mt('Send scanned bubblesheet data to a course').'</h3>
  <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
- '.$default_form_data.'
+ '.$default_form_data.
- <table>
+   &Apache::lonhtmlcommon::start_pick_box().
- <tr><td>'.$select_link.'                             </td></tr>
+   &Apache::lonhtmlcommon::row_title(&mt('Course ID')).
- <tr><td>'.&mt('Course ID:').'     </td>
+   '<input name="courseid" type="text" size="30" />'.$select_link.
-     <td><input name="courseid"   type="text" />      </td></tr>
+   &Apache::lonhtmlcommon::row_closure().
- <tr><td>'.&mt('Course Name:').'   </td>
+   &Apache::lonhtmlcommon::row_title(&mt('Course Name')).
-     <td><input name="coursename" type="text" />      </td></tr>
+   '<input name="coursename" type="text" size="30" />'.$syllabuslink.
- <tr><td>'.&mt('Domain:').'        </td>
+   &Apache::lonhtmlcommon::row_closure().
-     <td>'.$domsel.'                                  </td></tr>
+   &Apache::lonhtmlcommon::row_title(&mt('Domain')).
- <tr><td>'.&mt('File to upload:').'</td>
+   '<input name="domainid" type="hidden" />'.$domdesc.
-     <td><input type="file" name="upfile" size="50" /></td></tr>
+   &Apache::lonhtmlcommon::row_closure().
- </table>
+   &Apache::lonhtmlcommon::row_title(&mt('File to upload')).
+   '<input type="file" name="upfile" size="50" />'.
+   &Apache::lonhtmlcommon::row_closure(1).
+   &Apache::lonhtmlcommon::end_pick_box().'<br />
  <input name="command" value="scantronupload_save" type="hidden" />
  <input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />
  </form>
- Line 7752  sub scantron_upload_scantron_data_save {
+ Line 7786  sub scantron_upload_scantron_data_save {
  	return '';
      }
      my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
-     $r->print(&mt("Doing upload to [_1]",$coursedata{'description'})." <br />");
+     my $uploadedfile;
-     my $fname=$env{'form.upfile.filename'};
+     $r->print('<h3>'.&mt("Uploading file to [_1]",$coursedata{'description'}).'</h3>');
-     #FIXME
-     #copied from lonnet::userfileupload()
-     #make that function able to target a specified course
-     # Replace Windows backslashes by forward slashes
-     $fname=~s/\\/\//g;
-     # Get rid of everything but the actual filename
-     $fname=~s/^.*\/([^\/]+)$/$1/;
-     # Replace spaces by underscores
-     $fname=~s/\s+/\_/g;
-     # Replace all other weird characters by nothing
-     $fname=~s/[^\w\.\-]//g;
-     # See if there is anything left
-     unless ($fname) { return 'error: no uploaded file'; }
-     my $uploadedfile=$fname;
-     $fname='scantron_orig_'.$fname;
      if (length($env{'form.upfile'}) < 2) {
- 	$r->print(&mt("<span class=\"LC_error\">Error:</span> The file you attempted to upload, [_1]  contained no information. Please check that you entered the correct filename.",'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>"));
+         $r->print(&mt('[_1]Error:[_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.','<span class="LC_error">','</span>','<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'));
      } else {
- 	my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);
+         my $result =
- 	if ($result =~ m|^/uploaded/|) {
+             &Apache::lonnet::userfileupload('upfile','','scantron','','','',
- 	    $r->print(&mt("<span class=\"LC_success\">Success:</span> Successfully uploaded [_1] bytes of data into location [_2]",
+                                             $env{'form.courseid'},$env{'form.domainid'});
- 			  (length($env{'form.upfile'})-1),
+ 	if ($result =~ m{^/uploaded/}) {
- 			  '<span class="LC_filename">'.$result."</span>"));
+ 	    $r->print(&mt('[_1]Success:[_2] Successfully uploaded [_3] bytes of data into location: [_4]',
+                           '<span class="LC_success">','</span>',(length($env{'form.upfile'})-1),
+ 			  '<span class="LC_filename">'.$result.'</span>'));
+             ($uploadedfile) = ($result =~ m{/([^/]+)$});
+             $r->print(&validate_uploaded_scantron_file($env{'form.domainid'},
+                                                        $env{'form.courseid'},$uploadedfile));
  	} else {
- 	    $r->print(&mt("<span class=\"LC_error\">Error:</span> An error ([_1]) occurred when attempting to upload the file, [_2]",
+ 	    $r->print(&mt('[_1]Error:[_2] An error ([_3]) occurred when attempting to upload the file, [_4]',
- 			  $result,
+                           '<span class="LC_error">','</span>',$result,
- 			  '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>"));
+ 			  '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'));
  	}
      }
      if ($symb) {
- Line 7792  sub scantron_upload_scantron_data_save {
+ Line 7815  sub scantron_upload_scantron_data_save {
      return '';
  }
+ sub validate_uploaded_scantron_file {
+     my ($cdom,$cname,$fname) = @_;
+     my $scanlines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.$fname);
+     my @lines;
+     if ($scanlines ne '-1') {
+         @lines=split("\n",$scanlines,-1);
+     }
+     my $output;
+     if (@lines) {
+         my (%counts,$max_match_format);
+         my ($max_match_count,$max_match_pct) = (0,0);
+         my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cname);
+         my %idmap = &username_to_idmap($classlist);
+         foreach my $key (keys(%idmap)) {
+             my $lckey = lc($key);
+             $idmap{$lckey} = $idmap{$key};
+         }
+         my %unique_formats;
+         my @formatlines = &get_scantronformat_file();
+         foreach my $line (@formatlines) {
+             chomp($line);
+             my @config = split(/:/,$line);
+             my $idstart = $config[5];
+             my $idlength = $config[6];
+             if (($idstart ne '') && ($idlength > 0)) {
+                 if (ref($unique_formats{$idstart.':'.$idlength}) eq 'ARRAY') {
+                     push(@{$unique_formats{$idstart.':'.$idlength}},$config[0].':'.$config[1]);
+                 } else {
+                     $unique_formats{$idstart.':'.$idlength} = [$config[0].':'.$config[1]];
+                 }
+             }
+         }
+         foreach my $key (keys(%unique_formats)) {
+             my ($idstart,$idlength) = split(':',$key);
+             %{$counts{$key}} = (
+                                'found'   => 0,
+                                'total'   => 0,
+                               );
+             foreach my $line (@lines) {
+                 next if ($line =~ /^#/);
+                 next if ($line =~ /^[\s\cz]*$/);
+                 my $id = substr($line,$idstart-1,$idlength);
+                 $id = lc($id);
+                 if (exists($idmap{$id})) {
+                     $counts{$key}{'found'} ++;
+                 }
+                 $counts{$key}{'total'} ++;
+             }
+             if ($counts{$key}{'total'}) {
+                 my $percent_match = (100*$counts{$key}{'found'})/($counts{$key}{'total'});
+                 if (($max_match_format eq '') || ($percent_match > $max_match_pct)) {
+                     $max_match_pct = $percent_match;
+                     $max_match_format = $key;
+                     $max_match_count = $counts{$key}{'total'};
+                 }
+             }
+         }
+         if (ref($unique_formats{$max_match_format}) eq 'ARRAY') {
+             my $format_descs;
+             my $numwithformat = @{$unique_formats{$max_match_format}};
+             for (my $i=0; $i<$numwithformat; $i++) {
+                 my ($name,$desc) = split(':',$unique_formats{$max_match_format}[$i]);
+                 if ($i<$numwithformat-2) {
+                     $format_descs .= '"<i>'.$desc.'</i>", ';
+                 } elsif ($i==$numwithformat-2) {
+                     $format_descs .= '"<i>'.$desc.'</i>" '.&mt('and').' ';
+                 } elsif ($i==$numwithformat-1) {
+                     $format_descs .= '"<i>'.$desc.'</i>"';
+                 }
+             }
+             my $showpct = sprintf("%.0f",$max_match_pct).'%';
+             $output .= '<br />'.&mt('Comparison of student IDs in the uploaded file with the course roster found matches for [_1] of the [_2] entries in the file (for the format defined for [_3]).','<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs).
+                        '<br />'.&mt('A low percentage of matches results from one of the following:').'<ul>'.
+                        '<li>'.&mt('The file was uploaded to the wrong course').'</li>'.
+                        '<li>'.&mt('The data are not in the format expected for the domain: [_1]',
+                                   '<i>'.$cdom.'</i>').'</li>'.
+                        '<li>'.&mt('Students did not bubble their IDs, or mis-bubbled them').'</li>'.
+                        '<li>'.&mt('The course roster is not up to date').'</li>'.
+                        '</ul>';
+         }
+     } else {
+         $output = '<span class="LC_warning">'.&mt('Uploaded file contained no data').'</span>';
+     }
+     return $output;
+ }
  sub valid_file {
      my ($requested_file)=@_;
      foreach my $filename (sort(&scantron_filenames())) {
- Line 7845  sub checkscantron_results {
+ Line 7954  sub checkscantron_results {
      if (!$symb) {return '';}
      my $grading_menu_button=&show_grading_menu_form($symb);
      my $cid = $env{'request.course.id'};
-     my %lettdig = (
+     my %lettdig = &letter_to_digits();
-                     A => 1,
-                     B => 2,
-                     C => 3,
-                     D => 4,
-                     E => 5,
-                     F => 6,
-                     G => 7,
-                     H => 8,
-                     I => 9,
-                     J => 0,
-                   );
      my $numletts = scalar(keys(%lettdig));
      my $cnum = $env{'course.'.$cid.'.num'};
      my $cdom = $env{'course.'.$cid.'.domain'};
- Line 7869  sub checkscantron_results {
+ Line 7967  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");
- Line 7881  sub checkscantron_results {
+ Line 7983  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');
- Line 7923  sub checkscantron_results {
+ Line 8025  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 $parts;
-             my $symb = $resource->symb();
+             my $ressymb = $resource->symb();
-             my $partsref = $resource->parts();
+             if ((exists($grader_randomlists_by_symb{$ressymb})) ||
-             my @parts;
+                 (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
-             my @part_ids = ();
+                 (my $analysis,$parts) =
-             if (ref($partsref) eq 'ARRAY') {
+                     &scantron_partids_tograde($resource,$env{'request.course.id'},$username,$domain);
-                @parts = @{$partsref};
+             } else {
-                foreach my $part (@parts) {
+                 $parts = $grader_partids_by_symb{$ressymb};
-                    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},$parts,
+                                          \%scantron_config,\%lettdig,$numletts);
+             $record{$pid} .= $recording;
          }
      }
      &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- Line 8079  sub checkscantron_results {
+ Line 8076  sub checkscantron_results {
              }
          }
      }
-     $r->print('<p>'.&mt('Comparison of scantron data (including corrections) with corresponding submission records (most recent submission) for <b>[quant,_1,student]</b>  ([_2] scantron lines/student).',$numstudents,$env{'form.scantron_maxbubble'}).'</p>');
+     $r->print('<p>'.&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for <b>[quant,_1,student]</b>  ([_2] scantron lines/student).',$numstudents,$env{'form.scantron_maxbubble'}).'</p>');
      $r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>');
      if ($passed) {
-         $r->print(&mt('Students with exact correspondence between scantron data and submissions are as follows:').'<br /><br />');
+         $r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'<br /><br />');
          $r->print(&Apache::loncommon::start_data_table()."\n".
                   &Apache::loncommon::start_data_table_header_row()."\n".
                   '<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'.
- Line 8091  sub checkscantron_results {
+ Line 8088  sub checkscantron_results {
                   &Apache::loncommon::end_data_table().'<br />');
      }
      if ($failed) {
-         $r->print(&mt('Students with differences between scantron data and submissions are as follows:').'<br /><br />');
+         $r->print(&mt('Students with differences between bubblesheet data and submissions are as follows:').'<br /><br />');
          $r->print(&Apache::loncommon::start_data_table()."\n".
                   &Apache::loncommon::start_data_table_header_row()."\n".
                   '<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'.
                   &Apache::loncommon::end_data_table_header_row()."\n".
                   $badstudents."\n".
                   &Apache::loncommon::end_data_table()).'<br />'.
-                  &mt('Differences can occur if submissions were modified using manual grading after a scantron grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original scantron sheets.');
+                  &mt('Differences can occur if submissions were modified using manual grading after a bubblesheet grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original bubblesheets.');
      }
      $r->print('</form><br />'.$grading_menu_button);
      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 -------
  #
- Line 8150  sub grading_menu {
+ Line 8278  sub grading_menu {
                    'saveState'=>"",
                    'gradingMenu'=>1,
                    'showgrading'=>"yes");
-     my $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-     my @menu = ({ url => $url,
+     my $url1 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-                      name => &mt('Manual Grading/View Submissions'),
-                      short_description =>
-     &mt('Start the process of hand grading submissions.'),
-                  });
      $fields{'command'} = 'csvform';
-     $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+     my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-     push(@menu, { url => $url,
-                    name => &mt('Upload Scores'),
-                    short_description =>
-             &mt('Specify a file containing the class scores for current resource.')});
      $fields{'command'} = 'processclicker';
-     $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+     my $url3 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-     push(@menu, { url => $url,
-                    name => &mt('Process Clicker'),
-                    short_description =>
-             &mt('Specify a file containing the clicker information for this resource.')});
      $fields{'command'} = 'scantron_selectphase';
-     $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+     my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-     push(@menu, { url => $url,
-                    name => &mt('Grade/Manage/Review Scantron Forms'),
+     my @menu = ({	categorytitle=>'Course Grading',
-                    short_description =>
+             items =>[
-             &mt('Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.')});
+                         {	linktext => 'Manual Grading/View Submissions',
-     $fields{'command'} = 'verify';
+                     		url => $url1,
-     $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+                     		permission => 'F',
-     push(@menu, { url => "",
+                     		icon => 'edit-find-replace.png',
-                    name => &mt('Verify Receipt'),
+                     		linktitle => 'Start the process of hand grading submissions.'
-                    short_description =>
+                         },
-             &mt('')});
+                 	    {	linktext => 'Upload Scores',
+                     		url => $url2,
+                     		permission => 'F',
+                     		icon => 'uploadscores.png',
+                     		linktitle => 'Specify a file containing the class scores for current resource.'
+                 	    },
+                 	    {	linktext => 'Process Clicker',
+                     		url => $url3,
+                     		permission => 'F',
+                     		icon => 'addClickerInfoFile.png',
+                     		linktitle => 'Specify a file containing the clicker information for this resource.'
+                 	    },
+                 	    {	linktext => 'Grade/Manage/Review Scantron Forms',
+                     		url => $url4,
+                     		permission => 'F',
+                     		icon => 'stat.png',
+                     		linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.'
+                 	    }
+                     ]
+             });
+     #$fields{'command'} = 'verify';
+     #$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
      #
      # Create the menu
      my $Str;
- Line 8193  sub grading_menu {
+ Line 8334  sub grading_menu {
  	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
  	'<input type="hidden" name="showgrading" value="yes" />'."\n";
-     foreach my $menudata (@menu) {
+     $Str .= Apache::lonhtmlcommon::generate_menu(@menu);
-         if ($menudata->{'name'} ne &mt('Verify Receipt')) {
+     #$menudata->{'jscript'}
-             $Str .='    <h3><a '.
+     $Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '.
-                 $menudata->{'jscript'}.
+         ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
-                 ' href="'.
+         ' /> '.
-                 $menudata->{'url'}.'" >'.
+         &Apache::lonnet::recprefix($env{'request.course.id'}).
-                 $menudata->{'name'}."</a></h3>\n";
+         '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
-         } else {
-             $Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '.
-                 $menudata->{'jscript'}.
-                 ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
-                 ' /> '.
- 		&Apache::lonnet::recprefix($env{'request.course.id'}).
-                     '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
-         }
-         $Str .= '    '.('&nbsp;'x8).$menudata->{'short_description'}.
-             "\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) {
- Line 8239  sub grading_menu {
+ Line 8371  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");
  	    formname.receipt.value = "";
  	    formname.receipt.focus();
  	    return false;
- Line 8260  sub submit_options {
+ Line 8392  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) {
- Line 8287  sub submit_options {
+ Line 8420  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;
- Line 8306  GRADINGMENUJS
+ Line 8439  GRADINGMENUJS
      my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
      my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});
+     # Preselect sections
+     my $selsec="";
+     if (ref($sections)) {
+         foreach my $section (sort(@$sections)) {
+             $selsec.='<option value="'.$section.'" '.
+                 ($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
+         }
+     }
      $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
  	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
  	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
- Line 8316  GRADINGMENUJS
+ Line 8458  GRADINGMENUJS
  	'<input type="hidden" name="showgrading" value="yes" />'."\n";
      $result.='
-     <div class="LC_grade_select_mode">
+ <h2>
-       <div class="LC_grade_select_mode_current">
+   '.&mt('Grade Current Resource').'
-         <h2>
+ </h2>
-           '.&mt('Grade Current Resource').'
+ <div>
-         </h2>
+   '.$table.'
-         <div class="LC_grade_select_mode_body">
+ </div>
-           <div class="LC_grades_resource_info">
-            '.$table.'
+ <div class="LC_columnSection">
-           </div>
-           <div class="LC_grade_select_mode_selector">
+     <fieldset>
-              <div class="LC_grade_select_mode_selector_header">
+       <legend>
-                 '.&mt('Sections').'
+        '.&mt('Sections').'
-              </div>
+       </legend>
-              <div class="LC_grade_select_mode_selector_body">
+       <select name="section" multiple="multiple" size="5">'."\n";
- 	       <select name="section" multiple="multiple" size="5">'."\n";
+     $result.= $selsec;
-     if (ref($sections)) {
- 	foreach my $section (sort(@$sections)) {
- 	    $result.='<option value="'.$section.'" '.
- 		($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
- 	}
-     }
      $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> &nbsp; ';
      $result.='
-              </div>
+     </fieldset>
-           </div>
-           <div class="LC_grade_select_mode_selector">
+     <fieldset>
-              <div class="LC_grade_select_mode_selector_header">
+       <legend>
-                 '.&mt('Groups').'
+         '.&mt('Groups').'
-              </div>
+       </legend>
-              <div class="LC_grade_select_mode_selector_body">
+       '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
-                 '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
+     </fieldset>
-              </div>
-           </div>
+     <fieldset>
-           <div class="LC_grade_select_mode_selector">
+       <legend>
-              <div class="LC_grade_select_mode_selector_header">
+         '.&mt('Access Status').'
-                 '.&mt('Access Status').'
+       </legend>
-              </div>
+       '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
-              <div class="LC_grade_select_mode_selector_body">
+     </fieldset>
-                 '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
-              </div>
+     <fieldset>
-           </div>
+       <legend>
-           <div class="LC_grade_select_mode_selector">
+         '.&mt('Submission Status').'
-              <div class="LC_grade_select_mode_selector_header">
+       </legend>
-                 '.&mt('Submission Status').'
+       <select name="submitonly" size="5">
-              </div>
-              <div class="LC_grade_select_mode_selector_body">
-                <select name="submitonly" size="5">
  	         <option value="yes" '.      ($saveSub eq 'yes'       ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
  	         <option value="queued" '.   ($saveSub eq 'queued'    ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
  	         <option value="graded" '.   ($saveSub eq 'graded'    ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
  	         <option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>
                   <option value="all" '.      ($saveSub eq 'all'       ? 'selected="selected"' : '').'>'.&mt('with any status').'</option>
-                </select>
+       </select>
-              </div>
+     </fieldset>
-           </div>
-           <div class="LC_grade_select_mode_type_body">
+ </div>
-             <div class="LC_grade_select_mode_type">
+ <br />
+           <div>
+             <div>
                <label>
                  <input type="radio" name="radioChoice" value="submission" '.
                    ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.
               &mt('Select individual students to grade and view submissions.').'
  	      </label>
              </div>
-             <div class="LC_grade_select_mode_type">
+             <div>
  	      <label>
                  <input type="radio" name="radioChoice" value="viewgrades" '.
                    ($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
                      &mt('Grade all selected students in a grading table.').'
                </label>
              </div>
-             <div class="LC_grade_select_mode_type">
+             <div>
- 	      <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>
-       </div>
-       <div class="LC_grade_select_mode_page">
          <h2>
           '.&mt('Grade Complete Folder for One Student').'
          </h2>
-         <div class="LC_grades_select_mode_body">
+         <div>
-           <div class="LC_grade_select_mode_type_body">
+             <div>
-             <div class="LC_grade_select_mode_type">
                <label>
                  <input type="radio" name="radioChoice" value="pickStudentPage" '.
  	  ($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
    &mt('The <b>complete</b> page/sequence/folder: For one student').'
                </label>
              </div>
-             <div class="LC_grade_select_mode_type">
+             <div>
- 	      <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>
-       </div>
-     </div>
    </form>';
      $result .= &show_grading_menu_form($symb);
      return $result;
- Line 8510  sub process_clicker {
+ Line 8641  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";
+         '</b></td></tr>'."\n";
      $result.='<tr bgcolor=#ffffe6><td>'."\n";
  # Attempt to restore parameters from last session, set defaults if not present
      my %Saveable_Parameters=&clicker_grading_parameters();
- Line 8525  sub process_clicker {
+ Line 8656  sub process_clicker {
      my %checked;
      foreach my $gradingmechanism ('attendance','personnel','specific','given') {
         if ($env{'form.gradingmechanism'} eq $gradingmechanism) {
-           $checked{$gradingmechanism}="checked='checked'";
+           $checked{$gradingmechanism}=' checked="checked"';
         }
      }
- Line 8589  function sanitycheck() {
+ Line 8720  function sanitycheck() {
  <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
  <input type="file" name="upfile" size="50" />
  <br /><label>$type: $selectform</label>
- <br /><label><input type="radio" name="gradingmechanism" value="attendance" $checked{'attendance'} onClick="sanitycheck()" />$attendance </label>
+ <br /><label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onClick="sanitycheck()" />$attendance </label>
- <br /><label><input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" />$personnel</label>
+ <br /><label><input type="radio" name="gradingmechanism" value="personnel"$checked{'personnel'} onClick="sanitycheck()" />$personnel</label>
- <br /><label><input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" />$specific </label>
+ <br /><label><input type="radio" name="gradingmechanism" value="specific"$checked{'specific'} onClick="sanitycheck()" />$specific </label>
  <input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />
- <br /><label><input type="radio" name="gradingmechanism" value="given" $checked{'given'} onClick="sanitycheck()" />$given </label>
+ <br /><label><input type="radio" name="gradingmechanism" value="given"$checked{'given'} onClick="sanitycheck()" />$given </label>
  <br />&nbsp;&nbsp;&nbsp;
  <input type="text" name="givenanswer" size="50" />
  <input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />
- Line 8946  ENDHEADER
+ Line 9077  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);
- Line 8972  sub handler {
+ Line 9103  sub handler {
      }
      $ssi_error = 0;
-     $request->print(&Apache::loncommon::start_page('Grading'));
+     my $brcrum = [{href=>"/adm/grades",text=>"Grading"}];
+     $request->print(&Apache::loncommon::start_page('Grading',undef,
+                                           {'bread_crumbs' => $brcrum}));
      if ($symb eq '' && $command eq '') {
  	if ($env{'user.adv'}) {
  	    if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
- Line 9070  sub handler {
+ Line 9203  sub handler {
          } elsif ($command eq 'checksubmissions' && $perm{'vgr'}) {
              $request->print(&checkscantron_results($request));
  	} elsif ($command) {
- 	    $request->print("Access Denied ($command)");
+ 	    $request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>');
  	}
      }
      if ($ssi_error) {
- Line 9084  sub handler {
+ Line 9217  sub handler {
 ;
  __END__;
+ =head1 NAME
+ Apache::grades
+ =head1 SYNOPSIS
+ Handles the viewing of grades.
+ This is part of the LearningOnline Network with CAPA project
+ described at http://www.lon-capa.org.
+ =head1 OVERVIEW
+ Do an ssi with retries:
+ While I'd love to factor out this with the vesrion in lonprintout,
+ that would either require a data coupling between modules, which I refuse to perpetuate (there's quite enough of that already), or would require the invention of another infrastructure
+ I'm not quite ready to invent (e.g. an ssi_with_retry object).
+ At least the logic that drives this has been pulled out into loncommon.
+ ssi_with_retries - Does the server side include of a resource.
+                      if the ssi call returns an error we'll retry it up to
+                      the number of times requested by the caller.
+                      If we still have a proble, no text is appended to the
+                      output and we set some global variables.
+                      to indicate to the caller an SSI error occurred.
+                      All of this is supposed to deal with the issues described
+                      in LonCAPA BZ 5631 see:
+                      http://bugs.lon-capa.org/show_bug.cgi?id=5631
+                      by informing the user that this happened.
+ Parameters:
+   resource   - The resource to include.  This is passed directly, without
+                interpretation to lonnet::ssi.
+   form       - The form hash parameters that guide the interpretation of the resource
+   retries    - Number of retries allowed before giving up completely.
+ Returns:
+   On success, returns the rendered resource identified by the resource parameter.
+ Side Effects:
+   The following global variables can be set:
+    ssi_error                - If an unrecoverable error occurred this becomes true.
+                               It is up to the caller to initialize this to false
+                               if desired.
+    ssi_error_resource  - If an unrecoverable error occurred, this is the value
+                               of the resource that could not be rendered by the ssi
+                               call.
+    ssi_error_message   - The error string fetched from the ssi response
+                               in the event of an error.
+ =head1 HANDLER SUBROUTINE
+ ssi_with_retries()
+ =head1 SUBROUTINES
+ =over
+ =item scantron_get_correction() :
+    Builds the interface screen to interact with the operator to fix a
+    specific error condition in a specific scanline
+  Arguments:
+     $r           - Apache request object
+     $i           - number of the current scanline
+     $scan_record - hash ref as returned from &scantron_parse_scanline()
+     $scan_config - hash ref as returned from &get_scantron_config()
+     $line        - full contents of the current scanline
+     $error       - error condition, valid values are
+                    'incorrectCODE', 'duplicateCODE',
+                    'doublebubble', 'missingbubble',
+                    'duplicateID', 'incorrectID'
+     $arg         - extra information needed
+        For errors:
+          - duplicateID   - paper number that this studentID was seen before on
+          - duplicateCODE - array ref of the paper numbers this CODE was
+                            seen on before
+          - incorrectCODE - current incorrect CODE
+          - doublebubble  - array ref of the bubble lines that have double
+                            bubble errors
+          - missingbubble - array ref of the bubble lines that have missing
+                            bubble errors
+ =item  scantron_get_maxbubble() :
+    Returns the maximum number of bubble lines that are expected to
+    occur. Does this by walking the selected sequence rendering the
+    resource and then checking &Apache::lonxml::get_problem_counter()
+    for what the current value of the problem counter is.
+    Caches the results to $env{'form.scantron_maxbubble'},
+    $env{'form.scantron.bubble_lines.n'},
+    $env{'form.scantron.first_bubble_line.n'} and
+    $env{"form.scantron.sub_bubblelines.n"}
+    which are the total number of bubble, lines, the number of bubble
+    lines for response n and number of the first bubble line for response n,
+    and a comma separated list of numbers of bubble lines for sub-questions
+    (for optionresponse, matchresponse, and rankresponse items), for response n.
+ =item  scantron_validate_missingbubbles() :
+    Validates all scanlines in the selected file to not have any
+     answers that don't have bubbles that have not been verified
+     to be bubble free.
+ =item  scantron_process_students() :
+    Routine that does the actual grading of the bubble sheet information.
+    The parsed scanline hash is added to %env
+    Then foreach unskipped scanline it does an &Apache::lonnet::ssi()
+    foreach resource , with the form data of
+ 	'submitted'     =>'scantron'
+ 	'grade_target'  =>'grade',
+ 	'grade_username'=> username of student
+ 	'grade_domain'  => domain of student
+ 	'grade_courseid'=> of course
+ 	'grade_symb'    => symb of resource to grade
+     This triggers a grading pass. The problem grading code takes care
+     of converting the bubbled letter information (now in %env) into a
+     valid submission.
+ =item  scantron_upload_scantron_data() :
+     Creates the screen for adding a new bubble sheet data file to a course.
+ =item  scantron_upload_scantron_data_save() :
+    Adds a provided bubble information data file to the course if user
+    has the correct privileges to do so.
+ =item  valid_file() :
+    Validates that the requested bubble data file exists in the course.
+ =item  scantron_download_scantron_data() :
+    Shows a list of the three internal files (original, corrected,
+    skipped) for a specific bubble sheet data file that exists in the
+    course.
+ =item  scantron_validate_ID() :
+    Validates all scanlines in the selected file to not have any
+    invalid or underspecified student/employee IDs
+ =back
+ =cut

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.530
changed lines
	Added in v.1.574