--- loncom/homework/grades.pm	2007/11/16 07:56:15	1.492
+++ loncom/homework/grades.pm	2010/03/19 21:22:34	1.599
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.492 2007/11/16 07:56:15 albertel Exp $
+# $Id: grades.pm,v 1.599 2010/03/19 21:22:34 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,8 @@
 # http://www.lon-capa.org/
 #
 
+
+
 package Apache::grades;
 use strict;
 use Apache::style;
@@ -47,96 +49,66 @@ 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:
+my %perm=();
 
-sub get_response_bubbles {
-    my ($parsed_line, $response)  = @_;
+#  These variables are used to recover from ssi errors
 
+my $ssi_retries = 5;
+my $ssi_error;
+my $ssi_error_resource;
+my $ssi_error_message;
 
-    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++;
+sub ssi_with_retries {
+    my ($resource, $retries, %form) = @_;
+    my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form);
+    if ($response->is_error) {
+	$ssi_error          = 1;
+	$ssi_error_resource = $resource;
+	$ssi_error_message  = $response->code . " " . $response->message;
     }
-    return $selected;
-}
 
+    return $content;
 
-# ----- 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);
 }
+#
+#  Prodcuces an ssi retry failure error message to the user:
+#
 
-
-# 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;
+sub ssi_print_error {
+    my ($r) = @_;
+    my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk');
+    $r->print('
+<br />
+<h2>'.&mt('An unrecoverable network error occurred:').'</h2>
+<p>
+'.&mt('Unable to retrieve a resource from a server:').'<br />
+'.&mt('Resource:').' '.$ssi_error_resource.'<br />
+'.&mt('Error:').' '.$ssi_error_message.'
+</p>
+<p>'.
+&mt('It is recommended that you try again later, as this error may mean the server was just temporarily unavailable, or is down for maintenance.').'<br />'.
+&mt('If the error persists, please contact the [_1] for assistance.',$helpurl).
+'</p>');
+    return;
 }
 
 #
 # --- Retrieve the parts from the metadata file.---
