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.480 and 1.508

-version 1.480, 2007/11/05 11:46:08
+version 1.508, 2008/02/05 18:32:34
  Line 42  use Apache::Constants qw(:common);
  use Apache::lonlocal;
  use Apache::lonenc;
  use String::Similarity;
- use Data::Dumper;
  use LONCAPA;
  use POSIX qw(floor);
  my %perm=();
- my %bubble_lines_per_response = ();     # no. bubble lines for each response.
-                                    # index is "symb.part_id"
- my %first_bubble_line = ();	# First bubble line no. for each bubble.
- # Save and restore the bubble lines array to the form env.
- sub save_bubble_lines {
-     foreach my $line (keys(%bubble_lines_per_response)) {
- 	$env{"form.scantron.bubblelines.$line"}  = $bubble_lines_per_response{$line};
- 	$env{"form.scantron.first_bubble_line.$line"} =
- 	    $first_bubble_line{$line};
-     }
- }
- sub restore_bubble_lines {
-     my $line = 0;
-     %bubble_lines_per_response = ();
-     while ($env{"form.scantron.bubblelines.$line"}) {
- 	my $value = $env{"form.scantron.bubblelines.$line"};
- 	$bubble_lines_per_response{$line} = $value;
- 	$first_bubble_line{$line}  =
- 	    $env{"form.scantron.first_bubble_line.$line"};
- 	$line++;
-     }
- }
- #  Given the parsed scanline, get the response for
- #  'answer' number n:
- 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};
-     my $selected = "";
-     for (my $bline = 0; $bline < $bubble_lines; $bline++) {
- 	$selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":";
- 	$bubble_line++;
-     }
-     return $selected;
- }
- # ----- These first few routines are general use routines.----
- # Return the number of occurences of a pattern in a string.
- sub occurence_count {
-     my ($string, $pattern) = @_;
-     my @matches = ($string =~ /$pattern/g);
-     return scalar(@matches);
- }
- # Take a string known to have digits and convert all the
- # digits into letters in the range J,A..I.
- sub digits_to_letters {
-     my ($input) = @_;
-     my @alphabet = ('J', 'A'..'I');
-     my @input    = split(//, $input);
-     my $output ='';
-     for (my $i = 0; $i < scalar(@input); $i++) {
- 	if ($input[$i] =~ /\d/) {
- 	    $output .= $alphabet[$input[$i]];
- 	} else {
- 	    $output .= $input[$i];
- 	}
-     }
-     return $output;
- }
  #
  # --- Retrieve the parts from the metadata file.---
- Line 172  sub get_symb {
+ Line 89  sub get_symb {
  sub nameUserString {
      my ($type,$fullname,$uname,$udom) = @_;
      if ($type eq 'header') {
- 	return '<b>&nbsp;Fullname&nbsp;</b><span class="LC_internal_info">(Username)</span>';
+ 	return '<b>&nbsp;'.&mt('Fullname').'&nbsp;</b><span class="LC_internal_info">('.&mt('Username').')</span>';
      } else {
  	return '&nbsp;'.$fullname.'<span class="LC_internal_info">&nbsp;('.$uname.
  	    ($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</span>';
- Line 255  sub showResourceInfo {
+ Line 172  sub showResourceInfo {
  		$partsseen{$partID}=1;
  	    }
  	    my $display_part=&get_display_part($partID,$symb);
- 	    $result.='<td><b>Part: </b>'.$display_part.' <span class="LC_internal_info">'.
+ 	    $result.='<td>'.&mt('<b>Part: </b>[_1]',$display_part).' <span class="LC_internal_info">'.
  		$resID.'</span></td>'.
- 		'<td><b>Type: </b>'.$responsetype.'</td></tr>';
+ 		'<td>'.&mt('<b>Type: </b>[_1]',$responsetype).'</td></tr>';
- #	    '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
+ #	    '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';
  	}
      }
      $result.='</table>'."\n";
- Line 734  sub verifyreceipt {
+ Line 651  sub verifyreceipt {
      $receipt     =~ s/[^\-\d]//g;
      my ($symb)   = &get_symb($request);
-     my $title.='<h3><span class="LC_info">Verifying Submission Receipt '.
+     my $title.=
- 	$receipt.'</h3></span>'."\n".
+ 	'<h3><span class="LC_info">'.
- 	'<h4><b>Resource: </b>'.$env{'form.probTitle'}.'</h4><br /><br />'."\n";
+ 	&mt('Verifying Submission Receipt [_1]',$receipt).
+ 	'</span></h3>'."\n".
+ 	'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
+ 	'</h4>'."\n";
      my ($string,$contents,$matches) = ('','',0);
      my (undef,undef,$fullname) = &getclasslist('all','0');
- Line 746  sub verifyreceipt {
+ Line 666  sub verifyreceipt {
  	$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
      my $parts=['0'];
      if ($receiptparts) { ($parts)=&response_type($symb); }
+     my $header =
+ 	&Apache::loncommon::start_data_table().
+ 	&Apache::loncommon::start_data_table_header_row().
+ 	'<th>&nbsp;'.&mt('Fullname').'&nbsp;</th>'."\n".
+ 	'<th>&nbsp;'.&mt('Username').'&nbsp;</th>'."\n".
+ 	'<th>&nbsp;'.&mt('Domain').'&nbsp;</th>';
+     if ($receiptparts) {
+ 	$header.='<th>&nbsp;'.&mt('Problem Part').'&nbsp;</th>';
+     }
+     $header.=
+ 	&Apache::loncommon::end_data_table_header_row();
      foreach (sort
  	     {
  		 if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
- Line 756  sub verifyreceipt {
+ Line 689  sub verifyreceipt {
  	my ($uname,$udom)=split(/\:/);
  	foreach my $part (@$parts) {
  	    if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {
- 		$contents.='<tr bgcolor="#ffffe6"><td>&nbsp;'."\n".
+ 		$contents.=
+ 		    &Apache::loncommon::start_data_table_row().
+ 		    '<td>&nbsp;'."\n".
  		    '<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
  		    '\');" target="_self">'.$$fullname{$_}.'</a>&nbsp;</td>'."\n".
  		    '<td>&nbsp;'.$uname.'&nbsp;</td>'.
- Line 764  sub verifyreceipt {
+ Line 699  sub verifyreceipt {
  		if ($receiptparts) {
  		    $contents.='<td>&nbsp;'.$part.'&nbsp;</td>';
  		}
- 		$contents.='</tr>'."\n";
+ 		$contents.=
+ 		    &Apache::loncommon::end_data_table_row()."\n";
  		$matches++;
  	    }
  	}
      }
      if ($matches == 0) {
- 	$string = $title.'No match found for the above receipt.';
+ 	$string = $title.&mt('No match found for the above receipt.');
      } else {
  	$string = &jscriptNform($symb).$title.
- 	    'The above receipt matches the following student'.
+ 	    '<p>'.
- 	    ($matches <= 1 ? '.' : 's.')."\n".
+ 	    &mt('The above receipt matches the following [numerate,_1,student].',$matches).
- 	    '<table border="0"><tr><td bgcolor="#777777">'."\n".
+ 	    '</p>'.
- 	    '<table border="0"><tr bgcolor="#e6ffff">'."\n".
+ 	    $header.
- 	    '<td><b>&nbsp;Fullname&nbsp;</b></td>'."\n".
+ 	    $contents.
- 	    '<td><b>&nbsp;Username&nbsp;</b></td>'."\n".
+ 	    &Apache::loncommon::end_data_table()."\n";
- 	    '<td><b>&nbsp;Domain&nbsp;</b></td>';
- 	if ($receiptparts) {
- 	    $string.='<td>&nbsp;Problem Part&nbsp;</td>';
- 	}
- 	$string.='</tr>'."\n".$contents.
- 	    '</table></td></tr></table>'."\n";
      }
      return $string.&show_grading_menu_form($symb);
  }
- Line 807  sub listStudents {
+ Line 737  sub listStudents {
      $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
  	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
-     my $result='<h3><span class="LC_info">&nbsp;'.$viewgrade.
+     my $result='<h3><span class="LC_info">&nbsp;'.
- 	' Submissions for a Student or a Group of Students</span></h3>';
+ 	&mt($viewgrade.' Submissions for a Student or a Group of Students')
+ 	.'</span></h3>';
      my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
+     my %lt = ( 'multiple' =>
+ 	       "Please select a student or group of students before clicking on the Next button.",
+ 	       'single'   =>
+ 	       "Please select the student before clicking on the Next button.",
+ 	       );
+     %lt = &Apache::lonlocal::texthash(%lt);
      $request->print(<<LISTJAVASCRIPT);
  <script type="text/javascript" language="javascript">
      function checkSelect(checkBox) {
- Line 823  sub listStudents {
+ Line 760  sub listStudents {
  		    ctr++;
  		}
  	    }
- 	    sense = "a student or group of students";
+ 	    sense = '$lt{'multiple'}';
  	} else {
  	    if (checkBox.checked) {
  		ctr = 1;
  	    }
- 	    sense = "the student";
+ 	    sense = '$lt{'single'}';
  	}
  	if (ctr == 0) {
- 	    alert("Please select "+sense+" before clicking on the Next button.");
+ 	    alert(sense);
  	    return false;
  	}
  	document.gradesub.submit();
- Line 851  LISTJAVASCRIPT
+ Line 788  LISTJAVASCRIPT
      my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : '';
      my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : '';
      my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
- 	"\n".$table.
+ 	"\n".$table;
- 	'&nbsp;<b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".
- 	'<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n".
+     $gradeTable .=
- 	'<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n".
+ 	'&nbsp;'.
- 	'&nbsp;<b>View Answer: </b><label><input type="radio" name="vAns" value="no"  /> no </label>'."\n".
+ 	&mt('<b>View Problem Text: </b>[_1]',
- 	'<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n".
+ 	    '<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
- 	'<label><input type="radio" name="vAns" value="all" checked="checked" /> all students </label><br />'."\n".
+ 	    '<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n".
- 	'&nbsp;<b>Submissions: </b>'."\n";
+ 	    '<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label>').'<br />'."\n";
+     $gradeTable .=
+ 	'&nbsp;'.
+ 	&mt('<b>View Answer: </b>[_1]',
+ 	    '<label><input type="radio" name="vAns" value="no"  /> '.&mt('no').' </label>'."\n".
+ 	    '<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n".
+ 	    '<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label>').'<br />'."\n";
+     my $submission_options;
      if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
- 	$gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n";
+ 	$submission_options.=
+ 	    '<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> '.&mt('essay part only').' </label>'."\n";
      }
      my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
      my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
      $env{'form.Status'} = $saveStatus;
-     $gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".
+     $submission_options.=
- 	'<label><input type="radio" name="lastSub" value="last" /> last submission &amp; parts info </label>'."\n".
+ 	'<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.&mt('last submission only').' </label>'."\n".
- 	'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".
+ 	'<label><input type="radio" name="lastSub" value="last" /> '.&mt('last submission &amp; parts info').' </label>'."\n".
- 	'<label><input type="radio" name="lastSub" value="all" /> all details</label><br />'."\n".
+ 	'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n".
-         '&nbsp;<b>Grading Increments:</b> <select name="increment">'.
+ 	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>';
-         '<option value="1">Whole Points</option>'.
+     $gradeTable .=
-         '<option value=".5">Half Points</option>'.
+ 	'&nbsp;'.
-         '<option value=".25">Quarter Points</option>'.
+ 	&mt('<b>Submissions: </b>[_1]',$submission_options).'<br />'."\n";
-         '<option value=".1">Tenths of a Point</option>'.
-         '</select>'.
+     $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 887  LISTJAVASCRIPT
+ Line 843  LISTJAVASCRIPT
      if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
  	$gradeTable.='<input type="hidden" name="Status"   value="'.$stu_status.'" />'."\n";
      } else {
- 	$gradeTable.='<b>Student Status:</b> '.
+ 	$gradeTable.=&mt('<b>Student Status:</b> [_1]',
- 	    &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
+ 			 &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />';
      }
-     $gradeTable.='To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
+     $gradeTable.=&mt('To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
- 	'next to the student\'s name(s). Then click on the Next button.<br />'."\n".
+ 	'next to the student\'s name(s). Then click on the Next button.').'<br />'."\n".
  	'<input type="hidden" name="command" value="processGroup" />'."\n";
  # checkall buttons
      $gradeTable.=&check_script('gradesub', 'stuinfo');
      $gradeTable.='<input type="button" '."\n".
  	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
- 	'value="Next->" /> <br />'."\n";
+ 	'value="'.&mt('Next-&gt;').'" /> <br />'."\n";
      $gradeTable.=&check_buttons();
-     $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />Check For Plagiarism</label>';
+     $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();
      my $loop = 0;
      while ($loop < 2) {
- 	$gradeTable.='<th>No.</th><th>Select</th>'.
+ 	$gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'.
- 	    '<th>'.&nameUserString('header').'&nbsp;'.'Section/Group</th>';
+ 	    '<th>'.&nameUserString('header').'&nbsp;'.&mt('Section/Group').'</th>';
  	if ($env{'form.showgrading'} eq 'yes'
  	    && $submitonly ne 'queued'
  	    && $submitonly ne 'all') {
- 	    foreach (sort(@$partlist)) {
+ 	    foreach my $part (sort(@$partlist)) {
- 		my $display_part=&get_display_part((split(/_/))[0],$symb);
+ 		my $display_part=
- 		$gradeTable.='<th>Part: '.$display_part.
+ 		    &get_display_part((split(/_/,$part))[0],$symb);
- 		    ' Status</h>';
+ 		$gradeTable.=
+ 		    '<th>'.&mt('Part: [_1] Status',$display_part).'</th>';
  	    }
  	} elsif ($submitonly eq 'queued') {
  	    $gradeTable.='<th>'.&mt('Queue Status').'&nbsp;</th>';
- Line 991  LISTJAVASCRIPT
+ Line 948  LISTJAVASCRIPT
  	    if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
  		foreach (sort keys(%status)) {
- 		    next if (/^resource.*?submitted_by$/);
+ 		    next if ($_ =~ /^resource.*?submitted_by$/);
- 		    $gradeTable.='<td align="center">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
+ 		    $gradeTable.='<td align="center">&nbsp;'.&mt($status{$_}).'&nbsp;</td>'."\n";
  		}
  	    }
  #	    $gradeTable.='<td></td>' if ($ctr%2 ==1);
- Line 1018  LISTJAVASCRIPT
+ Line 975  LISTJAVASCRIPT
      $gradeTable.=&Apache::loncommon::end_data_table()."\n".
  	'<input type="button" '.
  	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
- 	'value="Next->" /></form>'."\n";
+ 	'value="'.&mt('Next-&gt;').'" /></form>'."\n";
      if ($ctr == 0) {
  	my $num_students=(scalar(keys(%$fullname)));
  	if ($num_students eq 0) {
- 	    $gradeTable='<br />&nbsp;<span class="LC_warning">There are no students currently enrolled.</span>';
+ 	    $gradeTable='<br />&nbsp;<span class="LC_warning">'.&mt('There are no students currently enrolled.').'</span>';
  	} else {
  	    my $submissions='submissions';
  	    if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; }
  	    if ($submitonly eq 'graded'   ) { $submissions = 'ungraded submissions'; }
  	    if ($submitonly eq 'queued'   ) { $submissions = 'queued submissions'; }
  	    $gradeTable='<br />&nbsp;<span class="LC_warning">'.
- 		'No '.$submissions.' found for this resource for any students. ('.$num_students.
+ 		&mt('No '.$submissions.' found for this resource for any students. ([_1] students checked for '.$submissions.')',
- 		' students checked for '.$submissions.')</span><br />';
+ 		    $num_students).
+ 		'</span><br />';
  	}
      } elsif ($ctr == 1) {
  	$gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/;
- Line 1080  sub check_script {
+ Line 1038  sub check_script {
  }
  sub check_buttons {
-     my $buttons.='<input type="button" onclick="checkall()" value="Check All" />';
+     my $buttons.='<input type="button" onclick="checkall()" value="'.&mt('Check All').'" />';
-     $buttons.='<input type="button" onclick="uncheckall()" value="Uncheck All" />&nbsp;';
+     $buttons.='<input type="button" onclick="uncheckall()" value="'.&mt('Uncheck All').'" />&nbsp;';
-     $buttons.='<input type="button" onclick="checksec()" value="Check Section/Group" />';
+     $buttons.='<input type="button" onclick="checksec()" value="'.&mt('Check Section/Group').'" />';
      $buttons.='<input type="text" size="5" name="chksec" />&nbsp;';
      return $buttons;
  }
- Line 1617  sub get_increment {
+ Line 1575  sub get_increment {
  sub gradeBox {
      my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
      my $checkIcon = '<img alt="'.&mt('Check Mark').
- 	'" src="'.$request->dir_config('lonIconsURL').
+ 	'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';
- 	'/check.gif" height="16" border="0" />';
      my $wgt    = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
      my $wgtmsg = ($wgt > 0) ? &mt('(problem weight)')
                             : '<span class="LC_info">'.&mt('problem weight assigned by computer').'</span>';
- Line 1633  sub gradeBox {
+ Line 1590  sub gradeBox {
      if ($last_resets{$partid}) {
          $aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
      }
-     $result.='<table border="0"><tr><td>'.
+     $result.='<table border="0"><tr>';
- 	'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";
      my $ctr = 0;
      my $thisweight = 0;
      my $increment = &get_increment();
-     $result.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
+     my $radio.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
      while ($thisweight<=$wgt) {
- 	$result.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+ 	$radio.= '<td><span style="white-space: nowrap;"><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";
- 	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+ 	$radio.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
          $thisweight += $increment;
  	$ctr++;
      }
-     $result.='</tr></table>';
+     $radio.='</tr></table>';
-     $result.='</td><td>&nbsp;<b>or</b>&nbsp;</td>'."\n";
-     $result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
+     my $line.='<input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
  	($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
  	'onChange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','.
  	$wgt.')" /></td>'."\n";
-     $result.='<td>/'.$wgt.' '.$wgtmsg.
+     $line.='<td>/'.$wgt.' '.$wgtmsg.
  	($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? '&nbsp;'.$checkIcon : '').
  	' </td><td>'."\n";
-     $result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
+     $line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
  	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
      if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
- 	$result.='<option></option>'.
+ 	$line.='<option></option>'.
- 	    '<option selected="selected">excused</option>';
+ 	    '<option value="excused" selected="selected">'.&mt('excused').'</option>';
      } else {
- 	$result.='<option selected="selected"></option>'.
+ 	$line.='<option selected="selected"></option>'.
- 	    '<option>excused</option>';
+ 	    '<option value="excused" >'.&mt('excused').'</option>';
      }
-     $result.='<option>reset status</option></select>'."\n";
+     $line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";
-     $result.="&nbsp;&nbsp;\n";
+     $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);
+     $result.='</tr></table>'."\n";
      $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
  	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
  	'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.
- Line 1676  sub gradeBox {
+ Line 1639  sub gradeBox {
          $$record{'resource.'.$partid.'.tries'}.'" />'."\n".
          '<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
          $aggtries.'" />'."\n";
-     $result.='</td></tr></table>'."\n";
      $result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record);
      return $result;
  }
- Line 1708  sub handback_box {
+ Line 1670  sub handback_box {
      			 '<span class="LC_filename">'.$file_disp.'</span>');
      	        $result.='<input type="file"   name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
      	        $result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';
-     	        $result.='(File will be uploaded when you click on Save &amp; Next below.)<br />';
+     	        $result.='('.&mt('File will be uploaded when you click on Save &amp; Next below.').')<br />';
      	        $file_counter++;
  	    }
  	}
- Line 1854  sub submission {
+ Line 1816  sub submission {
  	if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) {
  	    &download_all_link($request, $symb);
  	}
- 	$request->print('<h3>&nbsp;<span class="LC_info">Submission Record</span></h3>'."\n".
+ 	$request->print('<h3>&nbsp;<span class="LC_info">'.&mt('Submission Record').'</span></h3>'."\n".
- 			'<h4>&nbsp;<b>Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n");
+ 			'<h4>&nbsp;'.&mt('<b>Resource: </b> [_1]',$env{'form.probTitle'}).'</h4>'."\n");
  	# option to display problem, only once else it cause problems
          # with the form later since the problem has a form.
- Line 2220  KEYWORDS
+ Line 2182  KEYWORDS
      # print end of form
      if ($counter == $total) {
  	my $endform='<table border="0"><tr><td>'."\n";
- 	$endform.='<input type="button" value="Save & Next" '.
+ 	$endform.='<input type="button" value="'.&mt('Save &amp; Next').'" '.
  	    'onClick="javascript:checksubmit(this.form,\'Save & Next\','.
  	    $total.','.scalar(@partlist).');" target="_self" /> &nbsp;'."\n";
  	my $ntstu ='<select name="NTSTU">'.
- Line 2229  KEYWORDS
+ Line 2191  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.=$ntstu.'student(s) &nbsp;&nbsp;';
+ 	$endform.=&mt('[_1]student(s)',$ntstu);
- 	$endform.='<input type="button" value="Previous" '.
+ 	$endform.='&nbsp;&nbsp;<input type="button" value="'.&mt('Previous').'" '.
  	    'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> &nbsp;'."\n".
- 	    '<input type="button" value="Next" '.
+ 	    '<input type="button" value="'.&mt('Next').'" '.
  	    'onClick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> &nbsp;';
- 	$endform.='(Next and Previous (student) do not save the scores.)'."\n" ;
+ 	$endform.=&mt('(Next and Previous (student) do not save the scores.)')."\n" ;
          $endform.="<input type='hidden' value='".&get_increment().
              "' name='increment' />";
- 	$endform.='</td><tr></table></form>';
+ 	$endform.='</td></tr></table></form>';
  	$endform.=&show_grading_menu_form($symb);
  	$request->print($endform);
      }
- Line 2576  sub processHandGrade {
+ Line 2538  sub processHandGrade {
  	$ctr++;
      }
      if ($total < 0) {
- 	my $the_end = '<h3><span class="LC_info">LON-CAPA User Message</span></h3><br />'."\n";
+ 	my $the_end = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n";
- 	$the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";
+ 	$the_end.=&mt('<b>Message: </b> No more students for this section or class.').'<br /><br />'."\n";
- 	$the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";
+ 	$the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n";
  	$the_end.=&show_grading_menu_form($symb);
  	$request->print($the_end);
      }
- Line 3149  sub viewgrades {
+ Line 3111  sub viewgrades {
      &Apache::lonnet::clear_EXT_cache_status();
      my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>';
-     $result.='<h4><b>Current Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n";
+     $result.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n";
      #view individual student submission form - called using Javascript viewOneStudent
      $result.=&jscriptNform($symb);
- Line 3167  sub viewgrades {
+ Line 3129  sub viewgrades {
      my $sectionClass;
      my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
      if ($env{'form.section'} eq 'all') {
- 	$sectionClass='Class </h3>';
+ 	$sectionClass='Class';
      } elsif ($env{'form.section'} eq 'none') {
- 	$sectionClass=&mt('Students in no Section').'</h3>';
+ 	$sectionClass='Students in no Section';
      } else {
- 	$sectionClass=&mt('Students in Section(s) [_1]',$section_display).'</h3>';
+ 	$sectionClass='Students in Section(s) [_1]';
      }
-     $result.='<h3>'.&mt('Assign Common Grade To [_1]',$sectionClass);
+     $result.=
+ 	'<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
- Line 3191  sub viewgrades {
+ Line 3155  sub viewgrades {
  	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
  	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
- 	$result.=&Apache::loncommon::start_data_table_row().'<td>';
- 	$result.='<input type="hidden" name="partid_'.
- 	    $ctsparts.'" value="'.$partid.'" />'."\n";
- 	$result.='<input type="hidden" name="weight_'.
- 	    $partid.'" value="'.$weight{$partid}.'" />'."\n";
  	my $display_part=&get_display_part($partid,$symb);
- 	$result.=
+ 	my $radio.='<table border="0"><tr>';
- 	    '<b>Part:</b> '.$display_part.'&nbsp; &nbsp;<b>Point:</b> </td><td>';
- 	$result.='<table border="0"><tr>';
  	my $ctr = 0;
  	while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across
- 	    $result.= '<td><label><input type="radio" name="RADVAL_'.$partid.'" '.
+ 	    $radio.= '<td><label><input type="radio" name="RADVAL_'.$partid.'" '.
  		'onclick="javascript:writePoint(\''.$partid.'\','.$weight{$partid}.
  		','.$ctr.')" />'.$ctr."</label></td>\n";
  	    $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
  	    $ctr++;
  	}
- 	$result.='</tr></table>';
+ 	$radio.='</tr></table>';
- 	$result.= '</td><td><b> or </b><input type="text" name="TEXTVAL_'.
+ 	my $line = '<input type="text" name="TEXTVAL_'.
  	    $partid.'" size="4" '.'onChange="javascript:writePoint(\''.
  		$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.
  	    $weight{$partid}.' (problem weight)</td>'."\n";
- 	$result.= '<td><select name="SELVAL_'.$partid.'"'.
+ 	$line.= '<td><select name="SELVAL_'.$partid.'"'.
  	    'onChange="javascript:writeRadText(\''.$partid.'\','.
  		$weight{$partid}.')"> '.
  	    '<option selected="selected"> </option>'.
- 	    '<option>excused</option>'.
+ 	    '<option value="excused">'.&mt('excused').'</option>'.
- 	    '<option>reset status</option></select></td>'.
+ 	    '<option value="reset status">'.&mt('reset status').'</option>'.
-             '<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td>'.&Apache::loncommon::end_data_table_row()."\n";
+ 	    '</select></td>'.
+             '<td><label><input type="checkbox" name="FORCE_'.$partid.'" />'.&mt('Override "Correct"').'</label>';
+ 	$line.='<input type="hidden" name="partid_'.
+ 	    $ctsparts.'" value="'.$partid.'" />'."\n";
+ 	$line.='<input type="hidden" name="weight_'.
+ 	    $partid.'" value="'.$weight{$partid}.'" />'."\n";
+ 	$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).
+ 	    &Apache::loncommon::end_data_table_row()."\n";
  	$ctsparts++;
      }
      $result.=&Apache::loncommon::end_data_table()."\n".
  	'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
-     $result.='<input type="button" value="Revert to Default" '.
+     $result.='<input type="button" value="'.&mt('Revert to Default').'" '.
  	'onClick="javascript:resetEntry('.$ctsparts.');" />';
      #table listing all the students in a section/class
      #header of table
-     $result.= '<h3>Assign Grade to Specific Students in '.$sectionClass;
+     $result.= '<h3>'.&mt('Assign Grade to Specific Students in '.$sectionClass,
+ 			 $section_display).'</h3>';
      $result.= &Apache::loncommon::start_data_table().
  	&Apache::loncommon::start_data_table_header_row().
- 	'<th>No.</th>'.
+ 	'<th>'.&mt('No.').'</th>'.
  	'<th>'.&nameUserString('header')."</th>\n";
      my (@parts) = sort(&getpartlist($symb));
      my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
- Line 3245  sub viewgrades {
+ Line 3213  sub viewgrades {
          push(@partids, $partid);
  	my $display_part=&get_display_part($partid,$symb);
  	if ($display =~ /^Partial Credit Factor/) {
- 	    $result.='<th>Score Part: '.$display_part.
+ 	    $result.='<th>'.
- 		' <br />(weight = '.$weight{$partid}.')</th>'."\n";
+ 		&mt('Score Part: [_1]<br /> (weight = [_2])',
+ 		    $display_part,$weight{$partid}).'</th>'."\n";
  	    next;
  	} else {
- 	    $display =~s/\[Part: \Q$partid\E\]/Part:<\/b> $display_part/;
+ 	    if ($display =~ /Problem Status/) {
+ 		my $grade_status_mt = &mt('Grade Status');
+ 		$display =~ s{Problem Status}{$grade_status_mt<br />};
+ 	    }
+ 	    my $part_mt = &mt('Part:');
+ 	    $display =~s{\[Part: \Q$partid\E\]}{$part_mt $display_part};
  	}
- 	$display =~ s|Problem Status|Grade Status<br />|;
  	$result.='<th>'.$display.'</th>'."\n";
      }
      $result.=&Apache::loncommon::end_data_table_header_row();
- Line 3276  sub viewgrades {
+ Line 3251  sub viewgrades {
      }
      $result.=&Apache::loncommon::end_data_table();
      $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
-     $result.='<input type="button" value="Save" '.
+     $result.='<input type="button" value="'.&mt('Save').'" '.
  	'onClick="javascript:submit();" target="_self" /></form>'."\n";
      if (scalar(%$fullname) eq 0) {
  	my $colspan=3+scalar(@parts);
  	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
          my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
  	$result='<span class="LC_warning">'.
- 	    &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade',
+ 	    &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',
  	        $section_display, $stu_status).
  	    '</span>';
      }
- Line 3339  sub viewstudentgrade {
+ Line 3314  sub viewstudentgrade {
  	    $result.='&nbsp;<select name="'.
  		'GD_'.$student.'_'.$part.'_solved" '.
  		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
- 	    $result.= (($status eq 'excused') ? '<option> </option><option selected="selected">excused</option>'
+ 	    $result.= (($status eq 'excused') ? '<option> </option><option selected="selected" value="excused">'.&mt('excused').'</option>'
- 		: '<option selected="selected"> </option><option>excused</option>')."\n";
+ 		: '<option selected="selected"> </option><option value="excused">'.&mt('excused').'</option>')."\n";
- 	    $result.='<option>reset status</option>';
+ 	    $result.='<option value="reset status">'.&mt('reset status').'</option>';
  	    $result.="</select>&nbsp;</td>\n";
  	} else {
  	    $result.='<input type="hidden" name="'.
- Line 3985  sub csvuploadassign {
+ Line 3960  sub csvuploadassign {
  		$grades{$store_key}=$entries{$fields{$dest}};
  	    }
  	}
- 	if (! %grades) { push(@skipped,"$username:$domain no data to save"); }
+ 	if (! %grades) {
- 	$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
+            push(@skipped,&mt("[_1]: no data to save","$username:$domain"));
- 	my $result=&Apache::lonnet::cstore(\%grades,$symb,
+         } else {
+ 	   $grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
+ 	   my $result=&Apache::lonnet::cstore(\%grades,$symb,
  					   $env{'request.course.id'},
  					   $domain,$username);
- 	if ($result eq 'ok') {
+ 	   if ($result eq 'ok') {
- 	    $request->print('.');
+ 	      $request->print('.');
- 	} else {
+ 	   } else {
- 	    $request->print("<p>
+ 	      $request->print("<p><span class=\"LC_error\">".
-                               <span class=\"LC_error\">
+                               &mt("Failed to save data for student [_1]. Message when trying to save was: [_2]",
-                                  Failed to save student $username:$domain.
+                                   "$username:$domain",$result)."</span></p>");
-                                  Message when trying to save was ($result)
+ 	   }
-                               </span>
+ 	   $request->rflush();
-                              </p>" );
+ 	   $countdone++;
- 	}
+         }
- 	$request->rflush();
- 	$countdone++;
      }
-     $request->print("<br />Saved $countdone students\n");
+     $request->print('<br /><span class="LC_info">'.&mt("Saved [_1] students",$countdone)."</span>\n");
      if (@skipped) {
- 	$request->print('<p><h4><b>Skipped Students</b></h4></p>');
+ 	$request->print('<p><span class="LC_warning">'.&mt('Skipped Students').'</span></p>');
  	foreach my $student (@skipped) { $request->print("$student<br />\n"); }
      }
      if (@notallowed) {
- 	$request->print('<p><span class="LC_error">Students Not Allowed to Modify</span></p>');
+ 	$request->print('<p><span class="LC_error">'.&mt('Students Not Allowed to Modify').'</span></p>');
  	foreach my $student (@notallowed) { $request->print("$student<br />\n"); }
      }
      $request->print("<br />\n");
- Line 4049  LISTJAVASCRIPT
+ Line 4024  LISTJAVASCRIPT
      my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
      my $result='<h3><span class="LC_info">&nbsp;'.
- 	'Manual Grading by Page or Sequence</span></h3>';
+ 	&mt('Manual Grading by Page or Sequence').'</span></h3>';
      $result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
-     $result.='&nbsp;<b>Problems from:</b> <select name="selectpage">'."\n";
      my ($titles,$symbx) = &getSymbMap();
      my ($curpage) =&Apache::lonnet::decode_symb($symb);
  #    my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);
  #    my $type=($curpage =~ /\.(page|sequence)/);
+     my $select = '<select name="selectpage">'."\n";
      my $ctr=0;
      foreach (@$titles) {
  	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
- 	$result.='<option value="'.$ctr.'" '.
+ 	$select.='<option value="'.$ctr.'" '.
  	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : '').
  	    '>'.$showtitle.'</option>'."\n";
  	$ctr++;
      }
-     $result.= '</select>'."<br />\n";
+     $select.= '</select>';
+     $result.=&mt('&nbsp;<b>Problems from:</b> [_1]',$select)."<br />\n";
      $ctr=0;
      foreach (@$titles) {
  	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
- Line 4076  LISTJAVASCRIPT
+ Line 4053  LISTJAVASCRIPT
      $result.='<input type="hidden" name="page" />'."\n".
  	'<input type="hidden" name="title" />'."\n";
-     $result.='&nbsp;<b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n".
+     my $options =
- 	'<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n";
+ 	'<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;<b>Submission Details: </b>'.
+     $result.='&nbsp;'.&mt('<b>View Problems Text: </b> [_1]',$options);
- 	'<label><input type="radio" name="lastSub" value="none" /> none</label>'."\n".
- 	'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> by dates and submissions</label>'."\n".
+     $options =
- 	'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n";
+ 	'<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.=&build_section_inputs();
      my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
- Line 4091  LISTJAVASCRIPT
+ Line 4071  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;<b>'.&mt('Use CODE:').' </b>'.
+     $result.='&nbsp;'.&mt('<b>Use CODE: [_1] </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="Next->" /><br />'."\n";
+ 	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next-&gt;').'" /><br />'."\n";
      $request->print($result);
-     my $studentTable.='&nbsp;<b>Select a student you wish to grade and then click on the Next button.</b><br />'.
+     my $studentTable.='&nbsp;<b>'.&mt('Select a student you wish to grade and then click on the Next button.').'</b><br />'.
- 	'<table border="0"><tr><td bgcolor="#777777">'.
+ 	&Apache::loncommon::start_data_table().
- 	'<table border="0"><tr bgcolor="#e6ffff">'.
+ 	&Apache::loncommon::start_data_table_header_row().
- 	'<td align="right">&nbsp;<b>No.</b></td>'.
+ 	'<th align="right">&nbsp;'.&mt('No.').'</th>'.
- 	'<td>'.&nameUserString('header').'</td>'.
+ 	'<th>'.&nameUserString('header').'</th>'.
- 	'<td align="right">&nbsp;<b>No.</b></td>'.
+ 	'<th align="right">&nbsp;'.&mt('No.').'</th>'.
- 	'<td>'.&nameUserString('header').'</td></tr>';
+ 	'<th>'.&nameUserString('header').'</th>'.
+ 	&Apache::loncommon::end_data_table_header_row();
      my (undef,undef,$fullname) = &getclasslist($getsec,'1');
      my $ptr = 1;
- Line 4117  LISTJAVASCRIPT
+ Line 4099  LISTJAVASCRIPT
  			     return $a cmp $b;
  			 } (keys(%$fullname))) {
  	my ($uname,$udom) = split(/:/,$student);
- 	$studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>');
+ 	$studentTable.=($ptr%2==1 ? &Apache::loncommon::start_data_table_row()
+                                   : '</td>');
  	$studentTable.='<td align="right">'.$ptr.'&nbsp;</td>';
  	$studentTable.='<td>&nbsp;<label><input type="radio" name="student" value="'.$student.'" /> '
  	    .&nameUserString(undef,$$fullname{$student},$uname,$udom)."</label>\n";
- 	$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
+ 	$studentTable.=
+ 	    ($ptr%2 == 0 ? '</td>'.&Apache::loncommon::end_data_table_row()
+                          : '');
  	$ptr++;
      }
-     $studentTable.='</td><td>&nbsp;</td><td>&nbsp;</td></tr>' if ($ptr%2 == 0);
+     if ($ptr%2 == 0) {
-     $studentTable.='</table></td></tr></table>'."\n";
+ 	$studentTable.='</td><td>&nbsp;</td><td>&nbsp;</td>'.
+ 	    &Apache::loncommon::end_data_table_row();
+     }
+     $studentTable.=&Apache::loncommon::end_data_table()."\n";
      $studentTable.='<input type="button" '.
- 	'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";
+ 	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next-&gt;').'" /></form>'."\n";
      $studentTable.=&show_grading_menu_form($symb);
      $request->print($studentTable);
- Line 4179  sub displayPage {
+ Line 4167  sub displayPage {
      &Apache::lonnet::clear_EXT_cache_status();
      if (!&canview($usec)) {
- 	$request->print('<span class="LC_warning">Unable to view requested student.('.$env{'form.student'}.')</span>');
+ 	$request->print('<span class="LC_warning">'.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'</span>');
  	$request->print(&show_grading_menu_form($symb));
  	return;
      }
      my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
-     $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom).
+     $result.='<h3>&nbsp;'.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)).
  	'</h3>'."\n";
-     if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
+     $env{'form.CODE'} = uc($env{'form.CODE'});
- 	$result.='<h3>&nbsp;CODE: '.$env{'form.CODE'}.'</h3>'."\n";
+     if (&Apache::lonnet::validCODE(uc($env{'form.CODE'}))) {
+ 	$result.='<h3>&nbsp;'.&mt('CODE: [_1]',$env{'form.CODE'}).'</h3>'."\n";
      } else {
  	delete($env{'form.CODE'});
      }
- Line 4198  sub displayPage {
+ Line 4187  sub displayPage {
      my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
      my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
      if (!$map) {
- 	$request->print('<span class="LC_warning">Unable to view requested sequence. ('.$resUrl.')</span>');
+ 	$request->print('<span class="LC_warning">'.&mt('Unable to view requested sequence. ([_1])',$resUrl).'</span>');
  	$request->print(&show_grading_menu_form($symb));
  	return;
      }
- Line 4220  sub displayPage {
+ Line 4209  sub displayPage {
  	    '<input type="hidden" name="CODE" value="'.$env{'form.CODE'}.'" />'."\n";
      }
      my $checkIcon = '<img alt="'.&mt('Check Mark').
- 	'" src="'.$request->dir_config('lonIconsURL').
+ 	'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';
- 	'/check.gif" height="16" border="0" />';
-     $studentTable.='&nbsp;<b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.
+     $studentTable.='&nbsp;'.&mt('<b>Note:</b> Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon)."\n".
- 	' symbol.'."\n".
+ 	&Apache::loncommon::start_data_table().
- 	'<table border="0"><tr><td bgcolor="#777777">'.
+ 	&Apache::loncommon::start_data_table_header_row().
- 	'<table border="0"><tr bgcolor="#e6ffff">'.
+ 	'<th align="center">&nbsp;Prob.&nbsp;</th>'.
- 	'<td align="center"><b>&nbsp;Prob.&nbsp;</b></td>'.
+ 	'<th>&nbsp;'.($env{'form.vProb'} eq 'no' ? &mt('Title') : &mt('Problem Text')).'/'.&mt('Grade').'</th>'.
- 	'<td><b>&nbsp;'.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
+ 	&Apache::loncommon::end_data_table_header_row();
      &Apache::lonxml::clear_problem_counter();
      my ($depth,$question,$prob) = (1,1,1);
- Line 4242  sub displayPage {
+ Line 4230  sub displayPage {
  	    my $parts = $curRes->parts();
              my $title = $curRes->compTitle();
  	    my $symbx = $curRes->symb();
- 	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
+ 	    $studentTable.=
- 		(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
+ 		&Apache::loncommon::start_data_table_row().
+ 		'<td align="center" valign="top" >'.$prob.
+ 		(scalar(@{$parts}) == 1 ? ''
+ 		                        : '<br />('.&mt('[_1]&nbsp;parts)',
+ 							scalar(@{$parts}))
+ 		 ).
+ 		 '</td>';
  	    $studentTable.='<td valign="top">';
  	    my %form = ('CODE' => $env{'form.CODE'},);
  	    if ($env{'form.vProb'} eq 'yes' ) {
- Line 4258  sub displayPage {
+ Line 4252  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;<b>Correct answer:</b><br />'.$companswer;
+ 		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br />&nbsp;'.&mt('<b>Correct answer:</b><br />[_1]',$companswer);
  	    }
  	    my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
  	    if ($env{'form.lastSub'} eq 'datesub') {
  		if ($record{'version'} eq '') {
- 		    $studentTable.='<br />&nbsp;<span class="LC_warning">No recorded submission for this problem</span><br />';
+ 		    $studentTable.='<br />&nbsp;<span class="LC_warning">'.&mt('No recorded submission for this problem.').'</span><br />';
  		} else {
  		    my %responseType = ();
  		    foreach my $partid (@{$parts}) {
- Line 4301  sub displayPage {
+ Line 4295  sub displayPage {
          $curRes = $iterator->next();
      }
-     $studentTable.='</table></td></tr></table>'."\n".
+     $studentTable.='</table>'."\n".
- 	'<input type="button" value="Save" '.
+ 	'<input type="button" value="'.&mt('Save').'" '.
  	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
  	'</form>'."\n";
      $studentTable.=&show_grading_menu_form($symb);
- Line 4382  sub displaySubByDates {
+ Line 4376  sub displaySubByDates {
  		}
  	    }
  	    if (exists($$record{"$where.$partid.checkedin"})) {
- 		$displaySub[1].='Checked in by '.
+ 		$displaySub[1].=&mt('Checked in by [_1] into slot [_2]',
- 		    $$record{"$where.$partid.checkedin"}.' into slot '.
+ 				    $$record{"$where.$partid.checkedin"},
- 		    $$record{"$where.$partid.checkedin.slot"}.
+ 				    $$record{"$where.$partid.checkedin.slot"}).
- 		    '<br />';
+ 					'<br />';
  	    }
  	    if (exists $$record{"$where.$partid.award"}) {
- 		$displaySub[1].='<b>Part:</b>&nbsp;'.$display_part.' &nbsp;'.
+ 		$displaySub[1].='<b>'.&mt('Part:').'</b>&nbsp;'.$display_part.' &nbsp;'.
  		    lc($$record{"$where.$partid.award"}).' '.
  		    $mark{$$record{"$where.$partid.solved"}}.
  		    '<br />';
- Line 4450  sub updateGradeByPage {
+ Line 4444  sub updateGradeByPage {
      my $iterator = $navmap->getIterator($map->map_start(),
  					$map->map_finish());
-     my $studentTable='<table border="0"><tr><td bgcolor="#777777">'.
+     my $studentTable=
- 	'<table border="0"><tr bgcolor="#e6ffff">'.
+ 	&Apache::loncommon::start_data_table().
- 	'<td align="center"><b>&nbsp;Prob.&nbsp;</b></td>'.
+ 	&Apache::loncommon::start_data_table_header_row().
- 	'<td><b>&nbsp;Title&nbsp;</b></td>'.
+ 	'<th align="center">&nbsp;'.&mt('Prob.').'&nbsp;</th>'.
- 	'<td><b>&nbsp;Previous Score&nbsp;</b></td>'.
+ 	'<th>&nbsp;'.&mt('Title').'&nbsp;</th>'.
- 	'<td><b>&nbsp;New Score&nbsp;</b></td></tr>';
+ 	'<th>&nbsp;'.&mt('Previous Score').'&nbsp;</th>'.
+ 	'<th>&nbsp;'.&mt('New Score').'&nbsp;</th>'.
+ 	&Apache::loncommon::end_data_table_header_row();
      $iterator->next(); # skip the first BEGIN_MAP
      my $curRes = $iterator->next(); # for "current resource"
- Line 4468  sub updateGradeByPage {
+ Line 4464  sub updateGradeByPage {
  	    my $parts = $curRes->parts();
              my $title = $curRes->compTitle();
  	    my $symbx = $curRes->symb();
- 	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
+ 	    $studentTable.=
- 		(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
+ 		&Apache::loncommon::start_data_table_row().
+ 		'<td align="center" valign="top" >'.$prob.
+ 		(scalar(@{$parts}) == 1 ? ''
+                                         : '<br />('.&mt('[quant,_1,&nbsp;parts]',scalar(@{$parts}))
+ 		 ).')</td>';
  	    $studentTable.='<td valign="top">&nbsp;<b>'.$title.'</b>&nbsp;</td>';
  	    my %newrecord=();
  Line 4556  sub updateGradeByPage {
  	    $studentTable.='<td valign="top">'.$displayPts[0].'</td>'.
  		'<td valign="top">'.$displayPts[1].'</td>'.
- 		'</tr>';
+ 		&Apache::loncommon::end_data_table_row();
  	    $prob++;
  	}
          $curRes = $iterator->next();
      }
-     $studentTable.='</td></tr></table></td></tr></table>';
+     $studentTable.=&Apache::loncommon::end_data_table();
      $studentTable.=&show_grading_menu_form($env{'form.symb'});
      my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
  		  'The scores were changed for '.
  Line 4676  sub getSequenceDropDown {
      return $result;
  }
+ my %bubble_lines_per_response;     # no. bubble lines for each response.
+                                    # index is "symb.part_id"
+ my %first_bubble_line;             # First bubble line no. for each bubble.
+ my %subdivided_bubble_lines;       # no. bubble lines for optionresponse
+                                    # or matchresponse where an individual
+                                    # response can have multiple lines
+ my %responsetype_per_response;     # responsetype for each response
+ # Save and restore the bubble lines array to the form env.
+ sub save_bubble_lines {
+     foreach my $line (keys(%bubble_lines_per_response)) {
+ 	$env{"form.scantron.bubblelines.$line"}  = $bubble_lines_per_response{$line};
+ 	$env{"form.scantron.first_bubble_line.$line"} =
+ 	    $first_bubble_line{$line};
+         $env{"form.scantron.sub_bubblelines.$line"} =
+             $subdivided_bubble_lines{$line};
+         $env{"form.scantron.responsetype.$line"} =
+             $responsetype_per_response{$line};
+     }
+ }
+ sub restore_bubble_lines {
+     my $line = 0;
+     %bubble_lines_per_response = ();
+     while ($env{"form.scantron.bubblelines.$line"}) {
+ 	my $value = $env{"form.scantron.bubblelines.$line"};
+ 	$bubble_lines_per_response{$line} = $value;
+ 	$first_bubble_line{$line}  =
+ 	    $env{"form.scantron.first_bubble_line.$line"};
+         $subdivided_bubble_lines{$line} =
+             $env{"form.scantron.sub_bubblelines.$line"};
+         $responsetype_per_response{$line} =
+             $env{"form.scantron.responsetype.$line"};
+ 	$line++;
+     }
+ }
+ #  Given the parsed scanline, get the response for
+ #  'answer' number n:
+ 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};
+     my $selected = "";
+     for (my $bline = 0; $bline < $bubble_lines; $bline++) {
+ 	$selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":";
+ 	$bubble_line++;
+     }
+     return $selected;
+ }
  =pod
- Line 4820  sub scantron_selectphase {
+ Line 4882  sub scantron_selectphase {
      # Chunk of form to prompt for a file to grade and how:
-     $result.= <<SCANTRONFORM;
+     $result.= '
-     <table width="100%" border="0">
+     <br />
-     <tr>
+     <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
-      <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
+     <input type="hidden" name="command" value="scantron_warning" />
-       <td bgcolor="#777777">
+     '.$default_form_data.'
-        <input type="hidden" name="command" value="scantron_warning" />
+     '.&Apache::loncommon::start_data_table('LC_scantron_action').'
-         $default_form_data
+        '.&Apache::loncommon::start_data_table_header_row().'
-         <table width="100%" border="0">
+             <th colspan="2">
-           <tr bgcolor="#e6ffff">
+               &nbsp;'.&mt('Specify file and which Folder/Sequence to grade').'
-             <td colspan="2">
+             </th>
-               &nbsp;<b>Specify file and which Folder/Sequence to grade</b>
+        '.&Apache::loncommon::end_data_table_header_row().'
-             </td>
+        '.&Apache::loncommon::start_data_table_row().'
-           </tr>
+             <td> '.&mt('Sequence to grade:').' </td><td> '.$sequence_selector.' </td>
-           <tr bgcolor="#ffffe6">
+        '.&Apache::loncommon::end_data_table_row().'
-             <td> Sequence to grade: </td><td> $sequence_selector </td>
+        '.&Apache::loncommon::start_data_table_row().'
-           </tr>
+             <td> '.&mt('Filename of scoring office file:').' </td><td> '.$file_selector.' </td>
-           <tr bgcolor="#ffffe6">
+        '.&Apache::loncommon::end_data_table_row().'
-             <td> Filename of scoring office file: </td><td> $file_selector </td>
+        '.&Apache::loncommon::start_data_table_row().'
-           </tr>
+             <td> '.&mt('Format of data file:').' </td><td> '.$format_selector.' </td>
-           <tr bgcolor="#ffffe6">
+        '.&Apache::loncommon::end_data_table_row().'
-             <td> Format of data file: </td><td> $format_selector </td>
+        '.&Apache::loncommon::start_data_table_row().'
-           </tr>
+             <td> '.&mt('Saved CODEs to validate against:').' </td><td> '.$CODE_selector.' </td>
-           <tr bgcolor="#ffffe6">
+        '.&Apache::loncommon::end_data_table_row().'
-             <td> Saved CODEs to validate against: </td><td> $CODE_selector</td>
+        '.&Apache::loncommon::start_data_table_row().'
-           </tr>
+             <td> '.&mt('Each CODE is only to be used once:').'</td><td> '.$CODE_unique.' </td>
-           <tr bgcolor="#ffffe6">
+        '.&Apache::loncommon::end_data_table_row().'
-             <td> Each CODE is only to be used once:</td><td> $CODE_unique </td>
+        '.&Apache::loncommon::start_data_table_row().'
-           </tr>
+ 	    <td> '.&mt('Options:').' </td>
-           <tr bgcolor="#ffffe6">
- 	    <td> Options: </td>
              <td>
- 	       <label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br />
+ 	       <label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> '.&mt('Do only previously skipped records').'</label> <br />
-                <label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all existing corrections</label> <br />
+                <label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> '.&mt('Remove all existing corrections').'</label> <br />
-                <label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> Skip hidden resources when grading</label>
+                <label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> '.&mt('Skip hidden resources when grading').'</label>
  	    </td>
-           </tr>
+        '.&Apache::loncommon::end_data_table_row().'
-           <tr bgcolor="#ffffe6">
+        '.&Apache::loncommon::start_data_table_row().'
              <td colspan="2">
-               <input type="submit" value="Grading: Validate Scantron Records" />
+               <input type="submit" value="'.&mt('Grading: Validate Scantron Records').'" />
              </td>
-           </tr>
+        '.&Apache::loncommon::end_data_table_row().'
-         </table>
+     '.&Apache::loncommon::end_data_table().'
-        </td>
+     </form>
-      </form>
+ ';
-     </tr>
- SCANTRONFORM
      $r->print($result);
- Line 4874  SCANTRONFORM
+ Line 4932  SCANTRONFORM
  	# Chunk of form to prompt for a scantron file upload.
-         $r->print(<<SCANTRONFORM);
+         $r->print('
-     <tr>
+     <br />
-       <td bgcolor="#777777">
+     '.&Apache::loncommon::start_data_table('LC_scantron_action').'
-         <table width="100%" border="0">
+        '.&Apache::loncommon::start_data_table_header_row().'
-           <tr bgcolor="#e6ffff">
+             <th>
+               &nbsp;'.&mt('Specify a Scantron data file to upload.').'
+             </th>
+        '.&Apache::loncommon::end_data_table_header_row().'
+        '.&Apache::loncommon::start_data_table_row().'
              <td>
-               &nbsp;<b>Specify a Scantron data file to upload.</b>
+ ');
-             </td>
-           </tr>
-           <tr bgcolor="#ffffe6">
-             <td>
- SCANTRONFORM
      my $default_form_data=&defaultFormData(&get_symb($r,1));
      my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
-     $r->print(<<UPLOAD);
+     $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;
  	}
  	formname.submit();
      }
                </script>
-               <form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>
+               <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
-                 $default_form_data
+                 '.$default_form_data.'
-                 <input name='courseid' type='hidden' value='$cnum' />
+                 <input name="courseid" type="hidden" value="'.$cnum.'" />
-                 <input name='domainid' type='hidden' value='$cdom' />
+                 <input name="domainid" type="hidden" value="'.$cdom.'" />
-                 <input name='command' value='scantronupload_save' type='hidden' />
+                 <input name="command" value="scantronupload_save" type="hidden" />
-                 File to upload:<input type="file" name="upfile" size="50" />
+                 '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
                  <br />
-                 <input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
+                 <input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />
                </form>
- UPLOAD
+ ');
-         $r->print(<<SCANTRONFORM);
+         $r->print('
              </td>
-           </tr>
+        '.&Apache::loncommon::end_data_table_row().'
-         </table>
+        '.&Apache::loncommon::end_data_table().'
-       </td>
+ ');
-     </tr>
- SCANTRONFORM
      }
      # Chunk of the form that prompts to view a scoring office file,
      # corrected file, skipped records in a file.
-     $r->print(<<SCANTRONFORM);
+     $r->print('
-     <tr>
+    <br />
-       <form action='/adm/grades' name='scantron_download'>
+    <form action="/adm/grades" name="scantron_download">
-         <td bgcolor="#777777">
+      '.$default_form_data.'
- 	  $default_form_data
+      <input type="hidden" name="command" value="scantron_download" />
-           <input type="hidden" name="command" value="scantron_download" />
+      '.&Apache::loncommon::start_data_table('LC_scantron_action').'
-           <table width="100%" border="0">
+        '.&Apache::loncommon::start_data_table_header_row().'
-             <tr bgcolor="#e6ffff">
+               <th>
-               <td colspan="2">
+                 &nbsp;'.&mt('Download a scoring office file').'
-                 &nbsp;<b>Download a scoring office file</b>
+               </th>
-               </td>
+        '.&Apache::loncommon::end_data_table_header_row().'
-             </tr>
+        '.&Apache::loncommon::start_data_table_row().'
-             <tr bgcolor="#ffffe6">
+               <td> '.&mt('Filename of scoring office file: [_1]',$file_selector).'
-               <td> Filename of scoring office file: </td><td> $file_selector </td>
+                 <br />
-             </tr>
+                 <input type="submit" value="'.&mt('Download: Show List of Associated Files').'" />
-             <tr bgcolor="#ffffe6">
+        '.&Apache::loncommon::end_data_table_row().'
-               <td colspan="2">
+      '.&Apache::loncommon::end_data_table().'
-                 <input type="submit" value="Download: Show List of Associated Files" />
+    </form>
-               </td>
+    <br />
-             </tr>
+ ');
-           </table>
-         </td>
-       </form>
-     </tr>
- SCANTRONFORM
-     $r->print('<tr><td bgcolor="#777777">');
      &Apache::lonpickcode::code_list($r,2);
-     $r->print('</td></tr></table>');
      $r->print($grading_menu_button);
      return
  }
- Line 5031  sub get_scantron_config {
+ Line 5079  sub get_scantron_config {
  	$config{'IDstart'}=$config[5];
  	$config{'IDlength'}=$config[6];
  	$config{'Qstart'}=$config[7];
- 	$config{'Qlength'}=$config[8];
+  	$config{'Qlength'}=$config[8];
  	$config{'Qoff'}=$config[9];
  	$config{'Qon'}=$config[10];
  	$config{'PaperID'}=$config[11];
- Line 5105  sub username_to_idmap {
+ Line 5153  sub username_to_idmap {
                            - 'answer'
                                 'response' - new answer or 'none' if blank
                                 'question' - the bubble line to change
+                                'questionnum' - the question identifier,
+                                                may include subquestion.
    Returns:
      $line - the modified scanline
- Line 5117  sub username_to_idmap {
+ Line 5167  sub username_to_idmap {
  sub scantron_fixup_scanline {
      my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;
      if ($field eq 'ID') {
  	if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {
  	    return ($line,1,'New value too large');
- Line 5149  sub scantron_fixup_scanline {
+ Line 5197  sub scantron_fixup_scanline {
  		   $$scantron_config{'CODElength'})=$args->{'CODE'};
  	}
      } elsif ($field eq 'answer') {
- 	&scantron_get_maxbubble(); # Need the bubble counter info.
  	my $length=$scantron_config->{'Qlength'};
  	my $off=$scantron_config->{'Qoff'};
  	my $on=$scantron_config->{'Qon'};
  	my $answer=${off}x$length;
-         my $question_number = $args->{'question'} -1;
+ 	if ($args->{'response'} eq 'none') {
-         my $first_position  = $first_bubble_line{$question_number};
+ 	    &scan_data($scan_data,
- 	my $bubble_count    = $bubble_lines_per_response{$question_number};
+ 		       "$whichline.no_bubble.".$args->{'questionnum'},'1');
-         my $bubbles_per_line= $$scantron_config{'Qlength'};
+ 	} else {
-         my $final_answer;
+ 	    if ($on eq 'letter') {
-         if ($$scantron_config{'Qon'} eq 'letter'  ||
+ 		my @alphabet=('A'..'Z');
- 	    $$scantron_config{'Qon'} eq 'number') {
+ 		$answer=$alphabet[$args->{'response'}];
- 	    $bubbles_per_line = 10;
+ 	    } elsif ($on eq 'number') {
- 	}
+ 		$answer=$args->{'response'}+1;
- 	if (defined $args->{'response'}) {
+ 		if ($answer == 10) { $answer = '0'; }
- 	    if ($args->{'response'} eq 'none') {
- 		&scan_data($scan_data,
- 			   "$whichline.no_bubble.".$args->{'question'},'1');
  	    } else {
- 		my ($bubble_line, $bubble_number) = split(/:/,$args->{'response'});
+ 		substr($answer,$args->{'response'},1)=$on;
- 		if ($on eq 'letter') {
- 		    my @alphabet=('A'..'Z');
- 		    $answer=$alphabet[$bubble_number];
- 		} elsif ($on eq 'number') {
- 		    $answer=$args->$bubble_number+1;
- 		    if ($answer == 10) { $answer = '0'; }
- 		} else {
- 		    substr($answer,$args->{'response'},1)=$on;
- 		}
- 		&scan_data($scan_data,
- 			   "$whichline.no_bubble.".$args->{'question'},undef,'1');
- 		for (my $l = 0; $l < $bubble_count; $l++) {
- 		    if ($l eq $bubble_line) {
- 			$final_answer .= $answer;
- 		    } else {
- 			$final_answer .= ' ';
- 		    }
- 		}
  	    }
- 	    # $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
+ 	    &scan_data($scan_data,
- 	    #substr($line,$where-1,$length)=$answer;
+ 		       "$whichline.no_bubble.".$args->{'questionnum'},undef,'1');
- 	    substr($line,
- 		   $scantron_config->{'Qstart'}+$first_position-1,
- 		   $bubbles_per_line) = $final_answer;
  	}
+ 	my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
+ 	substr($line,$where-1,$length)=$answer;
      }
      return $line;
  }
- Line 5228  sub scan_data {
+ Line 5252  sub scan_data {
      return $scan_data->{$filename.'_'.$key};
  }
+ # ----- These first few routines are general use routines.----
+ # Return the number of occurences of a pattern in a string.
+ sub occurence_count {
+     my ($string, $pattern) = @_;
+     my @matches = ($string =~ /$pattern/g);
+     return scalar(@matches);
+ }
+ # Take a string known to have digits and convert all the
+ # digits into letters in the range J,A..I.
+ sub digits_to_letters {
+     my ($input) = @_;
+     my @alphabet = ('J', 'A'..'I');
+     my @input    = split(//, $input);
+     my $output ='';
+     for (my $i = 0; $i < scalar(@input); $i++) {
+ 	if ($input[$i] =~ /\d/) {
+ 	    $output .= $alphabet[$input[$i]];
+ 	} else {
+ 	    $output .= $input[$i];
+ 	}
+     }
+     return $output;
+ }
  =pod
  =item scantron_parse_scanline
- Line 5330  sub scantron_parse_scanline {
+ Line 5387  sub scantron_parse_scanline {
      $questions =~ s/\r$//;      # Get rid of trailing \r too (MAC or Win uploads).
      while (length($questions)) {
  	my $answers_needed = $bubble_lines_per_response{$questnum};
- 	my $answer_length  = $$scantron_config{'Qlength'} * $answers_needed;
+         my $answer_length  = ($$scantron_config{'Qlength'} * $answers_needed)
+                              || 1;
+         $questnum++;
+         my $quest_id = $questnum;
- 	$questnum++;
+         my $currentquest = substr($questions,0,$answer_length);
- 	my $currentquest = substr($questions,0,$answer_length);
+         $questions       = substr($questions,$answer_length);
- 	$questions       = substr($questions,0,$answer_length)='';
+         if (length($currentquest) < $answer_length) { next; }
- 	if (length($currentquest) < $answer_length) { next; }
+         if ($subdivided_bubble_lines{$questnum-1} =~ /,/) {
- 	# Qon letter implies for each slot in currentquest we have:
+             my $subquestnum = 1;
- 	#    ? or * for doubles a letter in A-Z for a bubble and
+             my $subquestions = $currentquest;
-         #    about anything else (esp. a value of Qoff for missing
+             my @subanswers_needed =
- 	#    bubbles.
+                 split(/,/,$subdivided_bubble_lines{$questnum-1});
+             foreach my $subans (@subanswers_needed) {
+                 my $subans_length =
- 	if ($$scantron_config{'Qon'} eq 'letter') {
+                     ($$scantron_config{'Qlength'} * $subans)  || 1;
+                 my $currsubquest = substr($subquestions,0,$subans_length);
- 	    if ($currentquest =~ /\?/
+                 $subquestions   = substr($subquestions,$subans_length);
- 		|| $currentquest =~ /\*/
+                 $quest_id = "$questnum.$subquestnum";
- 		|| (&occurence_count($currentquest, "[A-Z]") > 1)) {
+                 if (($$scantron_config{'Qon'} eq 'letter') ||
- 		push(@{$record{'scantron.doubleerror'}},$questnum);
+                     ($$scantron_config{'Qon'} eq 'number')) {
- 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
+                     $ansnum = &scantron_validator_lettnum($ansnum,
- 		    my $bubble = substr($currentquest, $ans, 1);
+                         $questnum,$quest_id,$subans,$currsubquest,$whichline,
- 		    if ($bubble =~ /[A-Z]/ ) {
+                         \@alphabet,\%record,$scantron_config,$scan_data);
- 			$record{"scantron.$ansnum.answer"} = $bubble;
+                 } else {
- 		    } else {
+                     $ansnum = &scantron_validator_positional($ansnum,
- 			$record{"scantron.$ansnum.answer"}='';
+                         $questnum,$quest_id,$subans,$currsubquest,$whichline,                        \@alphabet,\%record,$scantron_config,$scan_data);
- 		    }
+                 }
- 		    $ansnum++;
+                 $subquestnum ++;
- 		}
+             }
+         } else {
- 	    } elsif (!defined($currentquest)
+             if (($$scantron_config{'Qon'} eq 'letter') ||
- 		     || (&occurence_count($currentquest, $$scantron_config{'Qoff'}) == length($currentquest))
+                 ($$scantron_config{'Qon'} eq 'number')) {
- 		     || (&occurence_count($currentquest, "[A-Z]") == 0)) {
+                 $ansnum = &scantron_validator_lettnum($ansnum,$questnum,
- 		for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
+                     $quest_id,$answers_needed,$currentquest,$whichline,
- 		    $record{"scantron.$ansnum.answer"}='';
+                     \@alphabet,\%record,$scantron_config,$scan_data);
- 		    $ansnum++;
+             } else {
+                 $ansnum = &scantron_validator_positional($ansnum,$questnum,
- 		}
+                     $quest_id,$answers_needed,$currentquest,$whichline,
- 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+                     \@alphabet,\%record,$scantron_config,$scan_data);
- 		    push(@{$record{"scantron.missingerror"}},$questnum);
+             }
- 		   #  $ansnum += $answers_needed;
+         }
- 		}
+     }
- 	    } else {
+     $record{'scantron.maxquest'}=$questnum;
- 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
+     return \%record;
- 		    $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
+ }
- 		    $ansnum++;
- 		}
- 	    }
- 	# Qon 'number' implies each slot gives a digit that indexes the
- 	#    the bubbles filled or Qoff or a non number for unbubbled lines.
-         #    and *? for double bubbles on a line.
- 	#    these answers are also stored as letters.
- 	} elsif ($$scantron_config{'Qon'} eq 'number') {
- 	    if ($currentquest =~ /\?/
- 		|| $currentquest =~ /\*/
- 		|| (&occurence_count($currentquest, '\d') > 1)) {
- 		push(@{$record{'scantron.doubleerror'}},$questnum);
- 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
- 		    my $bubble = substr($currentquest, $ans, 1);
- 		    if ($bubble =~ /\d/) {
- 			$record{"scantron.$ansnum.answer"} = $alphabet[$bubble];
- 		    } else {
- 			$record{"scantron.$ansnum.answer"}=' ';
- 		    }
- 		    $ansnum++;
- 		}
- 	    } elsif (!defined($currentquest)
- 		     || (&occurence_count($currentquest,$$scantron_config{'Qoff'}) == length($currentquest))
- 		     || (&occurence_count($currentquest, '\d') == 0)) {
- 		for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
- 		    $record{"scantron.$ansnum.answer"}='';
- 		    $ansnum++;
- 		}
+ sub scantron_validator_lettnum {
- 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+     my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,$whichline,
- 		    push(@{$record{"scantron.missingerror"}},$questnum);
+         $alphabet,$record,$scantron_config,$scan_data) = @_;
- 		    $ansnum += $answers_needed;
- 		}
+     # Qon 'letter' implies for each slot in currquest we have:
+     #    ? or * for doubles, a letter in A-Z for a bubble, and
+     #    about anything else (esp. a value of Qoff) for missing
+     #    bubbles.
+     #
+     # Qon 'number' implies each slot gives a digit that indexes the
+     #    bubbles filled, or Qoff, or a non-number for unbubbled lines,
+     #    and * or ? for double bubbles on a single line.
+     #
- 	    } else {
+     my $matchon;
- 		$currentquest = &digits_to_letters($currentquest);
+     if ($$scantron_config{'Qon'} eq 'letter') {
- 		for (my $ans =0; $ans < $answers_needed; $ans++) {
+         $matchon = '[A-Z]';
- 		    $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
+     } elsif ($$scantron_config{'Qon'} eq 'number') {
- 		    $ansnum++;
+         $matchon = '\d';
- 		}
+     }
- 	    }
+     my $occurrences = 0;
- 	} else {
+     if (($responsetype_per_response{$questnum-1} eq 'essayresponse') ||
+         ($responsetype_per_response{$questnum-1} eq 'formularesponse') ||
+         ($responsetype_per_response{$questnum-1} eq 'stringresponse')) {
+         my @singlelines = split('',$currquest);
+         foreach my $entry (@singlelines) {
+             $occurrences = &occurence_count($entry,$matchon);
+             if ($occurrences > 1) {
+                 last;
+             }
+         }
+     } else {
+         $occurrences = &occurence_count($currquest,$matchon);
+     }
+     if (($currquest =~ /\?/ || $currquest =~ /\*/) || ($occurrences > 1)) {
+         push(@{$record->{'scantron.doubleerror'}},$quest_id);
+         for (my $ans=0; $ans<$answers_needed; $ans++) {
+             my $bubble = substr($currquest,$ans,1);
+             if ($bubble =~ /$matchon/ ) {
+                 if ($$scantron_config{'Qon'} eq 'number') {
+                     if ($bubble == 0) {
+                         $bubble = 10;
+                     }
+                     $record->{"scantron.$ansnum.answer"} =
+                         $alphabet->[$bubble-1];
+                 } else {
+                     $record->{"scantron.$ansnum.answer"} = $bubble;
+                 }
+             } else {
+                 $record->{"scantron.$ansnum.answer"}='';
+             }
+             $ansnum++;
+         }
+     } elsif (!defined($currquest)
+             || (&occurence_count($currquest, $$scantron_config{'Qoff'}) == length($currquest))
+             || (&occurence_count($currquest,$matchon) == 0)) {
+         for (my $ans=0; $ans<$answers_needed; $ans++ ) {
+             $record->{"scantron.$ansnum.answer"}='';
+             $ansnum++;
+         }
+         if (!&scan_data($scan_data,"$whichline.no_bubble.$quest_id")) {
+             push(@{$record->{'scantron.missingerror'}},$quest_id);
+         }
+     } else {
+         if ($$scantron_config{'Qon'} eq 'number') {
+             $currquest = &digits_to_letters($currquest);
+         }
+         for (my $ans=0; $ans<$answers_needed; $ans++) {
+             my $bubble = substr($currquest,$ans,1);
+             $record->{"scantron.$ansnum.answer"} = $bubble;
+             $ansnum++;
+         }
+     }
+     return $ansnum;
+ }
- 	    # Otherwise there's a positional notation;
+ sub scantron_validator_positional {
- 	    # each bubble line requires Qlength items, and there are filled in
+     my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,
- 	    # bubbles for each case where there 'Qon' characters.
+         $whichline,$alphabet,$record,$scantron_config,$scan_data) = @_;
- 	    #
- 	    my @array=split($$scantron_config{'Qon'},$currentquest,-1);
+     # Otherwise there's a positional notation;
+     # each bubble line requires Qlength items, and there are filled in
+     # bubbles for each case where there 'Qon' characters.
+     #
- 	    # If the split only  giveas us one element.. the full length of the
+     my @array=split($$scantron_config{'Qon'},$currquest,-1);
- 	    # answser string, no bubbles are filled in:
- 	    if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) {
+     # If the split only gives us one element.. the full length of the
- 		for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
+     # answer string, no bubbles are filled in:
- 		    $record{"scantron.$ansnum.answer"}='';
- 		    $ansnum++;
- 		}
+     if ($answers_needed eq '') {
- 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+         return;
- 		    push(@{$record{"scantron.missingerror"}},$questnum);
+     }
- 		}
- 	    } elsif (scalar(@array) lt 2) {
- 		my $location      = length($array[0]);
+     if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) {
- 		my $line_num      = $location / $$scantron_config{'Qlength'};
+         for (my $ans=0; $ans<$answers_needed; $ans++ ) {
- 		my $bubble        = $alphabet[$location % $$scantron_config{'Qlength'}];
+             $record->{"scantron.$ansnum.answer"}='';
+             $ansnum++;
+         }
+         if (!&scan_data($scan_data,"$whichline.no_bubble.$quest_id")) {
+             push(@{$record->{"scantron.missingerror"}},$quest_id);
+         }
+     } elsif (scalar(@array) == 2) {
+         my $location = length($array[0]);
+         my $line_num = int($location / $$scantron_config{'Qlength'});
+         my $bubble   = $alphabet->[$location % $$scantron_config{'Qlength'}];
+         for (my $ans=0; $ans<$answers_needed; $ans++) {
+             if ($ans eq $line_num) {
+                 $record->{"scantron.$ansnum.answer"} = $bubble;
+             } else {
+                 $record->{"scantron.$ansnum.answer"} = ' ';
+             }
+             $ansnum++;
+          }
+     } else {
+         #  If there's more than one instance of a bubble character
+         #  That's a double bubble; with positional notation we can
+         #  record all the bubbles filled in as well as the
+         #  fact this response consists of multiple bubbles.
+         #
+         if (($responsetype_per_response{$questnum-1} eq 'essayresponse') ||
+             ($responsetype_per_response{$questnum-1} eq 'formularesponse') ||
+             ($responsetype_per_response{$questnum-1} eq 'stringresponse')) {
+             my $doubleerror = 0;
+             while (($currquest >= $$scantron_config{'Qlength'}) &&
+                    (!$doubleerror)) {
+                my $currline = substr($currquest,0,$$scantron_config{'Qlength'});
+                $currquest = substr($currquest,$$scantron_config{'Qlength'});
+                my @currarray = split($$scantron_config{'Qon'},$currline,-1);
+                if (length(@currarray) > 2) {
+                    $doubleerror = 1;
+                }
+             }
+             if ($doubleerror) {
+                 push(@{$record->{'scantron.doubleerror'}},$quest_id);
+             }
+         } else {
+             push(@{$record->{'scantron.doubleerror'}},$quest_id);
+         }
+         my $item = $ansnum;
+         for (my $ans=0; $ans<$answers_needed; $ans++) {
+             $record->{"scantron.$item.answer"} = '';
+             $item ++;
+         }
- 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
+         my @ans=@array;
- 		    if ($ans eq $line_num) {
+         my $i=0;
- 			$record{"scantron.$ansnum.answer"} = $bubble;
+         my $increment = 0;
- 		    } else {
+         while ($#ans) {
- 			$record{"scantron.$ansnum.answer"} = ' ';
+             $i+=length($ans[0]) + $increment;
- 		    }
+             my $line   = int($i/$$scantron_config{'Qlength'} + $ansnum);
- 		    $ansnum++;
+             my $bubble = $i%$$scantron_config{'Qlength'};
- 		}
+             $record->{"scantron.$line.answer"}.=$alphabet->[$bubble];
- 	    }
+             shift(@ans);
- 	    #  If there's more than one instance of a bubble character
+             $increment = 1;
- 	    #  That's a double bubble; with positional notation we can
+         }
- 	    #  record all the bubbles filled in as well as the
+         $ansnum += $answers_needed;
- 	    #  fact this response consists of multiple bubbles.
- 	    #
- 	    else {
- 		push(@{$record{'scantron.doubleerror'}},$questnum);
- 		my $first_answer = $ansnum;
- 		for (my $ans =0; $ans < $answers_needed; $ans++) {
- 		    my $item = $first_answer+$ans;
- 		    $record{"scantron.$item.answer"} = '';
- 		}
- 		my @ans=@array;
- 		my $i=0;
- 		my $increment = 0;
- 		while ($#ans) {
- 		    $i+=length($ans[0]) + $increment;
- 		    my $line   = int($i/$$scantron_config{'Qlength'} + $first_answer);
- 		    my $bubble = $i%$$scantron_config{'Qlength'};
- 		    $record{"scantron.$line.answer"}.=$alphabet[$bubble];
- 		    shift(@ans);
- 		    $increment = 1;
- 		}
- 		$ansnum += $answers_needed;
- 	    }
- 	}
      }
-     $record{'scantron.maxquest'}=$questnum;
+     return $ansnum;
-     return \%record;
  }
  =pod
- Line 5626  sub scantron_process_corrections {
+ Line 5732  sub scantron_process_corrections {
  		&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,
  					 $which,'answer',
  					 { 'question'=>$question,
- 		       'response'=>$env{"form.scantron_correct_Q_$question"}});
+ 		      		   'response'=>$env{"form.scantron_correct_Q_$question"},
+                                    'questionnum'=>$env{"form.scantron_questionnum_Q_$question"}});
  	    if ($err) { last; }
  	}
      }
- Line 5731  sub remember_current_skipped {
+ Line 5838  sub remember_current_skipped {
  sub check_for_error {
      my ($r,$result)=@_;
      if ($result ne 'ok' && $result ne 'not_found' ) {
- 	$r->print("An error occurred ($result) when trying to Remove the existing corrections.");
+ 	$r->print(&mt("An error occurred ([_1]) when trying to remove the existing corrections.",$result));
      }
  }
- Line 5755  sub scantron_warning_screen {
+ Line 5862  sub scantron_warning_screen {
  	$CODElist=$env{'form.scantron_CODElist'};
  	if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; }
  	$CODElist=
- 	    '<tr><td><b>List of CODES to validate against:</b></td><td><tt>'.
+ 	    '<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'.
  	    $env{'form.scantron_CODElist'}.'</tt></td></tr>';
      }
-     return (<<STUFF);
+     return ('
  <p>
- <span class="LC_warning">Please double check the information
+ <span class="LC_warning">
-                  below before clicking on '$button_text'</span>
+ '.&mt('Please double check the information below before clicking on \'[_1]\'',&mt($button_text)).'</span>
  </p>
  <table>
- <tr><td><b>Sequence to be Graded:</b></td><td>$title</td></tr>
+ <tr><td><b>'.&mt('Sequence to be Graded:').'</b></td><td>'.$title.'</td></tr>
- <tr><td><b>Data File that will be used:</b></td><td><tt>$env{'form.scantron_selectfile'}</tt></td></tr>
+ <tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr>
- $CODElist
+ '.$CODElist.'
  </table>
  <br />
- <p> If this information is correct, please click on '$button_text'.</p>
+ <p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'</p>
- <p> If something is incorrect, please click the 'Grading Menu' button to start over.</p>
+ <p> '.&mt('If something is incorrect, please click the \'Grading Menu\' button to start over.').'</p>
  <br />
- STUFF
+ ');
  }
  =pod
- Line 5794  sub scantron_do_warning {
+ Line 5901  sub scantron_do_warning {
      if ( $env{'form.selectpage'} eq '' ||
  	 $env{'form.scantron_selectfile'} eq '' ||
  	 $env{'form.scantron_format'} eq '' ) {
- 	$r->print("<p>You have forgetten to specify some information. Please go Back and try again.</p>");
+ 	$r->print("<p>".&mt('You have forgetten to specify some information. Please go Back and try again.')."</p>");
  	if ( $env{'form.selectpage'} eq '') {
- 	    $r->print('<p><span class="LC_error">You have not selected a Sequence to grade</span></p>');
+ 	    $r->print('<p><span class="LC_error">'.&mt('You have not selected a Sequence to grade').'</span></p>');
  	}
  	if ( $env{'form.scantron_selectfile'} eq '') {
- 	    $r->print('<p><span class="LC_error">You have not selected a file that contains the student\'s response data.</span></p>');
+ 	    $r->print('<p><span class="LC_error">'.&mt('You have not selected a file that contains the student\'s response data.').'</span></p>');
  	}
  	if ( $env{'form.scantron_format'} eq '') {
- 	    $r->print('<p><span class="LC_error">You have not selected a the format of the student\'s response data.</span></p>');
+ 	    $r->print('<p><span class="LC_error">'.&mt('You have not selected a the format of the student\'s response data.').'</span></p>');
  	}
      } else {
  	my $warning=&scantron_warning_screen('Grading: Validate Records');
- 	$r->print(<<STUFF);
+ 	$r->print('
- $warning
+ '.$warning.'
- <input type="submit" name="submit" value="Grading: Validate Records" />
+ <input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" />
  <input type="hidden" name="command" value="scantron_validate" />
- STUFF
+ ');
      }
      $r->print("</form><br />".&show_grading_menu_form($symb));
      return '';
- Line 5845  SCANTRONFORM
+ Line 5952  SCANTRONFORM
  	   '<input type="hidden" name="scantron.bubblelines.'.$line.'" value="'.$env{"form.scantron.bubblelines.$line"}.'" />'."\n";
         $chunk .=
  	   '<input type="hidden" name="scantron.first_bubble_line.'.$line.'" value="'.$env{"form.scantron.first_bubble_line.$line"}.'" />'."\n";
+        $chunk .=
+            '<input type="hidden" name="scantron.sub_bubblelines.'.$line.'" value="'.$env{"form.scantron.sub_bubblelines.$line"}.'" />'."\n";
+        $chunk .=
+            '<input type="hidden" name="scantron.responsetype.'.$line.'" value="'.$env{"form.scantron.responsetype.$line"}.'" />'."\n";
         $result .= $chunk;
         $line++;
     }
- Line 5889  sub scantron_validate_file {
+ Line 6000  sub scantron_validate_file {
      if ($env{'form.scantron_corrections'}) {
  	&scantron_process_corrections($r);
      }
-     $r->print("<p>Gathering necessary info.</p>");$r->rflush();
+     $r->print('<p>'.&mt('Gathering necessary information.').'</p>');$r->rflush();
      #get the student pick code ready
      $r->print(&Apache::loncommon::studentbrowser_javascript());
      my $max_bubble=&scantron_get_maxbubble();
- Line 5909  sub scantron_validate_file {
+ Line 6020  sub scantron_validate_file {
      my $stop=0;
      while (!$stop && $currentphase < scalar(@validate_phases)) {
- 	$r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");
+ 	$r->print(&mt('Validating '.$validate_phases[$currentphase]).'<br />');
  	$r->rflush();
  	my $which="scantron_validate_".$validate_phases[$currentphase];
  	{
- Line 5919  sub scantron_validate_file {
+ Line 6030  sub scantron_validate_file {
      }
      if (!$stop) {
  	my $warning=&scantron_warning_screen('Start Grading');
- 	$r->print(<<STUFF);
+ 	$r->print('
- Validation process complete.<br />
+ <b>'.&mt('Validation process complete.').'<b><br />
- $warning
+ '.$warning.'
- <input type="submit" name="submit" value="Start Grading" />
+ <input type="submit" name="submit" value="'.&mt('Start Grading').'" />
  <input type="hidden" name="command" value="scantron_process" />
- STUFF
+ ');
      } else {
  	$r->print('<input type="hidden" name="command" value="scantron_validate" />');
- Line 5932  STUFF
+ Line 6043  STUFF
      }
      if ($stop) {
  	if ($validate_phases[$currentphase] eq 'sequence') {
- 	    $r->print('<input type="submit" name="submit" value="Ignore -> " />');
+ 	    $r->print('<input type="submit" name="submit" value="'.&mt('Ignore -&gt;').' " />');
- 	    $r->print(' this error <br />');
+ 	    $r->print(' '.&mt('this error').' <br />');
- 	    $r->print(" <p>Or click the 'Grading Menu' button to start over.</p>");
+ 	    $r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>");
  	} else {
- 	    $r->print('<input type="submit" name="submit" value="Continue ->" />');
+             if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') {
- 	    $r->print(' using corrected info <br />');
+ 	        $r->print('<input type="button" name="submitbutton" value="'.&mt('Continue -&gt;').'" onclick="javascript:verify_bubble_radio(this.form)" />');
- 	    $r->print("<input type='submit' value='Skip' name='scantron_skip_record' />");
+             } else {
- 	    $r->print(" this scanline saving it for later.");
+                 $r->print('<input type="submit" name="submit" value="'.&mt('Continue -&gt;').'" />');
+             }
+ 	    $r->print(' '.&mt('using corrected info').' <br />');
+ 	    $r->print("<input type='submit' value='".&mt("Skip")."' name='scantron_skip_record' />");
+ 	    $r->print(" ".&mt("this scanline saving it for later."));
  	}
      }
      $r->print(" </form><br />".&show_grading_menu_form($symb));
- Line 6001  sub scantron_remove_scan_data {
+ Line 6116  sub scantron_remove_scan_data {
      }
      my $result;
      if (@todelete) {
- 	$result=&Apache::lonnet::del('nohist_scantrondata',\@todelete,$cdom,$cname);
+ 	$result = &Apache::lonnet::del('nohist_scantrondata',
+ 				       \@todelete,$cdom,$cname);
+     } else {
+ 	$result = 'ok';
      }
      return $result;
  }
- Line 6416  sub scantron_validate_ID {
+ Line 6534  sub scantron_validate_ID {
  sub scantron_get_correction {
      my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
  #FIXME in the case of a duplicated ID the previous line, probably need
  #to show both the current line and the previous one and allow skipping
  #the previous one or the current one
-     $r->print("<p><b>An error was detected ($error)</b>");
      if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {
- 	$r->print(" for PaperID <tt>".
+ 	$r->print("<p>".&mt("<b>An error was detected ($error)</b>".
- 		  $$scan_record{'scantron.PaperID'}."</tt> \n");
+ 			    " for PaperID <tt>[_1]</tt>",
+ 			    $$scan_record{'scantron.PaperID'})."</p> \n");
      } else {
- 	$r->print(" in scanline $i <pre>".
+ 	$r->print("<p>".&mt("<b>An error was detected ($error)</b>".
- 		  $line."</pre> \n");
+ 			    " in scanline [_1] <pre>[_2]</pre>",
-     }
+ 			    $i,$line)."</p> \n");
-     my $message="<p>The ID on the form is  <tt>".
+     }
- 	$$scan_record{'scantron.ID'}."</tt><br />\n".
+     my $message="<p>".&mt("The ID on the form is  <tt>[_1]</tt><br />".
- 	"The name on the paper is ".
+ 			  "The name on the paper is [_2],[_3]",
- 	$$scan_record{'scantron.LastName'}.",".
+ 			  $$scan_record{'scantron.ID'},
- 	$$scan_record{'scantron.FirstName'}."</p>";
+ 			  $$scan_record{'scantron.LastName'},
+ 			  $$scan_record{'scantron.FirstName'})."</p>";
      $r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
      $r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");
+                            # Array populated for doublebubble or
+     my @lines_to_correct;  # missingbubble errors to build javascript
+                            # to validate radio button checking
      if ($error =~ /ID$/) {
  	if ($error eq 'incorrectID') {
- 	    $r->print("The encoded ID is not in the classlist</p>\n");
+ 	    $r->print("<p>".&mt("The encoded ID is not in the classlist").
+ 		      "</p>\n");
  	} elsif ($error eq 'duplicateID') {
- 	    $r->print("The encoded ID has also been used by a previous paper $arg</p>\n");
+ 	    $r->print("<p>".&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");
  	}
  	$r->print($message);
- 	$r->print("<p>How should I handle this? <br /> \n");
+ 	$r->print("<p>".&mt("How should I handle this?")." <br /> \n");
  	$r->print("\n<ul><li> ");
  	#FIXME it would be nice if this sent back the user ID and
  	#could do partial userID matches
- Line 6457  sub scantron_get_correction {
+ Line 6580  sub scantron_get_correction {
  	$r->print('</li>');
      } elsif ($error =~ /CODE$/) {
  	if ($error eq 'incorrectCODE') {
- 	    $r->print("</p><p>The encoded CODE is not in the list of possible CODEs</p>\n");
+ 	    $r->print("<p>".&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n");
  	} elsif ($error eq 'duplicateCODE') {
- 	    $r->print("</p><p>The encoded CODE has also been used by a previous paper ".join(', ',@{$arg}).", and CODEs are supposed to be unique</p>\n");
+ 	    $r->print("<p>".&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n");
  	}
- 	$r->print("<p>The CODE on the form is  <tt>'".
+ 	$r->print("<p>".&mt("The CODE on the form is  <tt>'[_1]'</tt>",
- 		  $$scan_record{'scantron.CODE'}."'</tt><br />\n");
+ 			    $$scan_record{'scantron.CODE'})."<br />\n");
  	$r->print($message);
- 	$r->print("<p>How should I handle this? <br /> \n");
+ 	$r->print("<p>".&mt("How should I handle this?")." <br /> \n");
  	$r->print("\n<br /> ");
  	my $i=0;
  	if ($error eq 'incorrectCODE'
- Line 6474  sub scantron_get_correction {
+ Line 6597  sub scantron_get_correction {
  		foreach my $testcode (@{$closest}) {
  		    my $checked='';
  		    if (!$i) { $checked=' checked="checked" '; }
- 		    $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.</label><input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");
+ 		    $r->print("
+    <label>
+        <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>
+     <input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");
  		    $r->print("\n<br />");
  		    $i++;
  		}
- Line 6482  sub scantron_get_correction {
+ Line 6611  sub scantron_get_correction {
  	}
  	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
  	    my $checked; if (!$i) { $checked=' checked="checked" '; }
- 	    $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> Use the CODE <b><tt>".$$scan_record{'scantron.CODE'}."</tt></b> that is was on the paper, ignoring the error.</label>");
+ 	    $r->print("
+     <label>
+         <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>");
  	    $r->print("\n<br />");
  	}
- Line 6504  ENDSCRIPT
+ Line 6638  ENDSCRIPT
  	   "&curCODE=".&escape($$scan_record{'scantron.CODE'}).
  	   "&scantron_selectfile=".&escape($env{'form.scantron_selectfile'});
  	if ($env{'form.scantron_CODElist'} =~ /\S/) {
- 	    $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it.</label> Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />");
+ 	    $r->print("
+     <label>
+        <input type='radio' name='scantron_CODE_resolution' value='use_found' />
+        ".&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')\" />"));
  	    $r->print("\n<br />");
  	}
- 	$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use </label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" /> as the CODE.");
+ 	$r->print("
+     <label>
+        <input type='radio' name='scantron_CODE_resolution' value='use_typed' />
+        ".&mt("Use [_1] as the CODE.",
+ 	     "</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />"));
  	$r->print("\n<br /><br />");
      } elsif ($error eq 'doublebubble') {
- 	$r->print("<p>There have been multiple bubbles scanned for a some question(s)</p>\n");
+ 	$r->print("<p>".&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n");
+ 	# The form field scantron_questions is acutally a list of line numbers.
+ 	# represented by this form so:
+ 	my $line_list = &questions_to_line_list($arg);
  	$r->print('<input type="hidden" name="scantron_questions" value="'.
- 		  join(',',@{$arg}).'" />');
+ 		  $line_list.'" />');
  	$r->print($message);
- 	$r->print("<p>Please indicate which bubble should be used for grading</p>");
+ 	$r->print("<p>".&mt("Please indicate which bubble should be used for grading")."</p>");
  	foreach my $question (@{$arg}) {
- 	    my $selected  = &get_response_bubbles($scan_record, $question);
+ 	    my @linenums = &prompt_for_corrections($r,$question,$scan_config,
- 	    my @select_array = split(/:/,$selected);
+                                                    $scan_record, $error);
- 	    &scantron_bubble_selector($r,$scan_config,$question,
+             push (@lines_to_correct,@linenums);
- 				      @select_array);
  	}
+         $r->print(&verify_bubbles_checked(@lines_to_correct));
      } elsif ($error eq 'missingbubble') {
- 	$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
+ 	$r->print("<p>".&mt("There have been <b>no</b> bubbles scanned for some question(s)")."</p>\n");
  	$r->print($message);
- 	$r->print("<p>Please indicate which bubble should be used for grading</p>");
+ 	$r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>");
- 	$r->print("Some questions have no scanned bubbles\n");
+ 	$r->print(&mt("Some questions have no scanned bubbles.")."\n");
+ 	# The form field scantron_questions is actually a list of line numbers not
+ 	# a list of question numbers. Therefore:
+ 	#
+ 	my $line_list = &questions_to_line_list($arg);
  	$r->print('<input type="hidden" name="scantron_questions" value="'.
- 		  join(',',@{$arg}).'" />');
+ 		  $line_list.'" />');
  	foreach my $question (@{$arg}) {
- 	    my $selected = &get_response_bubbles($scan_record, $question);
+ 	    my @linenums = &prompt_for_corrections($r,$question,$scan_config,
- 	    my @select_array = split(/:/,$selected); # ought to be an array of empties.
+                                                    $scan_record, $error);
- 	    &scantron_bubble_selector($r,$scan_config,$question, @select_array);
+             push (@lines_to_correct,@linenums);
  	}
+         $r->print(&verify_bubbles_checked(@lines_to_correct));
      } else {
  	$r->print("\n<ul>");
      }
      $r->print("\n</li></ul>");
+ }
+ sub verify_bubbles_checked {
+     my (@ansnums) = @_;
+     my $ansnumstr = join('","',@ansnums);
+     my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines.");
+     my $output = (<<ENDSCRIPT);
+ <script type="text/javascript">
+ function verify_bubble_radio(form) {
+     var ansnumArray = new Array ("$ansnumstr");
+     var need_bubble_count = 0;
+     for (var i=0; i<ansnumArray.length; i++) {
+         if (form.elements["scantron_correct_Q_"+ansnumArray[i]].length > 1) {
+             var bubble_picked = 0;
+             for (var j=0; j<form.elements["scantron_correct_Q_"+ansnumArray[i]].length; j++) {
+                 if (form.elements["scantron_correct_Q_"+ansnumArray[i]][j].checked == true) {
+                     bubble_picked = 1;
+                 }
+             }
+             if (bubble_picked == 0) {
+                 need_bubble_count ++;
+             }
+         }
+     }
+     if (need_bubble_count) {
+         alert("$warning");
+         return;
+     }
+     form.submit();
+ }
+ </script>
+ ENDSCRIPT
+     return $output;
  }
  =pod
- =item scantron_bubble_selector
+ =item  questions_to_line_list
-    Generates the html radiobuttons to correct a single bubble line
-    possibly showing the existing the selected bubbles if known
-  Arguments:
+ Converts a list of questions into a string of comma separated
-     $r           - Apache request object
+ line numbers in the answer sheet used by the questions.  This is
-     $scan_config - hash from &get_scantron_config()
+ used to fill in the scantron_questions form field.
-     $quest       - number of the bubble line to make a corrector for
-     @lines       - array of answer lines.
- =cut
+   Arguments:
+      questions    - Reference to an array of questions.
- sub scantron_bubble_selector {
+ =cut
-     my ($r,$scan_config,$quest,@lines)=@_;
-     my $max=$$scan_config{'Qlength'};
-     my $scmode=$$scan_config{'Qon'};
+ sub questions_to_line_list {
+     my ($questions) = @_;
+     my @lines;
+     foreach my $item (@{$questions}) {
+         my $question = $item;
+         my ($first,$count,$last);
+         if ($item =~ /^(\d+)\.(\d+)$/) {
+             $question = $1;
+             my $subquestion = $2;
+             $first = $first_bubble_line{$question-1} + 1;
+             my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
+             my $subcount = 1;
+             while ($subcount<$subquestion) {
+                 $first += $subans[$subcount-1];
+                 $subcount ++;
+             }
+             $count = $subans[$subquestion-1];
+         } else {
+ 	    $first   = $first_bubble_line{$question-1} + 1;
+ 	    $count   = $bubble_lines_per_response{$question-1};
+         }
+         $last = $first+$count-1;
+         push(@lines, ($first..$last));
+     }
+     return join(',', @lines);
+ }
-     my $bubble_length = scalar(@lines);
+ =pod
+ =item prompt_for_corrections
-     if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }
+ Prompts for a potentially multiline correction to the
+ user's bubbling (factors out common code from scantron_get_correction
+ for multi and missing bubble cases).
-     my $response = $quest-1;
+  Arguments:
-     my $lines = $bubble_lines_per_response{$response};
+    $r           - Apache request object.
+    $question    - The question number to prompt for.
+    $scan_config - The scantron file configuration hash.
+    $scan_record - Reference to the hash that has the the parsed scanlines.
+    $error       - Type of error
+  Implicit inputs:
+    %bubble_lines_per_response   - Starting line numbers for each question.
+                                   Numbered from 0 (but question numbers are from
+.
+    %first_bubble_line           - Starting bubble line for each question.
+    %subdivided_bubble_lines     - optionresponse and matchresponse type
+                                   problems render as separate sub-questions,
+                                   in exam mode. This hash contains a
+                                   comma-separated list of the lines per
+                                   sub-question.
+    %responsetype_per_response   - essayresponse, forumalaresponse, and
+                                   stringresponse type problem parts can have
+                                   multiple lines per response if the weight
+                                   assigned exceeds 10.  In this case, only
+                                   one bubble per line is permitted, but more
+                                   than one line might contain bubbles, e.g.
+                                   bubbling of: line 1 - J, line 2 - J,
+                                   line 3 - B would assign 22 points.
-     my $total_lines = $lines*2;
+ =cut
-     my @alphabet=('A'..'Z');
-     $r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>");
+ sub prompt_for_corrections {
+     my ($r, $question, $scan_config, $scan_record, $error) = @_;
+     my ($current_line,$lines);
+     my @linenums;
+     my $questionnum = $question;
+     if ($question =~ /^(\d+)\.(\d+)$/) {
+         $question = $1;
+         $current_line = $first_bubble_line{$question-1} + 1 ;
+         my $subquestion = $2;
+         my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
+         my $subcount = 1;
+         while ($subcount<$subquestion) {
+             $current_line += $subans[$subcount-1];
+             $subcount ++;
+         }
+         $lines = $subans[$subquestion-1];
+     } else {
+         $current_line = $first_bubble_line{$question-1} + 1 ;
+         $lines        = $bubble_lines_per_response{$question-1};
+     }
+     if ($lines > 1) {
+         $r->print(&mt('The group of bubble lines below responds to a single question.').'<br />');
+         if (($responsetype_per_response{$question-1} eq 'essayresponse') ||
+             ($responsetype_per_response{$question-1} eq 'formularesponse') ||
+             ($responsetype_per_response{$question-1} eq 'stringresponse')) {
+             $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 />');
+         } else {
+             $r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />");
+         }
+     }
+     for (my $i =0; $i < $lines; $i++) {
+         my $selected = $$scan_record{"scantron.$current_line.answer"};
+ 	&scantron_bubble_selector($r,$scan_config,$current_line,
+ 	        		  $questionnum,$error,split('', $selected));
+         push (@linenums,$current_line);
+ 	$current_line++;
+     }
+     if ($lines > 1) {
+ 	$r->print("<hr /><br />");
+     }
+     return @linenums;
+ }
-     for (my $l = 0; $l < $lines; $l++) {
+ =pod
- 	if ($l != 0) {
- 	    $r->print('<tr>');
- 	}
- 	my @selected = split(//,$lines[$l]);
- 	for (my $i=0;$i<$max;$i++) {
- 	    $r->print("\n".'<td align="center">');
- 	    if ($selected[0] eq $alphabet[$i]) {
- 		$r->print('X');
- 		shift(@selected) ;
- 	    } else {
- 		$r->print('&nbsp;');
- 	    }
- 	    $r->print('</td>');
- 	}
- 	if ($l == 0) {
+ =item scantron_bubble_selector
- 	    my $lspan = $total_lines * 2;   #  2 table rows per bubble line.
+    Generates the html radiobuttons to correct a single bubble line
+    possibly showing the existing the selected bubbles if known
- 	    $r->print('<td rowspan='.$lspan.'><label><input type="radio" name="scantron_correct_Q_'.
+  Arguments:
- 	      $quest.'" value="none" /> No bubble </label></td>');
+     $r           - Apache request object
+     $scan_config - hash from &get_scantron_config()
- 	}
+     $line        - Number of the line being displayed.
+     $questionnum - Question number (may include subquestion)
+     $error       - Type of error.
+     @selected    - Array of bubbles picked on this line.
- 	$r->print('</tr><tr>');
+ =cut
- 	# FIXME: This may have to be a bit more clever for
+ sub scantron_bubble_selector {
- 	#        multiline questions (different values e.g..).
+     my ($r,$scan_config,$line,$questionnum,$error,@selected)=@_;
+     my $max=$$scan_config{'Qlength'};
- 	for (my $i=0;$i<$max;$i++) {
+     my $scmode=$$scan_config{'Qon'};
- 	    my $value = "$l:$i";	# Relative bubble line #: Bubble in line.
+     if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }
- 	    $r->print("\n".
- 		      '<td><label><input type="radio" name="scantron_correct_Q_'.
- 		      $quest.'" value="'.$value.'" />'.$alphabet[$i]."</label></td>");
- 	}
- 	$r->print('</tr>');
+     my @alphabet=('A'..'Z');
-     }
+     $r->print(&Apache::loncommon::start_data_table().
-     $r->print('</table>');
+               &Apache::loncommon::start_data_table_row());
+     $r->print('<td rowspan="2" class="LC_leftcol_header">'.$line.'</td>');
+     for (my $i=0;$i<$max+1;$i++) {
+ 	$r->print("\n".'<td align="center">');
+ 	if ($selected[0] eq $alphabet[$i]) { $r->print('X'); shift(@selected) }
+ 	else { $r->print('&nbsp;'); }
+ 	$r->print('</td>');
+     }
+     $r->print(&Apache::loncommon::end_data_table_row().
+               &Apache::loncommon::start_data_table_row());
+     for (my $i=0;$i<$max;$i++) {
+ 	$r->print("\n".
+ 		  '<td><label><input type="radio" name="scantron_correct_Q_'.
+ 		  $line.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");
+     }
+     my $nobub_checked = ' ';
+     if ($error eq 'missingbubble') {
+         $nobub_checked = ' checked = "checked" ';
+     }
+     $r->print("\n".'<td><label><input type="radio" name="scantron_correct_Q_'.
+ 	      $line.'" value="none"'.$nobub_checked.'/>'.&mt('No bubble').
+               '</label>'."\n".'<input type="hidden" name="scantron_questionnum_Q_'.
+               $line.'" value="'.$questionnum.'" /></td>');
+     $r->print(&Apache::loncommon::end_data_table_row().
+               &Apache::loncommon::end_data_table());
  }
  =pod
- Line 6795  sub scantron_validate_doublebubble {
+ Line 7081  sub scantron_validate_doublebubble {
      #get scantron line setup
      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
      my ($scanlines,$scan_data)=&scantron_getfile();
      &scantron_get_maxbubble();	# parse needs the bubble line array.
      for (my $i=0;$i<=$scanlines->{'count'};$i++) {
- Line 6822  sub scantron_validate_doublebubble {
+ Line 7107  sub scantron_validate_doublebubble {
     for what the current value of the problem counter is.
     Caches the results to $env{'form.scantron_maxbubble'},
-    $env{'form.scantron.bubble_lines.n'} and
+    $env{'form.scantron.bubble_lines.n'},
-    $env{'form.scantron.first_bubble_line.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 reponse n and number of the first bubble line for response n.
+    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 items only), for response n.
  =cut
  sub scantron_get_maxbubble {
      if (defined($env{'form.scantron_maxbubble'}) &&
  	$env{'form.scantron_maxbubble'}) {
  	&restore_bubble_lines();
- Line 6851  sub scantron_get_maxbubble {
+ Line 7139  sub scantron_get_maxbubble {
      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();
+         # Need to retrieve part IDs and response IDs because essayresponse
- 	&Apache::lonxml::clear_bubble_lines_for_part();
+         # items are not included in $analysis{'parts'} from lonnet::ssi.
+         my %possible_part_ids;
+         if (ref($resource->parts()) eq 'ARRAY') {
+             foreach my $part (@{$resource->parts()}) {
+                 my @resp_ids = $resource->responseIds($part);
+                 foreach my $id (@resp_ids) {
+                     $possible_part_ids{$part.'.'.$id} = 1;
+                 }
+             }
+         }
  	my $result=&Apache::lonnet::ssi($resource->src(),
  					('symb' => $resource->symb()),
  					('grade_target' => 'analyze'),
- Line 6867  sub scantron_get_maxbubble {
+ Line 7165  sub scantron_get_maxbubble {
  	my (undef, $an) =
  	    split(/_HASH_REF__/,$result, 2);
- 	my %analysis = &Apache::lonnet::str2hash($an);
+         my @parts;
- 	foreach my $part_id (@{$analysis{'parts'}}) {
+ 	my %analysis = &Apache::lonnet::str2hash($an);
+         if (ref($analysis{'parts'}) eq 'ARRAY') {
+             @parts = @{$analysis{'parts'}};
+         }
+         # Add part_ids for any essayresponse items.
+         foreach my $part_id (keys(%possible_part_ids)) {
+             if ($analysis{$part_id.'.type'} eq 'essayresponse') {
+                 if (!grep(/^\Q$part_id\E$/,@parts)) {
+                     push (@parts,$part_id);
+                 }
+             }
+         }
- 	    my $lines = $analysis{"$part_id.bubble_lines"};;
+ 	foreach my $part_id (@parts) {
+             my $lines = $analysis{"$part_id.bubble_lines"};
  	    # TODO - make this a persistent hash not an array.
+             # optionresponse and matchresponse type items render as
+             # separate sub-questions in exam mode.
+             if (($analysis{$part_id.'.type'} eq 'optionresponse') ||
+                 ($analysis{$part_id.'.type'} eq 'matchresponse')) {
+                 my ($numbub,$numshown);
+                 if ($analysis{$part_id.'.type'} eq 'optionresponse') {
+                     if (ref($analysis{$part_id.'.options'}) eq 'ARRAY') {
+                         $numbub = scalar(@{$analysis{$part_id.'.options'}});
+                     }
+                 } elsif ($analysis{$part_id.'.type'} eq 'matchresponse') {
+                     if (ref($analysis{$part_id.'.items'}) eq 'ARRAY') {
+                         $numbub = scalar(@{$analysis{$part_id.'.items'}});
+                     }
+                 }
+                 if (ref($analysis{$part_id.'.shown'}) eq 'ARRAY') {
+                     $numshown = scalar(@{$analysis{$part_id.'.shown'}});
+                 }
+                 my $bubbles_per_line = 10;
+                 my $inner_bubble_lines = int($numshown/$bubbles_per_line);
+                 if (($numshown % $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/,$//;
+             }
- 	    $first_bubble_line{$response_number}           = $bubble_line;
+             $first_bubble_line{$response_number} = $bubble_line;
- 	    $bubble_lines_per_response{$response_number}   = $lines;
+ 	    $bubble_lines_per_response{$response_number} = $lines;
+             $responsetype_per_response{$response_number} =
+                 $analysis{$part_id.'.type'};
  	    $response_number++;
  	    $bubble_line +=  $lines;
- Line 6928  sub scantron_validate_missingbubbles {
+ Line 7266  sub scantron_validate_missingbubbles {
  	# Probably here's where the error is...
  	foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
- 	    if ($missing > $max_bubble) { next; }
+             my $lastbubble;
+             if ($missing =~ /^(\d+)\.(\d+)$/) {
+                my $question = $1;
+                my $subquestion = $2;
+                if (!defined($first_bubble_line{$question -1})) { next; }
+                my $first = $first_bubble_line{$question-1};
+                my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
+                my $subcount = 1;
+                while ($subcount<$subquestion) {
+                    $first += $subans[$subcount-1];
+                    $subcount ++;
+                }
+                my $count = $subans[$subquestion-1];
+                $lastbubble = $first + $count;
+             } else {
+                 if (!defined($first_bubble_line{$missing - 1})) { next; }
+                 $lastbubble = $first_bubble_line{$missing - 1} + $bubble_lines_per_response{$missing - 1};
+             }
+             if ($lastbubble > $max_bubble) { next; }
  	    push(@to_correct,$missing);
  	}
  	if (@to_correct) {
- Line 7087  sub scantron_upload_scantron_data {
+ Line 7443  sub scantron_upload_scantron_data {
      my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},
  						   'domainid');
      my $default_form_data=&defaultFormData(&get_symb($r,1));
-     $r->print(<<UPLOAD);
+     $r->print('
  <script type="text/javascript" language="javascript">
      function checkUpload(formname) {
  	if (formname.upfile.value == "") {
- Line 7098  sub scantron_upload_scantron_data {
+ Line 7454  sub scantron_upload_scantron_data {
      }
  </script>
- <form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>
+ <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
- $default_form_data
+ '.$default_form_data.'
  <table>
- <tr><td>$select_link </td></tr>
+ <tr><td>'.$select_link.'                             </td></tr>
- <tr><td>Course ID:   </td><td><input name='courseid' type='text' />  </td></tr>
+ <tr><td>'.&mt('Course ID:').'     </td>
- <tr><td>Course Name: </td><td><input name='coursename' type='text' /></td></tr>
+     <td><input name="courseid"   type="text" />      </td></tr>
- <tr><td>Domain:      </td><td>$domsel                                </td></tr>
+ <tr><td>'.&mt('Course Name:').'   </td>
- <tr><td>File to upload:</td><td><input type="file" name="upfile" size="50" /></td></tr>
+     <td><input name="coursename" type="text" />      </td></tr>
+ <tr><td>'.&mt('Domain:').'        </td>
+     <td>'.$domsel.'                                  </td></tr>
+ <tr><td>'.&mt('File to upload:').'</td>
+     <td><input type="file" name="upfile" size="50" /></td></tr>
  </table>
- <input name='command' value='scantronupload_save' type='hidden' />
+ <input name="command" value="scantronupload_save" type="hidden" />
- <input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
+ <input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />
  </form>
- UPLOAD
+ ');
      return '';
  }
- Line 7129  sub scantron_upload_scantron_data_save {
+ Line 7489  sub scantron_upload_scantron_data_save {
      my $doanotherupload=
  	'<br /><form action="/adm/grades" method="post">'."\n".
  	'<input type="hidden" name="command" value="scantronupload" />'."\n".
- 	'<input type="submit" name="submit" value="Do Another Upload" />'."\n".
+ 	'<input type="submit" name="submit" value="'.&mt('Do Another Upload').'" />'."\n".
  	'</form>'."\n";
      if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&
  	!&Apache::lonnet::allowed('usc',
  			    $env{'form.domainid'}.'_'.$env{'form.courseid'})) {
- 	$r->print("You are not allowed to upload Scantron data to the requested course.<br />");
+ 	$r->print(&mt("You are not allowed to upload Scantron data to the requested course.")."<br />");
  	if ($symb) {
  	    $r->print(&show_grading_menu_form($symb));
  	} else {
- Line 7143  sub scantron_upload_scantron_data_save {
+ Line 7503  sub scantron_upload_scantron_data_save {
  	return '';
      }
      my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
-     $r->print("Doing upload to ".$coursedata{'description'}." <br />");
+     $r->print(&mt("Doing upload to [_1]",$coursedata{'description'})." <br />");
      my $fname=$env{'form.upfile.filename'};
      #FIXME
      #copied from lonnet::userfileupload()
- Line 7161  sub scantron_upload_scantron_data_save {
+ Line 7521  sub scantron_upload_scantron_data_save {
      my $uploadedfile=$fname;
      $fname='scantron_orig_'.$fname;
      if (length($env{'form.upfile'}) < 2) {
- 	$r->print("<span class=\"LC_error\">Error:</span> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename.");
+ 	$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>"));
      } else {
  	my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);
  	if ($result =~ m|^/uploaded/|) {
- 	    $r->print("<span class=\"LC_success\">Success:</span> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
+ 	    $r->print(&mt("<span class=\"LC_success\">Success:</span> Successfully uploaded [_1] bytes of data into location [_2]",
+ 			  (length($env{'form.upfile'})-1),
+ 			  '<span class="LC_filename">'.$result."</span>"));
  	} else {
- 	    $r->print("<span class=\"LC_error\">Error:</span> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>");
+ 	    $r->print(&mt("<span class=\"LC_error\">Error:</span> An error ([_1]) occurred when attempting to upload the file, [_2]",
+ 			  $result,
+ 			  '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>"));
  	}
      }
      if ($symb) {
- Line 7211  sub scantron_download_scantron_data {
+ Line 7576  sub scantron_download_scantron_data {
      my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
      my $file=$env{'form.scantron_selectfile'};
      if (! &valid_file($file)) {
- 	$r->print(<<ERROR);
+ 	$r->print('
  	<p>
- 	    The requested file name was invalid.
+ 	    '.&mt('The requested file name was invalid.').'
          </p>
- ERROR
+ ');
  	$r->print(&show_grading_menu_form(&get_symb($r,1)));
  	return;
      }
- Line 7225  ERROR
+ Line 7590  ERROR
      &Apache::lonnet::allowuploaded('/adm/grades',$orig);
      &Apache::lonnet::allowuploaded('/adm/grades',$corrected);
      &Apache::lonnet::allowuploaded('/adm/grades',$skipped);
-     $r->print(<<DOWNLOAD);
+     $r->print('
      <p>
- 	<a href="$orig">Original</a> file as uploaded by the scantron office.
+ 	'.&mt('[_1]Original[_2] file as uploaded by the scantron office.',
+ 	      '<a href="'.$orig.'">','</a>').'
      </p>
      <p>
- 	<a href="$corrected">Corrections</a>, a file of corrected records that were used in grading.
+ 	'.&mt('[_1]Corrections[_2], a file of corrected records that were used in grading.',
+ 	      '<a href="'.$corrected.'">','</a>').'
      </p>
      <p>
- 	<a href="$skipped">Skipped</a>, a file of records that were skipped.
+ 	'.&mt('[_1]Skipped[_2], a file of records that were skipped.',
+ 	      '<a href="'.$skipped.'">','</a>').'
      </p>
- DOWNLOAD
+ ');
      $r->print(&show_grading_menu_form(&get_symb($r,1)));
      return '';
  }
- Line 7342  sub grading_menu {
+ Line 7710  sub grading_menu {
                  $menudata->{'url'}.'" >'.
                  $menudata->{'name'}."</a></h3>\n";
          } else {
-             $Str .='    <h3><input type="button" value="Verify Receipt" '.
+             $Str .='    <h3><input type="button" value="'.&mt('Verify Receipt').'" '.
                  $menudata->{'jscript'}.
                  ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
                  ' /></h3>';
              $Str .= ('&nbsp;'x8).
-                     ' receipt: '.&Apache::lonnet::recprefix($env{'request.course.id'}).
+ 		&mt(' receipt: [_1]',
-                     '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
+ 		    &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";
- Line 7555  GRADINGMENUJS
+ Line 7924  GRADINGMENUJS
        </div>
      </div>
    </form>';
+     $result .= &show_grading_menu_form($symb);
      return $result;
  }
- Line 7833  ENDHEADER
+ Line 8203  ENDHEADER
      }
      $result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.
               '<input type="hidden" name="number" value="'.$number.'" />'.
-              &mt('Awarding [_1] percent for corrion(s)',$number).'<br />'.
-              '<input type="hidden" name="number" value="'.$number.'" />'.
               &mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',
                   $env{'form.pcorrect'},$env{'form.pincorrect'}).
               '<br />';

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

Removed from v.1.480
changed lines
	Added in v.1.508