--- loncom/homework/grades.pm	2007/11/08 01:48:18	1.485
+++ loncom/homework/grades.pm	2007/11/13 11:06:54	1.490
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.485 2007/11/08 01:48:18 albertel Exp $
+# $Id: grades.pm,v 1.490 2007/11/13 11:06:54 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -733,9 +733,12 @@ sub verifyreceipt {
     $receipt     =~ s/[^\-\d]//g;
     my ($symb)   = &get_symb($request);
 
-    my $title.='<h3><span class="LC_info">Verifying Submission Receipt '.
-	$receipt.'</h3></span>'."\n".
-	'<h4><b>Resource: </b>'.$env{'form.probTitle'}.'</h4><br /><br />'."\n";
+    my $title.=
+	'<h3><span class="LC_info">'.
+	&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');
@@ -745,6 +748,19 @@ 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})) {
@@ -755,7 +771,9 @@ 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>'.
@@ -763,28 +781,23 @@ 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'.
-	    ($matches <= 1 ? '.' : 's.')."\n".
-	    '<table border="0"><tr><td bgcolor="#777777">'."\n".
-	    '<table border="0"><tr bgcolor="#e6ffff">'."\n".
-	    '<td><b>&nbsp;Fullname&nbsp;</b></td>'."\n".
-	    '<td><b>&nbsp;Username&nbsp;</b></td>'."\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";
+	    '<p>'.
+	    &mt('The above receipt matches the following [numerate,_1,student].',$matches).
+	    '</p>'.
+	    $header.
+	    $contents.
+	    &Apache::loncommon::end_data_table()."\n";
     }
     return $string.&show_grading_menu_form($symb);
 }