+# Returns an array of everything that the resources stores away
+#
+
 sub getpartlist {
-    my ($symb) = @_;
+    my ($symb,$errorref) = @_;
 
     my $navmap   = Apache::lonnavmaps::navmap->new();
+    unless (ref($navmap)) {
+        if (ref($errorref)) { 
+            $$errorref = 'navmap';
+            return;
+        }
+    }
     my $res      = $navmap->getBySymb($symb);
     my $partlist = $res->parts();
     my $url      = $res->src();
@@ -152,13 +124,17 @@ sub getpartlist {
 }
 
 # --- Get the symbolic name of a problem and the url
+# Generate an error message if symb could not be found unless silent flag is set
+# Takes $env{'form.symb'} by default; if not present, takes $env{'form.url'} and tries to get symb from that
+#
+ 
 sub get_symb {
     my ($request,$silent) = @_;
     (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
     my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
     if ($symb eq '') { 
 	if (!$silent) {
-	    $request->print("Unable to handle ambiguous references:$url:.");
+	    $request->print(&mt("Unable to handle ambiguous references: [_1].",$url));
 	    return ();
 	}
     }
@@ -181,10 +157,20 @@ sub nameUserString {
 #--- Get the partlist and the response type for a given problem. ---
 #--- Indicate if a response type is coded handgraded or not. ---
 sub response_type {
-    my ($symb) = shift;
+    my ($symb,$response_error) = @_;
 
     my $navmap = Apache::lonnavmaps::navmap->new();
+    unless (ref($navmap)) {
+        if (ref($response_error)) {
+            $$response_error = 1;
+        }
+        return;
+    }
     my $res = $navmap->getBySymb($symb);
+    unless (ref($res)) {
+        $$response_error = 1;
+        return;
+    }
     my $partlist = $res->parts();
     my %vPart = 
 	map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));
@@ -220,7 +206,8 @@ sub get_display_part {
     my ($partID,$symb)=@_;
     my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);
     if (defined($display) and $display ne '') {
-	$display.= " (<span class=\"LC_internal_info\">id $partID</span>)";
+        $display.= ' (<span class="LC_internal_info">'
+                  .&mt('Part ID: [_1]',$partID).'</span>)';
     } else {
 	$display=$partID;
     }
@@ -229,40 +216,52 @@ sub get_display_part {
 
 #--- Show resource title
 #--- and parts and response type
-sub showResourceInfo {
-    my ($symb,$probTitle,$checkboxes) = @_;
-    my $col=3;
-    if ($checkboxes) { $col=4; }
-    my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";
-    $result .='<table border="0">';
-    my ($partlist,$handgrade,$responseType) = &response_type($symb);
-    my %resptype = ();
-    my $hdgrade='no';
-    my %partsseen;
-    foreach my $partID (sort keys(%$responseType)) {
-	foreach my $resID (sort keys(%{ $responseType->{$partID} })) {
-	    my $handgrade=$$handgrade{$partID.'_'.$resID};
-	    my $responsetype = $responseType->{$partID}->{$resID};
-	    $hdgrade = $handgrade if ($handgrade eq 'yes');
-	    $result.='<tr>';
-	    if ($checkboxes) {
-		if (exists($partsseen{$partID})) {
-		    $result.="<td>&nbsp;</td>";
-		} else {
-		    $result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>";
-		}
-		$partsseen{$partID}=1;
-	    }
-	    my $display_part=&get_display_part($partID,$symb);
-	    $result.='<td>'.&mt('<b>Part: </b>[_1]',$display_part).' <span class="LC_internal_info">'.
-		$resID.'</span></td>'.
-		'<td>'.&mt('<b>Type: </b>[_1]',$responsetype).'</td></tr>';
-#	    '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';
-	}
-    }
-    $result.='</table>'."\n";
-    return $result,$responseType,$hdgrade,$partlist,$handgrade;
-}
+#sub showResourceInfo {
+#    my ($symb,$probTitle,$checkboxes,$res_error) = @_;
+#    my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n";
+#    my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
+#    if (ref($res_error)) {
+#        if ($$res_error) {
+#            return;
+#        }
+#    }
+#    $result.=&Apache::loncommon::start_data_table()
+#            .&Apache::loncommon::start_data_table_header_row();
+#    if ($checkboxes) {
+#        $result.='<th>&nbsp;</th>';
+#    }
+#    $result.='<th>'.&mt('Problem Part').'</th>'
+#            .'<th>'.&mt('Res. ID').'</th>'
+#            .'<th>'.&mt('Type').'</th>'
+#            .&Apache::loncommon::end_data_table_header_row();
+#    my %resptype = ();
+#    my $hdgrade='no';
+#    my %partsseen;
+#    foreach my $partID (sort(keys(%$responseType))) {
+#        foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) {
+#            my $handgrade=$$handgrade{$partID.'_'.$resID};
+#            my $responsetype = $responseType->{$partID}->{$resID};
+#            $hdgrade = $handgrade if ($handgrade eq 'yes');
+#            $result.=&Apache::loncommon::start_data_table_row();
+#            if ($checkboxes) {
+#                if (exists($partsseen{$partID})) {
+#                    $result.="<td>&nbsp;</td>";
+#                } else {
+#                    $result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>";
+#                }
+#                $partsseen{$partID}=1;
+#            }
+#            my $display_part=&get_display_part($partID,$symb);
+#            $result.='<td>'.$display_part.'</td>'
+#                    .'<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>'
+#                    .'<td>'.&mt($responsetype).'</td>'
+#                   .'<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td>'
+#                    .&Apache::loncommon::end_data_table_row();
+#       }
+#    }
+#    $result.=&Apache::loncommon::end_data_table();
+#    return $result,$responseType,$hdgrade,$partlist,$handgrade;
+#}
 
 sub reset_caches {
     &reset_analyze_cache();
@@ -271,45 +270,101 @@ sub reset_caches {
 
 {
     my %analyze_cache;
+    my %analyze_cache_formkeys;
 
     sub reset_analyze_cache {
 	undef(%analyze_cache);
+        undef(%analyze_cache_formkeys);
     }
 
     sub get_analyze {
-	my ($symb,$uname,$udom)=@_;
+	my ($symb,$uname,$udom,$no_increment,$add_to_hash)=@_;
 	my $key = "$symb\0$uname\0$udom";
-	return $analyze_cache{$key} if (exists($analyze_cache{$key}));
+	if (exists($analyze_cache{$key})) {
+            my $getupdate = 0;
+            if (ref($add_to_hash) eq 'HASH') {
+                foreach my $item (keys(%{$add_to_hash})) {
+                    if (ref($analyze_cache_formkeys{$key}) eq 'HASH') {
+                        if (!exists($analyze_cache_formkeys{$key}{$item})) {
+                            $getupdate = 1;
+                            last;
+                        }
+                    } else {
+                        $getupdate = 1;
+                    }
+                }
+            }
+            if (!$getupdate) {
+                return $analyze_cache{$key};
+            }
+        }
 
 	my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
 	$url=&Apache::lonnet::clutter($url);
-	my $subresult=&Apache::lonnet::ssi($url,
-					   ('grade_target' => 'analyze'),
-					   ('grade_domain' => $udom),
-					   ('grade_symb' => $symb),
-					   ('grade_courseid' => 
-					    $env{'request.course.id'}),
-					   ('grade_username' => $uname));
+        my %form = ('grade_target'      => 'analyze',
+                    'grade_domain'      => $udom,
+                    'grade_symb'        => $symb,
+                    'grade_courseid'    =>  $env{'request.course.id'},
+                    'grade_username'    => $uname,
+                    'grade_noincrement' => $no_increment);
+        if (ref($add_to_hash)) {
+            %form = (%form,%{$add_to_hash});
+        } 
+	my $subresult=&ssi_with_retries($url, $ssi_retries,%form);
 	(undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
 	my %analyze=&Apache::lonnet::str2hash($subresult);
+        if (ref($add_to_hash) eq 'HASH') {
+            $analyze_cache_formkeys{$key} = $add_to_hash;
+        } else {
+            $analyze_cache_formkeys{$key} = {};
+        }
 	return $analyze_cache{$key} = \%analyze;
     }
 
     sub get_order {
-	my ($partid,$respid,$symb,$uname,$udom)=@_;
-	my $analyze = &get_analyze($symb,$uname,$udom);
+	my ($partid,$respid,$symb,$uname,$udom,$no_increment)=@_;
+	my $analyze = &get_analyze($symb,$uname,$udom,$no_increment);
 	return $analyze->{"$partid.$respid.shown"};
     }
 
     sub get_radiobutton_correct_foil {
 	my ($partid,$respid,$symb,$uname,$udom)=@_;
 	my $analyze = &get_analyze($symb,$uname,$udom);
-	foreach my $foil (@{&get_order($partid,$respid,$symb,$uname,$udom)}) {
-	    if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {
-		return $foil;
+        my $foils = &get_order($partid,$respid,$symb,$uname,$udom);
+        if (ref($foils) eq 'ARRAY') {
+	    foreach my $foil (@{$foils}) {
+	        if ($analyze->{"$partid.$respid.foil.value.$foil"} eq 'true') {
+		    return $foil;
+	        }
 	    }
 	}
     }
+
+    sub scantron_partids_tograde {
+        my ($resource,$cid,$uname,$udom,$check_for_randomlist) = @_;
+        my (%analysis,@parts);
+        if (ref($resource)) {
+            my $symb = $resource->symb();
+            my $add_to_form;
+            if ($check_for_randomlist) {
+                $add_to_form = { 'check_parts_withrandomlist' => 1,};
+            }
+            my $analyze = &get_analyze($symb,$uname,$udom,undef,$add_to_form);
+            if (ref($analyze) eq 'HASH') {
+                %analysis = %{$analyze};
+            }
+            if (ref($analysis{'parts'}) eq 'ARRAY') {
+                foreach my $part (@{$analysis{'parts'}}) {
+                    my ($id,$respid) = split(/\./,$part);
+                    if (!&Apache::loncommon::check_if_partid_hidden($id,$symb,$udom,$uname)) {
+                        push(@parts,$part);
+                    }
+                }
+            }
+        }
+        return (\%analysis,\@parts);
+    }
+
 }
 
 #--- Clean response type for display
@@ -377,7 +432,7 @@ sub cleanRecord {
 	return '<blockquote><table border="1">'.
 	    '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
 	    '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
-	    $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
+	    $bottomrow.'</tr>'.'</table></blockquote>';
     } elsif ($response eq 'essay') {
 	if (! exists ($env{'form.'.$symb})) {
 	    my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',
@@ -439,8 +494,7 @@ sub cleanRecord {
 #-- A couple of common js functions
 sub commonJSfunctions {
     my $request = shift;
-    $request->print(<<COMMONJSFUNCTIONS);
-<script type="text/javascript" language="javascript">
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<COMMONJSFUNCTIONS));
     function radioSelection(radioButton) {
 	var selection=null;
 	if (radioButton.length > 1) {
@@ -468,7 +522,6 @@ sub commonJSfunctions {
 	    return selectOne.value;
 	}
     }
-</script>
 COMMONJSFUNCTIONS
 }
 
@@ -623,13 +676,13 @@ sub student_gradeStatus {
 sub jscriptNform {
     my ($symb) = @_;
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
-    my $jscript='<script type="text/javascript" language="javascript">'."\n".
+    my $jscript= &Apache::lonhtmlcommon::scripttag(
 	'    function viewOneStudent(user,domain) {'."\n".
 	'	document.onestudent.student.value = user;'."\n".
 	'	document.onestudent.userdom.value = domain;'."\n".
 	'	document.onestudent.submit();'."\n".
 	'    }'."\n".
-	'</script>'."\n";
+	"\n");
     $jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n".
 	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
 	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
@@ -686,7 +739,7 @@ sub most_similar {
 
 # ignore empty submissions (occuring when only files are sent)
 
-    unless ($uessay=~/\w+/) { return ''; }
+    unless ($uessay=~/\w+/s) { return ''; }
 
 # these will be returned. Do not care if not at least 50 percent similar
     my $limit=0.6;
@@ -735,7 +788,7 @@ sub verifyreceipt {
 
     my $title.=
 	'<h3><span class="LC_info">'.
-	&mt('Verifying Submission Receipt [_1]',$receipt).
+	&mt('Verifying Receipt No. [_1]',$receipt).
 	'</span></h3>'."\n".
 	'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
 	'</h4>'."\n";
@@ -747,7 +800,13 @@ sub verifyreceipt {
     if ($env{"course.$courseid.receiptalg"} eq 'receipt2' ||
 	$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
     my $parts=['0'];
-    if ($receiptparts) { ($parts)=&response_type($symb); }
+    if ($receiptparts) {
+        my $res_error; 
+        ($parts)=&response_type($symb,\$res_error);
+        if ($res_error) {
+            return &navmap_errormsg();
+        } 
+    }
     
     my $header = 
 	&Apache::loncommon::start_data_table().
@@ -789,11 +848,14 @@ sub verifyreceipt {
 	}
     }
     if ($matches == 0) {
-	$string = $title.&mt('No match found for the above receipt.');
+        $string = $title
+                 .'<p class="LC_warning">'
+                 .&mt('No match found for the above receipt number.')
+                 .'</p>';
     } else {
 	$string = &jscriptNform($symb).$title.
 	    '<p>'.
-	    &mt('The above receipt matches the following [numerate,_1,student].',$matches).
+	    &mt('The above receipt number matches the following [quant,_1,student].',$matches).
 	    '</p>'.
 	    $header.
 	    $contents.
@@ -819,20 +881,20 @@ sub listStudents {
     $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? 
 	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
 
-    my $result='<h3><span class="LC_info">&nbsp;'.
-	&mt($viewgrade.' Submissions for a Student or a Group of Students')
+    my $result='<h3><span class="LC_info">&nbsp;'
+	.&mt("$viewgrade Submissions for a Student or a Group of Students")
 	.'</span></h3>';
 
-    my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
-
-    my %lt = ( 'multiple' =>
-	       "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">
+#    my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
+    my ($partlist,$handgrade,$responseType) = &response_type($symb
+#,$res_error
+    );
+
+    my %lt = &Apache::lonlocal::texthash (
+		'multiple' => 'Please select a student or group of students before clicking on the Next button.',
+		'single'   => 'Please select the student before clicking on the Next button.',
+	     );
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
     function checkSelect(checkBox) {
 	var ctr=0;
 	var sense="";
@@ -861,7 +923,6 @@ sub listStudents {
 	formname.command.value = 'submission';
 	formname.submit();
     }
-</script>
 LISTJAVASCRIPT
 
     &commonJSfunctions($request);
@@ -870,20 +931,19 @@ 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";
 	
-    $gradeTable .= 
-	'&nbsp;'.
-	&mt('<b>View Problem Text: </b>[_1]',
-	    '<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
-	    '<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\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";
+    $gradeTable .= &Apache::lonhtmlcommon::start_pick_box();
+    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))
+                  .'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n"
+                  .'<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n"
+                  .'<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label><br />'."\n"
+                  .&Apache::lonhtmlcommon::row_closure();
+    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Answer'))
+                  .'<label><input type="radio" name="vAns" value="no"  /> '.&mt('no').' </label>'."\n"
+                  .'<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n"
+                  .'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n"
+                  .&Apache::lonhtmlcommon::row_closure();
 
     my $submission_options;
     if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
@@ -894,25 +954,32 @@ LISTJAVASCRIPT
     my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
     $env{'form.Status'} = $saveStatus;
     $submission_options.=
-	'<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.&mt('last submission only').' </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="datesub" /> '.&mt('by dates and submissions').' </label>'."\n".
-	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>';
-    $gradeTable .= 
-	'&nbsp;'.
-	&mt('<b>Submissions: </b>[_1]',$submission_options).'<br />'."\n";
+        '<span class="LC_nobreak">'.
+        '<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.
+        &mt('last submission only').' </label></span>'."\n".
+        '<span class="LC_nobreak">'.
+        '<label><input type="radio" name="lastSub" value="last" /> '.
+        &mt('last submission &amp; parts info').' </label></span>'."\n".
+        '<span class="LC_nobreak">'.
+        '<label><input type="radio" name="lastSub" value="datesub" /> '.
+        &mt('by dates and submissions').'</label></span>'."\n".
+        '<span class="LC_nobreak">'.
+        '<label><input type="radio" name="lastSub" value="all" /> '.
+        &mt('all details').'</label></span>';
+    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))
+                  .$submission_options
+                  .&Apache::lonhtmlcommon::row_closure();
+
+    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
+                  .'<select name="increment">'
+                  .'<option value="1">'.&mt('Whole Points').'</option>'
+                  .'<option value=".5">'.&mt('Half Points').'</option>'
+                  .'<option value=".25">'.&mt('Quarter Points').'</option>'
+                  .'<option value=".1">'.&mt('Tenths of a Point').'</option>'
+                  .'</select>'
+                  .&Apache::lonhtmlcommon::row_closure();
 
     $gradeTable .= 
-        '&nbsp;'.
-	&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".
@@ -923,23 +990,30 @@ LISTJAVASCRIPT
 	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
 
     if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
-	$gradeTable.='<input type="hidden" name="Status"   value="'.$stu_status.'" />'."\n";
+	$gradeTable .= '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";
     } else {
-	$gradeTable.=&mt('<b>Student Status:</b> [_1]',
-			 &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />';
+        $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status'))
+                      .&Apache::lonhtmlcommon::StatusOptions(
+                           $saveStatus,undef,1,'javascript:reLoadList(this.form);')
+                      .&Apache::lonhtmlcommon::row_closure();
     }
 
-    $gradeTable.=&mt('To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
-	'next to the student\'s name(s). Then click on the Next button.').'<br />'."\n".
-	'<input type="hidden" name="command" value="processGroup" />'."\n";
+    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))
+                  .'<input type="checkbox" name="checkPlag" checked="checked" />'
+                  .&Apache::lonhtmlcommon::row_closure(1)
+                  .&Apache::lonhtmlcommon::end_pick_box();
+
+    $gradeTable .= '<p>'
+                  .&mt('To '.lc($viewgrade)." a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button.")."\n"
+                  .'<input type="hidden" name="command" value="processGroup" />'
+                  .'</p>';
 
 # checkall buttons
     $gradeTable.=&check_script('gradesub', 'stuinfo');
     $gradeTable.='<input type="button" '."\n".
-	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
-	'value="'.&mt('Next-&gt;').'" /> <br />'."\n";
+        'onclick="javascript:checkSelect(this.form.stuinfo);" '."\n".
+        'value="'.&mt('Next').' &rarr;" /> <br />'."\n";
     $gradeTable.=&check_buttons();
-    $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />'.&mt('Check For Plagiarism').'</label>';
     my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup);
     $gradeTable.= &Apache::loncommon::start_data_table().
 	&Apache::loncommon::start_data_table_header_row();
@@ -1022,14 +1096,14 @@ LISTJAVASCRIPT
 		$gradeTable.= &Apache::loncommon::start_data_table_row();
 	    }
 	    $gradeTable.='<td align="right">'.$ctr.'&nbsp;</td>'.
-               '<td align="center"><label><input type=checkbox name="stuinfo" value="'.
+               '<td align="center"><label><input type="checkbox" name="stuinfo" value="'.
                $student.':'.$$fullname{$student}.':::SECTION'.$section.
 	       ')&nbsp;" />&nbsp;&nbsp;</label></td>'."\n".'<td>'.
 	       &nameUserString(undef,$$fullname{$student},$uname,$udom).
 	       '&nbsp;'.$section.($group ne '' ?'/'.$group:'').'</td>'."\n";
 
 	    if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
-		foreach (sort keys(%status)) {
+		foreach (sort(keys(%status))) {
 		    next if ($_ =~ /^resource.*?submitted_by$/);
 		    $gradeTable.='<td align="center">&nbsp;'.&mt($status{$_}).'&nbsp;</td>'."\n";
 		}
@@ -1055,9 +1129,9 @@ LISTJAVASCRIPT
     }
 
     $gradeTable.=&Apache::loncommon::end_data_table()."\n".
-	'<input type="button" '.
-	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
-	'value="'.&mt('Next-&gt;').'" /></form>'."\n";
+        '<input type="button" '.
+        'onclick="javascript:checkSelect(this.form.stuinfo);" '.
+        'value="'.&mt('Next').' &rarr;" /></form>'."\n";
     if ($ctr == 0) {
 	my $num_students=(scalar(keys(%$fullname)));
 	if ($num_students eq 0) {
@@ -1084,7 +1158,7 @@ LISTJAVASCRIPT
 
 sub check_script {
     my ($form, $type)=@_;
-    my $chkallscript='<script type="text/javascript">
+    my $chkallscript= &Apache::lonhtmlcommon::scripttag('
     function checkall() {
         for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
             ele = document.forms.'.$form.'.elements[i];
@@ -1115,7 +1189,7 @@ sub check_script {
         }
     }
 
-</script>'."\n";
+'."\n");
     return $chkallscript;
 }
 
@@ -1153,8 +1227,8 @@ sub processGroup {
 #--- Javascript to handle the submission page functionality ---
 sub sub_page_js {
     my $request = shift;
-    $request->print(<<SUBJAVASCRIPT);
-<script type="text/javascript" language="javascript">
+	    my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
     function updateRadio(formname,id,weight) {
 	var gradeBox = formname["GD_BOX"+id];
 	var radioButton = formname["RADVAL"+id];
@@ -1163,7 +1237,7 @@ sub sub_page_js {
 	gradeBox.value = pts;
 	var resetbox = false;
 	if (isNaN(pts) || pts < 0) {
-	    alert("A number equal or greater than 0 is expected. Entered value = "+pts);
+	    alert("$alertmsg"+pts);
 	    for (var i=0; i<radioButton.length; i++) {
 		if (radioButton[i].checked) {
 		    gradeBox.value = i;
@@ -1322,7 +1396,6 @@ sub sub_page_js {
 
 	formname.submit();
     }
-</script>
 SUBJAVASCRIPT
 }
 
@@ -1332,8 +1405,7 @@ sub sub_page_kw_js {
     my $iconpath = $request->dir_config('lonIconsURL');
     &commonJSfunctions($request);
 
-    my $inner_js_msg_central=<<INNERJS;
-    <script text="text/javascript">
+    my $inner_js_msg_central= &Apache::lonhtmlcommon::scripttag(<<INNERJS);
     function checkInput() {
       opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);
       var nmsg   = opener.document.SCORE.savemsgN.value;
@@ -1370,11 +1442,9 @@ sub sub_page_kw_js {
       self.close()
 
     }
-    </script>
 INNERJS
 
-    my $inner_js_highlight_central=<<INNERJS;
- <script type="text/javascript">
+    my $inner_js_highlight_central= &Apache::lonhtmlcommon::scripttag(<<INNERJS);
     function updateChoice(flag) {
       opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
       opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
@@ -1385,7 +1455,6 @@ INNERJS
       }
       self.close()
     }
-</script>
 INNERJS
 
     my $start_page_msg_central = 
@@ -1408,8 +1477,8 @@ INNERJS
 
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
     $docopen=~s/^document\.//;
-    $request->print(<<SUBJAVASCRIPT);
-<script type="text/javascript" language="javascript">
+    my $alertmsg = &mt('Please select a word or group of words from document and then click this link.');
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
 
 //===================== Show list of keywords ====================
   function keywords(formname) {
@@ -1440,7 +1509,7 @@ INNERJS
     else return;
     var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
     if (cleantxt=="") {
-	alert("Please select a word or group of words from document and then click this link.");
+	alert("$alertmsg");
 	return;
     }
     var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);
@@ -1527,8 +1596,8 @@ INNERJS
     pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
     pDoc.write("<h3><span class=\\"LC_info\\">&nbsp;Compose Message for \"+fullname+\"<\\/span><\\/h3><br /><br />");
 
-    pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
-    pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
+    pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">');
+    pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">');
     pDoc.write("<td><b>Type<\\/b><\\/td><td><b>Include<\\/b><\\/td><td><b>Message<\\/td><\\/tr>");
 }
     function displaySubject(msg,shwsel) {
@@ -1559,8 +1628,8 @@ INNERJS
     pDoc = pWin.document;
     pDoc.write("<\\/table>");
     pDoc.write("<\\/td><\\/tr><\\/table>&nbsp;");
-    pDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
-    pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
+    pDoc.write("<input type=\\"button\\" value=\\"Save\\" onclick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
+    pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onclick=\\"self.close()\\"><br /><br />");
     pDoc.write("<\\/form>");
     pDoc.write('$end_page_msg_central');
     pDoc.close();
@@ -1612,8 +1681,8 @@ INNERJS
     hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
     hDoc.write("<h3><span class=\\"LC_info\\">&nbsp;Keyword Highlight Options<\\/span><\\/h3><br /><br />");
 
-    hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
-    hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
+    hDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">');
+    hDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">');
     hDoc.write("<td><b>Text Color<\\/b><\\/td><td><b>Font Size<\\/b><\\/td><td><b>Font Style<\\/td><\\/tr>");
   }
 
@@ -1633,14 +1702,13 @@ INNERJS
     var hDoc = hwdWin.document;
     hDoc.write("<\\/table>");
     hDoc.write("<\\/td><\\/tr><\\/table>&nbsp;");
-    hDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
-    hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
+    hDoc.write("<input type=\\"button\\" value=\\"Save\\" onclick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
+    hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onclick=\\"self.close()\\"><br /><br />");
     hDoc.write("<\\/form>");
     hDoc.write('$end_page_highlight_central');
     hDoc.close();
   }
 
-</script>
 SUBJAVASCRIPT
 }
 
@@ -1653,6 +1721,25 @@ sub get_increment {
     return $increment;
 }
 
+sub gradeBox_start {
+    return (
+        &Apache::loncommon::start_data_table()
+       .&Apache::loncommon::start_data_table_header_row()
+       .'<th>'.&mt('Part').'</th>'
+       .'<th>'.&mt('Points').'</th>'
+       .'<th>&nbsp;</th>'
+       .'<th>'.&mt('Assign Grade').'</th>'
+       .'<th>'.&mt('Weight').'</th>'
+       .'<th>'.&mt('Grade Status').'</th>'
+       .&Apache::loncommon::end_data_table_header_row()
+    );
+}
+
+sub gradeBox_end {
+    return (
+        &Apache::loncommon::end_data_table()
+    );
+}
 #--- displays the grading box, used in essay type problem and grading by page/sequence
 sub gradeBox {
     my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
@@ -1672,15 +1759,15 @@ sub gradeBox {
     if ($last_resets{$partid}) {
         $aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
     }
-    $result.='<table border="0"><tr>';
+    $result.=&Apache::loncommon::start_data_table_row();
     my $ctr = 0;
     my $thisweight = 0;
     my $increment = &get_increment();
 
     my $radio.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
     while ($thisweight<=$wgt) {
-	$radio.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
-	    'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
+	$radio.= '<td><span class="LC_nobreak"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+        'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
 	    $thisweight.')" value="'.$thisweight.'" '.
 	    ($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n";
 	$radio.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
@@ -1691,13 +1778,13 @@ sub gradeBox {
 
     my $line.='<input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
 	($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
-	'onChange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','.
+	'onchange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','.
 	$wgt.')" /></td>'."\n";
     $line.='<td>/'.$wgt.' '.$wgtmsg.
 	($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? '&nbsp;'.$checkIcon : '').
-	' </td><td>'."\n";
-    $line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
-	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
+	' </td>'."\n";
+    $line.='<td><select name="GD_SEL'.$counter.'_'.$partid.'" '.
+	'onchange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
     if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
 	$line.='<option></option>'.
 	    '<option value="excused" selected="selected">'.&mt('excused').'</option>';
@@ -1708,11 +1795,10 @@ sub gradeBox {
     $line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";
 
 
+	#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
     $result .= 
-	&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
-
-    
-    $result.='</tr></table>'."\n";
+	    '<td>'.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';
+    $result.=&Apache::loncommon::end_data_table_row();
     $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="'.
@@ -1721,13 +1807,17 @@ sub gradeBox {
         $$record{'resource.'.$partid.'.tries'}.'" />'."\n".
         '<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
         $aggtries.'" />'."\n";
-    $result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record);
+    my $res_error;
+    $result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error);
+    if ($res_error) {
+        return &navmap_errormsg();
+    }
     return $result;
 }
 
 sub handback_box {
-    my ($symb,$uname,$udom,$counter,$partid,$record) = @_;
-    my ($partlist,$handgrade,$responseType) = &response_type($symb);
+    my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_;
+    my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
     my (@respids);
      my @part_response_id = &flatten_responseType($responseType);
     foreach my $part_response_id (@part_response_id) {
@@ -1789,26 +1879,23 @@ sub show_problem {
 	$companswer=~s|name="submit"|name="would_have_been_submit"|g;
     }
     $rendered=
-	'<div class="LC_grade_show_problem_header">'.
-	&mt('View of the problem').
-	'</div><div class="LC_grade_show_problem_problem">'.
-	$rendered.
-	'</div>';
+        '<div class="LC_Box">'
+       .'<h3 class="LC_hcell">'.&mt('View of the problem').'</h3>'
+       .$rendered
+       .'</div>';
     $companswer=
-	'<div class="LC_grade_show_problem_header">'.
-	&mt('Correct answer').
-	'</div><div class="LC_grade_show_problem_problem">'.
-	$companswer.
-	'</div>';
+        '<div class="LC_Box">'
+       .'<h3 class="LC_hcell">'.&mt('Correct answer').'</h3>'
+       .$companswer
+       .'</div>';
     my $result;
     if ($mode eq 'both') {
-	$result=$rendered.$companswer;
+        $result=$rendered.$companswer;
     } elsif ($mode eq 'text') {
-	$result=$rendered;
+        $result=$rendered;
     } elsif ($mode eq 'answer') {
-	$result=$companswer;
+        $result=$companswer;
     }
-    $result='<div class="LC_grade_show_problem">'.$result.'</div>';
     return $result;
 }
 
@@ -1841,9 +1928,9 @@ sub download_all_link {
 	join("\n",&Apache::loncommon::get_env_multiple('form.vPart'));
 
     my $identifier = &Apache::loncommon::get_cgi_id();
-    &Apache::lonnet::appenv('cgi.'.$identifier.'.students' => $all_students,
-                            'cgi.'.$identifier.'.symb' => $symb,
-                            'cgi.'.$identifier.'.parts' => $parts,);
+    &Apache::lonnet::appenv({'cgi.'.$identifier.'.students' => $all_students,
+                             'cgi.'.$identifier.'.symb' => $symb,
+                             'cgi.'.$identifier.'.parts' => $parts,});
     $r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'.
 	      &mt('Download All Submitted Documents').'</a>');
     return
@@ -1986,7 +2073,7 @@ sub submission {
 	    $request->print(<<KEYWORDS);
 &nbsp;<b>Keyword Options:</b>&nbsp;
 <a href="javascript:keywords(document.SCORE);" target="_self">List</a>&nbsp; &nbsp;
-<a href="#" onMouseDown="javascript:getSel(); return false"
+<a href="#" onmousedown="javascript:getSel(); return false"
  CLASS="page">Paste Selection to List</a>&nbsp; &nbsp;
 <a href="javascript:kwhighlight();" target="_self">Highlight Attribute</a><br /><br />
 KEYWORDS
@@ -2002,12 +2089,31 @@ KEYWORDS
     }
 
 # This is where output for one specific student would start
-    my $add_class = ($counter%2) ? 'LC_grade_show_user_odd_row' : '';
-    $request->print("\n\n".
-                    '<div class="LC_grade_show_user '.$add_class.'">'.
-		    '<div class="LC_grade_user_name">'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'</div>'.
-		    '<div class="LC_grade_show_user_body">'."\n");
+    my $add_class = ($counter%2) ? ' LC_grade_show_user_odd_row' : '';
+    $request->print(
+        "\n\n"
+       .'<div class="LC_grade_show_user'.$add_class.'">'
+       .'<h2>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'</h2>'
+       ."\n"
+    );
+
+    # Show additional functions if allowed
+    if ($perm{'vgr'}) {
+        $request->print(
+            &Apache::loncommon::track_student_link(
+                &mt('View recent activity'),
+                $uname,$udom,'check')
+           .' '
+        );
+    }
+    if ($perm{'opa'}) {
+        $request->print(
+            &Apache::loncommon::pprmlink(
+                &mt('Set/Change parameters'),
+                $uname,$udom,$symb,'check'));
+    }
 
+    # Show Problem
     if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') {
 	my $mode;
 	if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') {
@@ -2022,24 +2128,26 @@ KEYWORDS
     }
 
     my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
-    my ($partlist,$handgrade,$responseType) = &response_type($symb);
+    my $res_error;
+    my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
+    if ($res_error) {
+        $request->print(&navmap_errormsg());
+        return;
+    }
 
     # Display student info
     $request->print(($counter == 0 ? '' : '<br />'));
-    my $result='<div class="LC_grade_submissions">';
-    
-    $result.='<div class="LC_grade_submissions_header">';
-    $result.= &mt('Submissions');
+
+    my $result='<div class="LC_Box">'
+              .'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>';
     $result.='<input type="hidden" name="name'.$counter.
-	'" value="'.$env{'form.fullname'}.'" />'."\n";
+             '" value="'.$env{'form.fullname'}.'" />'."\n";
     if ($env{'form.handgrade'} eq 'no') {
-	$result.='<span class="LC_grade_check_note">'.
-	    &mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)."</span>\n";
-
+        $result.='<p class="LC_info">'
+                .&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)
+                ."</p>\n";
     }
 
-
-
     # If any part of the problem is an essay-response (handgraded), then check for collaborators
     my $fullname;
     my $col_fullnames = [];
@@ -2050,9 +2158,9 @@ KEYWORDS
 	$result.=$sub_result;
     }
     $request->print($result."\n");
-    $request->print('</div>'."\n");
+
     # print student answer/submission
-    # Options are (1) Handgaded submission only
+    # Options are (1) Handgraded submission only
     #             (2) Last submission, includes submission that is not handgraded 
     #                  (for multi-response type part)
     #             (3) Last submission plus the parts info
@@ -2062,10 +2170,12 @@ KEYWORDS
 	
 	my $lastsubonly;
 
-	if ($$timestamp eq '') {
-	    $lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>'; 
-	} else {
-	    $lastsubonly = '<div class="LC_grade_submissions_body"> <b>Date Submitted:</b> '.$$timestamp."\n";
+        if ($$timestamp eq '') {
+            $lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>'; 
+        } else {
+            $lastsubonly =
+                '<div class="LC_grade_submissions_body">'
+               .'<b>'.&mt('Date Submitted:').'</b> '.$$timestamp."\n";
 
 	    my %seenparts;
 	    my @part_response_id = &flatten_responseType($responseType);
@@ -2089,16 +2199,18 @@ KEYWORDS
 		}
 		my $responsetype = $responseType->{$partid}->{$respid};
 		if (!exists($record{"resource.$partid.$respid.submission"})) {
-		    $lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '.
-			$display_part.' <span class="LC_internal_info">( ID '.$respid.
-			' )</span>&nbsp; &nbsp;'.
-			'<span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br /><br /></div>';
+                    $lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
+                        '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
+                        ' <span class="LC_internal_info">'.
+                        '('.&mt('Part ID: [_1]',$respid).')'.
+                        '</span>&nbsp; &nbsp;'.
+			'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
 		    next;
 		}
 		foreach my $submission (@$string) {
 		    my ($partid,$respid) = ($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);
 		    if (join('_',@{$part}) ne ($partid.'_'.$respid)) { next; }
-		    my ($ressub,$subval) = split(/:/,$submission,2);
+		    my ($ressub,$hide,$subval) = split(/:/,$submission,3);
 		    # Similarity check
 		    my $similar='';
 		    if($env{'form.checkPlag'}){
@@ -2110,17 +2222,21 @@ KEYWORDS
 				&Apache::lonnet::coursedescription($ocrsid,
 								   {'one_time' => 1});
 
-			    $similar="<hr /><h3><span class=\"LC_warning\">".
-				&mt('Essay is [_1]% similar to an essay by [_2] ([_3]:[_4]) in course [_5] (course id [_6]:[_7])',
-				    $osim,
-				    &Apache::loncommon::plainname($oname,$odom),
-				    $oname,$odom,
-				    $old_course_desc{'description'},
-				    $old_course_desc{'num'},
-				    $old_course_desc{'domain'}).
-				'</span></h3><blockquote><i>'.
-				&keywords_highlight($oessay).
-				'</i></blockquote><hr />';
+                            if ($hide) {
+                                $similar='<hr /><span class="LC_warning">'.&mt("Essay was found to be similar to another essay submitted for this assignment.").'<br />'.
+                                         &mt('As the current submission is for an anonymous survey, no other details are available.').'</span><hr />';
+                            } else {
+			        $similar="<hr /><h3><span class=\"LC_warning\">".
+				    &mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',
+				        $osim,
+				        &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',
+				        $old_course_desc{'description'},
+				        $old_course_desc{'num'},
+				        $old_course_desc{'domain'}).
+				    '</span></h3><blockquote><i>'.
+				    &keywords_highlight($oessay).
+				    '</i></blockquote><hr />';
+                            }
 			}
 		    }
 		    my $order=&get_order($partid,$respid,$symb,$uname,$udom);
@@ -2128,33 +2244,43 @@ KEYWORDS
 			($env{'form.lastSub'} eq 'hdgrade' && 
 			 $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
 			my $display_part=&get_display_part($partid,$symb);
-			$lastsubonly.='<div class="LC_grade_submission_part"><b>Part:</b> '.
-			    $display_part.' <span class="LC_internal_info">( ID '.$respid.
-			    ' )</span>&nbsp; &nbsp;';
+                        $lastsubonly.='<div class="LC_grade_submission_part">'.
+                            '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
+                            ' <span class="LC_internal_info">'.
+                            '('.&mt('Part ID: [_1]',$respid).')'.
+                            '</span>&nbsp; &nbsp;';
 			my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
 			if (@$files) {
-			    $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain virusses').'</span><br />';
-			    my $file_counter = 0;
-			    foreach my $file (@$files) {
-			        $file_counter++;
-				&Apache::lonnet::allowuploaded('/adm/grades',$file);
-				$lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
-			    }
+                            if ($hide) {
+                                $lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));
+                            } else {
+                                $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';
+                                foreach my $file (@$files) {
+                                    &Apache::lonnet::allowuploaded('/adm/grades',$file);
+                                    $lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border="0" /> '.$file.'</a>';
+                                }
+                            }
 			    $lastsubonly.='<br />';
 			}
-			$lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.
-			    &cleanRecord($subval,$responsetype,$symb,$partid,
-					 $respid,\%record,$order);
+                        if ($hide) {
+                            $lastsubonly.='<b>'.&mt('Anonymous Survey').'</b>'; 
+                        } else {
+			    $lastsubonly.='<b>'.&mt('Submitted Answer:').' </b>'.
+			        &cleanRecord($subval,$responsetype,$symb,$partid,
+					     $respid,\%record,$order,undef,$uname,$udom);
+                        }
 			if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
 			$lastsubonly.='</div>';
 		    }
 		}
 	    }
-	    $lastsubonly.='</div>'."\n";
+	    $lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body
 	}
 	$request->print($lastsubonly);
    } elsif ($env{'form.lastSub'} eq 'datesub') {
-	my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);
+#	my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);
+    my ($parts,$handgrade,$responseType) = &response_type($symb);
+
 	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
     } elsif ($env{'form.lastSub'} =~ /^(last|all)$/) {
 	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
@@ -2168,7 +2294,7 @@ KEYWORDS
     # return if view submission with no grading option
     if ($env{'form.showgrading'} eq '' || (!&canmodify($usec))) {
 	my $toGrade.='<input type="button" value="Grade Student" '.
-	    'onClick="javascript:checksubmit(this.form,\'Grade Student\',\''
+	    'onclick="javascript:checksubmit(this.form,\'Grade Student\',\''
 	    .$counter.'\');" target="_self" /> &nbsp;'."\n" if (&canmodify($usec));
 	$toGrade.='</div>'."\n";
 	if (($env{'form.command'} eq 'submission') || 
@@ -2212,11 +2338,11 @@ KEYWORDS
     my @partlist;
     my @gradePartRespid;
     my @part_response_id = &flatten_responseType($responseType);
-    $request->print('<div class="LC_grade_assign">'.
-		    
-		    '<div class="LC_grade_assign_header">'.
-		    &mt('Assign Grades').'</div>'.
-		    '<div class="LC_grade_assign_body">');
+    $request->print(
+        '<div class="LC_Box">'
+       .'<h3 class="LC_hcell">'.&mt('Assign Grades').'</h3>'
+    );
+    $request->print(&gradeBox_start());
     foreach my $part_response_id (@part_response_id) {
     	my ($partid,$respid) = @{ $part_response_id };
 	my $part_resp = join('_',@{ $part_response_id });
@@ -2224,23 +2350,14 @@ KEYWORDS
 	$seen{$partid}++;
 	next if ($$handgrade{$part_resp} ne 'yes' 
 		 && $env{'form.lastSub'} eq 'hdgrade');
-	push @partlist,$partid;
-	push @gradePartRespid,$partid.'.'.$respid;
+	push(@partlist,$partid);
+	push(@gradePartRespid,$partid.'.'.$respid);
 	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
     }
-    $request->print('</div></div>');
+    $request->print(&gradeBox_end()); # </div>
+    $request->print('</div>');
 
     $request->print('<div class="LC_grade_info_links">');
-    if ($perm{'vgr'}) {
-	$request->print(
-	    &Apache::loncommon::track_student_link(&mt('View recent activity'),
-						   $uname,$udom,'check'));
-    }
-    if ($perm{'opa'}) {
-	$request->print(
-	    &Apache::loncommon::pprmlink(&mt('Set/Change parameters'),
-					 $uname,$udom,$symb,'check'));
-    }
     $request->print('</div>');
 
     $result='<input type="hidden" name="partlist'.$counter.
@@ -2257,15 +2374,14 @@ KEYWORDS
 
 # Done with printing info for one student
 
-    $request->print('</div>');#LC_grade_show_user_body
     $request->print('</div>');#LC_grade_show_user
 
 
     # print end of form
     if ($counter == $total) {
-	my $endform='<table border="0"><tr><td>'."\n";
+        my $endform='<br /><hr /><table border="0"><tr><td>'."\n";
 	$endform.='<input type="button" value="'.&mt('Save &amp; Next').'" '.
-	    'onClick="javascript:checksubmit(this.form,\'Save & Next\','.
+	    'onclick="javascript:checksubmit(this.form,\'Save & Next\','.
 	    $total.','.scalar(@partlist).');" target="_self" /> &nbsp;'."\n";
 	my $ntstu ='<select name="NTSTU">'.
 	    '<option>1</option><option>2</option>'.
@@ -2273,12 +2389,14 @@ KEYWORDS
 	    '<option>7</option><option>10</option></select>'."\n";
 	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
 	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
-	$endform.=&mt('[_1]student(s)',$ntstu);
+        $endform.=&mt('[_1]student(s)',$ntstu);
 	$endform.='&nbsp;&nbsp;<input type="button" value="'.&mt('Previous').'" '.
-	    'onClick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> &nbsp;'."\n".
+	    'onclick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> &nbsp;'."\n".
 	    '<input type="button" value="'.&mt('Next').'" '.
-	    'onClick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> &nbsp;';
-	$endform.=&mt('(Next and Previous (student) do not save the scores.)')."\n" ;
+	    'onclick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> &nbsp;';
+        $endform.='<span class="LC_warning">'.
+                  &mt('(Next and Previous (student) do not save the scores.)').
+                  '</span>'."\n" ;
         $endform.="<input type='hidden' value='".&get_increment().
             "' name='increment' />";
 	$endform.='</td></tr></table></form>';
@@ -2347,7 +2465,7 @@ sub check_collaborators {
 #--- Retrieve the last submission for all the parts
 sub get_last_submission {
     my ($returnhash)=@_;
-    my (@string,$timestamp);
+    my (@string,$timestamp,%lasthidden);
     if ($$returnhash{'version'}) {
 	my %lasthash=();
 	my ($version);
@@ -2356,21 +2474,47 @@ sub get_last_submission {
 					$$returnhash{$version.':keys'}))) {
 		$lasthash{$key}=$$returnhash{$version.':'.$key};
 		$timestamp = 
-		    scalar(localtime($$returnhash{$version.':timestamp'}));
+		    &Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
 	    }
 	}
+        my %typeparts;
+        my $showsurv = 
+            &Apache::lonnet::allowed('vas',$env{'request.course.id'});
+        foreach my $key (sort(keys(%lasthash))) {
+            if ($key =~ /\.type$/) {
+                if (($lasthash{$key} eq 'anonsurvey') || 
+                    ($lasthash{$key} eq 'anonsurveycred')) {
+                    my ($ign,@parts) = split(/\./,$key);
+                    pop(@parts);
+                    unless ($showsurv) {
+                        my $id = join(',',@parts);
+                        $typeparts{$ign.'.'.$id} = $lasthash{$key};
+                    }
+                    delete($lasthash{$key});
+                }
+            }
+        }
+        my @hidden = keys(%typeparts);
 	foreach my $key (keys(%lasthash)) {
 	    next if ($key !~ /\.submission$/);
-
+            my $hide;
+            if (@hidden) {
+                foreach my $id (@hidden) {
+                    if ($key =~ /^\Q$id\E/) {
+                        $hide = 1;
+                        last;
+                    }
+                }
+            }
 	    my ($partid,$foo) = split(/submission$/,$key);
 	    my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
 		'<span class="LC_warning">Draft Copy</span> ' : '';
-	    push(@string, join(':', $key, $draft.$lasthash{$key}));
+	    push(@string, join(':', $key, $hide, $draft.$lasthash{$key}));
 	}
     }
     if (!@string) {
 	$string[0] =
-	    '<span class="LC_warning">Nothing submitted - no attempts.</span>';
+	    '<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span>';
     }
     return (\@string,\$timestamp);
 }
@@ -2439,7 +2583,7 @@ sub processHandGrade {
                                                      undef,$feedurl,undef,
                                                      undef,undef,$showsymb,
                                                      $restitle);
-		$request->print('<br />'.&mt('Sending message to [_1]:[_2]',$uname,$udom).': '.
+		$request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '.
 				$msgstatus);
 	    }
 	    if ($env{'form.collaborator'.$ctr}) {
@@ -2532,7 +2676,7 @@ sub processHandGrade {
 
 # Go directly to grade student - from submission or link from chart page
     if ($button eq 'Grade Student') {
-	(undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb);
+#	(undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb);
 	my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};
 	($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
 	$env{'form.fullname'} = $$fullname{$processUser};
@@ -2552,7 +2696,7 @@ sub processHandGrade {
 
     my (@parsedlist,@nextlist);
     my ($nextflg) = 0;
-    foreach (sort 
+    foreach my $item (sort 
 	     {
 		 if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
 		     return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
@@ -2560,17 +2704,22 @@ sub processHandGrade {
 		 return $a cmp $b;
 	     } (keys(%$fullname))) {
 	if ($nextflg == 1 && $button =~ /Next$/) {
-	    push @parsedlist,$_;
+	    push(@parsedlist,$item);
 	}
-	$nextflg = 1 if ($_ eq $laststu);
+	$nextflg = 1 if ($item eq $laststu);
 	if ($button eq 'Previous') {
-	    last if ($_ eq $firststu);
-	    push @parsedlist,$_;
+	    last if ($item eq $firststu);
+	    push(@parsedlist,$item);
 	}
     }
     $ctr = 0;
     @parsedlist = reverse @parsedlist if ($button eq 'Previous');
-    my ($partlist) = &response_type($symb);
+    my $res_error;
+    my ($partlist) = &response_type($symb,\$res_error);
+    if ($res_error) {
+        $request->print(&navmap_errormsg());
+        return;
+    }
     foreach my $student (@parsedlist) {
 	my $submitonly=$env{'form.submitonly'};
 	my ($uname,$udom) = split(/:/,$student);
@@ -2588,11 +2737,11 @@ sub processHandGrade {
 	    my $submitted = 0;
 	    my $ungraded = 0;
 	    my $incorrect = 0;
-	    foreach (keys(%status)) {
-		$submitted = 1 if ($status{$_} ne 'nothing');
-		$ungraded = 1 if ($status{$_} =~ /^ungraded/);
-		$incorrect = 1 if ($status{$_} =~ /^incorrect/);
-		my ($foo,$partid,$foo1) = split(/\./,$_);
+	    foreach my $item (keys(%status)) {
+		$submitted = 1 if ($status{$item} ne 'nothing');
+		$ungraded = 1 if ($status{$item} =~ /^ungraded/);
+		$incorrect = 1 if ($status{$item} =~ /^incorrect/);
+		my ($foo,$partid,$foo1) = split(/\./,$item);
 		if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
 		    $submitted = 0;
 		}
@@ -2603,7 +2752,7 @@ sub processHandGrade {
 	    next if (!$ungraded && ($submitonly eq 'graded'));
 	    next if (!$incorrect && $submitonly eq 'incorrect');
 	}
-	push @nextlist,$student if ($ctr < $ntstu);
+	push(@nextlist,$student) if ($ctr < $ntstu);
 	last if ($ctr == $ntstu);
 	$ctr++;
     }
@@ -2611,7 +2760,7 @@ sub processHandGrade {
     $ctr = 0;
     my $total = scalar(@nextlist)-1;
 
-    foreach (sort @nextlist) {
+    foreach (sort(@nextlist)) {
 	my ($uname,$udom,$submitter) = split(/:/);
 	$env{'form.student'}  = $uname;
 	$env{'form.userdom'}  = $udom;
@@ -2657,7 +2806,7 @@ sub saveHandGrade {
 	    }
 	} elsif ($dropMenu eq 'reset status'
 		 && exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts
-	    foreach my $key (keys (%record)) {
+	    foreach my $key (keys(%record)) {
 		if ($key=~/^resource\.\Q$new_part\E\./) { $newrecord{$key} = ''; }
 	    }
 	    $newrecord{'resource.'.$new_part.'.regrader'}=
@@ -2692,7 +2841,7 @@ sub saveHandGrade {
                 &handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord);
 		next;
 	    } else {
-	        push @parts_graded, $new_part;
+	        push(@parts_graded,$new_part);
 	    }
 	    if ($record{'resource.'.$new_part.'.awarded'} ne $partial) {
 		$newrecord{'resource.'.$new_part.'.awarded'}  = $partial;
@@ -2719,7 +2868,7 @@ sub saveHandGrade {
 	        $record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override' ||
 	        $dropMenu eq 'reset status')
 	   {
-	    push (@version_parts,$new_part);
+	    push(@version_parts,$new_part);
 	}
     }
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -2767,9 +2916,13 @@ sub check_and_remove_from_queue {
 
 sub handback_files {
     my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;
-    my $portfolio_root = &propath($domain,$stuname).'/userfiles/portfolio';
-    my ($partlist,$handgrade,$responseType) = &response_type($symb);
-
+    my $portfolio_root = '/userfiles/portfolio';
+    my $res_error;
+    my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
+    if ($res_error) {
+        $request->print('<br />'.&navmap_errormsg().'<br />');
+        return;
+    }
     my @part_response_id = &flatten_responseType($responseType);
     foreach my $part_response_id (@part_response_id) {
     	my ($part_id,$resp_id) = @{ $part_response_id };
@@ -2785,7 +2938,8 @@ sub handback_files {
                     my ($answer_name,$answer_ver,$answer_ext) =
 		        &file_name_version_ext($answer_file);
 		    my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
-		    my @dir_list = &Apache::lonnet::dirlist($portfolio_path,$domain,$stuname,$portfolio_root);
+                    my $getpropath = 1;
+		    my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$portfolio_path,$domain,$stuname,$getpropath);
 		    my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
                     # fix file name
                     my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
@@ -2793,8 +2947,10 @@ sub handback_files {
             	                                $newflg.'_'.$part_resp.'_returndoc'.$file_counter,
             	                                $save_file_name);
                     if ($result !~ m|^/uploaded/|) {
-                        $request->print('<span class="LC_error">An error occurred ('.$result.
-                        ') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</span><br />');
+                        $request->print('<br /><span class="LC_error">'.
+                            &mt('An error occurred ([_1]) while trying to upload [_2].',
+                                $result,$newflg.'_'.$part_resp.'_returndoc'.$file_counter).
+                                        '</span>');
                     } else {
                         # mark the file as read only
                         my @files = ($save_file_name);
@@ -2891,7 +3047,7 @@ sub decrement_aggs {
     if ($aggtries == $totaltries) {
         $decrement{'users'} = 1;
     }
-    foreach my $type (keys (%decrement)) {
+    foreach my $type (keys(%decrement)) {
         $$aggregate{$symb."\0".$part."\0".$type} = -$decrement{$type};
     }
     return;
@@ -2921,8 +3077,7 @@ sub version_portfiles {
     my $version_parts = join('|',@$v_flag);
     my @returned_keys;
     my $parts = join('|', @$parts_graded);
-    my $portfolio_root = &propath($domain,$stu_name).
-	'/userfiles/portfolio';
+    my $portfolio_root = '/userfiles/portfolio';
     foreach my $key (keys(%$record)) {
         my $new_portfiles;
         if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
@@ -2933,7 +3088,8 @@ sub version_portfiles {
                 my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);
 		my ($answer_name,$answer_ver,$answer_ext) =
 		    &file_name_version_ext($answer_file);
-                my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stu_name,$portfolio_root);
+                my $getpropath = 1;    
+                my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,$stu_name,$getpropath);
                 my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
                 my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
                 if ($new_answer ne 'problem getting file') {
@@ -3013,15 +3169,15 @@ sub file_name_version_ext {
 sub viewgrades_js {
     my ($request) = shift;
 
-    $request->print(<<VIEWJAVASCRIPT);
-<script type="text/javascript" language="javascript">
+    my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<VIEWJAVASCRIPT));
    function writePoint(partid,weight,point) {
 	var radioButton = document.classgrade["RADVAL_"+partid];
 	var textbox = document.classgrade["TEXTVAL_"+partid];
 	if (point == "textval") {
 	    point = document.classgrade["TEXTVAL_"+partid].value;
 	    if (isNaN(point) || parseFloat(point) < 0) {
-		alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
+		alert("$alertmsg"+parseFloat(point));
 		var resetbox = false;
 		for (var i=0; i<radioButton.length; i++) {
 		    if (radioButton[i].checked) {
@@ -3119,7 +3275,7 @@ sub viewgrades_js {
 	var weight = document.classgrade["weight_"+partid].value;
 
 	if (isNaN(point) || parseFloat(point) < 0) {
-	    alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
+	    alert("$alertmsg"+parseFloat(point));
 	    textbox.value = "";
 	    return;
 	}
@@ -3175,7 +3331,6 @@ sub viewgrades_js {
 	}
     }
 
-</script>
 VIEWJAVASCRIPT
 }
 
@@ -3208,22 +3363,26 @@ sub viewgrades {
 	'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".
 	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
 
-    my $sectionClass;
-    my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
+    my ($common_header,$specific_header);
     if ($env{'form.section'} eq 'all') {
-	$sectionClass='Class';
+	$common_header = &mt('Assign Common Grade to Class');
+        $specific_header = &mt('Assign Grade to Specific Students in Class');
     } elsif ($env{'form.section'} eq 'none') {
-	$sectionClass='Students in no Section';
+        $common_header = &mt('Assign Common Grade to Students in no Section');
+	$specific_header = &mt('Assign Grade to Specific Students in no Section');
     } else {
-	$sectionClass='Students in Section(s) [_1]';
+        my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
+        $common_header = &mt('Assign Common Grade to Students in Section(s) [_1]',$section_display);
+	$specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1]',$section_display);
     }
-    $result.=
-	'<h3>'.
-	&mt("Assign Common Grade To $sectionClass",$section_display).'</h3>';
-    $result.= &Apache::loncommon::start_data_table();
+    $result.= '<h3>'.$common_header.'</h3>'.&Apache::loncommon::start_data_table();
     #radio buttons/text box for assigning points for a section or class.
     #handles different parts of a problem
-    my ($partlist,$handgrade,$responseType) = &response_type($symb);
+    my $res_error;
+    my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
+    if ($res_error) {
+        return &navmap_errormsg();
+    }
     my %weight = ();
     my $ctsparts = 0;
     my %seen = ();
@@ -3249,11 +3408,11 @@ sub viewgrades {
 	}
 	$radio.='</tr></table>';
 	my $line = '<input type="text" name="TEXTVAL_'.
-	    $partid.'" size="4" '.'onChange="javascript:writePoint(\''.
+	    $partid.'" size="4" '.'onchange="javascript:writePoint(\''.
 		$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.
-	    $weight{$partid}.' (problem weight)</td>'."\n";
-	$line.= '<td><select name="SELVAL_'.$partid.'"'.
-	    'onChange="javascript:writeRadText(\''.$partid.'\','.
+	    $weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n";
+	$line.= '<td><b>'.&mt('Grade Status').':</b><select name="SELVAL_'.$partid.'"'.
+	    'onchange="javascript:writeRadText(\''.$partid.'\','.
 		$weight{$partid}.')"> '.
 	    '<option selected="selected"> </option>'.
 	    '<option value="excused">'.&mt('excused').'</option>'.
@@ -3267,32 +3426,36 @@ sub viewgrades {
 
 	$result.=
 	    &Apache::loncommon::start_data_table_row()."\n".
-	    &mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line).
+	    '<td><b>'.&mt('Part:').'</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points:').'</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
 	    &Apache::loncommon::end_data_table_row()."\n";
 	$ctsparts++;
     }
     $result.=&Apache::loncommon::end_data_table()."\n".
 	'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
     $result.='<input type="button" value="'.&mt('Revert to Default').'" '.
-	'onClick="javascript:resetEntry('.$ctsparts.');" />';
+	'onclick="javascript:resetEntry('.$ctsparts.');" />';
 
     #table listing all the students in a section/class
     #header of table
-    $result.= '<h3>'.&mt('Assign Grade to Specific Students in '.$sectionClass,
-			 $section_display).'</h3>';
-    $result.= &Apache::loncommon::start_data_table().
-	&Apache::loncommon::start_data_table_header_row().
-	'<th>'.&mt('No.').'</th>'.
-	'<th>'.&nameUserString('header')."</th>\n";
-    my (@parts) = sort(&getpartlist($symb));
+    $result.= '<h3>'.$specific_header.'</h3>'.
+              &Apache::loncommon::start_data_table().
+	      &Apache::loncommon::start_data_table_header_row().
+	      '<th>'.&mt('No.').'</th>'.
+	      '<th>'.&nameUserString('header')."</th>\n";
+    my $partserror;
+    my (@parts) = sort(&getpartlist($symb,\$partserror));
+    if ($partserror) {
+        return &navmap_errormsg();
+    }
     my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
     my @partids = ();
     foreach my $part (@parts) {
 	my $display=&Apache::lonnet::metadata($url,$part.'.display');
-	$display =~ s|^Number of Attempts|Tries<br />|; # makes the column narrower
+        my $narrowtext = &mt('Tries');
+	$display =~ s|^Number of Attempts|$narrowtext <br />|; # makes the column narrower
 	if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
 	my ($partid) = &split_part_type($part);
-        push(@partids, $partid);
+        push(@partids,$partid);
 	my $display_part=&get_display_part($partid,$symb);
 	if ($display =~ /^Partial Credit Factor/) {
 	    $result.='<th>'.
@@ -3334,7 +3497,7 @@ sub viewgrades {
     $result.=&Apache::loncommon::end_data_table();
     $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
     $result.='<input type="button" value="'.&mt('Save').'" '.
-	'onClick="javascript:submit();" target="_self" /></form>'."\n";
+	'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'));
@@ -3386,7 +3549,7 @@ sub viewstudentgrade {
 		'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
 	    $result.='<input type="text" name="'.
 		'GD_'.$student.'_'.$part.'_awarded" '.
-		'onChange="javascript:changeSelect(\''.$part.'\',\''.$student.
+                'onchange="javascript:changeSelect(\''.$part.'\',\''.$student.
 		'\')" value="'.$pts.'" size="4" /></td>'."\n";
 	} elsif ($type eq 'solved') {
 	    my ($status,$foo)=split(/_/,$score,2);
@@ -3395,7 +3558,7 @@ sub viewstudentgrade {
 		$part.'_solved_s" value="'.$status.'" />'."\n";
 	    $result.='&nbsp;<select name="'.
 		'GD_'.$student.'_'.$part.'_solved" '.
-		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
+                'onchange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
 	    $result.= (($status eq 'excused') ? '<option> </option><option selected="selected" value="excused">'.&mt('excused').'</option>' 
 		: '<option selected="selected"> </option><option value="excused">'.&mt('excused').'</option>')."\n";
 	    $result.='<option value="reset status">'.&mt('reset status').'</option>';
@@ -3433,6 +3596,7 @@ sub editgrades {
 		    'incorrect'=>'incorrect_by_override',
 		    'excused'  =>'excused',
 		    'ungraded' =>'ungraded_attempted',
+                    'credited' =>'credit_attempted',
 		    'nothing'  => '',
 		    );
     my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0');
@@ -3442,11 +3606,15 @@ sub editgrades {
     my %columns = ();
     my ($i,$ctr,$count,$rec_update) = (0,0,0,0);
 
-    my (@parts) = sort(&getpartlist($symb));
+    my $partserror;
+    my (@parts) = sort(&getpartlist($symb,\$partserror));
+    if ($partserror) {
+        return &navmap_errormsg();
+    }
     my $header;
     while ($ctr < $env{'form.totalparts'}) {
 	my $partid = $env{'form.partid_'.$ctr};
-	push @partid,$partid;
+	push(@partid,$partid);
 	$weight{$partid} = $env{'form.weight_'.$partid};
 	$ctr++;
     }
@@ -3460,10 +3628,11 @@ sub editgrades {
 	    if ($part !~ m/^\Q$partid\E/) { next;}
 	    if ($type eq 'awarded' || $type eq 'solved') { next; }
 	    my $display=&Apache::lonnet::metadata($url,$stores.'.display');
-	    $display =~ s/\[Part: (\w)+\]//;
-	    $display =~ s/Number of Attempts/Tries/;
-	    $header .= '<th align="center">'.&mt('Old '.$display).'</th>'.
-		'<th align="center">'.&mt('New '.$display).'</th>';
+	    $display =~ s/\[Part: \Q$part\E\]//;
+            my $narrowtext = &mt('Tries');
+	    $display =~ s/Number of Attempts/$narrowtext/;
+	    $header .= '<th align="center">'.&mt('Old').' '.$display.'</th>'.
+		'<th align="center">'.&mt('New').' '.$display.'</th>';
 	    $columns{$partid}+=2;
 	}
     }
@@ -3652,7 +3821,7 @@ sub split_part_type {
 #
 #--- Javascript to handle csv upload
 sub csvupload_javascript_reverse_associate {
-    my $error1=&mt('You need to specify the username or ID');
+    my $error1=&mt('You need to specify the username or the student/employee ID');
     my $error2=&mt('You need to specify at least one grading field');
   return(<<ENDPICK);
   function verify(vf) {
@@ -3692,7 +3861,7 @@ ENDPICK
 }
 
 sub csvupload_javascript_forward_associate {
-    my $error1=&mt('You need to specify the username or ID');
+    my $error1=&mt('You need to specify the username or the student/employee ID');
     my $error2=&mt('You need to specify at least one grading field');
   return(<<ENDPICK);
   function verify(vf) {
@@ -3737,7 +3906,8 @@ sub csvuploadmap_header {
 	$javascript=&csvupload_javascript_forward_associate();
     }
 
-    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
+#    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
+    my $result='';
     my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
     my $ignore=&mt('Ignore First Line');
     $symb = &Apache::lonenc::check_encrypt($symb);
@@ -3750,7 +3920,7 @@ $result
 Total number of records found in file: $distotal <hr />
 Enter as many fields as you can. The system will inform you and bring you back
 to this page if the data selected is insufficient to run your class.<hr />
-<input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
+<input type="button" value="Reverse Association" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
 <label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>
 <input type="hidden" name="associate"  value="" />
 <input type="hidden" name="phase"      value="three" />
@@ -3764,18 +3934,22 @@ to this page if the data selected is ins
 <input type="hidden" name="probTitle"  value="$env{'form.probTitle'}" />
 <input type="hidden" name="command"    value="csvuploadoptions" />
 <hr />
-<script type="text/javascript" language="Javascript">
-$javascript
-</script>
 ENDPICK
+    $request->print(&Apache::lonhtmlcommon::scripttag($javascript));
     return '';
 
 }
 
 sub csvupload_fields {
-    my ($symb) = @_;
-    my (@parts) = &getpartlist($symb);
-    my @fields=(['ID','Student ID'],
+    my ($symb,$errorref) = @_;
+    my (@parts) = &getpartlist($symb,$errorref);
+    if (ref($errorref)) {
+        if ($$errorref) {
+            return;
+        }
+    }
+
+    my @fields=(['ID','Student/Employee ID'],
 		['username','Student Username'],
 		['domain','Student Domain']);
     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
@@ -3799,22 +3973,21 @@ sub csvuploadmap_footer {
 </table>
 <input type="hidden" name="nfields" value="$i" />
 <input type="hidden" name="keyfields" value="$keyfields" />
-<input type="button" onClick="javascript:verify(this.form)" value="Assign Grades" /><br />
+<input type="button" onclick="javascript:verify(this.form)" value="Assign Grades" /><br />
 </form>
 ENDPICK
 }
 
 sub checkforfile_js {
-    my $result =<<CSVFORMJS;
-<script type="text/javascript" language="javascript">
+    my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
+    my $result = &Apache::lonhtmlcommon::scripttag(<<CSVFORMJS);
     function checkUpload(formname) {
 	if (formname.upfile.value == "") {
-	    alert("Please use the browse button to select a file from your local directory.");
+	    alert("$alertmsg");
 	    return false;
 	}
 	formname.submit();
     }
-    </script>
 CSVFORMJS
     return $result;
 }
@@ -3825,12 +3998,12 @@ sub upcsvScores_form {
     if (!$symb) {return '';}
     my $result=&checkforfile_js();
     $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
-    my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
-    $result.=$table;
+#    my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
+#    $result.=$table;
     $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
     $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
-    $result.='&nbsp;<b>'.&mt('Specify a file containing the class scores for current resource').
-	'.</b></td></tr>'."\n";
+    $result.='&nbsp;<b>'.&mt('Specify a file containing the class scores for current resource.').
+	'</b></td></tr>'."\n";
     $result.='<tr bgcolor=#ffffe6><td>'."\n";
     my $upload=&mt("Upload Scores");
     my $upfile_select=&Apache::loncommon::upfile_select_html();
@@ -3843,7 +4016,7 @@ sub upcsvScores_form {
 <input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
 <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
 $upfile_select
-<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" />
+<br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
 <label><input type="checkbox" name="noFirstLine" />$ignore</label>
 </form>
 ENDUPFORM
@@ -3873,8 +4046,12 @@ sub csvuploadmap {
     &csvuploadmap_header($request,$symb,$datatoken,$#records+1);
     my ($i,$keyfields);
     if (@records) {
-	my @fields=&csvupload_fields($symb);
-
+        my $fieldserror;
+	my @fields=&csvupload_fields($symb,\$fieldserror);
+        if ($fieldserror) {
+            $request->print(&navmap_errormsg());
+            return;
+        }
 	if ($env{'form.upfile_associate'} eq 'reverse') {	
 	    &Apache::loncommon::csv_print_samples($request,\@records);
 	    $i=&Apache::loncommon::csv_print_select_table($request,\@records,
@@ -4042,32 +4219,32 @@ sub csvuploadassign {
 		$grades{$store_key}=$entries{$fields{$dest}};
 	    }
 	}
-	if (! %grades) { push(@skipped,"$username:$domain no data to save"); }
-	$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
-	my $result=&Apache::lonnet::cstore(\%grades,$symb,
+	if (! %grades) { 
+           push(@skipped,&mt("[_1]: no data to save","$username:$domain")); 
+        } 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') {
-	    $request->print('.');
-	} else {
-	    $request->print("<p>
-                              <span class=\"LC_error\">
-                                 Failed to save student $username:$domain.
-                                 Message when trying to save was ($result)
-                              </span>
-                             </p>" );
-	}
-	$request->rflush();
-	$countdone++;
+	   if ($result eq 'ok') {
+	      $request->print('.');
+	   } else {
+	      $request->print("<p><span class=\"LC_error\">".
+                              &mt("Failed to save data for student [_1]. Message when trying to save was: [_2]",
+                                  "$username:$domain",$result)."</span></p>");
+	   }
+	   $request->rflush();
+	   $countdone++;
+        }
     }
-    $request->print("<br />Saved $countdone students\n");
+    $request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0));
     if (@skipped) {
-	$request->print('<p><h4><b>Skipped Students</b></h4></p>');
-	foreach my $student (@skipped) { $request->print("$student<br />\n"); }
+	$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('No scores stored for the following username(s):'),1).'<br />');
+        $request->print(join(', ',@skipped));
     }
     if (@notallowed) {
-	$request->print('<p><span class="LC_error">Students Not Allowed to Modify</span></p>');
-	foreach my $student (@notallowed) { $request->print("$student<br />\n"); }
+	$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('Modification of scores not allowed for the following username(s):'),1).'<br />');
+	$request->print(join(', ',@notallowed));
     }
     $request->print("<br />\n");
     $request->print(&show_grading_menu_form($symb));
@@ -4083,12 +4260,12 @@ sub csvuploadassign {
 sub pickStudentPage {
     my ($request) = shift;
 
-    $request->print(<<LISTJAVASCRIPT);
-<script type="text/javascript" language="javascript">
+    my $alertmsg = &mt('Please select the student you wish to grade.');
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
 
 function checkPickOne(formname) {
     if (radioSelection(formname.student) == null) {
-	alert("Please select the student you wish to grade.");
+	alert("$alertmsg");
 	return;
     }
     ptr = pullDownSelection(formname.selectpage);
@@ -4097,7 +4274,6 @@ function checkPickOne(formname) {
     formname.submit();
 }
 
-</script>
 LISTJAVASCRIPT
     &commonJSfunctions($request);
     my ($symb) = &get_symb($request);
@@ -4109,7 +4285,12 @@ LISTJAVASCRIPT
 	&mt('Manual Grading by Page or Sequence').'</span></h3>';
 
     $result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
-    my ($titles,$symbx) = &getSymbMap();
+    my $map_error;
+    my ($titles,$symbx) = &getSymbMap($map_error);
+    if ($map_error) {
+        $request->print(&navmap_errormsg());
+        return; 
+    }
     my ($curpage) =&Apache::lonnet::decode_symb($symb); 
 #    my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); 
 #    my $type=($curpage =~ /\.(page|sequence)/);
@@ -4123,7 +4304,7 @@ LISTJAVASCRIPT
 	$ctr++;
     }
     $select.= '</select>';
-    $result.=&mt('&nbsp;<b>Problems from:</b> [_1]',$select)."<br />\n";
+    $result.='&nbsp;<b>'.&mt('Problems from').':</b> '.$select."<br />\n";
 
     $ctr=0;
     foreach (@$titles) {
@@ -4138,13 +4319,13 @@ LISTJAVASCRIPT
     my $options =
 	'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
 	'<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n";
-    $result.='&nbsp;'.&mt('<b>View Problems Text: </b> [_1]',$options);
+    $result.='&nbsp;<b>'.&mt('View Problem Text').': </b>'.$options;
 
     $options =
 	'<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n".
 	'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n".
 	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n";
-    $result.='&nbsp;'.&mt('<b>Submission Details: </b>[_1]',$options);
+    $result.='&nbsp;<b>'.&mt('Submissions').': </b>'.$options;
     
     $result.=&build_section_inputs();
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
@@ -4153,12 +4334,10 @@ LISTJAVASCRIPT
 	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
 	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
 
-    $result.='&nbsp;'.&mt('<b>Use CODE: [_1] </b>',
-			  '<input type="text" name="CODE" value="" />').
-			      '<br />'."\n";
+    $result.='&nbsp;<b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n";
 
     $result.='&nbsp;<input type="button" '.
-	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next-&gt;').'" /><br />'."\n";
+             'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' &rarr;" /><br />'."\n";
 
     $request->print($result);
 
@@ -4197,7 +4376,7 @@ LISTJAVASCRIPT
     }
     $studentTable.=&Apache::loncommon::end_data_table()."\n";
     $studentTable.='<input type="button" '.
-	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next-&gt;').'" /></form>'."\n";
+                   'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' &rarr;" /></form>'."\n";
 
     $studentTable.=&show_grading_menu_form($symb);
     $request->print($studentTable);
@@ -4206,8 +4385,14 @@ LISTJAVASCRIPT
 }
 
 sub getSymbMap {
+    my ($map_error) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
-
+    unless (ref($navmap)) {
+        if (ref($map_error)) {
+            $$map_error = 'navmap';
+        }
+        return;
+    }
     my %symbx = ();
     my @titles = ();
     my $minder = 0;
@@ -4256,7 +4441,8 @@ sub displayPage {
     my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
     $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'});
+    if (&Apache::lonnet::validCODE(uc($env{'form.CODE'}))) {
 	$result.='<h3>&nbsp;'.&mt('CODE: [_1]',$env{'form.CODE'}).'</h3>'."\n";
     } else {
 	delete($env{'form.CODE'});
@@ -4265,6 +4451,11 @@ sub displayPage {
     $request->print($result);
 
     my $navmap = Apache::lonnavmaps::navmap->new();
+    unless (ref($navmap)) {
+        $request->print(&navmap_errormsg());
+        $request->print(&show_grading_menu_form($symb));
+        return;
+    }
     my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
     if (!$map) {
@@ -4292,7 +4483,9 @@ sub displayPage {
     my $checkIcon = '<img alt="'.&mt('Check Mark').
 	'" src="'.&Apache::loncommon::lonhttpdurl($request->dir_config('lonIconsURL').'/check.gif').'" height="16" border="0" />';
 
-    $studentTable.='&nbsp;'.&mt('<b>Note:</b> Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon)."\n".
+    $studentTable.='&nbsp;<span class="LC_info">'.
+        &mt('Problems graded correct by the computer are marked with a [_1] symbol.',$checkIcon).
+        '</span>'."\n".
 	&Apache::loncommon::start_data_table().
 	&Apache::loncommon::start_data_table_header_row().
 	'<th align="center">&nbsp;Prob.&nbsp;</th>'.
@@ -4333,7 +4526,7 @@ sub displayPage {
 #		    $request->print('match='.$1."<br />\n");
 #		}
 #		$companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
-		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br />&nbsp;'.&mt('<b>Correct answer:</b><br />[_1]',$companswer);
+		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br />&nbsp;<b>'.&mt('Correct answer').':</b><br />'.$companswer;
 	    }
 
 	    my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
@@ -4363,11 +4556,13 @@ sub displayPage {
  
 	    }
 	    if (&canmodify($usec)) {
+            $studentTable.=&gradeBox_start();
 		foreach my $partid (@{$parts}) {
 		    $studentTable.=&gradeBox($request,$symbx,$uname,$udom,$question,$partid,\%record);
 		    $studentTable.='<input type="hidden" name="q_'.$question.'" value="'.$partid.'" />'."\n";
 		    $question++;
 		}
+            $studentTable.=&gradeBox_end();
 		$prob++;
 	    }
 	    $studentTable.='</td></tr>';
@@ -4376,10 +4571,11 @@ sub displayPage {
         $curRes = $iterator->next();
     }
 
-    $studentTable.='</table>'."\n".
-	'<input type="button" value="'.&mt('Save').'" '.
-	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
-	'</form>'."\n";
+    $studentTable.=
+        '</table>'."\n".
+        '<input type="button" value="'.&mt('Save').'" '.
+        'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
+        '</form>'."\n";
     $studentTable.=&show_grading_menu_form($symb);
     $request->print($studentTable);
 
@@ -4403,10 +4599,11 @@ sub displaySubByDates {
     my %orders;
     $mark{'correct_by_student'} = $checkIcon;
     if (!exists($$record{'1:timestamp'})) {
-	return '<br />&nbsp;<span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br />';
+	return '<br />&nbsp;<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />';
     }
 
     my $interaction;
+    my $no_increment = 1;
     for ($version=1;$version<=$$record{'version'};$version++) {
 	my $timestamp = 
 	    &Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});
@@ -4424,36 +4621,49 @@ sub displaySubByDates {
 	my @versionKeys = split(/\:/,$$record{$version.':keys'});
 	my @displaySub = ();
 	foreach my $partid (@{$parts}) {
+            my $hidden;
+            if (($$record{$version.':resource.'.$partid.'.type'} eq 'anonsurvey') ||
+                ($$record{$version.':resource.'.$partid.'.type'} eq 'anonsurveycred')) {
+                $hidden = 1;
+            }
 	    my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)
 			            : sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));
 	    
-
 #	    next if ($$record{"$version:resource.$partid.solved"} eq '');
 	    my $display_part=&get_display_part($partid,$symb);
 	    foreach my $matchKey (@matchKey) {
 		if (exists($$record{$version.':'.$matchKey}) &&
 		    $$record{$version.':'.$matchKey} ne '') {
-
+                    
 		    my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
 				               : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
-		    $displaySub[0].='<b>'.&mt('Part:').'</b>&nbsp;'.$display_part.'&nbsp;';
-		    $displaySub[0].='<span class="LC_internal_info">('.&mt('ID').'&nbsp;'.
-			$responseId.')</span>&nbsp;<b>';
-		    if ($$record{"$where.$partid.tries"} eq '') {
-			$displaySub[0].=&mt('Trial&nbsp;not&nbsp;counted');
-		    } else {
-			$displaySub[0].=&mt('Trial&nbsp;[_1]',
+                    $displaySub[0].='<span class="LC_nobreak"';
+                    $displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
+                                   .' <span class="LC_internal_info">'
+                                   .'('.&mt('Part ID: [_1]',$responseId).')'
+                                   .'</span>'
+                                   .' <b>';
+                    if ($hidden) {
+                        $displaySub[0].= &mt('Anonymous Survey').'</b>';
+                    } else {
+		        if ($$record{"$where.$partid.tries"} eq '') {
+			    $displaySub[0].=&mt('Trial not counted');
+		        } else {
+			    $displaySub[0].=&mt('Trial: [_1]',
 					    $$record{"$where.$partid.tries"});
-		    }
-		    my $responseType=($isTask ? 'Task'
+		        }
+		        my $responseType=($isTask ? 'Task'
                                               : $responseType->{$partid}->{$responseId});
-		    if (!exists($orders{$partid})) { $orders{$partid}={}; }
-		    if (!exists($orders{$partid}->{$responseId})) {
-			$orders{$partid}->{$responseId}=
-			    &get_order($partid,$responseId,$symb,$uname,$udom);
-		    }
-		    $displaySub[0].='</b>&nbsp; '.
-			&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
+		        if (!exists($orders{$partid})) { $orders{$partid}={}; }
+		        if (!exists($orders{$partid}->{$responseId})) {
+			    $orders{$partid}->{$responseId}=
+			        &get_order($partid,$responseId,$symb,$uname,$udom,
+                                           $no_increment);
+		        }
+		        $displaySub[0].='</b></span>'; # /nobreak
+		        $displaySub[0].='&nbsp; '.
+			    &cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
+                    }
 		}
 	    }
 	    if (exists($$record{"$where.$partid.checkedin"})) {
@@ -4503,21 +4713,26 @@ sub updateGradeByPage {
     my ($uname,$udom) = split(/:/,$env{'form.student'});
     my $usec=$classlist->{$env{'form.student'}}[5];
     if (!&canmodify($usec)) {
-	$request->print('<span class="LC_warning">Unable to modify requested student.('.$env{'form.student'}.'</span>');
+	$request->print('<span class="LC_warning">'.&mt('Unable to modify requested student ([_1])',$env{'form.student'}).'</span>');
 	$request->print(&show_grading_menu_form($env{'form.symb'}));
 	return;
     }
     my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
-    $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
+    $result.='<h3>&nbsp;'.&mt('Student: ').&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
 	'</h3>'."\n";
 
     $request->print($result);
 
+
     my $navmap = Apache::lonnavmaps::navmap->new();
+    unless (ref($navmap)) {
+        $request->print(&navmap_errormsg());
+        return;
+    }
     my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
     if (!$map) {
-	$request->print('<span class="LC_warning">Unable to grade requested sequence. ('.$resUrl.')</span>');
+	$request->print('<span class="LC_warning">'.&mt('Unable to grade requested sequence ([_1]).',$resUrl).'</span>');
 	my ($symb)=&get_symb($request);
 	$request->print(&show_grading_menu_form($symb));
 	return; 
@@ -4549,8 +4764,8 @@ sub updateGradeByPage {
 		&Apache::loncommon::start_data_table_row().
 		'<td align="center" valign="top" >'.$prob.
 		(scalar(@{$parts}) == 1 ? '' 
-                                        : '<br />('.&mt('[quant,_1,&nbsp;parts]',scalar(@{$parts}))
-		 ).')</td>';
+                                        : '<br />('.&mt('[quant,_1,&nbsp;part]',scalar(@{$parts}))
+		.')').'</td>';
 	    $studentTable.='<td valign="top">&nbsp;<b>'.$title.'</b>&nbsp;</td>';
 
 	    my %newrecord=();
@@ -4594,10 +4809,10 @@ sub updateGradeByPage {
 		}
 		my $display_part=&get_display_part($partid,$curRes->symb());
 		my $oldstatus = $env{'form.solved'.$question.'_'.$partid};
-		$displayPts[0].='&nbsp;<b>Part:</b> '.$display_part.' = '.
+		$displayPts[0].='&nbsp;<b>'.&mt('Part').':</b> '.$display_part.' = '.
 		    (($oldstatus eq 'excused') ? 'excused' : $oldpts).
 		    '&nbsp;<br />';
-		$displayPts[1].='&nbsp;<b>Part:</b> '.$display_part.' = '.
+		$displayPts[1].='&nbsp;<b>'.&mt('Part').':</b> '.$display_part.' = '.
 		     (($score eq 'excused') ? 'excused' : $newpts).
 		    '&nbsp;<br />';
 		$question++;
@@ -4646,9 +4861,9 @@ sub updateGradeByPage {
 
     $studentTable.=&Apache::loncommon::end_data_table();
     $studentTable.=&show_grading_menu_form($env{'form.symb'});
-    my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
-		  'The scores were changed for '.
-		  $changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));
+    my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') :
+		  &mt('The scores were changed for [quant,_1,problem].',
+		  $changeflag));
     $request->print($grademsg.$studentTable);
 
     return '';
@@ -4658,7 +4873,7 @@ sub updateGradeByPage {
 #
 #-------------------------------------------------------------------
 
-#--------------------Scantron Grading-----------------------------------
+#-------------------- Bubblesheet (Scantron) Grading -------------------
 #
 #------ start of section for handling grading by page/sequence ---------
 
@@ -4685,10 +4900,10 @@ Next each scanline is checked for any er
 bubbles' (it's an error because it may have been mis-scanned
 because too light bubbling), 'double bubble' (each bubble line should
 have no more that one letter picked), invalid or duplicated CODE,
-invalid student ID
+invalid student/employee ID
 
 If the CODE option is used that determines the randomization of the
-homework problems, either way the student ID is looked up into a
+homework problems, either way the student/employee ID is looked up into a
 username:domain.
 
 During the validation phase the instructor can choose to skip scanlines. 
@@ -4736,14 +4951,19 @@ sub defaultFormData {
    Return html dropdown of possible sequences to grade
  
  Arguments:
-   $symb - $symb of the current resource 
+   $symb - $symb of the current resource
+   $map_error - ref to scalar which will container error if
+                $navmap object is unavailable in &getSymbMap().
 
 =cut
 
 sub getSequenceDropDown {
-    my ($symb)=@_;
+    my ($symb,$map_error)=@_;
     my $result='<select name="selectpage">'."\n";
-    my ($titles,$symbx) = &getSymbMap();
+    my ($titles,$symbx) = &getSymbMap($map_error);
+    if (ref($map_error)) {
+        return if ($$map_error);
+    }
     my ($curpage)=&Apache::lonnet::decode_symb($symb); 
     my $ctr=0;
     foreach (@$titles) {
@@ -4757,6 +4977,67 @@ sub getSequenceDropDown {
     return $result;
 }
 
+my %bubble_lines_per_response;     # no. bubble lines for each response.
+                                   # key is zero-based index - 0, 1, 2 ...
+
+my %first_bubble_line;             # First bubble line no. for each bubble.
+
+my %subdivided_bubble_lines;       # no. bubble lines for optionresponse, 
+                                   # matchresponse or rankresponse, 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 
 
@@ -4769,8 +5050,9 @@ sub getSequenceDropDown {
 sub scantron_filenames {
     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $getpropath = 1;
     my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
-				    &propath($cdom,$cname));
+                                       $getpropath);
     my @possiblenames;
     foreach my $filename (sort(@files)) {
 	($filename)=split(/&/,$filename);
@@ -4813,19 +5095,76 @@ sub scantron_uploads {
 =cut
 
 sub scantron_scantab {
-    my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
     my $result='<select name="scantron_format">'."\n";
     $result.='<option></option>'."\n";
-    foreach my $line (<$fh>) {
-	my ($name,$descrip)=split(/:/,$line);
-	if ($name =~ /^\#/) { next; }
-	$result.='<option value="'.$name.'">'.$descrip.'</option>'."\n";
+    my @lines = &get_scantronformat_file();
+    if (@lines > 0) {
+        foreach my $line (@lines) {
+            next if (($line =~ /^\#/) || ($line eq ''));
+	    my ($name,$descrip)=split(/:/,$line);
+	    $result.='<option value="'.$name.'">'.$descrip.'</option>'."\n";
+        }
     }
     $result.='</select>'."\n";
-
     return $result;
 }
 
+=pod
+
+=item get_scantronformat_file
+
+  Returns an array containing lines from the scantron format file for
+  the domain of the course.
+
+  If a url for a custom.tab file is listed in domain's configuration.db, 
+  lines are from this file.
+
+  Otherwise, if a default.tab has been published in RES space by the 
+  domainconfig user, lines are from this file.
+
+  Otherwise, fall back to getting lines from the legacy file on the
+  local server:  /home/httpd/lonTabs/default_scantronformat.tab    
+
+=cut
+
+sub get_scantronformat_file {
+    my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$cdom);
+    my $gottab = 0;
+    my @lines;
+    if (ref($domconfig{'scantron'}) eq 'HASH') {
+        if ($domconfig{'scantron'}{'scantronformat'} ne '') {
+            my $formatfile = &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.$domconfig{'scantron'}{'scantronformat'});
+            if ($formatfile ne '-1') {
+                @lines = split("\n",$formatfile,-1);
+                $gottab = 1;
+            }
+        }
+    }
+    if (!$gottab) {
+        my $confname = $cdom.'-domainconfig';
+        my $default = $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cdom.'/'.$confname.'/default.tab';
+        my $formatfile =  &Apache::lonnet::getfile($default);
+        if ($formatfile ne '-1') {
+            @lines = split("\n",$formatfile,-1);
+            $gottab = 1;
+        }
+    }
+    if (!$gottab) {
+        my @domains = &Apache::lonnet::current_machine_domains();
+        if (grep(/^\Q$cdom\E$/,@domains)) {
+            my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+            @lines = <$fh>;
+            close($fh);
+        } else {
+            my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab');
+            @lines = <$fh>;
+            close($fh);
+        }
+    }
+    return @lines;
+}
+
 =pod 
 
 =item scantron_CODElist
@@ -4858,11 +5197,11 @@ sub scantron_CODElist {
 =cut
 
 sub scantron_CODEunique {
-    my $result='<span style="white-space: nowrap;">
+    my $result='<span class="LC_nobreak">
                  <label><input type="radio" name="scantron_CODEunique"
                         value="yes" checked="checked" />'.&mt('Yes').' </label>
                 </span>
-                <span style="white-space: nowrap;">
+                <span class="LC_nobreak">
                  <label><input type="radio" name="scantron_CODEunique"
                         value="no" />'.&mt('No').' </label>
                 </span>';
@@ -4890,7 +5229,12 @@ sub scantron_selectphase {
     my ($r,$file2grade) = @_;
     my ($symb)=&get_symb($r);
     if (!$symb) {return '';}
-    my $sequence_selector=&getSequenceDropDown($symb);
+    my $map_error;
+    my $sequence_selector=&getSequenceDropDown($symb,\$map_error);
+    if ($map_error) {
+        $r->print('<br />'.&navmap_errormsg().'<br />');
+        return;
+    }
     my $default_form_data=&defaultFormData($symb);
     my $grading_menu_button=&show_grading_menu_form($symb);
     my $file_selector=&scantron_uploads($file2grade);
@@ -4899,6 +5243,8 @@ sub scantron_selectphase {
     my $CODE_unique=&scantron_CODEunique();
     my $result;
 
+    $ssi_error = 0;
+
     # Chunk of form to prompt for a file to grade and how:
 
     $result.= '
@@ -4916,10 +5262,10 @@ sub scantron_selectphase {
             <td> '.&mt('Sequence to grade:').' </td><td> '.$sequence_selector.' </td>
        '.&Apache::loncommon::end_data_table_row().'
        '.&Apache::loncommon::start_data_table_row().'
-            <td> '.&mt('Filename of scoring office file:').' </td><td> '.$file_selector.' </td>
+            <td> '.&mt('Filename of bubblesheet data file:').' </td><td> '.$file_selector.' </td>
        '.&Apache::loncommon::end_data_table_row().'
        '.&Apache::loncommon::start_data_table_row().'
-            <td> '.&mt('Format of data file:').' </td><td> '.$format_selector.' </td>
+            <td> '.&mt('Format of bubblesheet data file:').' </td><td> '.$format_selector.' </td>
        '.&Apache::loncommon::end_data_table_row().'
        '.&Apache::loncommon::start_data_table_row().'
             <td> '.&mt('Saved CODEs to validate against:').' </td><td> '.$CODE_selector.' </td>
@@ -4937,7 +5283,7 @@ sub scantron_selectphase {
        '.&Apache::loncommon::end_data_table_row().'
        '.&Apache::loncommon::start_data_table_row().'
             <td colspan="2">
-              <input type="submit" value="'.&mt('Grading: Validate Scantron Records').'" />
+              <input type="submit" value="'.&mt('Grading: Validate Bubblesheet Records').'" />
             </td>
        '.&Apache::loncommon::end_data_table_row().'
     '.&Apache::loncommon::end_data_table().'
@@ -4956,7 +5302,7 @@ sub scantron_selectphase {
     '.&Apache::loncommon::start_data_table('LC_scantron_action').'
        '.&Apache::loncommon::start_data_table_header_row().'
             <th>
-              &nbsp;'.&mt('Specify a Scantron data file to upload.').'
+              &nbsp;'.&mt('Specify a bubblesheet data file to upload.').'
             </th>
        '.&Apache::loncommon::end_data_table_header_row().'
        '.&Apache::loncommon::start_data_table_row().'
@@ -4965,17 +5311,15 @@ sub scantron_selectphase {
     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('
-              <script type="text/javascript" language="javascript">
+    $r->print(&Apache::lonhtmlcommon::scripttag('
     function checkUpload(formname) {
 	if (formname.upfile.value == "") {
 	    alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
 	    return false;
 	}
 	formname.submit();
-    }
-              </script>
-
+    }'));
+    $r->print('
               <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
                 '.$default_form_data.'
                 <input name="courseid" type="hidden" value="'.$cnum.'" />
@@ -4983,7 +5327,7 @@ sub scantron_selectphase {
                 <input name="command" value="scantronupload_save" type="hidden" />
                 '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
                 <br />
-                <input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />
+                <input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
               </form>
 ');
 
@@ -5019,8 +5363,41 @@ sub scantron_selectphase {
 ');
 
     &Apache::lonpickcode::code_list($r,2);
+
+    $r->print('<br /><form method="post" name="checkscantron">'.
+             $default_form_data."\n".
+             &Apache::loncommon::start_data_table('LC_scantron_action')."\n".
+             &Apache::loncommon::start_data_table_header_row()."\n".
+             '<th colspan="2">
+              &nbsp;'.&mt('Review bubblesheet data and submissions for a previously graded folder/sequence')."\n".
+             '</th>'."\n".
+              &Apache::loncommon::end_data_table_header_row()."\n".
+              &Apache::loncommon::start_data_table_row()."\n".
+              '<td> '.&mt('Graded folder/sequence:').' </td>'."\n".
+              '<td> '.$sequence_selector.' </td>'.
+              &Apache::loncommon::end_data_table_row()."\n".
+              &Apache::loncommon::start_data_table_row()."\n".
+              '<td> '.&mt('Filename of scoring office file:').' </td>'."\n".
+              '<td> '.$file_selector.' </td>'."\n".
+              &Apache::loncommon::end_data_table_row()."\n".
+              &Apache::loncommon::start_data_table_row()."\n".
+              '<td> '.&mt('Format of data file:').' </td>'."\n".
+              '<td> '.$format_selector.' </td>'."\n".
+              &Apache::loncommon::end_data_table_row()."\n".
+              &Apache::loncommon::start_data_table_row()."\n".
+              '<td> '.&mt('Options').' </td>'."\n".
+              '<td> <label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> '.&mt('Skip hidden resources').'</label></td>'.
+              &Apache::loncommon::end_data_table_row()."\n".
+              &Apache::loncommon::start_data_table_row()."\n".
+              '<td colspan="2">'."\n".
+              '<input type="hidden" name="command" value="checksubmissions" />'."\n".
+              '<input type="submit" value="'.&mt('Review Bubblesheet Data and Submission Records').'" />'."\n".
+              '</td>'."\n".
+              &Apache::loncommon::end_data_table_row()."\n".
+              &Apache::loncommon::end_data_table()."\n".
+              '</form><br />');
     $r->print($grading_menu_button);
-    return
+    return;
 }
 
 =pod
@@ -5055,8 +5432,8 @@ sub scantron_selectphase {
       CODEstart   - (only matter if a CODE exists) column in the line where
                      the CODE starts
       CODElength  - length of the CODE
-      IDstart     - column where the student ID number starts
-      IDlength    - length of the student ID info
+      IDstart     - column where the student/employee ID starts
+      IDlength    - length of the student/employee ID info
       Qstart      - column where the information from the bubbled
                     'questions' start
       Qlength     - number of columns comprising a single bubble line from
@@ -5082,10 +5459,10 @@ sub scantron_selectphase {
 
 sub get_scantron_config {
     my ($which) = @_;
-    my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+    my @lines = &get_scantronformat_file();
     my %config;
     #FIXME probably should move to XML it has already gotten a bit much now
-    foreach my $line (<$fh>) {
+    foreach my $line (@lines) {
 	my ($name,$descrip)=split(/:/,$line);
 	if ($name ne $which ) { next; }
 	chomp($line);
@@ -5098,7 +5475,7 @@ 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];
@@ -5116,7 +5493,7 @@ sub get_scantron_config {
 
 =item username_to_idmap
 
-    creates a hash keyed by student id with values of the corresponding
+    creates a hash keyed by student/employee ID with values of the corresponding
     student username:domain.
 
   Arguments:
@@ -5155,7 +5532,7 @@ sub username_to_idmap {
     $whichline         - line number of the passed in scanline
     $field             - type of change to process 
                          (either 
-                          'ID'     -> correct the student ID number
+                          'ID'     -> correct the student/employee ID
                           'CODE'   -> correct the CODE
                           'answer' -> fixup the submitted answers)
     
@@ -5172,6 +5549,8 @@ 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
@@ -5184,8 +5563,6 @@ 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');
@@ -5216,58 +5593,28 @@ 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 $length=$scantron_config->{'Qlength'};
 	my $off=$scantron_config->{'Qoff'};
 	my $on=$scantron_config->{'Qon'};
-        my $question_number = $args->{'question'} -1;
-        my $first_position  = $first_bubble_line{$question_number};
-	my $bubble_count    = $bubble_lines_per_response{$question_number};
-        my $bubbles_per_line= $$scantron_config{'Qlength'};
-	my $answer=${off}x($bubbles_per_line*$bubble_count);
-        my $final_answer;
-        if ($$scantron_config{'Qon'} eq 'letter'  ||
-	    $$scantron_config{'Qon'} eq 'number') { 
-	    $bubbles_per_line = 10;
-	}
-	if (defined $args->{'response'}) {
-	    
-	    if ($args->{'response'} eq 'none') {
-		&scan_data($scan_data,
-			   "$whichline.no_bubble.".$args->{'question'},'1');
+	my $answer=${off}x$length;
+	if ($args->{'response'} eq 'none') {
+	    &scan_data($scan_data,
+		       "$whichline.no_bubble.".$args->{'questionnum'},'1');
+	} else {
+	    if ($on eq 'letter') {
+		my @alphabet=('A'..'Z');
+		$answer=$alphabet[$args->{'response'}];
+	    } elsif ($on eq 'number') {
+		$answer=$args->{'response'}+1;
+		if ($answer == 10) { $answer = '0'; }
 	    } else {
-		my ($bubble_line, $bubble_number) = split(/:/,$args->{'response'});
-		if ($on eq 'letter') {
-		    my @alphabet=('A'..'Z');
-		    $answer=$alphabet[$bubble_number];
-		} elsif ($on eq 'number') {
-		    $answer= $bubble_number+1;
-		    if ($answer == 10) { $answer = '0'; }
-		} else {
-		    substr($answer,$bubble_number+$bubble_line*$bubbles_per_line,1)=$on;
-		    $final_answer = $answer;
-		}
-		&scan_data($scan_data,
-			   "$whichline.no_bubble.".$args->{'question'},undef,'1');
-		
-		# Positional notation already has the right final answer length..
-
-		if (($on eq 'letter') || ($on eq 'number')) {
-		    for (my $l = 0; $l < $bubble_count; $l++) {
-			if ($l eq $bubble_line) {
-			    $final_answer .= $answer;
-			} else {
-			    $final_answer .= ' ';
-			}
-		    }
-		}
+		substr($answer,$args->{'response'},1)=$on;
 	    }
-	    # $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
-	    #substr($line,$where-1,$length)=$answer;
-	    substr($line, 
-		   $scantron_config->{'Qstart'}+$first_position-1,
-		   $bubbles_per_line*$length) = $final_answer;
+	    &scan_data($scan_data,
+		       "$whichline.no_bubble.".$args->{'questionnum'},undef,'1');
 	}
+	my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
+	substr($line,$where-1,$length)=$answer;
     }
     return $line;
 }
@@ -5301,6 +5648,39 @@ 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
@@ -5326,7 +5706,7 @@ sub scan_data {
        CODE_ignore_dup - 1 if the CODE is a duplicated use when unique
                             CODEs were selected, but the usage has been
                             forced by the operator
-       ID  - student ID
+       ID  - student/employee ID
        PaperID - if used, the ID number printed on the sheet when the 
                  paper was scanned
        FirstName - first name from the sheet
@@ -5362,7 +5742,8 @@ sub scantron_parse_scanline {
     my ($line,$whichline,$scantron_config,$scan_data,$just_header)=@_;
 
     my %record;
-    my $questions=substr($line,$$scantron_config{'Qstart'}-1);  # Answers
+    my $lastpos = $env{'form.scantron_maxbubble'}*$$scantron_config{'Qlength'};
+    my $questions=substr($line,$$scantron_config{'Qstart'}-1,$lastpos);  # Answers
     my $data=substr($line,0,$$scantron_config{'Qstart'}-1);     # earlier stuff
     if (!($$scantron_config{'CODElocation'} eq 0 ||
 	  $$scantron_config{'CODElocation'} eq 'none')) {
@@ -5403,166 +5784,218 @@ 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;
-
-
-	$questnum++;
-	my $currentquest = 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:
-	#    ? or * for doubles a letter in A-Z for a bubble and
-        #    about anything else (esp. a value of Qoff for missing
-	#    bubbles.
-
-
-	if ($$scantron_config{'Qon'} eq 'letter') {
-	    if ($currentquest =~ /\?/
-		|| $currentquest =~ /\*/
-		|| (&occurence_count($currentquest, "[A-Z]") > 1)) {
-		push(@{$record{'scantron.doubleerror'}},$questnum);
-		for (my $ans = 0; $ans < $answers_needed; $ans++) { 
-		    my $bubble = substr($currentquest, $ans, 1);
-		    if ($bubble =~ /[A-Z]/ ) {
-			$record{"scantron.$ansnum.answer"} = $bubble;
-		    } else {
-			$record{"scantron.$ansnum.answer"}='';
-		    }
-		    $ansnum++;
-		}
-
-	    } elsif (!defined($currentquest)
-		     || (&occurence_count($currentquest, $$scantron_config{'Qoff'}) == length($currentquest))
-		     || (&occurence_count($currentquest, "[A-Z]") == 0)) {
-		for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
-		    $record{"scantron.$ansnum.answer"}='';
-		    $ansnum++;
-
-		}
-		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
-		    push(@{$record{"scantron.missingerror"}},$questnum);
-		   #  $ansnum += $answers_needed;
-		}
-	    } else {
-		for (my $ans = 0; $ans < $answers_needed; $ans++) {
-		    my $bubble = substr($currentquest, $ans, 1);
-		    $record{"scantron.$ansnum.answer"} = $bubble;
-		    $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++;
-
-		}
-		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
-		    push(@{$record{"scantron.missingerror"}},$questnum);
-		    $ansnum += $answers_needed;
-		}
-
-	    } else {
-		$currentquest = &digits_to_letters($currentquest);
-		for (my $ans =0; $ans < $answers_needed; $ans++) {
-		    $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
-		    $ansnum++;
-		}
-	    }
-	} else {
+        my $answer_length  = ($$scantron_config{'Qlength'} * $answers_needed)
+                             || 1;
+        $questnum++;
+        my $quest_id = $questnum;
+        my $currentquest = substr($questions,0,$answer_length);
+        $questions       = substr($questions,$answer_length);
+        if (length($currentquest) < $answer_length) { next; }
+
+        if ($subdivided_bubble_lines{$questnum-1} =~ /,/) {
+            my $subquestnum = 1;
+            my $subquestions = $currentquest;
+            my @subanswers_needed = 
+                split(/,/,$subdivided_bubble_lines{$questnum-1});  
+            foreach my $subans (@subanswers_needed) {
+                my $subans_length =
+                    ($$scantron_config{'Qlength'} * $subans)  || 1;
+                my $currsubquest = substr($subquestions,0,$subans_length);
+                $subquestions   = substr($subquestions,$subans_length);
+                $quest_id = "$questnum.$subquestnum";
+                if (($$scantron_config{'Qon'} eq 'letter') ||
+                    ($$scantron_config{'Qon'} eq 'number')) {
+                    $ansnum = &scantron_validator_lettnum($ansnum, 
+                        $questnum,$quest_id,$subans,$currsubquest,$whichline,
+                        \@alphabet,\%record,$scantron_config,$scan_data);
+                } else {
+                    $ansnum = &scantron_validator_positional($ansnum,
+                        $questnum,$quest_id,$subans,$currsubquest,$whichline,                        \@alphabet,\%record,$scantron_config,$scan_data);
+                }
+                $subquestnum ++;
+            }
+        } else {
+            if (($$scantron_config{'Qon'} eq 'letter') ||
+                ($$scantron_config{'Qon'} eq 'number')) {
+                $ansnum = &scantron_validator_lettnum($ansnum,$questnum,
+                    $quest_id,$answers_needed,$currentquest,$whichline,
+                    \@alphabet,\%record,$scantron_config,$scan_data);
+            } else {
+                $ansnum = &scantron_validator_positional($ansnum,$questnum,
+                    $quest_id,$answers_needed,$currentquest,$whichline,
+                    \@alphabet,\%record,$scantron_config,$scan_data);
+            }
+        }
+    }
+    $record{'scantron.maxquest'}=$questnum;
+    return \%record;
+}
 
-	    # 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.
-	    #
+sub scantron_validator_lettnum {
+    my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,$whichline,
+        $alphabet,$record,$scantron_config,$scan_data) = @_;
+
+    # 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.
+    #
 
-	    my @array=split($$scantron_config{'Qon'},$currentquest,-1);
+    my $matchon;
+    if ($$scantron_config{'Qon'} eq 'letter') {
+        $matchon = '[A-Z]';
+    } elsif ($$scantron_config{'Qon'} eq 'number') {
+        $matchon = '\d';
+    }
+    my $occurrences = 0;
+    if (($responsetype_per_response{$questnum-1} eq 'essayresponse') ||
+        ($responsetype_per_response{$questnum-1} eq 'formularesponse') ||
+        ($responsetype_per_response{$questnum-1} eq 'stringresponse') ||
+        ($responsetype_per_response{$questnum-1} eq 'imageresponse') ||
+        ($responsetype_per_response{$questnum-1} eq 'reactionresponse') ||
+        ($responsetype_per_response{$questnum-1} eq 'organicresponse')) {
+        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;
+}
 
-	    # If the split only  giveas us one element.. the full length of the
-	    # answser string, no bubbles are filled in:
+sub scantron_validator_positional {
+    my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,
+        $whichline,$alphabet,$record,$scantron_config,$scan_data) = @_;
 
-	    if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) {
-		for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
-		    $record{"scantron.$ansnum.answer"}='';
-		    $ansnum++;
+    # 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 (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
-		    push(@{$record{"scantron.missingerror"}},$questnum);
-		}
-		
+    my @array=split($$scantron_config{'Qon'},$currquest,-1);
 
+    # If the split only gives us one element.. the full length of the
+    # answer string, no bubbles are filled in:
 
-	    } elsif (scalar(@array) eq 2) {
+    if ($answers_needed eq '') {
+        return;
+    }
 
-		my $location      = length($array[0]);
-		my $line_num      = int($location / $$scantron_config{'Qlength'});
-		my $bubble        = $alphabet[$location % $$scantron_config{'Qlength'}];
-		
+    if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) {
+        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);
+        }
+    } 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') ||
+            ($responsetype_per_response{$questnum-1} eq 'imageresponse') ||
+            ($responsetype_per_response{$questnum-1} eq 'reactionresponse') ||
+            ($responsetype_per_response{$questnum-1} eq 'organicresponse')) {
+            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++) {
-		    if ($ans eq $line_num) {
-			$record{"scantron.$ansnum.answer"} = $bubble;
-		    } else {
-			$record{"scantron.$ansnum.answer"} = ' ';
-		    }
-		    $ansnum++;
-		}
-	    }
-	    #  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.
-	    #
-	    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;
-	    }
-	}
+        my @ans=@array;
+        my $i=0;
+        my $increment = 0;
+        while ($#ans) {
+            $i+=length($ans[0]) + $increment;
+            my $line   = int($i/$$scantron_config{'Qlength'} + $ansnum);
+            my $bubble = $i%$$scantron_config{'Qlength'};
+            $record->{"scantron.$line.answer"}.=$alphabet->[$bubble];
+            shift(@ans);
+            $increment = 1;
+        }
+        $ansnum += $answers_needed;
     }
-    $record{'scantron.maxquest'}=$questnum;
-    return \%record;
+    return $ansnum;
 }
 
 =pod
@@ -5702,7 +6135,8 @@ 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; }
 	}
     }
@@ -5921,6 +6355,10 @@ 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++;
    }
@@ -5965,10 +6403,15 @@ sub scantron_validate_file {
     if ($env{'form.scantron_corrections'}) {
 	&scantron_process_corrections($r);
     }
-    $r->print('<p>'.&mt('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();
+    my $nav_error;
+    my $max_bubble=&scantron_get_maxbubble(\$nav_error);
+    if ($nav_error) {
+        $r->print(&navmap_errormsg());
+        return '';
+    }
     my $result=&scantron_form_start($max_bubble).$default_form_data;
     $r->print($result);
     
@@ -5985,7 +6428,7 @@ sub scantron_validate_file {
 
     my $stop=0;
     while (!$stop && $currentphase < scalar(@validate_phases)) {
-	$r->print('<p> '.&mt('Validating '.$validate_phases[$currentphase]).'</p>');
+	$r->print(&mt('Validating '.$validate_phases[$currentphase]).'<br />');
 	$r->rflush();
 	my $which="scantron_validate_".$validate_phases[$currentphase];
 	{
@@ -5995,25 +6438,34 @@ sub scantron_validate_file {
     }
     if (!$stop) {
 	my $warning=&scantron_warning_screen('Start Grading');
-	$r->print('
-'.&mt('Validation process complete.').'<br />
-'.$warning.'
-<input type="submit" name="submit" value="'.&mt('Start Grading').'" />
-<input type="hidden" name="command" value="scantron_process" />
-');
-
+	$r->print(&mt('Validation process complete.').'<br />'.
+                  $warning.
+                  &mt('Perform verification for each student after storage of submissions?').
+                  '&nbsp;<span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="verifyrecord" value="1" />'.&mt('Yes').'</label>'.
+                  ('&nbsp;'x3).'<label>'.
+                  '<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No').
+                  '</label></span><br />'.
+                  &mt('Grading will take longer if you use verification.').'<br />'.
+                  &mt("Alternatively, the 'Review bubblesheet data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'.
+                  '<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'.
+                  '<input type="hidden" name="command" value="scantron_process" />'."\n");
     } else {
 	$r->print('<input type="hidden" name="command" value="scantron_validate" />');
 	$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
     }
     if ($stop) {
 	if ($validate_phases[$currentphase] eq 'sequence') {
-	    $r->print('<input type="submit" name="submit" value="'.&mt('Ignore -&gt;').' " />');
+	    $r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' &rarr; " />');
 	    $r->print(' '.&mt('this error').' <br />');
 
 	    $r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>");
 	} else {
-	    $r->print('<input type="submit" name="submit" value="'.&mt('Continue -&gt;').'" />');
+            if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') {
+	        $r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' &rarr;" onclick="javascript:verify_bubble_radio(this.form)" />');
+            } else {
+                $r->print('<input type="submit" name="submit" value="'.&mt('Continue').' &rarr;" />');
+            }
 	    $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."));
@@ -6371,6 +6823,10 @@ sub scantron_validate_sequence {
     my ($r,$currentphase) = @_;
 
     my $navmap=Apache::lonnavmaps::navmap->new();
+    unless (ref($navmap)) {
+        $r->print(&navmap_errormsg());
+        return (1,$currentphase);
+    }
     my (undef,undef,$sequence)=
 	&Apache::lonnet::decode_symb($env{'form.selectpage'});
 
@@ -6390,14 +6846,7 @@ sub scantron_validate_sequence {
     return (0,$currentphase+1);
 }
 
-=pod
-
-=item scantron_validate_ID
-
-   Validates all scanlines in the selected file to not have any
-   invalid or underspecified student IDs
 
-=cut
 
 sub scantron_validate_ID {
     my ($r,$currentphase) = @_;
@@ -6409,8 +6858,13 @@ sub scantron_validate_ID {
     #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_lines.. array.
+
+    my $nav_error;
+    &scantron_get_maxbubble(\$nav_error); # parse needs the bubble_lines.. array.
+    if ($nav_error) {
+        $r->print(&navmap_errormsg());
+        return(1,$currentphase);
+    }
 
     my %found=('ids'=>{},'usernames'=>{});
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
@@ -6463,39 +6917,9 @@ sub scantron_validate_ID {
     return (0,$currentphase+1);
 }
 
-=pod
-
-=item scantron_get_correction
-
-   Builds the interface screen to interact with the operator to fix a
-   specific error condition in a specific scanline
-
- Arguments:
-    $r           - Apache request object
-    $i           - number of the current scanline
-    $scan_record - hash ref as returned from &scantron_parse_scanline()
-    $scan_config - hash ref as returned from &get_scantron_config()
-    $line        - full contents of the current scanline
-    $error       - error condition, valid values are
-                   'incorrectCODE', 'duplicateCODE',
-                   'doublebubble', 'missingbubble',
-                   'duplicateID', 'incorrectID'
-    $arg         - extra information needed
-       For errors:
-         - duplicateID   - paper number that this studentID was seen before on
-         - duplicateCODE - array ref of the paper numbers this CODE was
-                           seen on before
-         - incorrectCODE - current incorrect CODE 
-         - doublebubble  - array ref of the bubble lines that have double
-                           bubble errors
-         - missingbubble - array ref of the bubble lines that have missing
-                           bubble errors
-
-=cut
 
 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
@@ -6517,6 +6941,10 @@ sub scantron_get_correction {
 
     $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("<p>".&mt("The encoded ID is not in the classlist").
@@ -6554,10 +6982,10 @@ sub scantron_get_correction {
 	    if ($closest > 0) {
 		foreach my $testcode (@{$closest}) {
 		    my $checked='';
-		    if (!$i) { $checked=' checked="checked" '; }
+		    if (!$i) { $checked=' checked="checked"'; }
 		    $r->print("
    <label>
-       <input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked />
+       <input type='radio' name='scantron_CODE_resolution' value='use_closest_$i'$checked />
        ".&mt("Use the similar CODE [_1] instead.",
 	    "<b><tt>".$testcode."</tt></b>")."
     </label>
@@ -6568,18 +6996,17 @@ sub scantron_get_correction {
 	    }
 	}
 	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
-	    my $checked; if (!$i) { $checked=' checked="checked" '; }
+	    my $checked; if (!$i) { $checked=' checked="checked"'; }
 	    $r->print("
     <label>
-        <input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked />
+        <input type='radio' name='scantron_CODE_resolution' value='use_unfound'$checked />
        ".&mt("Use the CODE [_1] that is was on the paper, ignoring the error.",
 	     "<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")."
     </label>");
 	    $r->print("\n<br />");
 	}
 
-	$r->print(<<ENDSCRIPT);
-<script type="text/javascript">
+	$r->print(&Apache::lonhtmlcommon::scripttag(<<ENDSCRIPT));
 function change_radio(field) {
     var slct=document.scantronupload.scantron_CODE_resolution;
     var i;
@@ -6587,7 +7014,6 @@ function change_radio(field) {
         if (slct[i].value==field) { slct[i].checked=true; }
     }
 }
-</script>
 ENDSCRIPT
 	my $href="/adm/pickcode?".
 	   "form=".&escape("scantronupload").
@@ -6602,7 +7028,7 @@ ENDSCRIPT
        ".&mt("[_1]Select[_2] a CODE from the list of all CODEs and use it.",
 	     "<a target='_blank' href='$href'>","</a>")."
     </label> 
-    ".&mt("Selected CODE is [_1]","<input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />"));
+    ".&mt("Selected CODE is [_1]",'<input readonly="readonly" type="text" size="8" name="scantron_CODE_selectedvalue" onfocus="javascript:change_radio(\'use_found\')" onchange="javascript:change_radio(\'use_found\')" />'));
 	    $r->print("\n<br />");
 	}
 	$r->print("
@@ -6612,112 +7038,256 @@ ENDSCRIPT
 	     "</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>".&mt("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>".&mt("Please indicate which bubble should be used for grading")."</p>");
 	foreach my $question (@{$arg}) {
-	    my $selected  = &get_response_bubbles($scan_record, $question);
-	    my @select_array = split(/:/,$selected);
-	    &scantron_bubble_selector($r,$scan_config,$question,
-				      @select_array);
+	    my @linenums = &prompt_for_corrections($r,$question,$scan_config,
+                                                   $scan_record, $error);
+            push(@lines_to_correct,@linenums);
 	}
+        $r->print(&verify_bubbles_checked(@lines_to_correct));
     } elsif ($error eq 'missingbubble') {
 	$r->print("<p>".&mt("There have been <b>no</b> bubbles scanned for some question(s)")."</p>\n");
 	$r->print($message);
 	$r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>");
-	$r->print(&mt("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 @select_array = split(/:/,$selected); # ought to be an array of empties.
-	    &scantron_bubble_selector($r,$scan_config,$question, @select_array);
+	    my @linenums = &prompt_for_corrections($r,$question,$scan_config,
+                                                   $scan_record, $error);
+            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 = &Apache::lonhtmlcommon::scripttag((<<ENDSCRIPT));
+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(); 
+}
+ENDSCRIPT
+    return $output;
 }
 
 =pod
 
-=item scantron_bubble_selector
-  
-   Generates the html radiobuttons to correct a single bubble line
-   possibly showing the existing the selected bubbles if known
+=item  questions_to_line_list
 
- Arguments:
-    $r           - Apache request object
-    $scan_config - hash from &get_scantron_config()
-    $quest       - number of the bubble line to make a corrector for
-    @lines       - array of answer lines.
+Converts a list of questions into a string of comma separated
+line numbers in the answer sheet used by the questions.  This is
+used to fill in the scantron_questions form field.
 
-=cut
+  Arguments:
+     questions    - Reference to an array of questions.
 
-sub scantron_bubble_selector {
-    my ($r,$scan_config,$quest,@lines)=@_;
-    my $max=$$scan_config{'Qlength'};
+=cut
 
 
-    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;
-    my $lines = $bubble_lines_per_response{$response};
+ Arguments:
+   $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
+                                  1.
+   %first_bubble_line           - Starting bubble line for each question.
+   %subdivided_bubble_lines     - optionresponse, matchresponse and rankresponse 
+                                  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, formularesponse,
+                                  stringresponse, imageresponse, reactionresponse,
+                                  and organicresponse 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;
-    my @alphabet=('A'..'Z');
+=cut
 
-    $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') ||
+            ($responsetype_per_response{$question-1} eq 'imageresponse') ||
+            ($responsetype_per_response{$question-1} eq 'reactionresponse') ||
+            ($responsetype_per_response{$question-1} eq 'organicresponse')) {
+            $r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the exam directed students to leave [quant,_1,line] blank on their bubblesheets.",$lines).'<br /><br />'.&mt('A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.').'<br />'.&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.').'<br />'.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'<br /><br />');
+        } else {
+            $r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />");
+        }
+    }
+    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++) {
-	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>');
-	    
-	}
+=pod
 
-	if ($l == 0) {
-	    my $lspan = $total_lines * 2;   #  2 table rows per bubble line.
+=item scantron_bubble_selector
+  
+   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_'.
-	      $quest.'" value="none" /> '.&mt('No bubble').' </label></td>');
-	
-	}
+ Arguments:
+    $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
-	#        multiline questions (different values e.g..).
+sub scantron_bubble_selector {
+    my ($r,$scan_config,$line,$questionnum,$error,@selected)=@_;
+    my $max=$$scan_config{'Qlength'};
 
-	for (my $i=0;$i<$max;$i++) {
-	    my $value = "$l:$i";	# Relative bubble line #: Bubble in line.
-	    $r->print("\n".
-		      '<td><label><input type="radio" name="scantron_correct_Q_'.
-		      $quest.'" value="'.$value.'" />'.$alphabet[$i]."</label></td>");
-	}
-	$r->print('</tr>');
+    my $scmode=$$scan_config{'Qon'};
+    if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }	     
 
-	    
-    }
-    $r->print('</table>');
+    my @alphabet=('A'..'Z');
+    $r->print(&Apache::loncommon::start_data_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
@@ -6843,7 +7413,12 @@ sub scantron_validate_CODE {
 
     my %allcodes=&get_codes();
 
-    &scantron_get_maxbubble();	# parse needs the lines per response array.
+    my $nav_error;
+    &scantron_get_maxbubble(\$nav_error); # parse needs the lines per response array.
+    if ($nav_error) {
+        $r->print(&navmap_errormsg());
+        return(1,$currentphase);
+    }
 
     my ($scanlines,$scan_data)=&scantron_getfile();
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
@@ -6874,7 +7449,7 @@ sub scantron_validate_CODE {
 				     $line,'duplicateCODE',$usedCODEs{$CODE});
 	    return(1,$currentphase);
 	}
-	push (@{$usedCODEs{$CODE}},$$scan_record{'scantron.PaperID'});
+	push(@{$usedCODEs{$CODE}},$$scan_record{'scantron.PaperID'});
     }
     return (0,$currentphase+1);
 }
@@ -6897,8 +7472,12 @@ 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.
+    my $nav_error;
+    &scantron_get_maxbubble(\$nav_error); # parse needs the bubble line array.
+    if ($nav_error) {
+        $r->print(&navmap_errormsg());
+        return(1,$currentphase);
+    }
 
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
 	my $line=&scantron_get_line($scanlines,$scan_data,$i);
@@ -6914,24 +7493,9 @@ sub scantron_validate_doublebubble {
     return (0,$currentphase+1);
 }
 
-=pod
-
-=item scantron_get_maxbubble
-
-   Returns the maximum number of bubble lines that are expected to
-   occur. Does this by walking the selected sequence rendering the
-   resource and then checking &Apache::lonxml::get_problem_counter()
-   for what the current value of the problem counter is.
-
-   Caches the results to $env{'form.scantron_maxbubble'},
-   $env{'form.scantron.bubble_lines.n'} and 
-   $env{'form.scantron.first_bubble_line.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.
-
-=cut
 
-sub scantron_get_maxbubble {    
+sub scantron_get_maxbubble {
+    my ($nav_error) = @_;
     if (defined($env{'form.scantron_maxbubble'}) &&
 	$env{'form.scantron_maxbubble'}) {
 	&restore_bubble_lines();
@@ -6942,56 +7506,85 @@ sub scantron_get_maxbubble {
 	&Apache::lonnet::decode_symb($env{'form.selectpage'});
 
     my $navmap=Apache::lonnavmaps::navmap->new();
+    unless (ref($navmap)) {
+        if (ref($nav_error)) {
+            $$nav_error = 1;
+        }
+        return;
+    }
     my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
 
     &Apache::lonxml::clear_problem_counter();
 
-    my $uname       = $env{'form.student'};
-    my $udom        = $env{'form.userdom'};
+    my $uname       = $env{'user.name'};
+    my $udom        = $env{'user.domain'};
     my $cid         = $env{'request.course.id'};
     my $total_lines = 0;
     %bubble_lines_per_response = ();
     %first_bubble_line         = ();
+    %subdivided_bubble_lines   = ();
+    %responsetype_per_response = ();
 
-  
     my $response_number = 0;
     my $bubble_line     = 0;
     foreach my $resource (@resources) {
-	my $symb = $resource->symb();
-	&Apache::lonxml::clear_bubble_lines_for_part();
-	my $result=&Apache::lonnet::ssi($resource->src(),
-					('symb' => $resource->symb()),
-					('grade_target' => 'analyze'),
-					('grade_courseid' => $cid),
-					('grade_domain' => $udom),
-					('grade_username' => $uname));
-	my (undef, $an) =
-	    split(/_HASH_REF__/,$result, 2);
-
-	my %analysis = &Apache::lonnet::str2hash($an);
-
-
-
-	foreach my $part_id (@{$analysis{'parts'}}) {
-
-	    my $lines = $analysis{"$part_id.bubble_lines"};;
-
-
-
-	    # TODO - make this a persistent hash not an array.
-
-
-	    $first_bubble_line{$response_number}           = $bubble_line;
-	    $bubble_lines_per_response{$response_number}   = $lines;
-	    $response_number++;
+        my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom);
+        if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {
+	    foreach my $part_id (@{$parts}) {
+                my $lines;
+
+	        # TODO - make this a persistent hash not an array.
+
+                # optionresponse, matchresponse and rankresponse type items 
+                # render as separate sub-questions in exam mode.
+                if (($analysis->{$part_id.'.type'} eq 'optionresponse') ||
+                    ($analysis->{$part_id.'.type'} eq 'matchresponse') ||
+                    ($analysis->{$part_id.'.type'} eq 'rankresponse')) {
+                    my ($numbub,$numshown);
+                    if ($analysis->{$part_id.'.type'} eq 'optionresponse') {
+                        if (ref($analysis->{$part_id.'.options'}) eq 'ARRAY') {
+                            $numbub = scalar(@{$analysis->{$part_id.'.options'}});
+                        }
+                    } elsif ($analysis->{$part_id.'.type'} eq 'matchresponse') {
+                        if (ref($analysis->{$part_id.'.items'}) eq 'ARRAY') {
+                            $numbub = scalar(@{$analysis->{$part_id.'.items'}});
+                        }
+                    } elsif ($analysis->{$part_id.'.type'} eq 'rankresponse') {
+                        if (ref($analysis->{$part_id.'.foils'}) eq 'ARRAY') {
+                            $numbub = scalar(@{$analysis->{$part_id.'.foils'}});
+                        }
+                    }
+                    if (ref($analysis->{$part_id.'.shown'}) eq 'ARRAY') {
+                        $numshown = scalar(@{$analysis->{$part_id.'.shown'}});
+                    }
+                    my $bubbles_per_line = 10;
+                    my $inner_bubble_lines = int($numbub/$bubbles_per_line);
+                    if (($numbub % $bubbles_per_line) != 0) {
+                        $inner_bubble_lines++;
+                    }
+                    for (my $i=0; $i<$numshown; $i++) {
+                        $subdivided_bubble_lines{$response_number} .= 
+                            $inner_bubble_lines.',';
+                    }
+                    $subdivided_bubble_lines{$response_number} =~ s/,$//;
+                    $lines = $numshown * $inner_bubble_lines;
+                } else {
+                    $lines = $analysis->{"$part_id.bubble_lines"};
+                } 
 
-	    $bubble_line +=  $lines;
-	    $total_lines +=  $lines;
-	}
+                $first_bubble_line{$response_number} = $bubble_line;
+	        $bubble_lines_per_response{$response_number} = $lines;
+                $responsetype_per_response{$response_number} = 
+                    $analysis->{$part_id.'.type'};
+	        $response_number++;
 
+	        $bubble_line +=  $lines;
+	        $total_lines +=  $lines;
+	    }
+        }
     }
-    &Apache::lonnet::delenv('scantron\.');
+    &Apache::lonnet::delenv('scantron.');
 
     &save_bubble_lines();
     $env{'form.scantron_maxbubble'} =
@@ -6999,16 +7592,6 @@ sub scantron_get_maxbubble {
     return $env{'form.scantron_maxbubble'};
 }
 
-=pod
-
-=item scantron_validate_missingbubbles
-
-   Validates all scanlines in the selected file to not have any
-    answers that don't have bubbles that have not been verified
-    to be bubble free.
-
-=cut
-
 sub scantron_validate_missingbubbles {
     my ($r,$currentphase) = @_;
     #get student info
@@ -7018,7 +7601,11 @@ sub scantron_validate_missingbubbles {
     #get scantron line setup
     my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
-    my $max_bubble=&scantron_get_maxbubble();
+    my $nav_error;
+    my $max_bubble=&scantron_get_maxbubble(\$nav_error);
+    if ($nav_error) {
+        return(1,$currentphase);
+    }
     if (!$max_bubble) { $max_bubble=2**31; }
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
 	my $line=&scantron_get_line($scanlines,$scan_data,$i);
@@ -7031,7 +7618,25 @@ 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) {
@@ -7044,35 +7649,15 @@ sub scantron_validate_missingbubbles {
     return (0,$currentphase+1);
 }
 
-=pod
-
-=item scantron_process_students
-
-   Routine that does the actual grading of the bubble sheet information.
-
-   The parsed scanline hash is added to %env 
-
-   Then foreach unskipped scanline it does an &Apache::lonnet::ssi()
-   foreach resource , with the form data of
-
-	'submitted'     =>'scantron' 
-	'grade_target'  =>'grade',
-	'grade_username'=> username of student
-	'grade_domain'  => domain of student
-	'grade_courseid'=> of course
-	'grade_symb'    => symb of resource to grade
-
-    This triggers a grading pass. The problem grading code takes care
-    of converting the bubbled letter information (now in %env) into a
-    valid submission.
-
-=cut
 
 sub scantron_process_students {
     my ($r) = @_;
+
     my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'});
     my ($symb)=&get_symb($r);
-    if (!$symb) {return '';}
+    if (!$symb) {
+	return '';
+    }
     my $default_form_data=&defaultFormData($symb);
 
     my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
@@ -7080,9 +7665,41 @@ sub scantron_process_students {
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($classlist);
     my $navmap=Apache::lonnavmaps::navmap->new();
+    unless (ref($navmap)) {
+        $r->print(&navmap_errormsg());
+        return '';
+    }  
     my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
-#    $r->print("geto ".scalar(@resources)."<br />");
+    my (%grader_partids_by_symb,%grader_randomlists_by_symb);
+    &graders_resources_pass(\@resources,\%grader_partids_by_symb,
+                            \%grader_randomlists_by_symb);
+    my $resource_error;
+    foreach my $resource (@resources) {
+        my $ressymb;
+        if (ref($resource)) {
+            $ressymb = $resource->symb();
+        } else {
+            $resource_error = 1;
+            last;
+        }
+        my ($analysis,$parts) =
+            &scantron_partids_tograde($resource,$env{'request.course.id'},
+                                      $env{'user.name'},$env{'user.domain'},1);
+        $grader_partids_by_symb{$ressymb} = $parts;
+        if (ref($analysis) eq 'HASH') {
+            if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {
+                $grader_randomlists_by_symb{$ressymb} = 
+                    $analysis->{'parts_withrandomlist'};
+            }
+        }
+    }
+    if ($resource_error) {
+        $r->print(&navmap_errormsg());
+        return '';
+    }
+
+    my ($uname,$udom);
     my $result= <<SCANTRONFORM;
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
   <input type="hidden" name="command" value="scantron_configphase" />
@@ -7091,19 +7708,40 @@ SCANTRONFORM
     $r->print($result);
 
     my @delayqueue;
-    my %completedstudents;
+    my (%completedstudents,%scandata);
     
+    my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));
     my $count=&get_todo_count($scanlines,$scan_data);
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status',
- 				    'Scantron Progress',$count,
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status',
+ 				    'Bubblesheet Progress',$count,
 				    'inline',undef,'scantronupload');
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
 					  'Processing first student');
+    $r->print('<br />');
     my $start=&Time::HiRes::time();
     my $i=-1;
-    my ($uname,$udom,$started);
+    my $started;
 
-    &scantron_get_maxbubble();	# Need the bubble lines array to parse.
+    my $nav_error;
+    &scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.
+    if ($nav_error) {
+        $r->print(&navmap_errormsg());
+        return '';
+    }
+
+    # If an ssi failed in scantron_get_maxbubble, put an error message out to
+    # the user and return.
+
+    if ($ssi_error) {
+	$r->print("</form>");
+	&ssi_print_error($r);
+	$r->print(&show_grading_menu_form($symb));
+        &Apache::lonnet::remove_lock($lock);
+	return '';		# Dunno why the other returns return '' rather than just returning.
+    }
+
+    my %lettdig = &letter_to_digits();
+    my $numletts = scalar(keys(%lettdig));
 
     while ($i<$scanlines->{'count'}) {
  	($uname,$udom)=('','');
@@ -7130,41 +7768,131 @@ SCANTRONFORM
  	}
   	($uname,$udom)=split(/:/,$uname);
 
+        my (%partids_by_symb,$res_error);
+        foreach my $resource (@resources) {
+            my $ressymb;
+            if (ref($resource)) {
+                $ressymb = $resource->symb();
+            } else {
+                $res_error = 1;
+                last;
+            }
+            if ((exists($grader_randomlists_by_symb{$ressymb})) ||
+                (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
+                my ($analysis,$parts) =
+                    &scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom);
+                $partids_by_symb{$ressymb} = $parts;
+            } else {
+                $partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb};
+            }
+        }
+
+        if ($res_error) {
+            &scantron_add_delay(\@delayqueue,$line,
+                                'An error occurred while grading student '.$uname,2);
+            next;
+        }
+
 	&Apache::lonxml::clear_problem_counter();
-  	&Apache::lonnet::appenv(%$scan_record);
+  	&Apache::lonnet::appenv($scan_record);
 
 	if (&scantron_clear_skip($scanlines,$scan_data,$i)) {
 	    &scantron_putfile($scanlines,$scan_data);
 	}
 	
-	my $i=0;
-	foreach my $resource (@resources) {
-	    $i++;
-	    my %form=('submitted'     =>'scantron',
-		      'grade_target'  =>'grade',
-		      'grade_username'=>$uname,
-		      'grade_domain'  =>$udom,
-		      'grade_courseid'=>$env{'request.course.id'},
-		      'grade_symb'    =>$resource->symb());
-	    if (exists($scan_record->{'scantron.CODE'})
-		&& 
-		&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'})) {
-		$form{'CODE'}=$scan_record->{'scantron.CODE'};
-	    } else {
-		$form{'CODE'}='';
-	    }
-	    my $result=&Apache::lonnet::ssi($resource->src(),%form);
-	    if ($result ne '') {
-	    }
-	    if (&Apache::loncommon::connection_aborted($r)) { last; }
-	}
+        my $scancode;
+        if ((exists($scan_record->{'scantron.CODE'})) &&
+            (&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {
+            $scancode = $scan_record->{'scantron.CODE'};
+        } else {
+            $scancode = '';
+        }
+
+        if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
+                                   \@resources,\%partids_by_symb) eq 'ssi_error') {
+            $ssi_error = 0; # So end of handler error message does not trigger.
+            $r->print("</form>");
+            &ssi_print_error($r);
+            $r->print(&show_grading_menu_form($symb));
+            &Apache::lonnet::remove_lock($lock);
+            return '';      # Why return ''?  Beats me.
+        }
+
 	$completedstudents{$uname}={'line'=>$line};
-	if (&Apache::loncommon::connection_aborted($r)) { last; }
+        if ($env{'form.verifyrecord'}) {
+            my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'};
+            my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos);
+            chomp($studentdata);
+            $studentdata =~ s/\r$//;
+            my $studentrecord = '';
+            my $counter = -1;
+            foreach my $resource (@resources) {
+                my $ressymb = $resource->symb();
+                ($counter,my $recording) =
+                    &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
+                                             $counter,$studentdata,$partids_by_symb{$ressymb},
+                                             \%scantron_config,\%lettdig,$numletts);
+                $studentrecord .= $recording;
+            }
+            if ($studentrecord ne $studentdata) {
+                &Apache::lonxml::clear_problem_counter();
+                if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
+                                           \@resources,\%partids_by_symb) eq 'ssi_error') {
+                    $ssi_error = 0; # So end of handler error message does not trigger.
+                    $r->print("</form>");
+                    &ssi_print_error($r);
+                    $r->print(&show_grading_menu_form($symb));
+                    &Apache::lonnet::remove_lock($lock);
+                    delete($completedstudents{$uname});
+                    return '';
+                }
+                $counter = -1;
+                $studentrecord = '';
+                foreach my $resource (@resources) {
+                    my $ressymb = $resource->symb();
+                    ($counter,my $recording) =
+                        &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
+                                                 $counter,$studentdata,$partids_by_symb{$ressymb},
+                                                 \%scantron_config,\%lettdig,$numletts);
+                    $studentrecord .= $recording;
+                }
+                if ($studentrecord ne $studentdata) {
+                    $r->print('<p><span class="LC_error">');
+                    if ($scancode eq '') {
+                        $r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2].',
+                                  $uname.':'.$udom,$scan_record->{'scantron.ID'}));
+                    } else {
+                        $r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2] and CODE: [_3].',
+                                  $uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode));
+                    }
+                    $r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n".
+                              &Apache::loncommon::start_data_table_header_row()."\n".
+                              '<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'.
+                              &Apache::loncommon::end_data_table_header_row()."\n".
+                              &Apache::loncommon::start_data_table_row().
+                              '<td>'.&mt('Bubble Sheet').'</td>'.
+                              '<td><span class="LC_nobreak">'.$studentdata.'</span></td>'.
+                              &Apache::loncommon::end_data_table_row().
+                              &Apache::loncommon::start_data_table_row().
+                              '<td>Stored submissions</td>'.
+                              '<td><span class="LC_nobreak">'.$studentrecord.'</span></td>'."\n".
+                              &Apache::loncommon::end_data_table_row().
+                              &Apache::loncommon::end_data_table().'</p>');
+                } else {
+                    $r->print('<br /><span class="LC_warning">'.
+                             &mt('A second grading pass was needed for user: [_1] with ID: [_2], because a mismatch was seen on the first pass.',$uname.':'.$udom,$scan_record->{'scantron.ID'}).'<br />'.
+                             &mt("As a consequence, this user's submission history records two tries.").
+                                 '</span><br />');
+                }
+            }
+        }
+        if (&Apache::loncommon::connection_aborted($r)) { last; }
     } continue {
 	&Apache::lonxml::clear_problem_counter();
-	&Apache::lonnet::delenv('scantron\.');
+	&Apache::lonnet::delenv('scantron.');
     }
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+    &Apache::lonnet::remove_lock($lock);
 #    my $lasttime = &Time::HiRes::time()-$start;
 #    $r->print("<p>took $lasttime</p>");
 
@@ -7173,62 +7901,126 @@ SCANTRONFORM
     return '';
 }
 
-=pod
-
-=item scantron_upload_scantron_data
-
-    Creates the screen for adding a new bubble sheet data file to a course.
+sub graders_resources_pass {
+    my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb) = @_;
+    if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) && 
+        (ref($grader_randomlists_by_symb) eq 'HASH')) {
+        foreach my $resource (@{$resources}) {
+            my $ressymb = $resource->symb();
+            my ($analysis,$parts) =
+                &scantron_partids_tograde($resource,$env{'request.course.id'},
+                                          $env{'user.name'},$env{'user.domain'},1);
+            $grader_partids_by_symb->{$ressymb} = $parts;
+            if (ref($analysis) eq 'HASH') {
+                if (ref($analysis->{'parts_withrandomlist'}) eq 'ARRAY') {
+                    $grader_randomlists_by_symb->{$ressymb} =
+                        $analysis->{'parts_withrandomlist'};
+                }
+            }
+        }
+    }
+    return;
+}
 
-=cut
+sub grade_student_bubbles {
+    my ($r,$uname,$udom,$scan_record,$scancode,$resources,$parts) = @_;
+    if (ref($resources) eq 'ARRAY') {
+        my $count = 0;
+        foreach my $resource (@{$resources}) {
+            my $ressymb = $resource->symb();
+            my %form = ('submitted'      => 'scantron',
+                        'grade_target'   => 'grade',
+                        'grade_username' => $uname,
+                        'grade_domain'   => $udom,
+                        'grade_courseid' => $env{'request.course.id'},
+                        'grade_symb'     => $ressymb,
+                        'CODE'           => $scancode
+                       );
+            if (ref($parts) eq 'HASH') {
+                if (ref($parts->{$ressymb}) eq 'ARRAY') {
+                    foreach my $part (@{$parts->{$ressymb}}) {
+                        $form{'scantron_questnum_start.'.$part} =
+                            1+$env{'form.scantron.first_bubble_line.'.$count};
+                        $count++;
+                    }
+                }
+            }
+            my $result=&ssi_with_retries($resource->src(),$ssi_retries,%form);
+            return 'ssi_error' if ($ssi_error);
+            last if (&Apache::loncommon::connection_aborted($r));
+        }
+    }
+    return;
+}
 
 sub scantron_upload_scantron_data {
     my ($r)=@_;
-    $r->print(&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}));
+    my $dom = $env{'request.role.domain'};
+    my $domdesc = &Apache::lonnet::domain($dom,'description');
+    $r->print(&Apache::loncommon::coursebrowser_javascript($dom));
     my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
 							  'domainid',
-							  'coursename');
-    my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},
-						   'domainid');
+							  'coursename',$dom);
+    my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.
+                       ('&nbsp'x2).&mt('(shows course personnel)'); 
     my $default_form_data=&defaultFormData(&get_symb($r,1));
-    $r->print('
-<script type="text/javascript" language="javascript">
+    my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');
+    my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");
+    $r->print(&Apache::lonhtmlcommon::scripttag('
     function checkUpload(formname) {
 	if (formname.upfile.value == "") {
-	    alert("Please use the browse button to select a file from your local directory.");
+	    alert("'.$nofile_alert.'");
 	    return false;
 	}
+        if (formname.courseid.value == "") {
+            alert("'.$nocourseid_alert.'");
+            return false;
+        }
 	formname.submit();
     }
-</script>
+
+    function ToSyllabus() {
+        var cdom = '."'$dom'".';
+        var cnum = document.rules.courseid.value;
+        if (cdom == "" || cdom == null) {
+            return;
+        }
+        if (cnum == "" || cnum == null) {
+           return;
+        }
+        syllwin=window.open("/public/"+cdom+"/"+cnum+"/syllabus","LONCAPASyllabus",
+                            "height=350,width=350,scrollbars=yes,menubar=no");
+        return;
+    }
+
+'));
+    $r->print('
+<h3>'.&mt('Send scanned bubblesheet data to a course').'</h3>
 
 <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
-'.$default_form_data.'
-<table>
-<tr><td>'.$select_link.'                             </td></tr>
-<tr><td>'.&mt('Course ID:').'     </td>
-    <td><input name="courseid"   type="text" />      </td></tr>
-<tr><td>'.&mt('Course Name:').'   </td>
-    <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>
+'.$default_form_data.
+  &Apache::lonhtmlcommon::start_pick_box().
+  &Apache::lonhtmlcommon::row_title(&mt('Course ID')).
+  '<input name="courseid" type="text" size="30" />'.$select_link.
+  &Apache::lonhtmlcommon::row_closure().
+  &Apache::lonhtmlcommon::row_title(&mt('Course Name')).
+  '<input name="coursename" type="text" size="30" />'.$syllabuslink.
+  &Apache::lonhtmlcommon::row_closure().
+  &Apache::lonhtmlcommon::row_title(&mt('Domain')).
+  '<input name="domainid" type="hidden" />'.$domdesc.
+  &Apache::lonhtmlcommon::row_closure().
+  &Apache::lonhtmlcommon::row_title(&mt('File to upload')).
+  '<input type="file" name="upfile" size="50" />'.
+  &Apache::lonhtmlcommon::row_closure(1).
+  &Apache::lonhtmlcommon::end_pick_box().'<br />
+
 <input name="command" value="scantronupload_save" type="hidden" />
-<input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />
+<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
 </form>
 ');
     return '';
 }
 
-=pod
-
-=item scantron_upload_scantron_data_save
-
-   Adds a provided bubble information data file to the course if user
-   has the correct privileges to do so.  
-
-=cut
 
 sub scantron_upload_scantron_data_save {
     my($r)=@_;
@@ -7241,7 +8033,7 @@ sub scantron_upload_scantron_data_save {
     if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&
 	!&Apache::lonnet::allowed('usc',
 			    $env{'form.domainid'}.'_'.$env{'form.courseid'})) {
-	$r->print(&mt("You are not allowed to upload Scantron data to the requested course.")."<br />");
+	$r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />");
 	if ($symb) {
 	    $r->print(&show_grading_menu_form($symb));
 	} else {
@@ -7250,36 +8042,25 @@ sub scantron_upload_scantron_data_save {
 	return '';
     }
     my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
-    $r->print(&mt("Doing upload to [_1]",$coursedata{'description'})." <br />");
-    my $fname=$env{'form.upfile.filename'};
-    #FIXME
-    #copied from lonnet::userfileupload()
-    #make that function able to target a specified course
-    # Replace Windows backslashes by forward slashes
-    $fname=~s/\\/\//g;
-    # Get rid of everything but the actual filename
-    $fname=~s/^.*\/([^\/]+)$/$1/;
-    # Replace spaces by underscores
-    $fname=~s/\s+/\_/g;
-    # Replace all other weird characters by nothing
-    $fname=~s/[^\w\.\-]//g;
-    # See if there is anything left
-    unless ($fname) { return 'error: no uploaded file'; }
-    my $uploadedfile=$fname;
-    $fname='scantron_orig_'.$fname;
+    my $uploadedfile;
+    $r->print('<h3>'.&mt("Uploading file to [_1]",$coursedata{'description'}).'</h3>');
     if (length($env{'form.upfile'}) < 2) {
-	$r->print(&mt("<span class=\"LC_error\">Error:</span> The file you attempted to upload, [_1]  contained no information. Please check that you entered the correct filename.",'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>"));
+        $r->print(&mt('[_1]Error:[_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.','<span class="LC_error">','</span>','<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'));
     } else {
-	my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);
-	if ($result =~ m|^/uploaded/|) {
-	    $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>"));
+        my $result = 
+            &Apache::lonnet::userfileupload('upfile','','scantron','','','',
+                                            $env{'form.courseid'},$env{'form.domainid'});
+	if ($result =~ m{^/uploaded/}) {
+	    $r->print(&mt('[_1]Success:[_2] Successfully uploaded [_3] bytes of data into location: [_4]',
+                          '<span class="LC_success">','</span>',(length($env{'form.upfile'})-1),
+			  '<span class="LC_filename">'.$result.'</span>'));
+            ($uploadedfile) = ($result =~ m{/([^/]+)$});
+            $r->print(&validate_uploaded_scantron_file($env{'form.domainid'},
+                                                       $env{'form.courseid'},$uploadedfile));
 	} else {
-	    $r->print(&mt("<span class=\"LC_error\">Error:</span> An error ([_1]) occurred when attempting to upload the file, [_2]",
-			  $result,
-			  '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>"));
-
+	    $r->print(&mt('[_1]Error:[_2] An error ([_3]) occurred when attempting to upload the file, [_4]',
+                          '<span class="LC_error">','</span>',$result,
+			  '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'));
 	}
     }
     if ($symb) {
@@ -7290,13 +8071,91 @@ sub scantron_upload_scantron_data_save {
     return '';
 }
 
-=pod
-
-=item valid_file
-
-   Validates that the requested bubble data file exists in the course.
-
-=cut
+sub validate_uploaded_scantron_file {
+    my ($cdom,$cname,$fname) = @_;
+    my $scanlines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.$fname);
+    my @lines;
+    if ($scanlines ne '-1') {
+        @lines=split("\n",$scanlines,-1);
+    }
+    my $output;
+    if (@lines) {
+        my (%counts,$max_match_format);
+        my ($max_match_count,$max_match_pct) = (0,0);
+        my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cname);
+        my %idmap = &username_to_idmap($classlist);
+        foreach my $key (keys(%idmap)) {
+            my $lckey = lc($key);
+            $idmap{$lckey} = $idmap{$key};
+        }
+        my %unique_formats;
+        my @formatlines = &get_scantronformat_file();
+        foreach my $line (@formatlines) {
+            chomp($line);
+            my @config = split(/:/,$line);
+            my $idstart = $config[5];
+            my $idlength = $config[6];
+            if (($idstart ne '') && ($idlength > 0)) {
+                if (ref($unique_formats{$idstart.':'.$idlength}) eq 'ARRAY') {
+                    push(@{$unique_formats{$idstart.':'.$idlength}},$config[0].':'.$config[1]); 
+                } else {
+                    $unique_formats{$idstart.':'.$idlength} = [$config[0].':'.$config[1]];
+                }
+            }
+        }
+        foreach my $key (keys(%unique_formats)) {
+            my ($idstart,$idlength) = split(':',$key);
+            %{$counts{$key}} = (
+                               'found'   => 0,
+                               'total'   => 0,
+                              );
+            foreach my $line (@lines) {
+                next if ($line =~ /^#/);
+                next if ($line =~ /^[\s\cz]*$/);
+                my $id = substr($line,$idstart-1,$idlength);
+                $id = lc($id);
+                if (exists($idmap{$id})) {
+                    $counts{$key}{'found'} ++;
+                }
+                $counts{$key}{'total'} ++;
+            }
+            if ($counts{$key}{'total'}) {
+                my $percent_match = (100*$counts{$key}{'found'})/($counts{$key}{'total'});
+                if (($max_match_format eq '') || ($percent_match > $max_match_pct)) {
+                    $max_match_pct = $percent_match;
+                    $max_match_format = $key;
+                    $max_match_count = $counts{$key}{'total'};
+                }
+            }
+        }
+        if (ref($unique_formats{$max_match_format}) eq 'ARRAY') {
+            my $format_descs;
+            my $numwithformat = @{$unique_formats{$max_match_format}};
+            for (my $i=0; $i<$numwithformat; $i++) {
+                my ($name,$desc) = split(':',$unique_formats{$max_match_format}[$i]);
+                if ($i<$numwithformat-2) {
+                    $format_descs .= '"<i>'.$desc.'</i>", ';
+                } elsif ($i==$numwithformat-2) {
+                    $format_descs .= '"<i>'.$desc.'</i>" '.&mt('and').' ';
+                } elsif ($i==$numwithformat-1) {
+                    $format_descs .= '"<i>'.$desc.'</i>"';
+                }
+            }
+            my $showpct = sprintf("%.0f",$max_match_pct).'%';
+            $output .= '<br />'.&mt('Comparison of student IDs in the uploaded file with the course roster found matches for [_1] of the [_2] entries in the file (for the format defined for [_3]).','<b>'.$showpct.'</b>','<b>'.$max_match_count.'</b>',$format_descs).
+                       '<br />'.&mt('A low percentage of matches results from one of the following:').'<ul>'.
+                       '<li>'.&mt('The file was uploaded to the wrong course').'</li>'.
+                       '<li>'.&mt('The data are not in the format expected for the domain: [_1]',
+                                  '<i>'.$cdom.'</i>').'</li>'.
+                       '<li>'.&mt('Students did not bubble their IDs, or mis-bubbled them').'</li>'.
+                       '<li>'.&mt('The course roster is not up to date').'</li>'.
+                       '</ul>';
+        }
+    } else {
+        $output = '<span class="LC_warning">'.&mt('Uploaded file contained no data').'</span>';
+    }
+    return $output;
+}
 
 sub valid_file {
     my ($requested_file)=@_;
@@ -7306,16 +8165,6 @@ sub valid_file {
     return 0;
 }
 
-=pod
-
-=item scantron_download_scantron_data
-
-   Shows a list of the three internal files (original, corrected,
-   skipped) for a specific bubble sheet data file that exists in the
-   course.
-
-=cut
-
 sub scantron_download_scantron_data {
     my ($r)=@_;
     my $default_form_data=&defaultFormData(&get_symb($r,1));
@@ -7355,11 +8204,298 @@ sub scantron_download_scantron_data {
     return '';
 }
 
-=pod
+sub checkscantron_results {
+    my ($r) = @_;
+    my ($symb)=&get_symb($r);
+    if (!$symb) {return '';}
+    my $grading_menu_button=&show_grading_menu_form($symb);
+    my $cid = $env{'request.course.id'};
+    my %lettdig = &letter_to_digits();
+    my $numletts = scalar(keys(%lettdig));
+    my $cnum = $env{'course.'.$cid.'.num'};
+    my $cdom = $env{'course.'.$cid.'.domain'};
+    my (undef, undef, $sequence) = &Apache::lonnet::decode_symb($env{'form.selectpage'});
+    my %record;
+    my %scantron_config =
+        &Apache::grades::get_scantron_config($env{'form.scantron_format'});
+    my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();
+    my $classlist=&Apache::loncoursedata::get_classlist();
+    my %idmap=&Apache::grades::username_to_idmap($classlist);
+    my $navmap=Apache::lonnavmaps::navmap->new();
+    unless (ref($navmap)) {
+        $r->print(&navmap_errormsg());
+        return '';
+    }
+    my $map=$navmap->getResourceByUrl($sequence);
+    my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
+    my (%grader_partids_by_symb,%grader_randomlists_by_symb);
+    &graders_resources_pass(\@resources,\%grader_partids_by_symb,                             \%grader_randomlists_by_symb);
 
-=back
+    my ($uname,$udom);
+    my (%scandata,%lastname,%bylast);
+    $r->print('
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="checkscantron">'."\n");
+
+    my @delayqueue;
+    my %completedstudents;
+
+    my $count=&Apache::grades::get_todo_count($scanlines,$scan_data);
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status',
+                                    'Progress of Bubblesheet Data/Submission Records Comparison',$count,
+                                    'inline',undef,'checkscantron');
+    my ($username,$domain,$started);
+    my $nav_error;
+    &scantron_get_maxbubble(\$nav_error); # Need the bubble lines array to parse.
+    if ($nav_error) {
+        $r->print(&navmap_errormsg());
+        return '';
+    }
+
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+                                          'Processing first student');
+    my $start=&Time::HiRes::time();
+    my $i=-1;
+
+    while ($i<$scanlines->{'count'}) {
+        ($username,$domain,$uname)=('','','');
+        $i++;
+        my $line=&Apache::grades::scantron_get_line($scanlines,$scan_data,$i);
+        if ($line=~/^[\s\cz]*$/) { next; }
+        if ($started) {
+            &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+                                                     'last student');
+        }
+        $started=1;
+        my $scan_record=
+            &Apache::grades::scantron_parse_scanline($line,$i,\%scantron_config,
+                                                     $scan_data);
+        unless ($uname=&Apache::grades::scantron_find_student($scan_record,$scan_data,
+                                                              \%idmap,$i)) {
+            &Apache::grades::scantron_add_delay(\@delayqueue,$line,
+                                'Unable to find a student that matches',1);
+            next;
+        }
+        if (exists $completedstudents{$uname}) {
+            &Apache::grades::scantron_add_delay(\@delayqueue,$line,
+                                'Student '.$uname.' has multiple sheets',2);
+            next;
+        }
+        my $pid = $scan_record->{'scantron.ID'};
+        $lastname{$pid} = $scan_record->{'scantron.LastName'};
+        push(@{$bylast{$lastname{$pid}}},$pid);
+        my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'};
+        $scandata{$pid} = substr($line,$scantron_config{'Qstart'}-1,$lastpos);
+        chomp($scandata{$pid});
+        $scandata{$pid} =~ s/\r$//;
+        ($username,$domain)=split(/:/,$uname);
+        my $counter = -1;
+        foreach my $resource (@resources) {
+            my $parts;
+            my $ressymb = $resource->symb();
+            if ((exists($grader_randomlists_by_symb{$ressymb})) ||
+                (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
+                (my $analysis,$parts) =
+                    &scantron_partids_tograde($resource,$env{'request.course.id'},$username,$domain);
+            } else {
+                $parts = $grader_partids_by_symb{$ressymb};
+            }
+            ($counter,my $recording) =
+                &verify_scantron_grading($resource,$domain,$username,$cid,$counter,
+                                         $scandata{$pid},$parts,
+                                         \%scantron_config,\%lettdig,$numletts);
+            $record{$pid} .= $recording;
+        }
+    }
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+    $r->print('<br />');
+    my ($okstudents,$badstudents,$numstudents,$passed,$failed);
+    $passed = 0;
+    $failed = 0;
+    $numstudents = 0;
+    foreach my $last (sort(keys(%bylast))) {
+        if (ref($bylast{$last}) eq 'ARRAY') {
+            foreach my $pid (sort(@{$bylast{$last}})) {
+                my $showscandata = $scandata{$pid};
+                my $showrecord = $record{$pid};
+                $showscandata =~ s/\s/&nbsp;/g;
+                $showrecord =~ s/\s/&nbsp;/g;
+                if ($scandata{$pid} eq $record{$pid}) {
+                    my $css_class = ($passed % 2)?'LC_odd_row':'LC_even_row';
+                    $okstudents .= '<tr class="'.$css_class.'">'.
+'<td>'.&mt('Bubblesheet').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
+'</tr>'."\n".
+'<tr class="'.$css_class.'">'."\n".
+'<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n";
+                    $passed ++;
+                } else {
+                    my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row';
+                    $badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Bubblesheet').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
+'</tr>'."\n".
+'<tr class="'.$css_class.'">'."\n".
+'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".
+'</tr>'."\n";
+                    $failed ++;
+                }
+                $numstudents ++;
+            }
+        }
+    }
+    $r->print('<p>'.&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for <b>[quant,_1,student]</b>  ([_2] scantron lines/student).',$numstudents,$env{'form.scantron_maxbubble'}).'</p>');
+    $r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>');
+    if ($passed) {
+        $r->print(&mt('Students with exact correspondence between bubblesheet data and submissions are as follows:').'<br /><br />');
+        $r->print(&Apache::loncommon::start_data_table()."\n".
+                 &Apache::loncommon::start_data_table_header_row()."\n".
+                 '<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'.
+                 &Apache::loncommon::end_data_table_header_row()."\n".
+                 $okstudents."\n".
+                 &Apache::loncommon::end_data_table().'<br />');
+    }
+    if ($failed) {
+        $r->print(&mt('Students with differences between bubblesheet data and submissions are as follows:').'<br /><br />');
+        $r->print(&Apache::loncommon::start_data_table()."\n".
+                 &Apache::loncommon::start_data_table_header_row()."\n".
+                 '<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'.
+                 &Apache::loncommon::end_data_table_header_row()."\n".
+                 $badstudents."\n".
+                 &Apache::loncommon::end_data_table()).'<br />'.
+                 &mt('Differences can occur if submissions were modified using manual grading after a bubblesheet grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original bubblesheets.');  
+    }
+    $r->print('</form><br />'.$grading_menu_button);
+    return;
+}
+
+sub verify_scantron_grading {
+    my ($resource,$domain,$username,$cid,$counter,$scandata,$partids,
+        $scantron_config,$lettdig,$numletts) = @_;
+    my ($record,%expected,%startpos);
+    return ($counter,$record) if (!ref($resource));
+    return ($counter,$record) if (!$resource->is_problem());
+    my $symb = $resource->symb();
+    return ($counter,$record) if (ref($partids) ne 'ARRAY');
+    foreach my $part_id (@{$partids}) {
+        $counter ++;
+        $expected{$part_id} = 0;
+        if ($env{"form.scantron.sub_bubblelines.$counter"}) {
+            my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$counter"});
+            foreach my $item (@sub_lines) {
+                $expected{$part_id} += $item;
+            }
+        } else {
+            $expected{$part_id} = $env{"form.scantron.bubblelines.$counter"};
+        }
+        $startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"};
+    }
+    if ($symb) {
+        my %recorded;
+        my (%returnhash) = &Apache::lonnet::restore($symb,$cid,$domain,$username);
+        if ($returnhash{'version'}) {
+            my %lasthash=();
+            my $version;
+            for ($version=1;$version<=$returnhash{'version'};$version++) {
+                foreach my $key (sort(split(/\:/,$returnhash{$version.':keys'}))) {
+                    $lasthash{$key}=$returnhash{$version.':'.$key};
+                }
+            }
+            foreach my $key (keys(%lasthash)) {
+                if ($key =~ /\.scantron$/) {
+                    my $value = &unescape($lasthash{$key});
+                    my ($part_id) = ($key =~ /^resource\.(.+)\.scantron$/);
+                    if ($value eq '') {
+                        for (my $i=0; $i<$expected{$part_id}; $i++) {
+                            for (my $j=0; $j<$scantron_config->{'length'}; $j++) {
+                                $recorded{$part_id} .= $scantron_config->{'Qoff'};
+                            }
+                        }
+                    } else {
+                        my @tocheck;
+                        my @items = split(//,$value);
+                        if (($scantron_config->{'Qon'} eq 'letter') ||
+                            ($scantron_config->{'Qon'} eq 'number')) {
+                            if (@items < $expected{$part_id}) {
+                                my $fragment = substr($scandata,$startpos{$part_id},$expected{$part_id});
+                                my @singles = split(//,$fragment);
+                                foreach my $pos (@singles) {
+                                    if ($pos eq ' ') {
+                                        push(@tocheck,$pos);
+                                    } else {
+                                        my $next = shift(@items);
+                                        push(@tocheck,$next);
+                                    }
+                                }
+                            } else {
+                                @tocheck = @items;
+                            }
+                            foreach my $letter (@tocheck) {
+                                if ($scantron_config->{'Qon'} eq 'letter') {
+                                    if ($letter !~ /^[A-J]$/) {
+                                        $letter = $scantron_config->{'Qoff'};
+                                    }
+                                    $recorded{$part_id} .= $letter;
+                                } elsif ($scantron_config->{'Qon'} eq 'number') {
+                                    my $digit;
+                                    if ($letter !~ /^[A-J]$/) {
+                                        $digit = $scantron_config->{'Qoff'};
+                                    } else {
+                                        $digit = $lettdig->{$letter};
+                                    }
+                                    $recorded{$part_id} .= $digit;
+                                }
+                            }
+                        } else {
+                            @tocheck = @items;
+                            for (my $i=0; $i<$expected{$part_id}; $i++) {
+                                my $curr_sub = shift(@tocheck);
+                                my $digit;
+                                if ($curr_sub =~ /^[A-J]$/) {
+                                    $digit = $lettdig->{$curr_sub}-1;
+                                }
+                                if ($curr_sub eq 'J') {
+                                    $digit += scalar($numletts);
+                                }
+                                for (my $j=0; $j<$scantron_config->{'Qlength'}; $j++) {
+                                    if ($j == $digit) {
+                                        $recorded{$part_id} .= $scantron_config->{'Qon'};
+                                    } else {
+                                        $recorded{$part_id} .= $scantron_config->{'Qoff'};
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        foreach my $part_id (@{$partids}) {
+            if ($recorded{$part_id} eq '') {
+                for (my $i=0; $i<$expected{$part_id}; $i++) {
+                    for (my $j=0; $j<$scantron_config->{'Qlength'}; $j++) {
+                        $recorded{$part_id} .= $scantron_config->{'Qoff'};
+                    }
+                }
+            }
+            $record .= $recorded{$part_id};
+        }
+    }
+    return ($counter,$record);
+}
+
+sub letter_to_digits { 
+    my %lettdig = (
+                    A => 1,
+                    B => 2,
+                    C => 3,
+                    D => 4,
+                    E => 5,
+                    F => 6,
+                    G => 7,
+                    H => 8,
+                    I => 9,
+                    J => 0,
+                  );
+    return %lettdig;
+}
 
-=cut
 
 #-------- end of section for handling grading scantron forms -------
 #
@@ -7396,46 +8532,88 @@ sub grading_menu {
     my ($symb)=&get_symb($request);
     if (!$symb) {return '';}
     my $probTitle = &Apache::lonnet::gettitle($symb);
-    my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
 
-    $request->print($table);
+#    $request->print($table);
     my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
-                  'handgrade'=>$hdgrade,
                   'probTitle'=>$probTitle,
-                  'command'=>'submit_options',
+                  'command'=>'individual',
                   'saveState'=>"",
                   'gradingMenu'=>1,
                   'showgrading'=>"yes");
-    my $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    my @menu = ({ url => $url,
-                     name => &mt('Manual Grading/View Submissions'),
-                     short_description => 
-    &mt('Start the process of hand grading submissions.'),
-                 });
+    
+    my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+
+    $fields{'command'}='ungraded';
+    my $url1b=&Apache::lonhtmlcommon::build_url('grades/',\%fields);
+
+    $fields{'command'}='table';
+    my $url1c=&Apache::lonhtmlcommon::build_url('grades/',\%fields);
+
+    $fields{'command'}='all_for_one';
+    my $url1d=&Apache::lonhtmlcommon::build_url('grades/',\%fields);
+
     $fields{'command'} = 'csvform';
-    $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    push (@menu, { url => $url,
-                   name => &mt('Upload Scores'),
-                   short_description => 
-            &mt('Specify a file containing the class scores for current resource.')});
+    my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+    
     $fields{'command'} = 'processclicker';
-    $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    push (@menu, { url => $url,
-                   name => &mt('Process Clicker'),
-                   short_description => 
-            &mt('Specify a file containing the clicker information for this resource.')});
+    my $url3 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+    
     $fields{'command'} = 'scantron_selectphase';
-    $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    push (@menu, { url => $url,
-                   name => &mt('Grade/Manage Scantron Forms'),
-                   short_description => 
-            &mt('')});
-    $fields{'command'} = 'verify';
-    $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    push (@menu, { url => "",
-                   name => &mt('Verify Receipt'),
-                   short_description => 
-            &mt('')});
+    my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+    
+    my @menu = ({	categorytitle=>'Hand Grading',
+            items =>[
+                        {	linktext => 'Select individual students to grade',
+                    		url => $url1a,
+                    		permission => 'F',
+                    		icon => 'edit-find-replace.png',
+                    		linktitle => 'Grade current resource for a selection of students.'
+                        }, 
+                        {       linktext => 'Grade ungraded submissions.',
+                                url => $url1b,
+                                permission => 'F',
+                                icon => 'edit-find-replace.png',
+                                linktitle => 'Grade all submissions that have not been graded yet.'
+                        },
+
+                        {       linktext => 'Grading table',
+                                url => $url1c,
+                                permission => 'F',
+                                icon => 'edit-find-replace.png',
+                                linktitle => 'Grade current resource for all students.'
+                        },
+                        {       linktext => 'Grade complete page/sequence/folder for one student.',
+                                url => $url1d,
+                                permission => 'F',
+                                icon => 'edit-find-replace.png',
+                                linktitle => 'Grade all resources in current page/sequence/folder for one student.'
+                        }]},
+                         { categorytitle=>'Automated Grading',
+               items =>[
+
+                	    {	linktext => 'Upload Scores',
+                    		url => $url2,
+                    		permission => 'F',
+                    		icon => 'uploadscores.png',
+                    		linktitle => 'Specify a file containing the class scores for current resource.'
+                	    },
+                	    {	linktext => 'Process Clicker',
+                    		url => $url3,
+                    		permission => 'F',
+                    		icon => 'addClickerInfoFile.png',
+                    		linktitle => 'Specify a file containing the clicker information for this resource.'
+                	    },
+                	    {	linktext => 'Grade/Manage/Review Bubblesheets',
+                    		url => $url4,
+                    		permission => 'F',
+                    		icon => 'stat.png',
+                    		linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.'
+                	    }
+                    ]
+            });
+
+    #$fields{'command'} = 'verify';
+    #$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
     #
     # Create the menu
     my $Str;
@@ -7443,35 +8621,23 @@ sub grading_menu {
     $Str .= '<form method="post" action="" name="gradingMenu">';
     $Str .= '<input type="hidden" name="command" value="" />'.
     	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
-	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
+#	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
 	'<input type="hidden" name="probTitle"   value="'.$probTitle.'" />'."\n".
 	'<input type="hidden" name="saveState"   value="" />'."\n".
 	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
 	'<input type="hidden" name="showgrading" value="yes" />'."\n";
 
-    foreach my $menudata (@menu) {
-        if ($menudata->{'name'} ne &mt('Verify Receipt')) {
-            $Str .='    <h3><a '.
-                $menudata->{'jscript'}.
-                ' href="'.
-                $menudata->{'url'}.'" >'.
-                $menudata->{'name'}."</a></h3>\n";
-        } else {
-            $Str .='    <h3><input type="button" value="'.&mt('Verify Receipt').'" '.
-                $menudata->{'jscript'}.
-                ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
-                ' /></h3>';
-            $Str .= ('&nbsp;'x8).
-		&mt(' receipt: [_1]',
-		    &Apache::lonnet::recprefix($env{'request.course.id'}).
-                    '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />');
-        }
-        $Str .= '    '.('&nbsp;'x8).$menudata->{'short_description'}.
-            "\n";
-    }
+    $Str .= Apache::lonhtmlcommon::generate_menu(@menu);
+    #$menudata->{'jscript'}
+    $Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '.
+        ' onclick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
+        ' /> '.
+        &Apache::lonnet::recprefix($env{'request.course.id'}).
+        '-<input type="text" name="receipt" size="4" onchange="javascript:checkReceiptNo(this.form,\'OK\')" />';
+
     $Str .="</form>\n";
-    $request->print(<<GRADINGMENUJS);
-<script type="text/javascript" language="javascript">
+    my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<GRADINGMENUJS));
     function checkChoice(formname,val,cmdx) {
 	if (val <= 2) {
 	    var cmd = radioSelection(formname.radioChoice);
@@ -7497,19 +8663,149 @@ sub grading_menu {
 	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
 	if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
 	if (checkOpt) {
-	    alert("Please enter a receipt number given by a student in the receipt box.");
+	    alert("$receiptalert");
 	    formname.receipt.value = "";
 	    formname.receipt.focus();
 	    return false;
 	}
 	return true;
     }
-</script>
 GRADINGMENUJS
     &commonJSfunctions($request);
     return $Str;    
 }
 
+sub individual {
+    my ($request)=@_;
+    &submit_options($request);
+}
+
+sub ungraded {
+    my ($request)=@_;
+    &submit_options($request);
+}
+
+sub table {
+    my ($request)=@_;
+    &submit_options($request);
+}
+
+sub all_for_one {
+    my ($request)=@_;
+    &submit_options($request);
+}
+
+sub submit_options_sequence {
+    my ($request) = @_;
+    my ($symb)=&get_symb($request);
+    if (!$symb) {return '';}
+    my $probTitle = &Apache::lonnet::gettitle($symb);
+
+    my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box."); 
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<GRADINGMENUJS));
+    function checkChoice(formname,val,cmdx) {
+        if (val <= 2) {
+            var cmd = radioSelection(formname.radioChoice);
+            var cmdsave = cmd;
+        } else {
+            cmd = cmdx;
+            cmdsave = 'submission';
+        }
+        formname.command.value = cmd;
+        formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
+            ":saveSub="+pullDownSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
+        if (val < 5) formname.submit();
+        if (val == 5) {
+            if (!checkReceiptNo(formname,'notOK')) { return false;}
+            formname.submit();
+        }
+        if (val < 7) formname.submit();
+    }
+
+    function checkReceiptNo(formname,nospace) {
+        var receiptNo = formname.receipt.value;
+        var checkOpt = false;
+        if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
+        if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
+        if (checkOpt) {
+            alert("$receiptalert");
+            formname.receipt.value = "";
+            formname.receipt.focus();
+            return false;
+        }
+        return true;
+    }
+GRADINGMENUJS
+    &commonJSfunctions($request);
+#    my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
+    my $result;
+    my (undef,$sections) = &getclasslist('all','0');
+    my $savedState = &savedState();
+    my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
+    my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});
+    my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
+    my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});
+
+    # Preselect sections
+    my $selsec="";
+    if (ref($sections)) {
+        foreach my $section (sort(@$sections)) {
+            $selsec.='<option value="'.$section.'" '.
+                ($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
+        }
+    }
+
+    $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
+        '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
+        '<input type="hidden" name="probTitle"   value="'.$probTitle.'" />'."\n".
+        '<input type="hidden" name="saveState"   value="" />'."\n".
+        '<input type="hidden" name="gradingMenu" value="1" />'."\n".
+        '<input type="hidden" name="showgrading" value="yes" />'."\n";
+
+    $result.='
+<h2>
+  '.&mt('Grade Complete Folder for One Student').'
+</h2>
+
+<div class="LC_columnSection">
+  
+    <fieldset>
+      <legend>
+       '.&mt('Sections').'
+      </legend>
+      <select name="section" multiple="multiple" size="5">'."\n";
+    $result.= $selsec;
+    $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> &nbsp; ';
+    $result.='
+    </fieldset>
+  
+    <fieldset>
+      <legend>
+        '.&mt('Groups').'
+      </legend>
+      '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
+    </fieldset>
+  
+    <fieldset>
+      <legend>
+        '.&mt('Access Status').'
+      </legend>
+      '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
+    </fieldset>
+  
+</div>
+
+<br />
+
+            <input type="hidden" name="command" value="pickStudentPage" />
+            <div>
+              <input type="submit" value="'.&mt('Next').' &rarr;" />
+            </div>
+        </div>
+  </form>';
+    $result .= &show_grading_menu_form($symb);
+    return $result;
+}
 
 #--- Displays the submissions first page -------
 sub submit_options {
@@ -7518,8 +8814,8 @@ sub submit_options {
     if (!$symb) {return '';}
     my $probTitle = &Apache::lonnet::gettitle($symb);
 
-    $request->print(<<GRADINGMENUJS);
-<script type="text/javascript" language="javascript">
+    my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box."); 
+    $request->print(&Apache::lonhtmlcommon::scripttag(<<GRADINGMENUJS));
     function checkChoice(formname,val,cmdx) {
 	if (val <= 2) {
 	    var cmd = radioSelection(formname.radioChoice);
@@ -7545,17 +8841,16 @@ sub submit_options {
 	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
 	if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
 	if (checkOpt) {
-	    alert("Please enter a receipt number given by a student in the receipt box.");
+	    alert("$receiptalert");
 	    formname.receipt.value = "";
 	    formname.receipt.focus();
 	    return false;
 	}
 	return true;
     }
-</script>
 GRADINGMENUJS
     &commonJSfunctions($request);
-    my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
+#    my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
     my $result;
     my (undef,$sections) = &getclasslist('all','0');
     my $savedState = &savedState();
@@ -7564,9 +8859,18 @@ GRADINGMENUJS
     my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
     my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});
 
+    # Preselect sections
+    my $selsec="";
+    if (ref($sections)) {
+        foreach my $section (sort(@$sections)) {
+            $selsec.='<option value="'.$section.'" '.
+                ($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
+        }
+    }
+
     $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
 	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
-	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
+#	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
 	'<input type="hidden" name="probTitle"   value="'.$probTitle.'" />'."\n".
 	'<input type="hidden" name="command"     value="" />'."\n".
 	'<input type="hidden" name="saveState"   value="" />'."\n".
@@ -7574,103 +8878,75 @@ GRADINGMENUJS
 	'<input type="hidden" name="showgrading" value="yes" />'."\n";
 
     $result.='
-    <div class="LC_grade_select_mode">
-      <div class="LC_grade_select_mode_current">
-        <h2>
-          '.&mt('Grade Current Resource').'
-        </h2>
-        <div class="LC_grade_select_mode_body">
-          <div class="LC_grades_resource_info">
-           '.$table.'
-          </div>
-          <div class="LC_grade_select_mode_selector">
-             <div class="LC_grade_select_mode_selector_header">
-                '.&mt('Sections').'
-             </div>
-             <div class="LC_grade_select_mode_selector_body">
-	       <select name="section" multiple="multiple" size="5">'."\n";
-    if (ref($sections)) {
-	foreach my $section (sort (@$sections)) {
-	    $result.='<option value="'.$section.'" '.
-		($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
-	}
-    }
+<h2>
+  '.&mt('Grade Current Resource').'
+</h2>
+
+<div class="LC_columnSection">
+  
+    <fieldset>
+      <legend>
+       '.&mt('Sections').'
+      </legend>
+      <select name="section" multiple="multiple" size="5">'."\n";
+    $result.= $selsec;
     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> &nbsp; ';
     $result.='
-             </div>
-          </div>
-          <div class="LC_grade_select_mode_selector">
-             <div class="LC_grade_select_mode_selector_header">
-                '.&mt('Groups').'
-             </div>
-             <div class="LC_grade_select_mode_selector_body">
-                '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
-             </div>
-          </div>
-          <div class="LC_grade_select_mode_selector">
-             <div class="LC_grade_select_mode_selector_header">
-                '.&mt('Access Status').'
-             </div>
-             <div class="LC_grade_select_mode_selector_body">
-                '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
-             </div>
-          </div>
-          <div class="LC_grade_select_mode_selector">
-             <div class="LC_grade_select_mode_selector_header">
-                '.&mt('Submission Status').'
-             </div>
-             <div class="LC_grade_select_mode_selector_body">
-               <select name="submitonly" size="5">
+    </fieldset>
+  
+    <fieldset>
+      <legend>
+        '.&mt('Groups').'
+      </legend>
+      '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
+    </fieldset>
+  
+    <fieldset>
+      <legend>
+        '.&mt('Access Status').'
+      </legend>
+      '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
+    </fieldset>
+  
+    <fieldset>
+      <legend>
+        '.&mt('Submission Status').'
+      </legend>
+      <select name="submitonly" size="5">
 	         <option value="yes" '.      ($saveSub eq 'yes'       ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
 	         <option value="queued" '.   ($saveSub eq 'queued'    ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
 	         <option value="graded" '.   ($saveSub eq 'graded'    ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
 	         <option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>
                  <option value="all" '.      ($saveSub eq 'all'       ? 'selected="selected"' : '').'>'.&mt('with any status').'</option>
-               </select>
-             </div>
-          </div>
-          <div class="LC_grade_select_mode_type_body">
-            <div class="LC_grade_select_mode_type">
+      </select>
+    </fieldset>
+  
+</div>
+
+<br />
+          <div>
+            <div>
               <label>
                 <input type="radio" name="radioChoice" value="submission" '.
                   ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.
              &mt('Select individual students to grade and view submissions.').'
 	      </label> 
             </div>
-            <div class="LC_grade_select_mode_type">
+            <div>
 	      <label>
                 <input type="radio" name="radioChoice" value="viewgrades" '.
                   ($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
                     &mt('Grade all selected students in a grading table.').'
               </label>
             </div>
-            <div class="LC_grade_select_mode_type">
-	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
+            <div>
+	      <input type="button" onclick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' &rarr;" />
             </div>
           </div>
-        </div>
-      </div>
-      <div class="LC_grade_select_mode_page">
-        <h2>
-         '.&mt('Grade Complete Folder for One Student').'
-        </h2>
-        <div class="LC_grades_select_mode_body">
-          <div class="LC_grade_select_mode_type_body">
-            <div class="LC_grade_select_mode_type">
-              <label>
-                <input type="radio" name="radioChoice" value="pickStudentPage" '.
-	  ($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
-  &mt('The <b>complete</b> page/sequence/folder: For one student').'
-              </label>
-            </div>
-            <div class="LC_grade_select_mode_type">
-	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
+
+
   </form>';
+    $result .= &show_grading_menu_form($symb);
     return $result;
 }
 
@@ -7763,12 +9039,12 @@ sub process_clicker {
     if (!$symb) {return '';}
     my $result=&checkforfile_js();
     $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
-    my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
-    $result.=$table;
+#    my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
+#    $result.=$table;
     $result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
     $result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
-    $result.='&nbsp;<b>'.&mt('Specify a file containing the clicker information for this resource').
-        '.</b></td></tr>'."\n";
+    $result.='&nbsp;<b>'.&mt('Specify a file containing the clicker information for this resource.').
+        '</b></td></tr>'."\n";
     $result.='<tr bgcolor=#ffffe6><td>'."\n";
 # Attempt to restore parameters from last session, set defaults if not present
     my %Saveable_Parameters=&clicker_grading_parameters();
@@ -7780,9 +9056,9 @@ sub process_clicker {
     if (!$env{'form.upfiletype'}) { $env{'form.upfiletype'}='iclicker'; }
 
     my %checked;
-    foreach my $gradingmechanism ('attendance','personnel','specific') {
+    foreach my $gradingmechanism ('attendance','personnel','specific','given') {
        if ($env{'form.gradingmechanism'} eq $gradingmechanism) {
-          $checked{$gradingmechanism}="checked='checked'";
+          $checked{$gradingmechanism}=' checked="checked"';
        }
     }
 
@@ -7791,14 +9067,15 @@ sub process_clicker {
     my $attendance=&mt("Award points just for participation");
     my $personnel=&mt("Correctness determined from response by course personnel");
     my $specific=&mt("Correctness determined from response with clicker ID(s)"); 
+    my $given=&mt("Correctness determined from given list of answers").' '.
+              '<font size="-2"><tt>('.&mt("Provide comma-separated list. Use '*' for any answer correct, '-' for skip").')</tt></font>';
     my $pcorrect=&mt("Percentage points for correct solution");
     my $pincorrect=&mt("Percentage points for incorrect solution");
     my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',
 						   ('iclicker' => 'i>clicker',
                                                     'interwrite' => 'interwrite PRS'));
     $symb = &Apache::lonenc::check_encrypt($symb);
-    $result.=<<ENDUPFORM;
-<script type="text/javascript">
+    $result.= &Apache::lonhtmlcommon::scripttag(<<ENDUPFORM);
 function sanitycheck() {
 // Accept only integer percentages
    document.forms.gradesupload.pcorrect.value=Math.round(document.forms.gradesupload.pcorrect.value);
@@ -7836,7 +9113,8 @@ function sanitycheck() {
 // Remember the old state
    document.forms.gradesupload.waschecked.value=newgradingchoice;
 }
-</script>
+ENDUPFORM
+    $result.= <<ENDUPFORM;
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
 <input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="command" value="processclickerfile" />
@@ -7844,15 +9122,18 @@ function sanitycheck() {
 <input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
 <input type="file" name="upfile" size="50" />
 <br /><label>$type: $selectform</label>
-<br /><label><input type="radio" name="gradingmechanism" value="attendance" $checked{'attendance'} onClick="sanitycheck()" />$attendance </label>
-<br /><label><input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" />$personnel</label>
-<br /><label><input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" />$specific </label>
+<br /><label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onclick="sanitycheck()" />$attendance </label>
+<br /><label><input type="radio" name="gradingmechanism" value="personnel"$checked{'personnel'} onclick="sanitycheck()" />$personnel</label>
+<br /><label><input type="radio" name="gradingmechanism" value="specific"$checked{'specific'} onclick="sanitycheck()" />$specific </label>
 <input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />
+<br /><label><input type="radio" name="gradingmechanism" value="given"$checked{'given'} onclick="sanitycheck()" />$given </label>
+<br />&nbsp;&nbsp;&nbsp;
+<input type="text" name="givenanswer" size="50" />
 <input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />
-<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onChange="sanitycheck()" /></label>
-<br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onChange="sanitycheck()" /></label>
-<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" />
-</form>
+<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onchange="sanitycheck()" /></label>
+<br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onchange="sanitycheck()" /></label>
+<br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
+</form>'
 ENDUPFORM
     $result.='</td></tr></table>'."\n".
              '</td></tr></table><br /><br />'."\n";
@@ -7868,12 +9149,25 @@ sub process_clicker_file {
     my %Saveable_Parameters=&clicker_grading_parameters();
     &Apache::loncommon::store_course_settings('grades_clicker',
                                               \%Saveable_Parameters);
-
-    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
+    my $result='';
+#    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
     if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) {
 	$result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>';
 	return $result.&show_grading_menu_form($symb);
     }
+    if (($env{'form.gradingmechanism'} eq 'given') && ($env{'form.givenanswer'}!~/\S/)) {
+        $result.='<span class="LC_error">'.&mt('You need to specify the correct answer').'</span>';
+        return $result.&show_grading_menu_form($symb);
+    }
+    my $foundgiven=0;
+    if ($env{'form.gradingmechanism'} eq 'given') {
+        $env{'form.givenanswer'}=~s/^\s*//gs;
+        $env{'form.givenanswer'}=~s/\s*$//gs;
+        $env{'form.givenanswer'}=~s/[^a-zA-Z0-9\.\*\-]+/\,/g;
+        $env{'form.givenanswer'}=uc($env{'form.givenanswer'});
+        my @answers=split(/\,/,$env{'form.givenanswer'});
+        $foundgiven=$#answers+1;
+    }
     my %clicker_ids=&gather_clicker_ids();
     my %correct_ids;
     if ($env{'form.gradingmechanism'} eq 'personnel') {
@@ -7892,6 +9186,8 @@ sub process_clicker_file {
     }
     if ($env{'form.gradingmechanism'} eq 'attendance') {
 	$result.=&mt('Score based on attendance only');
+    } elsif ($env{'form.gradingmechanism'} eq 'given') {
+        $result.=&mt('Score based on [_1] ([_2] answers)','<tt>'.$env{'form.givenanswer'}.'</tt>',$foundgiven);
     } else {
 	my $number=0;
 	$result.='<p><b>'.&mt('Correctness determined by the following IDs').'</b>';
@@ -7937,6 +9233,9 @@ sub process_clicker_file {
 <input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" />
 <input type="hidden" name="pincorrect" value="$env{'form.pincorrect'}" />
 ENDHEADER
+    if ($env{'form.gradingmechanism'} eq 'given') {
+       $result.='<input type="hidden" name="correct:given" value="'.$env{'form.givenanswer'}.'" />';
+    } 
     my %responses;
     my @questiontitles;
     my $errormsg='';
@@ -7949,11 +9248,13 @@ 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 />';
+    if (($env{'form.gradingmechanism'} eq 'given') && ($number!=$foundgiven)) {
+       $result.='<span class="LC_error">'.&mt('Number of given answers does not agree with number of questions in file.').'</span>';
+       return $result.&show_grading_menu_form($symb);
+    } 
 # Remember Question Titles
 # FIXME: Possibly need delimiter other than ":"
     for (my $i=0;$i<$number;$i++) {
@@ -7997,7 +9298,7 @@ ENDHEADER
     }
     $result.='<hr />'.
              &mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count);
-    if ($env{'form.gradingmechanism'} ne 'attendance') {
+    if (($env{'form.gradingmechanism'} ne 'attendance') && ($env{'form.gradingmechanism'} ne 'given')) {
        if ($correct_count==0) {
           $errormsg.="Found no correct answers answers for grading!";
        } elsif ($correct_count>1) {
@@ -8068,7 +9369,7 @@ sub interwrite_eval {
         $id=~s/[\-\:]//g;
         $idresponses{$id}[$number]=$entries[6];
     }
-    foreach my $id (keys %idresponses) {
+    foreach my $id (keys(%idresponses)) {
        $$responses{$id}=join(',',@{$idresponses{$id}});
        $$responses{$id}=~s/^\s*\,//;
     }
@@ -8080,11 +9381,16 @@ sub assign_clicker_grades {
     my ($symb)=&get_symb($r);
     if (!$symb) {return '';}
 # See which part we are saving to
-    my ($partlist,$handgrade,$responseType) = &response_type($symb);
+    my $res_error;
+    my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
+    if ($res_error) {
+        return &navmap_errormsg();
+    }
 # FIXME: This should probably look for the first handgradeable part
     my $part=$$partlist[0];
 # Start screen output
-    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
+    my $result='';
+#    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
 
     my $heading=&mt('Assigning grades based on clicker file');
     $result.=(<<ENDHEADER);
@@ -8142,10 +9448,15 @@ ENDHEADER
        if ($user) { 
           my @answer=split(/\,/,$env{$key});
           my $sum=0;
+          my $realnumber=$number;
           for (my $i=0;$i<$number;$i++) {
-             if ($answer[$i]) {
+             if  ($correct[$i] eq '-') {
+                $realnumber--;
+             } elsif ($answer[$i]) {
                 if ($gradingmechanism eq 'attendance') {
                    $sum+=$pcorrect;
+                } elsif ($correct[$i] eq '*') {
+                   $sum+=$pcorrect;
                 } else {
                    if ($answer[$i] eq $correct[$i]) {
                       $sum+=$pcorrect;
@@ -8155,7 +9466,7 @@ ENDHEADER
                 }
              }
           }
-          my $ave=$sum/(100*$number);
+          my $ave=$sum/(100*$realnumber);
 # Store
           my ($username,$domain)=split(/\:/,$user);
           my %grades=();
@@ -8173,12 +9484,19 @@ ENDHEADER
        }
     }
 # We are done
-    $result.='<br />'.&mt('Successfully stored grades for [_1] student(s).',$storecount).
+    $result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount).
              '</td></tr></table>'."\n".
              '</td></tr></table><br /><br />'."\n";
     return $result.&show_grading_menu_form($symb);
 }
 
+sub navmap_errormsg {
+    return '<div class="LC_error">'.
+           &mt('An error occurred retrieving information about resources in the course.').'<br />'.
+           &mt('It is recommended that you [_1]re-initialize the course[_2] and then return to this grading page.','<a href="/adm/roles?selectrole=1&newrole='.$env{'request.role'}.'">','</a>').
+           '</div>';
+}
+
 sub handler {
     my $request=$_[0];
     &reset_caches();
@@ -8198,8 +9516,10 @@ sub handler {
 	&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
     }
 
-
-    $request->print(&Apache::loncommon::start_page('Grading'));
+    $ssi_error = 0;
+    my $brcrum = [{href=>"/adm/grades",text=>"Grading"}];
+    $request->print(&Apache::loncommon::start_page('Grading',undef,
+                                          {'bread_crumbs' => $brcrum}));
     if ($symb eq '' && $command eq '') {
 	if ($env{'user.adv'}) {
 	    if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
@@ -8211,7 +9531,7 @@ sub handler {
 		if ($tsymb) {
 		    my ($map,$id,$url)=&Apache::lonnet::decode_symb($tsymb);
 		    if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
-			$request->print(&Apache::lonnet::ssi_body('/res/'.$url,
+			$request->print(&ssi_with_retries('/res/'.$url, $ssi_retries,
 					  ('grade_username' => $tuname,
 					   'grade_domain' => $tudom,
 					   'grade_courseid' => $tcrsid,
@@ -8240,8 +9560,14 @@ sub handler {
 	    &processGroup($request);
 	} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
 	    $request->print(&grading_menu($request));
-	} elsif ($command eq 'submit_options' && $perm{'vgr'}) {
-	    $request->print(&submit_options($request));
+	} elsif ($command eq 'individual' && $perm{'vgr'}) {
+	    $request->print(&individual($request));
+        } elsif ($command eq 'ungraded' && $perm{'vgr'}) {
+            $request->print(&submit_options($request));
+        } elsif ($command eq 'table' && $perm{'vgr'}) {
+            $request->print(&submit_options($request));
+        } elsif ($command eq 'all_for_one' && $perm{'vgr'}) {
+            $request->print(&submit_options_sequence($request));
 	} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
 	    $request->print(&viewgrades($request));
 	} elsif ($command eq 'handgrade' && $perm{'mgr'}) {
@@ -8294,10 +9620,15 @@ sub handler {
  	} elsif ($command eq 'scantron_download' &&
 		 &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
  	    $request->print(&scantron_download_scantron_data($request));
+        } elsif ($command eq 'checksubmissions' && $perm{'vgr'}) {
+            $request->print(&checkscantron_results($request));     
 	} elsif ($command) {
-	    $request->print("Access Denied ($command)");
+	    $request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>');
 	}
     }
+    if ($ssi_error) {
+	&ssi_print_error($request);
+    }
     $request->print(&Apache::loncommon::end_page());
     &reset_caches();
     return '';
@@ -8306,3 +9637,174 @@ sub handler {
 1;
 
 __END__;
+
+
+=head1 NAME
+
+Apache::grades
+
+=head1 SYNOPSIS
+
+Handles the viewing of grades.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 OVERVIEW
+
+Do an ssi with retries:
+While I'd love to factor out this with the vesrion in lonprintout,
+that would either require a data coupling between modules, which I refuse to perpetuate (there's quite enough of that already), or would require the invention of another infrastructure
+I'm not quite ready to invent (e.g. an ssi_with_retry object).
+
+At least the logic that drives this has been pulled out into loncommon.
+
+
+
+ssi_with_retries - Does the server side include of a resource.
+                     if the ssi call returns an error we'll retry it up to
+                     the number of times requested by the caller.
+                     If we still have a proble, no text is appended to the
+                     output and we set some global variables.
+                     to indicate to the caller an SSI error occurred.  
+                     All of this is supposed to deal with the issues described
+                     in LonCAPA BZ 5631 see:
+                     http://bugs.lon-capa.org/show_bug.cgi?id=5631
+                     by informing the user that this happened.
+
+Parameters:
+  resource   - The resource to include.  This is passed directly, without
+               interpretation to lonnet::ssi.
+  form       - The form hash parameters that guide the interpretation of the resource
+               
+  retries    - Number of retries allowed before giving up completely.
+Returns:
+  On success, returns the rendered resource identified by the resource parameter.
+Side Effects:
+  The following global variables can be set:
+   ssi_error                - If an unrecoverable error occurred this becomes true.
+                              It is up to the caller to initialize this to false
+                              if desired.
+   ssi_error_resource  - If an unrecoverable error occurred, this is the value
+                              of the resource that could not be rendered by the ssi
+                              call.
+   ssi_error_message   - The error string fetched from the ssi response
+                              in the event of an error.
+
+
+=head1 HANDLER SUBROUTINE
+
+ssi_with_retries()
+
+=head1 SUBROUTINES
+
+=over
+
+=item scantron_get_correction() : 
+
+   Builds the interface screen to interact with the operator to fix a
+   specific error condition in a specific scanline
+
+ Arguments:
+    $r           - Apache request object
+    $i           - number of the current scanline
+    $scan_record - hash ref as returned from &scantron_parse_scanline()
+    $scan_config - hash ref as returned from &get_scantron_config()
+    $line        - full contents of the current scanline
+    $error       - error condition, valid values are
+                   'incorrectCODE', 'duplicateCODE',
+                   'doublebubble', 'missingbubble',
+                   'duplicateID', 'incorrectID'
+    $arg         - extra information needed
+       For errors:
+         - duplicateID   - paper number that this studentID was seen before on
+         - duplicateCODE - array ref of the paper numbers this CODE was
+                           seen on before
+         - incorrectCODE - current incorrect CODE 
+         - doublebubble  - array ref of the bubble lines that have double
+                           bubble errors
+         - missingbubble - array ref of the bubble lines that have missing
+                           bubble errors
+
+=item  scantron_get_maxbubble() : 
+
+   Arguments:
+       $nav_error  - Reference to scalar which is a flag to indicate a
+                      failure to retrieve a navmap object.
+       if $nav_error is set to 1 by scantron_get_maxbubble(), the 
+       calling routine should trap the error condition and display the warning
+       found in &navmap_errormsg().
+
+   Returns the maximum number of bubble lines that are expected to
+   occur. Does this by walking the selected sequence rendering the
+   resource and then checking &Apache::lonxml::get_problem_counter()
+   for what the current value of the problem counter is.
+
+   Caches the results to $env{'form.scantron_maxbubble'},
+   $env{'form.scantron.bubble_lines.n'}, 
+   $env{'form.scantron.first_bubble_line.n'} and
+   $env{"form.scantron.sub_bubblelines.n"}
+   which are the total number of bubble, lines, the number of bubble
+   lines for response n and number of the first bubble line for response n,
+   and a comma separated list of numbers of bubble lines for sub-questions
+   (for optionresponse, matchresponse, and rankresponse items), for response n.  
+
+
+=item  scantron_validate_missingbubbles() : 
+
+   Validates all scanlines in the selected file to not have any
+    answers that don't have bubbles that have not been verified
+    to be bubble free.
+
+=item  scantron_process_students() : 
+
+   Routine that does the actual grading of the bubble sheet information.
+
+   The parsed scanline hash is added to %env 
+
+   Then foreach unskipped scanline it does an &Apache::lonnet::ssi()
+   foreach resource , with the form data of
+
+	'submitted'     =>'scantron' 
+	'grade_target'  =>'grade',
+	'grade_username'=> username of student
+	'grade_domain'  => domain of student
+	'grade_courseid'=> of course
+	'grade_symb'    => symb of resource to grade
+
+    This triggers a grading pass. The problem grading code takes care
+    of converting the bubbled letter information (now in %env) into a
+    valid submission.
+
+=item  scantron_upload_scantron_data() :
+
+    Creates the screen for adding a new bubble sheet data file to a course.
+
+=item  scantron_upload_scantron_data_save() : 
+
+   Adds a provided bubble information data file to the course if user
+   has the correct privileges to do so. 
+
+=item  valid_file() :
+
+   Validates that the requested bubble data file exists in the course.
+
+=item  scantron_download_scantron_data() : 
+
+   Shows a list of the three internal files (original, corrected,
+   skipped) for a specific bubble sheet data file that exists in the
+   course.
+
+=item  scantron_validate_ID() : 
+
+   Validates all scanlines in the selected file to not have any
+   invalid or underspecified student/employee IDs
+
+=item navmap_errormsg() :
+
+   Returns HTML mark-up inside a <div></div> with a link to re-initialize the course.
+   Should be called whenever the request to instantiate a navmap object fails.  
+
+=back
+
+=cut