@@ -4888,52 +4901,48 @@ sub scantron_selectphase {
 
     # Chunk of form to prompt for a file to grade and how:
 
-    $result.= <<SCANTRONFORM;
-    <table width="100%" border="0">
-    <tr>
-     <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
-      <td bgcolor="#777777">
-       <input type="hidden" name="command" value="scantron_warning" />
-        $default_form_data
-        <table width="100%" border="0">
-          <tr bgcolor="#e6ffff">
-            <td colspan="2">
-              &nbsp;<b>Specify file and which Folder/Sequence to grade</b>
-            </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
-            <td> Sequence to grade: </td><td> $sequence_selector </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
-            <td> Filename of scoring office file: </td><td> $file_selector </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
-            <td> Format of data file: </td><td> $format_selector </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
-            <td> Saved CODEs to validate against: </td><td> $CODE_selector</td>
-          </tr>
-          <tr bgcolor="#ffffe6">
-            <td> Each CODE is only to be used once:</td><td> $CODE_unique </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
+    $result.= '
+    <br />
+    <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
+    <input type="hidden" name="command" value="scantron_warning" />
+    '.$default_form_data.'
+    '.&Apache::loncommon::start_data_table('LC_scantron_action').'
+       '.&Apache::loncommon::start_data_table_header_row().'
+            <th colspan="2">
+              &nbsp;Specify file and which Folder/Sequence to grade
+            </th>
+       '.&Apache::loncommon::end_data_table_header_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+            <td> Sequence to grade: </td><td> '.$sequence_selector.' </td>
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+            <td> Filename of scoring office file: </td><td> '.$file_selector.' </td>
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+            <td> Format of data file: </td><td> '.$format_selector.' </td>
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+            <td> Saved CODEs to validate against: </td><td> '.$CODE_selector.' </td>
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+            <td> Each CODE is only to be used once:</td><td> '.$CODE_unique.' </td>
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::start_data_table_row().'
 	    <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_ignore" value="ignore_corrections"/> Remove all existing corrections</label> <br />
                <label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> Skip hidden resources when grading</label>
 	    </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::start_data_table_row().'
             <td colspan="2">
               <input type="submit" value="Grading: Validate Scantron Records" />
             </td>
-          </tr>
-        </table>
-       </td>
-     </form>
-    </tr>
-SCANTRONFORM
+       '.&Apache::loncommon::end_data_table_row().'
+    '.&Apache::loncommon::end_data_table().'
+    </form>
+';
    
     $r->print($result);
 
@@ -4942,18 +4951,17 @@ SCANTRONFORM
 
 	# Chunk of form to prompt for a scantron file upload.
 
-        $r->print(<<SCANTRONFORM);
-    <tr>
-      <td bgcolor="#777777">
-        <table width="100%" border="0">
-          <tr bgcolor="#e6ffff">
-            <td>
-              &nbsp;<b>Specify a Scantron data file to upload.</b>
-            </td>
-          </tr>
-          <tr bgcolor="#ffffe6">
+        $r->print('
+    <br />
+    '.&Apache::loncommon::start_data_table('LC_scantron_action').'
+       '.&Apache::loncommon::start_data_table_header_row().'
+            <th>
+              &nbsp;Specify a Scantron data file to upload.
+            </th>
+       '.&Apache::loncommon::end_data_table_header_row().'
+       '.&Apache::loncommon::start_data_table_row().'
             <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'};
@@ -4979,47 +4987,38 @@ SCANTRONFORM
               </form>
 UPLOAD
 
-        $r->print(<<SCANTRONFORM);
+        $r->print('
             </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-SCANTRONFORM
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::end_data_table().'
+');
     }
 
     # Chunk of the form that prompts to view a scoring office file,
     # corrected file, skipped records in a file.
 
-    $r->print(<<SCANTRONFORM);
-    <tr>
-      <form action='/adm/grades' name='scantron_download'>
-        <td bgcolor="#777777">
-	  $default_form_data
-          <input type="hidden" name="command" value="scantron_download" />
-          <table width="100%" border="0">
-            <tr bgcolor="#e6ffff">
-              <td colspan="2">
-                &nbsp;<b>Download a scoring office file</b>
-              </td>
-            </tr>
-            <tr bgcolor="#ffffe6">
-              <td> Filename of scoring office file: </td><td> $file_selector </td>
-            </tr>
-            <tr bgcolor="#ffffe6">
-              <td colspan="2">
+    $r->print('
+   <br />
+   <form action="/adm/grades" name="scantron_download">
+     '.$default_form_data.'
+     <input type="hidden" name="command" value="scantron_download" />
+     '.&Apache::loncommon::start_data_table('LC_scantron_action').'
+       '.&Apache::loncommon::start_data_table_header_row().'
+              <th>
+                &nbsp;Download a scoring office file
+              </th>
+       '.&Apache::loncommon::end_data_table_header_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+              <td> Filename of scoring office file: '.$file_selector.' 
+                <br />
                 <input type="submit" value="Download: Show List of Associated Files" />
-              </td>
-            </tr>
-          </table>
-        </td>
-      </form>
-    </tr>
-SCANTRONFORM
+       '.&Apache::loncommon::end_data_table_row().'
+     '.&Apache::loncommon::end_data_table().'
+   </form>
+   <br />
+');
 
-    $r->print('<tr><td bgcolor="#777777">');
     &Apache::lonpickcode::code_list($r,2);
-    $r->print('</td></tr></table>');
     $r->print($grading_menu_button);
     return
 }
@@ -5407,10 +5406,9 @@ sub scantron_parse_scanline {
 	my $answer_length  = $$scantron_config{'Qlength'} * $answers_needed;
 
 
-
 	$questnum++;
 	my $currentquest = substr($questions,0,$answer_length);
-	$questions       = substr($questions,0,$answer_length)='';
+	$questions       = substr($questions,$answer_length);
 	if (length($currentquest) < $answer_length) { next; }
 
 	# Qon letter implies for each slot in currentquest we have:
@@ -5420,7 +5418,6 @@ sub scantron_parse_scanline {
 
 
 	if ($$scantron_config{'Qon'} eq 'letter') {
-
 	    if ($currentquest =~ /\?/
 		|| $currentquest =~ /\*/
 		|| (&occurence_count($currentquest, "[A-Z]") > 1)) {
@@ -5449,7 +5446,8 @@ sub scantron_parse_scanline {
 		}
 	    } else {
 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
-		    $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
+		    my $bubble = substr($currentquest, $ans, 1);
+		    $record{"scantron.$ansnum.answer"} = $bubble;
 		    $ansnum++;
 		}
 	    }
@@ -5516,10 +5514,9 @@ sub scantron_parse_scanline {
 		    push(@{$record{"scantron.missingerror"}},$questnum);
 		}
 		
-		#  If the bubble is not the last position, there will be
-		# 2 elements.  If it is the last position, there will be 1 element.
 
-	    } elsif (scalar(@array) le 2) {
+
+	    } elsif (scalar(@array) eq 2) {
 
 		my $location      = length($array[0]);
 		my $line_num      = int($location / $$scantron_config{'Qlength'});
@@ -6952,9 +6949,10 @@ sub scantron_get_maxbubble {
 
 	foreach my $part_id (@{$analysis{'parts'}}) {
 
-
 	    my $lines = $analysis{"$part_id.bubble_lines"};;
 
+
+
 	    # TODO - make this a persistent hash not an array.