--- loncom/homework/grades.pm	2023/03/10 23:36:22	1.596.2.12.2.60.2.3
+++ loncom/homework/grades.pm	2013/08/15 12:38:30	1.701
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.596.2.12.2.60.2.3 2023/03/10 23:36:22 raeburn Exp $
+# $Id: grades.pm,v 1.701 2013/08/15 12:38:30 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,10 +44,8 @@ use Apache::Constants qw(:common :http);
 use Apache::lonlocal;
 use Apache::lonenc;
 use Apache::lonstathelpers;
+use Apache::lonquickgrades;
 use Apache::bridgetask();
-use Apache::lontexconvert();
-use HTML::Parser();
-use File::MMagic;
 use String::Similarity;
 use LONCAPA;
 
@@ -143,7 +141,6 @@ sub nameUserString {
 
 #--- Get the partlist and the response type for a given problem. ---
 #--- Indicate if a response type is coded handgraded or not. ---
-#--- Count responseIDs, essayresponse items, and dropbox items ---
 #--- Sets response_error pointer to "1" if navmaps object broken ---
 sub response_type {
     my ($symb,$response_error) = @_;
@@ -161,7 +158,6 @@ sub response_type {
         return;
     }
     my $partlist = $res->parts();
-    my ($numresp,$numessay,$numdropbox) = (0,0,0);
     my %vPart = 
 	map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));
     my (%response_types,%handgrade);
@@ -171,20 +167,13 @@ sub response_type {
 	my @types = $res->responseType($part);
 	my @ids = $res->responseIds($part);
 	for (my $i=0; $i < scalar(@ids); $i++) {
-            $numresp ++;
 	    $response_types{$part}{$ids[$i]} = $types[$i];
-            if ($types[$i] eq 'essay') {
-                $numessay ++;
-                if (&Apache::lonnet::EXT("resource.$part".'_'.$ids[$i].".uploadedfiletypes",$symb)) {
-                    $numdropbox ++;
-                }
-            }
 	    $handgrade{$part.'_'.$ids[$i]} = 
 		&Apache::lonnet::EXT('resource.'.$part.'_'.$ids[$i].
 				     '.handgrade',$symb);
 	}
     }
-    return ($partlist,\%handgrade,\%response_types,$numresp,$numessay,$numdropbox);
+    return ($partlist,\%handgrade,\%response_types);
 }
 
 sub flatten_responseType {
@@ -211,129 +200,6 @@ sub get_display_part {
     return $display;
 }
 
-#--- Show parts and response type
-sub showResourceInfo {
-    my ($symb,$partlist,$responseType,$formname,$checkboxes,$uploads) = @_;
-    unless ((ref($partlist) eq 'ARRAY') && (ref($responseType) eq 'HASH')) {
-        return '<br clear="all">';
-    }
-    my $coltitle = &mt('Problem Part Shown');
-    if ($checkboxes) {
-        $coltitle = &mt('Problem Part');
-    } else {
-        my $checkedparts = 0;
-        foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
-            if (grep(/^\Q$partid\E$/,@{$partlist})) {
-                $checkedparts ++;
-            }
-        }
-        if ($checkedparts == scalar(@{$partlist})) {
-            return '<br clear="all">';
-        }
-        if ($uploads) {
-            $coltitle = &mt('Problem Part Selected');
-        }
-    }
-    my $result = '<div class="LC_left_float" style="display:inline-block;">';
-    if ($checkboxes) {
-        my $legend = &mt('Parts to display');
-        if ($uploads) {
-            $legend = &mt('Part(s) with dropbox');
-        }
-        $result .= '<fieldset style="display:inline-block;"><legend>'.$legend.'</legend>'.
-                   '<span class="LC_nobreak">'.
-                   '<label><input type="radio" name="chooseparts" value="0" onclick="toggleParts('."'$formname'".');" checked="checked" />'.
-                   &mt('All parts').'</label>'.('&nbsp;'x2).
-                   '<label><input type="radio" name="chooseparts" value="1" onclick="toggleParts('."'$formname'".');" />'.
-                   &mt('Selected parts').'</label></span>'.
-                   '<div id="LC_partselector" style="display:none">';
-    }
-    $result .= &Apache::loncommon::start_data_table()
-              .&Apache::loncommon::start_data_table_header_row();
-    if ($checkboxes) {
-        $result .= '<th>'.&mt('Display?').'</th>';
-    }
-    $result .= '<th>'.$coltitle.'</th>'
-              .'<th>'.&mt('Res. ID').'</th>'
-              .'<th>'.&mt('Type').'</th>'
-              .&Apache::loncommon::end_data_table_header_row();
-    my %partsseen;
-    foreach my $partID (sort(keys(%$responseType))) {
-        foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) {
-            my $responsetype = $responseType->{$partID}->{$resID};
-            if ($uploads) {
-                next unless ($responsetype eq 'essay');
-                next unless (&Apache::lonnet::EXT("resource.$partID".'_'."$resID.uploadedfiletypes",$symb));
-            }
-            my $display_part=&get_display_part($partID,$symb);
-            if (exists($partsseen{$partID})) {
-                $result.=&Apache::loncommon::continue_data_table_row();
-            } else {
-                $partsseen{$partID}=scalar(keys(%{$responseType->{$partID}}));
-                $result.=&Apache::loncommon::start_data_table_row().
-                         '<td rowspan="'.$partsseen{$partID}.'" style="vertical-align:middle">';
-                if ($checkboxes) {
-                    $result.='<input type="checkbox" name="vPart" checked="checked" value="'.$partID.'" /></td>'.
-                             '<td rowspan="'.$partsseen{$partID}.'" style="vertical-align:middle">'.$display_part.'</td>';
-                } else {
-                    $result.=$display_part.'</td>';
-                }
-            }
-            $result.='<td>'.'<span class="LC_internal_info">'.$resID.'</span></td>'
-                    .'<td>'.&mt($responsetype).'</td>'
-                    .&Apache::loncommon::end_data_table_row();
-        }
-    }
-    $result.=&Apache::loncommon::end_data_table();
-    if ($checkboxes) {
-        $result .= '</div></fieldset>';
-    }
-    $result .= '</div><div style="padding:0;clear:both;margin:0;border:0"></div>';
-    if (!keys(%partsseen)) {
-        $result = '';
-        if ($uploads) {
-            return '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
-                   '<p class="LC_info">'.
-                    &mt('No dropbox items or essayresponse items with uploadedfiletypes set.').
-                   '</p>';
-        } else {
-            return '<br clear="all" />';
-        }
-    }  
-    return $result;
-}
-
-sub part_selector_js {
-    my $js = <<"END";
-function toggleParts(formname) {
-    if (document.getElementById('LC_partselector')) {
-        var index = '';
-        if (document.forms.length) {
-            for (var i=0; i<document.forms.length; i++) {
-                if (document.forms[i].name == formname) {
-                    index = i;
-                    break;
-                }
-            }
-        }
-        if ((index != '') && (document.forms[index].elements['chooseparts'].length > 1)) {
-            for (var i=0; i<document.forms[index].elements['chooseparts'].length; i++) {
-                if (document.forms[index].elements['chooseparts'][i].checked) {
-                   var val = document.forms[index].elements['chooseparts'][i].value;
-                    if (document.forms[index].elements['chooseparts'][i].value == 1) {
-                        document.getElementById('LC_partselector').style.display = 'block';
-                    } else {
-                        document.getElementById('LC_partselector').style.display = 'none';
-                    }
-                }
-            }
-        }
-    }
-}
-END
-    return &Apache::lonhtmlcommon::scripttag($js);
-}
-
 sub reset_caches {
     &reset_analyze_cache();
     &reset_perm();
@@ -427,7 +293,7 @@ sub reset_caches {
     }
 
     sub scantron_partids_tograde {
-        my ($resource,$cid,$uname,$udom,$check_for_randomlist,$bubbles_per_row,$scancode) = @_;
+        my ($resource,$cid,$uname,$udom,$check_for_randomlist,$bubbles_per_row) = @_;
         my (%analysis,@parts);
         if (ref($resource)) {
             my $symb = $resource->symb();
@@ -435,14 +301,7 @@ sub reset_caches {
             if ($check_for_randomlist) {
                 $add_to_form = { 'check_parts_withrandomlist' => 1,};
             }
-            if ($scancode) {
-                if (ref($add_to_form) eq 'HASH') {
-                    $add_to_form->{'code_for_randomlist'} = $scancode;
-                } else {
-                    $add_to_form = { 'code_for_randomlist' => $scancode,};
-                }
-            }
-            my $analyze =
+            my $analyze = 
                 &get_analyze($symb,$uname,$udom,undef,$add_to_form,
                              undef,undef,undef,$bubbles_per_row);
             if (ref($analyze) eq 'HASH') {
@@ -471,8 +330,6 @@ sub cleanRecord {
     my $grayFont = '<span class="LC_internal_info">';
     if ($response =~ /^(option|rank)$/) {
 	my %answer=&Apache::lonnet::str2hash($answer);
-        my @answer = %answer;
-        %answer = map {&HTML::Entities::encode($_, '"<>&')} @answer;
 	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
 	my ($toprow,$bottomrow);
 	foreach my $foil (@$order) {
@@ -489,8 +346,6 @@ sub cleanRecord {
 	    $bottomrow.'</tr></table></blockquote>';
     } elsif ($response eq 'match') {
 	my %answer=&Apache::lonnet::str2hash($answer);
-        my @answer = %answer;
-        %answer = map {&HTML::Entities::encode($_, '"<>&')} @answer;
 	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
 	my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"});
 	my ($toprow,$middlerow,$bottomrow);
@@ -513,8 +368,6 @@ sub cleanRecord {
 	    $bottomrow.'</tr></table></blockquote>';
     } elsif ($response eq 'radiobutton') {
 	my %answer=&Apache::lonnet::str2hash($answer);
-        my @answer = %answer;
-        %answer = map {&HTML::Entities::encode($_, '"<>&')}  @answer;
 	my ($toprow,$bottomrow);
 	my $correct = 
 	    &get_radiobutton_correct_foil($partid,$respid,$symb,$uname,$udom,$type,$trial,$rndseed);
@@ -547,11 +400,10 @@ sub cleanRecord {
 	    $env{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
 	    $env{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
 	}
-        $answer = &Apache::lontexconvert::msgtexconverted($answer);
+	$answer =~ s-\n-<br />-g;
 	return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';
     } elsif ( $response eq 'organic') {
-        my $result=&mt('Smile representation: [_1]',
-                           '"<tt>'.&HTML::Entities::encode($answer, '"<>&').'</tt>"');
+	my $result='Smile representation: "<tt>'.$answer.'</tt>"';
 	my $jme=$record->{$version."resource.$partid.$respid.molecule"};
 	$result.=&Apache::chemresponse::jme_img($jme,$answer,400);
 	return $result;
@@ -585,14 +437,12 @@ sub cleanRecord {
 	    $result.='</ul>';
 	    return $result;
 	}
-    } elsif ( $response =~ m/(?:numerical|formula|custom)/) {
-        # Respect multiple input fields, see Bug #5409 
+    } elsif ( $response =~ m/(?:numerical|formula)/) {
 	$answer = 
 	    &Apache::loncommon::format_previous_attempt_value('submission',
 							      $answer);
-	return $answer;
     }
-    return &HTML::Entities::encode($answer, '"<>&');
+    return $answer;
 }
 
 #-- A couple of common js functions
@@ -632,7 +482,7 @@ COMMONJSFUNCTIONS
 #--- Dumps the class list with usernames,list of sections,
 #--- section, ids and fullnames for each user.
 sub getclasslist {
-    my ($getsec,$filterbyaccstatus,$getgroup,$symb,$submitonly,$filterbysubmstatus) = @_;
+    my ($getsec,$filterlist,$getgroup) = @_;
     my @getsec;
     my @getgroup;
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
@@ -660,13 +510,6 @@ sub getclasslist {
     #
     my %sections;
     my %fullnames;
-    my ($cdom,$cnum,$partlist);
-    if (($filterbysubmstatus) && ($submitonly ne 'all') && ($symb ne '')) {
-        $cdom = $env{"course.$env{'request.course.id'}.domain"};
-        $cnum = $env{"course.$env{'request.course.id'}.num"};
-        my $res_error;
-        ($partlist) = &response_type($symb,\$res_error);
-    }
     foreach my $student (keys(%$classlist)) {
         my $end      = 
             $classlist->{$student}->[&Apache::loncoursedata::CL_END()];
@@ -683,7 +526,7 @@ sub getclasslist {
         my $group   = 
             $classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
 	# filter students according to status selected
-	if ($filterbyaccstatus && (!($stu_status =~ /Any/))) {
+	if ($filterlist && (!($stu_status =~ /Any/))) {
 	    if (!($stu_status =~ $status)) {
 		delete($classlist->{$student});
 		next;
@@ -700,58 +543,13 @@ sub getclasslist {
     	            } 
 	        }
     	        if (($grp eq 'none') && !$group) {
-        	    $exclude = 0;
+        	        $exclude = 0;
         	}
 	    }
 	    if ($exclude) {
 	        delete($classlist->{$student});
-		next;
 	    }
 	}
-        if (($filterbysubmstatus) && ($submitonly ne 'all') && ($symb ne '')) {
-            my $udom =
-                $classlist->{$student}->[&Apache::loncoursedata::CL_SDOM()];
-            my $uname =
-                $classlist->{$student}->[&Apache::loncoursedata::CL_SNAME()];
-            if (($symb ne '') && ($udom ne '') && ($uname ne '')) {
-                if ($submitonly eq 'queued') {
-                    my %queue_status =
-                        &Apache::bridgetask::get_student_status($symb,$cdom,$cnum,
-                                                                $udom,$uname);
-                    if (!defined($queue_status{'gradingqueue'})) {
-                        delete($classlist->{$student});
-                        next;
-                    }
-                } else {
-                    my (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);
-                    my $submitted = 0;
-                    my $graded = 0;
-                    my $incorrect = 0;
-                    foreach (keys(%status)) {
-                        $submitted = 1 if ($status{$_} ne 'nothing');
-                        $graded = 1 if ($status{$_} =~ /^ungraded/);
-                        $incorrect = 1 if ($status{$_} =~ /^incorrect/);
-
-                        my ($foo,$partid,$foo1) = split(/\./,$_);
-                        if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
-                            $submitted = 0;
-                        }
-                    }
-                    if (!$submitted && ($submitonly eq 'yes' ||
-                                        $submitonly eq 'incorrect' ||
-                                        $submitonly eq 'graded')) {
-                        delete($classlist->{$student});
-                        next;
-                    } elsif (!$graded && ($submitonly eq 'graded')) {
-                        delete($classlist->{$student});
-                        next;
-                    } elsif (!$incorrect && $submitonly eq 'incorrect') {
-                        delete($classlist->{$student});
-                        next;
-                    }
-                }
-            }
-        }
 	$section = ($section ne '' ? $section : 'none');
 	if (&canview($section)) {
 	    if (!@getsec || grep(/^\Q$section\E$/,@getsec)) {
@@ -766,6 +564,7 @@ sub getclasslist {
 	    delete($classlist->{$student});
 	}
     }
+    my %seen = ();
     my @sections = sort(keys(%sections));
     return ($classlist,\@sections,\%fullnames);
 }
@@ -781,7 +580,7 @@ sub canmodify {
 		#can modify the requested section
 		return 1;
 	    } else {
-		# can't modify the requested section
+		# can't modify the request section
 		return 0;
 	    }
 	}
@@ -794,19 +593,19 @@ sub canview {
     my ($sec)=@_;
     if ($perm{'vgr'}) {
 	if (!defined($perm{'vgr_section'})) {
-	    # can view whole class
+	    # can modify whole class
 	    return 1;
 	} else {
 	    if ($sec eq $perm{'vgr_section'}) {
-		#can view the requested section
+		#can modify the requested section
 		return 1;
 	    } else {
-		# can't view the requested section
+		# can't modify the request section
 		return 0;
 	    }
 	}
     }
-    #can't view
+    #can't modify
     return 0;
 }
 
@@ -947,14 +746,14 @@ sub initialverifyreceipt {
 
 #--- Check whether a receipt number is valid.---
 sub verifyreceipt {
-    my ($request,$symb) = @_;
+    my ($request,$symb)  = @_;
 
     my $courseid = $env{'request.course.id'};
     my $receipt  = &Apache::lonnet::recprefix($courseid).'-'.
 	$env{'form.receipt'};
     $receipt     =~ s/[^\-\d]//g;
 
-    my $title =
+    my $title.=
 	'<h3><span class="LC_info">'.
 	&mt('Verifying Receipt Number [_1]',$receipt).
 	'</span></h3>'."\n";
@@ -1035,36 +834,24 @@ sub verifyreceipt {
 #--- Also called directly when one clicks on the subm button 
 #    on the problem page.
 sub listStudents {
-    my ($request,$symb,$submitonly,$divforres) = @_;
+    my ($request,$symb,$submitonly) = @_;
 
     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
     my $cnum      = $env{"course.$env{'request.course.id'}.num"};
     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
     my $getgroup  = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
     unless ($submitonly) {
-        $submitonly = $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
+       $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
     }
 
     my $result='';
     my $res_error;
-    my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,\$res_error);
-
-    my $table;
-    if (ref($partlist) eq 'ARRAY') {
-        if (scalar(@$partlist) > 1 ) {
-            $table = &showResourceInfo($symb,$partlist,$responseType,'gradesub',1);
-        } elsif ($divforres) {
-            $table = '<div style="padding:0;clear:both;margin:0;border:0"></div>';
-        } else {
-            $table = '<br clear="all" />';
-        }
-    }
+    my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
 
-    my %js_lt = &Apache::lonlocal::texthash (
+    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.',
 	     );
-    &js_escape(\%js_lt);
     $request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
     function checkSelect(checkBox) {
 	var ctr=0;
@@ -1075,12 +862,12 @@ sub listStudents {
 		    ctr++;
 		}
 	    }
-	    sense = '$js_lt{'multiple'}';
+	    sense = '$lt{'multiple'}';
 	} else {
 	    if (checkBox.checked) {
 		ctr = 1;
 	    }
-	    sense = '$js_lt{'single'}';
+	    sense = '$lt{'single'}';
 	}
 	if (ctr == 0) {
 	    alert(sense);
@@ -1100,8 +887,8 @@ LISTJAVASCRIPT
     $request->print($result);
 
     my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
-	"\n".$table;
-
+	"\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"
@@ -1114,98 +901,54 @@ LISTJAVASCRIPT
                   .'<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n"
                   .&Apache::lonhtmlcommon::row_closure();
 
+    my $submission_options;
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
     my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
     $env{'form.Status'} = $saveStatus;
-    my %optiontext = &Apache::lonlocal::texthash (
-                          lastonly => 'last submission',
-                          last     => 'last submission with details',
-                          datesub  => 'all submissions',
-                          all      => 'all submissions with details',
-                      );
-    my $submission_options =
+    $submission_options.=
         '<span class="LC_nobreak">'.
         '<label><input type="radio" name="lastSub" value="lastonly" /> '.
-        $optiontext{'lastonly'}.' </label></span>'."\n".
+        &mt('last submission').' </label></span>'."\n".
         '<span class="LC_nobreak">'.
         '<label><input type="radio" name="lastSub" value="last" /> '.
-        $optiontext{'last'}.' </label></span>'."\n".
+        &mt('last submission with details').' </label></span>'."\n".
         '<span class="LC_nobreak">'.
         '<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.
-        $optiontext{'datesub'}.'</label></span>'."\n".
+        &mt('all submissions').'</label></span>'."\n".
         '<span class="LC_nobreak">'.
         '<label><input type="radio" name="lastSub" value="all" /> '.
-        $optiontext{'all'}.'</label></span>';
-    my ($compmsg,$nocompmsg);
-    $nocompmsg = ' checked="checked"';
-    if ($numessay) {
-        $compmsg = $nocompmsg;
-        $nocompmsg = '';
-    }
-    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Submissions'))
-                  .$submission_options;
-# Check if any gradable
-    my $showmore;
-    if ($perm{'mgr'}) {
-        my @sections;
-        if ($env{'request.course.sec'} ne '') {
-            @sections = ($env{'request.course.sec'});
-        } elsif ($env{'form.section'} eq '') {
-            @sections = ('all');
-        } else {
-            @sections = &Apache::loncommon::get_env_multiple('form.section');
-        }
-        if (grep(/^all$/,@sections)) {
-            $showmore = 1;
-        } else {
-            foreach my $sec (@sections) {
-                if (&canmodify($sec)) {
-                    $showmore = 1;
-                    last;
-                }
-            }
-        }
-    }
-
-    if ($showmore) {
-        $gradeTable .=
-                   &Apache::lonhtmlcommon::row_closure()
-                  .&Apache::lonhtmlcommon::row_title(&mt('Send Messages'))
-                  .'<span class="LC_nobreak">'
-                  .'<label><input type="radio" name="compmsg" value="0"'.$nocompmsg.' />'
-                  .&mt('No').('&nbsp;'x2).'</label>'
-                  .'<label><input type="radio" name="compmsg" value="1"'.$compmsg.' />'
-                  .&mt('Yes').('&nbsp;'x2).'</label>'
+        &mt('all submissions with details').'</label></span>';
+    $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Submissions'))
+                  .$submission_options
                   .&Apache::lonhtmlcommon::row_closure();
 
-        $gradeTable .= 
-                   &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
+    $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>';
-    }
+                  .'</select>'
+                  .&Apache::lonhtmlcommon::row_closure();
+
     $gradeTable .= 
         &build_section_inputs().
 	'<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
 	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
 	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
+
     if (exists($env{'form.Status'})) {
-	$gradeTable .= '<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n";
+	$gradeTable .= '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";
     } else {
-        $gradeTable .= &Apache::lonhtmlcommon::row_closure()
-                      .&Apache::lonhtmlcommon::row_title(&mt('Student Status'))
+        $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status'))
                       .&Apache::lonhtmlcommon::StatusOptions(
-                           $saveStatus,undef,1,'javascript:reLoadList(this.form);');
-    }
-    if ($numessay) {
-        $gradeTable .= &Apache::lonhtmlcommon::row_closure()
-                      .&Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))
-                      .'<input type="checkbox" name="checkPlag" checked="checked" />';
+                           $saveStatus,undef,1,'javascript:reLoadList(this.form);')
+                      .&Apache::lonhtmlcommon::row_closure();
     }
-    $gradeTable .= &Apache::lonhtmlcommon::row_closure(1)
+
+    $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>'
@@ -1341,7 +1084,7 @@ LISTJAVASCRIPT
 	    if ($submitonly eq 'graded'   ) { $submissions = 'ungraded submissions'; }
 	    if ($submitonly eq 'queued'   ) { $submissions = 'queued submissions'; }
 	    $gradeTable='<br />&nbsp;<span class="LC_warning">'.
-		&mt('No '.$submissions.' found for this resource for any students. ([quant,_1,student] checked for '.$submissions.')',
+		&mt('No '.$submissions.' found for this resource for any students. ([_1] students checked for '.$submissions.')',
 		    $num_students).
 		'</span><br />';
 	}
@@ -1355,8 +1098,8 @@ LISTJAVASCRIPT
 #---- Called from the listStudents routine
 
 sub check_script {
-    my ($form,$type) = @_;
-    my $chkallscript = &Apache::lonhtmlcommon::scripttag('
+    my ($form, $type)=@_;
+    my $chkallscript= &Apache::lonhtmlcommon::scripttag('
     function checkall() {
         for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
             ele = document.forms.'.$form.'.elements[i];
@@ -1401,7 +1144,7 @@ sub check_buttons {
 
 #     Displays the submissions for one student or a group of students
 sub processGroup {
-    my ($request,$symb) = @_;
+    my ($request,$symb)  = @_;
     my $ctr        = 0;
     my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');
     my $total      = scalar(@stuchecked)-1;
@@ -1425,8 +1168,7 @@ sub processGroup {
 #--- Javascript to handle the submission page functionality ---
 sub sub_page_js {
     my $request = shift;
-    my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
-    &js_escape(\$alertmsg);
+	    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];
@@ -1544,8 +1286,10 @@ sub sub_page_js {
 			    }
 			}
 		    }
+		    
 		}
 	    }
+	    
 	}
 	formname.submit();
     }
@@ -1589,8 +1333,8 @@ sub sub_page_js {
 SUBJAVASCRIPT
 }
 
-#--- javascript for grading message center
-sub sub_grademessage_js {
+#--- javascript for essay type problem --
+sub sub_page_kw_js {
     my $request = shift;
     my $iconpath = $request->dir_config('lonIconsURL');
     &commonJSfunctions($request);
@@ -1636,19 +1380,45 @@ sub sub_grademessage_js {
 </script>
 INNERJS
 
-    my $start_page_msg_central =
+    my $inner_js_highlight_central= (<<INNERJS);
+<script type="text/javascript">
+    function updateChoice(flag) {
+      opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
+      opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
+      opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);
+      opener.document.SCORE.refresh.value = "on";
+      if (opener.document.SCORE.keywords.value!=""){
+         opener.document.SCORE.submit();
+      }
+      self.close()
+    }
+</script>
+INNERJS
+
+    my $start_page_msg_central = 
         &Apache::loncommon::start_page('Message Central',$inner_js_msg_central,
 				       {'js_ready'  => 1,
 					'only_body' => 1,
 					'bgcolor'   =>'#FFFFFF',});
-    my $end_page_msg_central =
+    my $end_page_msg_central = 
 	&Apache::loncommon::end_page({'js_ready' => 1});
 
 
+    my $start_page_highlight_central = 
+        &Apache::loncommon::start_page('Highlight Central',
+				       $inner_js_highlight_central,
+				       {'js_ready'  => 1,
+					'only_body' => 1,
+					'bgcolor'   =>'#FFFFFF',});
+    my $end_page_highlight_central = 
+	&Apache::loncommon::end_page({'js_ready' => 1});
+
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
     $docopen=~s/^document\.//;
-
-    my %html_js_lt = &Apache::lonlocal::texthash(
+    my %lt = &Apache::lonlocal::texthash(
+                keyw => 'Keywords list, separated by a space. Add/delete to list if desired.',
+                plse => 'Please select a word or group of words from document and then click this link.',
+                adds => 'Add selection to keyword list? Edit if desired.',
                 comp => 'Compose Message for: ',
                 incl => 'Include',
                 type => 'Type',
@@ -1657,11 +1427,26 @@ INNERJS
                 new  => 'New',
                 save => 'Save',
                 canc => 'Cancel',
+                kehi => 'Keyword Highlight Options',
+                txtc => 'Text Color',
+                font => 'Font Size',
+                fnst => 'Font Style',
              );
-    &html_escape(\%html_js_lt);
-    &js_escape(\%html_js_lt);
     $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
 
+//===================== Show list of keywords ====================
+  function keywords(formname) {
+    var nret = prompt("$lt{'keyw'}",formname.keywords.value);
+    if (nret==null) return;
+    formname.keywords.value = nret;
+
+    if (formname.keywords.value != "") {
+	formname.refresh.value = "on";
+	formname.submit();
+    }
+    return;
+  }
+
 //===================== Script to view submitted by ==================
   function viewSubmitter(submitter) {
     document.SCORE.refresh.value = "on";
@@ -1671,6 +1456,26 @@ INNERJS
     return;
   }
 
+//===================== Script to add keyword(s) ==================
+  function getSel() {
+    if (document.getSelection) txt = document.getSelection();
+    else if (document.selection) txt = document.selection.createRange().text;
+    else return;
+    var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
+    if (cleantxt=="") {
+	alert("$lt{'plse'}");
+	return;
+    }
+    var nret = prompt("$lt{'adds'}",cleantxt);
+    if (nret==null) return;
+    document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
+    if (document.SCORE.keywords.value != "") {
+	document.SCORE.refresh.value = "on";
+	document.SCORE.submit();
+    }
+    return;
+  }
+
 //====================== Script for composing message ==============
    // preload images
    img1 = new Image();
@@ -1741,16 +1546,16 @@ INNERJS
 
     pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
     pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
-    pDoc.write("<h1>&nbsp;$html_js_lt{'comp'}\"+fullname+\"<\\/h1>");
+    pDoc.write("<h1>&nbsp;$lt{'comp'}\"+fullname+\"<\\/h1>");
 
     pDoc.write('<table style="border:1px solid black;"><tr>');
-    pDoc.write("<td><b>$html_js_lt{'incl'}<\\/b><\\/td><td><b>$html_js_lt{'type'}<\\/b><\\/td><td><b>$html_js_lt{'mesa'}<\\/td><\\/tr>");
+    pDoc.write("<td><b>$lt{'incl'}<\\/b><\\/td><td><b>$lt{'type'}<\\/b><\\/td><td><b>$lt{'mesa'}<\\/td><\\/tr>");
 }
     function displaySubject(msg,shwsel) {
     pDoc = pWin.document;
     pDoc.write("<tr>");
     pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
-    pDoc.write("<td>$html_js_lt{'subj'}<\\/td>");
+    pDoc.write("<td>$lt{'subj'}<\\/td>");
     pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"40\\" maxlength=\\"80\\"><\\/td><\\/tr>");
 }
 
@@ -1766,121 +1571,21 @@ INNERJS
     pDoc = pWin.document;
     pDoc.write("<tr>");
     pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
-    pDoc.write("<td align=\\"center\\">$html_js_lt{'new'}<\\/td>");
+    pDoc.write("<td align=\\"center\\">$lt{'new'}<\\/td>");
     pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>");
 }
 
   function msgTail() {
     pDoc = pWin.document;
+    //pDoc.write("<\\/table>");
     pDoc.write("<\\/td><\\/tr><\\/table>&nbsp;");
-    pDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'save'}\\" onclick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
-    pDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />");
+    pDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
+    pDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />");
     pDoc.write("<\\/form>");
     pDoc.write('$end_page_msg_central');
     pDoc.close();
 }
 
-SUBJAVASCRIPT
-}
-
-#--- javascript for essay type problem --
-sub sub_page_kw_js {
-    my $request = shift;
-
-    unless ($env{'form.compmsg'}) {
-        &commonJSfunctions($request);
-    }
-
-    my $inner_js_highlight_central= (<<INNERJS);
-<script type="text/javascript">
-    function updateChoice(flag) {
-      opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
-      opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
-      opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);
-      opener.document.SCORE.refresh.value = "on";
-      if (opener.document.SCORE.keywords.value!=""){
-         opener.document.SCORE.submit();
-      }
-      self.close()
-    }
-</script>
-INNERJS
-
-    my $start_page_highlight_central =
-        &Apache::loncommon::start_page('Highlight Central',
-                                       $inner_js_highlight_central,
-                                       {'js_ready'  => 1,
-                                        'only_body' => 1,
-                                        'bgcolor'   =>'#FFFFFF',});
-    my $end_page_highlight_central =
-        &Apache::loncommon::end_page({'js_ready' => 1});
-
-    my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
-    $docopen=~s/^document\.//;
-
-    my %js_lt = &Apache::lonlocal::texthash(
-                keyw => 'Keywords list, separated by a space. Add/delete to list if desired.',
-                plse => 'Please select a word or group of words from document and then click this link.',
-                adds => 'Add selection to keyword list? Edit if desired.',
-                col1 => 'red',
-                col2 => 'green',
-                col3 => 'blue',
-                siz1 => 'normal',
-                siz2 => '+1',
-                siz3 => '+2',
-                sty1 => 'normal',
-                sty2 => 'italic',
-                sty3 => 'bold',
-             );
-    my %html_js_lt = &Apache::lonlocal::texthash(
-                save => 'Save',
-                canc => 'Cancel',
-                kehi => 'Keyword Highlight Options',
-                txtc => 'Text Color',
-                font => 'Font Size',
-                fnst => 'Font Style',
-             );
-    &js_escape(\%js_lt);
-    &html_escape(\%html_js_lt);
-    &js_escape(\%html_js_lt);
-    $request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT));
-
-//===================== Show list of keywords ====================
-  function keywords(formname) {
-    var nret = prompt("$js_lt{'keyw'}",formname.keywords.value);
-    if (nret==null) return;
-    formname.keywords.value = nret;
-
-    if (formname.keywords.value != "") {
-        formname.refresh.value = "on";
-        formname.submit();
-    }
-    return;
-  }
-
-//===================== Script to add keyword(s) ==================
-  function getSel() {
-    if (document.getSelection) txt = document.getSelection();
-    else if (document.selection) txt = document.selection.createRange().text;
-    else return;
-    if (typeof(txt) != 'string') {
-        txt = String(txt);
-    }
-    var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
-    if (cleantxt=="") {
-        alert("$js_lt{'plse'}");
-        return;
-    }
-    var nret = prompt("$js_lt{'adds'}",cleantxt);
-    if (nret==null) return;
-    document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
-    if (document.SCORE.keywords.value != "") {
-        document.SCORE.refresh.value = "on";
-        document.SCORE.submit();
-    }
-    return;
-  }
-
 //====================== Script for keyword highlight options ==============
   function kwhighlight() {
     var kwclr    = document.SCORE.kwclr.value;
@@ -1889,34 +1594,25 @@ INNERJS
     var redsel = "";
     var grnsel = "";
     var blusel = "";
-    var txtcol1 = "$js_lt{'col1'}";
-    var txtcol2 = "$js_lt{'col2'}";
-    var txtcol3 = "$js_lt{'col3'}";
-    var txtsiz1 = "$js_lt{'siz1'}";
-    var txtsiz2 = "$js_lt{'siz2'}";
-    var txtsiz3 = "$js_lt{'siz3'}";
-    var txtsty1 = "$js_lt{'sty1'}";
-    var txtsty2 = "$js_lt{'sty2'}";
-    var txtsty3 = "$js_lt{'sty3'}";
-    if (kwclr=="red")   {var redsel="checked='checked'"};
-    if (kwclr=="green") {var grnsel="checked='checked'"};
-    if (kwclr=="blue")  {var blusel="checked='checked'"};
+    if (kwclr=="red")   {var redsel="checked"};
+    if (kwclr=="green") {var grnsel="checked"};
+    if (kwclr=="blue")  {var blusel="checked"};
     var sznsel = "";
     var sz1sel = "";
     var sz2sel = "";
-    if (kwsize=="0")  {var sznsel="checked='checked'"};
-    if (kwsize=="+1") {var sz1sel="checked='checked'"};
-    if (kwsize=="+2") {var sz2sel="checked='checked'"};
+    if (kwsize=="0")  {var sznsel="checked"};
+    if (kwsize=="+1") {var sz1sel="checked"};
+    if (kwsize=="+2") {var sz2sel="checked"};
     var synsel = "";
     var syisel = "";
     var sybsel = "";
-    if (kwstyle=="")    {var synsel="checked='checked'"};
-    if (kwstyle=="<i>") {var syisel="checked='checked'"};
-    if (kwstyle=="<b>") {var sybsel="checked='checked'"};
+    if (kwstyle=="")    {var synsel="checked"};
+    if (kwstyle=="<i>") {var syisel="checked"};
+    if (kwstyle=="<b>") {var sybsel="checked"};
     highlightCentral();
-    highlightbody('red',txtcol1,redsel,'0',txtsiz1,sznsel,'',txtsty1,synsel);
-    highlightbody('green',txtcol2,grnsel,'+1',txtsiz2,sz1sel,'<i>',txtsty2,syisel);
-    highlightbody('blue',txtcol3,blusel,'+2',txtsiz3,sz2sel,'<b>',txtsty3,sybsel);
+    highlightbody('red','red',redsel,'0','normal',sznsel,'','normal',synsel);
+    highlightbody('green','green',grnsel,'+1','+1',sz1sel,'<i>','italic',syisel);
+    highlightbody('blue','blue',blusel,'+2','+2',sz2sel,'<b>','bold',sybsel);
     highlightend();
     return;
   }
@@ -1934,29 +1630,31 @@ INNERJS
     hDoc.$docopen;
     hDoc.write('$start_page_highlight_central');
     hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
-    hDoc.write("<h1>$html_js_lt{'kehi'}<\\/h1>");
+    hDoc.write("<h3><span class=\\"LC_info\\">&nbsp;$lt{'kehi'}<\\/span><\\/h3><br /><br />");
 
-    hDoc.write('<table border="0" width="100%"><tr style="background-color:#A1D676">');
-    hDoc.write("<th>$html_js_lt{'txtc'}<\\/th><th>$html_js_lt{'font'}<\\/th><th>$html_js_lt{'fnst'}<\\/th><\\/tr>");
+    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>$lt{'txtc'}<\\/b><\\/td><td><b>$lt{'font'}<\\/b><\\/td><td><b>$lt{'fnst'}<\\/td><\\/tr>");
   }
 
   function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) { 
     var hDoc = hwdWin.document;
-    hDoc.write("<tr>");
+    hDoc.write("<tr bgcolor=\\"#ffffdd\\">");
     hDoc.write("<td align=\\"left\\">");
-    hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+" \\/>&nbsp;"+clrtxt+"<\\/td>");
+    hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+">&nbsp;"+clrtxt+"<\\/td>");
     hDoc.write("<td align=\\"left\\">");
-    hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+" \\/>&nbsp;"+sztxt+"<\\/td>");
+    hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+">&nbsp;"+sztxt+"<\\/td>");
     hDoc.write("<td align=\\"left\\">");
-    hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+" \\/>&nbsp;"+sytxt+"<\\/td>");
+    hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+">&nbsp;"+sytxt+"<\\/td>");
     hDoc.write("<\\/tr>");
   }
 
   function highlightend() { 
     var hDoc = hwdWin.document;
-    hDoc.write("<\\/table><br \\/>");
-    hDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\" \\/>&nbsp;&nbsp;");
-    hDoc.write("<input type=\\"button\\" value=\\"$html_js_lt{'canc'}\\" onclick=\\"self.close()\\" \\/><br /><br />");
+    hDoc.write("<\\/table>");
+    hDoc.write("<\\/td><\\/tr><\\/table>&nbsp;");
+    hDoc.write("<input type=\\"button\\" value=\\"$lt{'save'}\\" onclick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
+    hDoc.write("<input type=\\"button\\" value=\\"$lt{'canc'}\\" onclick=\\"self.close()\\"><br /><br />");
     hDoc.write("<\\/form>");
     hDoc.write('$end_page_highlight_central');
     hDoc.close();
@@ -2071,8 +1769,7 @@ sub gradeBox {
 
 sub handback_box {
     my ($symb,$uname,$udom,$counter,$partid,$record,$res_error_pointer) = @_;
-    my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,$res_error_pointer);
-    return unless ($numessay);
+    my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error_pointer);
     my (@respids);
     my @part_response_id = &flatten_responseType($responseType);
     foreach my $part_response_id (@part_response_id) {
@@ -2174,11 +1871,12 @@ sub show_problem {
 sub files_exist {
     my ($r, $symb) = @_;
     my @students = &Apache::loncommon::get_env_multiple('form.stuinfo');
+
     foreach my $student (@students) {
         my ($uname,$udom,$fullname) = split(/:/,$student);
         my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
 					      $udom,$uname);
-        my ($string)= &get_last_submission(\%record);
+        my ($string,$timestamp)= &get_last_submission(\%record);
         foreach my $submission (@$string) {
             my ($partid,$respid) =
 		($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/);
@@ -2193,9 +1891,10 @@ sub files_exist {
 sub download_all_link {
     my ($r,$symb) = @_;
     unless (&files_exist($r, $symb)) {
-        $r->print(&mt('There are currently no submitted documents.'));
-        return;
+       $r->print(&mt('There are currently no submitted documents.'));
+       return;
     }
+
     my $all_students = 
 	join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo'));
 
@@ -2214,48 +1913,8 @@ sub download_all_link {
 sub submit_download_link {
     my ($request,$symb) = @_;
     if (!$symb) { return ''; }
-    my $res_error;
-    my ($partlist,$handgrade,$responseType,$numresp,$numessay,$numdropbox) =
-        &response_type($symb,\$res_error);
-    if ($res_error) {
-        $request->print(&mt('An error occurred retrieving response types'));
-        return;
-    }
-    unless ($numessay) {
-        $request->print(&mt('No essayresponse items found'));
-        return;
-    }
-    my @chosenparts = &Apache::loncommon::get_env_multiple('form.vPart');
-    if (@chosenparts) {
-        $request->print(&showResourceInfo($symb,$partlist,$responseType,
-                                          undef,undef,1));
-    }
-    if ($numessay) {
-        my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
-        my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
-        my $getgroup  = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
-        (undef,undef,my $fullname) = &getclasslist($getsec,1,$getgroup,$symb,$submitonly,1);
-        if (ref($fullname) eq 'HASH') {
-            my @students = map { $_.':'.$fullname->{$_} } (keys(%{$fullname}));
-            if (@students) {
-                @{$env{'form.stuinfo'}} = @students;
-                if ($numdropbox) {
-                    &download_all_link($request,$symb);
-                } else {
-                    $request->print(&mt('No essayrespose items with dropbox found'));
-                }
-# FIXME Need a mechanism to download essays, i.e., if $numessay > $numdropbox
-# Needs to omit user's identity if resource instance is for an anonymous survey.
-            } else {
-                $request->print(&mt('No students match the criteria you selected'));
-            }
-        } else {
-            $request->print(&mt('Could not retrieve student information'));
-        }
-    } else {
-        $request->print(&mt('No essayresponse items found'));
-    }
-    return;
+#FIXME: Figure out which type of problem this is and provide appropriate download
+    &download_all_link($request,$symb);
 }
 
 sub build_section_inputs {
@@ -2273,40 +1932,25 @@ sub build_section_inputs {
 
 # --------------------------- show submissions of a student, option to grade 
 sub submission {
-    my ($request,$counter,$total,$symb,$divforres,$calledby) = @_;
+    my ($request,$counter,$total,$symb) = @_;
     my ($uname,$udom)     = ($env{'form.student'},$env{'form.userdom'});
     $udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?
     my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
     $env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';
 
+    my $probtitle=&Apache::lonnet::gettitle($symb); 
     if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }
-    my $probtitle=&Apache::lonnet::gettitle($symb);
-    my ($essayurl,%coursedesc_by_cid);
 
     if (!&canview($usec)) {
-        $request->print(
-            '<span class="LC_warning">'.
-            &mt('Unable to view requested student.').
-            ' '.&mt('([_1] in section [_2] in course id [_3])',
-                        $uname.':'.$udom,$usec,$env{'request.course.id'}).
-            '</span>');
+	$request->print('<span class="LC_warning">Unable to view requested student.('.
+			$uname.':'.$udom.' in section '.$usec.' in course id '.
+			$env{'request.course.id'}.')</span>');
 	return;
     }
 
-    my $res_error;
-    my ($partlist,$handgrade,$responseType,$numresp,$numessay) =
-        &response_type($symb,\$res_error);
-    if ($res_error) {
-        $request->print(&navmap_errormsg());
-        return;
-    }
-
     if (!$env{'form.lastSub'}) { $env{'form.lastSub'} = 'datesub'; }
     if (!$env{'form.vProb'}) { $env{'form.vProb'} = 'yes'; }
     if (!$env{'form.vAns'}) { $env{'form.vAns'} = 'yes'; }
-    if (($numessay) && ($calledby eq 'submission') && (!exists($env{'form.compmsg'}))) {
-        $env{'form.compmsg'} = 1;
-    }
     my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
     my $checkIcon = '<img alt="'.&mt('Check Mark').
 	'" src="'.$request->dir_config('lonIconsURL').
@@ -2314,17 +1958,8 @@ sub submission {
 
     # header info
     if ($counter == 0) {
-        my @chosenparts = &Apache::loncommon::get_env_multiple('form.vPart');
-        if (@chosenparts) {
-            $request->print(&showResourceInfo($symb,$partlist,$responseType,'gradesub'));
-        } elsif ($divforres) {
-            $request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>');
-        } else {
-            $request->print('<br clear="all" />');
-        }
 	&sub_page_js($request);
-        &sub_grademessage_js($request) if ($env{'form.compmsg'});
-	&sub_page_kw_js($request) if ($numessay);
+	&sub_page_kw_js($request);
 
 	# option to display problem, only once else it cause problems 
         # with the form later since the problem has a form.
@@ -2341,27 +1976,24 @@ sub submission {
 	    $request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
 	}
 
+	# kwclr is the only variable that is guaranteed to be non blank 
+        # if this subroutine has been called once.
 	my %keyhash = ();
-	if (($env{'form.kwclr'} eq '' && $numessay) || ($env{'form.compmsg'})) {
+#	if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') {
+        if (1) {
 	    %keyhash = &Apache::lonnet::dump('nohist_handgrade',
 					     $env{'course.'.$env{'request.course.id'}.'.domain'},
 					     $env{'course.'.$env{'request.course.id'}.'.num'});
-	}
-	# kwclr is the only variable that is guaranteed not to be blank
-	# if this subroutine has been called once.
-	if ($env{'form.kwclr'} eq '' && $numessay) {
+
 	    my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
 	    $env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
 	    $env{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
 	    $env{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
 	    $env{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
-	}
-	if ($env{'form.compmsg'}) {
-	    $env{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ?
+	    $env{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ? 
 		$keyhash{$symb.'_subject'} : $probtitle;
 	    $env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
 	}
-
 	my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};
 	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
 	$request->print('<form action="/adm/grades" method="post" name="SCORE" enctype="multipart/form-data">'."\n".
@@ -2375,23 +2007,24 @@ sub submission {
 			'<input type="hidden" name="vProb"      value="'.$env{'form.vProb'}.'" />'."\n".
 			'<input type="hidden" name="vAns"       value="'.$env{'form.vAns'}.'" />'."\n".
 			'<input type="hidden" name="lastSub"    value="'.$env{'form.lastSub'}.'" />'."\n".
-			'<input type="hidden" name="compmsg"    value="'.$env{'form.compmsg'}.'" />'."\n".
 			&build_section_inputs().
 			'<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'" />'."\n".
 			'<input type="hidden" name="NCT"'.
 			' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");
-	if ($env{'form.compmsg'}) {
-	    $request->print('<input type="hidden" name="msgsub"   value="'.$env{'form.msgsub'}.'" />'."\n".
-			    '<input type="hidden" name="shownSub" value="0" />'."\n".
-			    '<input type="hidden" name="savemsgN" value="'.$env{'form.savemsgN'}.'" />'."\n");
-	}
-	if ($numessay) {
+#	if ($env{'form.handgrade'} eq 'yes') {
+        if (1) {
 	    $request->print('<input type="hidden" name="keywords" value="'.$env{'form.keywords'}.'" />'."\n".
 			    '<input type="hidden" name="kwclr"    value="'.$env{'form.kwclr'}.'" />'."\n".
 			    '<input type="hidden" name="kwsize"   value="'.$env{'form.kwsize'}.'" />'."\n".
-			    '<input type="hidden" name="kwstyle"  value="'.$env{'form.kwstyle'}.'" />'."\n");
+			    '<input type="hidden" name="kwstyle"  value="'.$env{'form.kwstyle'}.'" />'."\n".
+			    '<input type="hidden" name="msgsub"   value="'.$env{'form.msgsub'}.'" />'."\n".
+			    '<input type="hidden" name="shownSub" value="0" />'."\n".
+			    '<input type="hidden" name="savemsgN" value="'.$env{'form.savemsgN'}.'" />'."\n");
+	    foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
+		$request->print('<input type="hidden" name="vPart" value="'.$partid.'" />'."\n");
+	    }
 	}
-
+	
 	my ($cts,$prnmsg) = (1,'');
 	while ($cts <= $env{'form.savemsgN'}) {
 	    $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
@@ -2404,51 +2037,33 @@ sub submission {
 	}
 	$request->print($prnmsg);
 
-	if ($numessay) {
+#	if ($env{'form.handgrade'} eq 'yes') {
+        if (1) {
 
             my %lt = &Apache::lonlocal::texthash(
-                          keyh => 'Keyword Highlighting for Essays',
                           keyw => 'Keyword Options',
                           list => 'List',
                           past => 'Paste Selection to List',
                           high => 'Highlight Attribute',
-                     );
+                     );    
 #
 # Print out the keyword options line
 #
-	    $request->print(
-                '<div class="LC_columnSection">'
-               .'<fieldset><legend>'.$lt{'keyh'}.'</legend>'
-               .&Apache::lonhtmlcommon::funclist_from_array(
-                    ['<a href="javascript:keywords(document.SCORE);" target="_self">'.$lt{'list'}.'</a>',
-                     '<a href="#" onmousedown="javascript:getSel(); return false"
- class="page">'.$lt{'past'}.'</a>',
-                     '<a href="javascript:kwhighlight();" target="_self">'.$lt{'high'}.'</a>'],
-                    {legend => $lt{'keyw'}})
-               .'</fieldset></div>'
-            );
-
+	    $request->print(<<KEYWORDS);
+<br /><b>$lt{'keyw'}:</b>&nbsp;
+<a href="javascript:keywords(document.SCORE);" target="_self">$lt{'list'}</a>&nbsp; &nbsp;
+<a href="#" onmousedown="javascript:getSel(); return false"
+ class="page">$lt{'past'}</a>&nbsp; &nbsp;
+<a href="javascript:kwhighlight();" target="_self">$lt{'high'}</a><br /><br />
+KEYWORDS
 #
 # Load the other essays for similarity check
 #
-            (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
-            if ($essayurl eq 'lib/templates/simpleproblem.problem') {
-                my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-                my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-                if ($cdom ne '' && $cnum ne '') {
-                    my ($map,$id,$res) = &Apache::lonnet::decode_symb($symb);
-                    if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(default(?:|_\d+)\.(?:sequence|page))$}) {
-                        my $apath = $1.'_'.$id;
-                        $apath=~s/\W/\_/gs;
-                        &init_old_essays($symb,$apath,$cdom,$cnum);
-                    }
-                }
-            } else {
-	        my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
-	        $apath=&escape($apath);
-	        $apath=~s/\W/\_/gs;
-                &init_old_essays($symb,$apath,$adom,$aname);
-            }
+            my (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
+	    my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
+	    $apath=&escape($apath);
+	    $apath=~s/\W/\_/gs;
+            &init_old_essays($symb,$apath,$adom,$aname);
         }
     }
 
@@ -2465,7 +2080,7 @@ sub submission {
     if ($perm{'vgr'}) {
         $request->print(
             &Apache::loncommon::track_student_link(
-                'View recent activity',
+                &mt('View recent activity'),
                 $uname,$udom,'check')
            .' '
         );
@@ -2492,6 +2107,12 @@ sub submission {
     }
 
     my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
+    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 />'));
@@ -2500,16 +2121,18 @@ sub submission {
               .'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>';
     $result.='<input type="hidden" name="name'.$counter.
              '" value="'.$env{'form.fullname'}.'" />'."\n";
-    if ($numresp > $numessay) {
+#    if ($env{'form.handgrade'} eq 'no') {
+    if (1) {
         $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 essayresponse, then check for collaborators
+    # If any part of the problem is an essay-response (handgraded), then check for collaborators
     my $fullname;
     my $col_fullnames = [];
-    if ($numessay) {
+#    if ($env{'form.handgrade'} eq 'yes') {
+    if (1) {
 	(my $sub_result,$fullname,$col_fullnames)=
 	    &check_collaborators($symb,$uname,$udom,\%record,$handgrade,
 				 $counter);
@@ -2518,227 +2141,184 @@ sub submission {
     $request->print($result."\n");
 
     # print student answer/submission
-    # Options are (1) Last submission only
-    #             (2) Last submission (with detailed information for that submission)
-    #             (3) All transactions (by date)
-    #             (4) The whole record (with detailed information for all transactions)
-
-    my ($string,$timestamp,$lastgradetime,$lastsubmittime) = &get_last_submission(\%record);
-
-    my $lastsubonly;
-
-    if ($timestamp eq '') {
-        $lastsubonly.='<div class="LC_grade_submissions_body">'.$string->[0].'</div>'; 
-    } else {
-        my ($shownsubmdate,$showngradedate);
-        if ($lastsubmittime && $lastgradetime) {
-            $shownsubmdate = &Apache::lonlocal::locallocaltime($lastsubmittime);
-            if ($lastgradetime > $lastsubmittime) {
-                 $showngradedate = &Apache::lonlocal::locallocaltime($lastgradetime);
-             }
-        } else {
-            $shownsubmdate = $timestamp;
-        }
-        $lastsubonly =
-            '<div class="LC_grade_submissions_body">'
-           .'<b>'.&mt('Date Submitted:').'</b> '.$shownsubmdate."\n";
-        if ($showngradedate) {
-            $lastsubonly .= '<br /><b>'.&mt('Date Graded:').'</b> '.$showngradedate."\n";
-        }
+    # 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
+    #             (4) The whole record for this student
+    if ($env{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
+	my ($string,$timestamp)= &get_last_submission(\%record);
+	
+	my $lastsubonly;
 
-	my %seenparts;
-	my @part_response_id = &flatten_responseType($responseType);
-	foreach my $part (@part_response_id) {
-	    my ($partid,$respid) = @{ $part };
-	    my $display_part=&get_display_part($partid,$symb);
-	    if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
-		if (exists($seenparts{$partid})) { next; }
-		$seenparts{$partid}=1;
-                $request->print(
-                    '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
-                    ' <b>'.&mt('Collaborative submission by: [_1]',
-                               '<a href="javascript:viewSubmitter(\''.
-                               $env{"form.$uname:$udom:$partid:submitted_by"}.
-                               '\');" target="_self">'.
-                               $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a>').
-                    '<br />');
-		next;
-	    }
-	    my $responsetype = $responseType->{$partid}->{$respid};
-	    if (!exists($record{"resource.$partid.$respid.submission"})) {
-                $lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
-                    '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
-                    ' <span class="LC_internal_info">'.
-                    '('.&mt('Response 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,$hide,$draft,$subval) = split(/:/,$submission,4);
-		# Similarity check
-                my $similar='';
-                my ($type,$trial,$rndseed);
-                if ($hide eq 'rand') {
-                    $type = 'randomizetry';
-                    $trial = $record{"resource.$partid.tries"};
-                    $rndseed = $record{"resource.$partid.rndseed"};
-                }
-		if ($env{'form.checkPlag'}) {
-		    my ($oname,$odom,$ocrsid,$oessay,$osim)=
-		        &most_similar($uname,$udom,$symb,$subval);
-		    if ($osim) {
-		        $osim=int($osim*100.0);
-                        if ($hide eq 'anon') {
-                            $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 />';
-                            if ($essayurl eq 'lib/templates/simpleproblem.problem') {
-                                $similar .= '<h3><span class="LC_warning">'.
-                                            &mt('Essay is [_1]% similar to an essay by [_2]',
-                                                $osim,
-                                                &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')').
-                                            '</span></h3>';
-                            } elsif ($ocrsid ne '') {
-                                my %old_course_desc;
-                                if (ref($coursedesc_by_cid{$ocrsid}) eq 'HASH') {
-                                    %old_course_desc = %{$coursedesc_by_cid{$ocrsid}};
-                                } else {
-                                    my $args;
-                                    if ($ocrsid ne $env{'request.course.id'}) {
-                                        $args = {'one_time' => 1};
-                                    }
-                                    %old_course_desc =
-                                        &Apache::lonnet::coursedescription($ocrsid,$args);
-                                    $coursedesc_by_cid{$ocrsid} = \%old_course_desc;
-                                }
-                                $similar .=
-                                    '<h3><span class="LC_warning">'.
+        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);
+	    foreach my $part (@part_response_id) {
+		next if ($env{'form.lastSub'} eq 'hdgrade' 
+			 && $$handgrade{$$part[0].'_'.$$part[1]} ne 'yes');
+
+		my ($partid,$respid) = @{ $part };
+		my $display_part=&get_display_part($partid,$symb);
+		if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
+		    if (exists($seenparts{$partid})) { next; }
+		    $seenparts{$partid}=1;
+                    $request->print(
+                        '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
+                        ' <b>'.&mt('Collaborative submission by: [_1]',
+                                   '<a href="javascript:viewSubmitter(\''.
+                                   $env{"form.$uname:$udom:$partid:submitted_by"}.
+                                   '\');" target="_self">'.
+                                   $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a>').
+                        '<br />');
+		    next;
+		}
+		my $responsetype = $responseType->{$partid}->{$respid};
+		if (!exists($record{"resource.$partid.$respid.submission"})) {
+                    $lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
+                        '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
+                        ' <span class="LC_internal_info">'.
+                        '('.&mt('Response 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,$hide,$subval) = split(/:/,$submission,3);
+		    # Similarity check
+		    my $similar='';
+                    my ($type,$trial,$rndseed);
+                    if ($hide eq 'rand') {
+                        $type = 'randomizetry';
+                        $trial = $record{"resource.$partid.tries"};
+                        $rndseed = $record{"resource.$partid.rndseed"};
+                    }
+		    if($env{'form.checkPlag'}){
+			my ($oname,$odom,$ocrsid,$oessay,$osim)=
+			    &most_similar($uname,$udom,$symb,$subval);
+			if ($osim) {
+			    $osim=int($osim*100.0);
+			    my %old_course_desc = 
+				&Apache::lonnet::coursedescription($ocrsid,
+								   {'one_time' => 1});
+
+                            if ($hide eq 'anon') {
+                                $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>';
+				    '</span></h3><blockquote><i>'.
+				    &keywords_highlight($oessay).
+				    '</i></blockquote><hr />';
+                            }
+			}
+		    }
+		    my $order=&get_order($partid,$respid,$symb,$uname,$udom,
+                                         undef,$type,$trial,$rndseed);
+		    if ($env{'form.lastSub'} eq 'lastonly' || 
+			($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>'.&mt('Part: [_1]',$display_part).'</b>'.
+                            ' <span class="LC_internal_info">'.
+                            '('.&mt('Response ID: [_1]',$respid).')'.
+                            '</span>&nbsp; &nbsp;';
+			my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
+
+			if (@$files) {
+                            if ($hide eq 'anon') {
+                                $lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));
                             } else {
-                                $similar .=
-                                    '<h3><span class="LC_warning">'.
-                                    &mt('Essay is [_1]% similar to an essay by [_2] in an unknown course',
-                                        $osim,
-                                        &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')').
-                                    '</span></h3>';
+                                $lastsubonly.='<br /><br />'.'<b>'.&mt('Submitted Files:').'</b>'
+                                            .'<br /><span class="LC_warning">';
+                                if(@$files == 1) {
+                                    $lastsubonly .= &mt('Like all files provided by users, this file may contain viruses!');
+                                } else {
+                                    $lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!');
+                                }
+                                $lastsubonly .= '</span>';                         
+                                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" alt="" /> '.$file.'</a>';
+                                }
                             }
-                            $similar .= '<blockquote><i>'.
-                                        &keywords_highlight($oessay).
-                                        '</i></blockquote><hr />';
-		        }
-                    }
-                }
-		my $order=&get_order($partid,$respid,$symb,$uname,$udom,
-                                     undef,$type,$trial,$rndseed);
-                if (($env{'form.lastSub'} eq 'lastonly') ||
-                    ($env{'form.lastSub'} eq 'datesub')  ||
-                    ($env{'form.lastSub'} =~ /^(last|all)$/)) {
-		    my $display_part=&get_display_part($partid,$symb);
-                    $lastsubonly.='<div class="LC_grade_submission_part">'.
-                        '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
-                        ' <span class="LC_internal_info">'.
-                        '('.&mt('Response ID: [_1]',$respid).')'.
-                        '</span>&nbsp; &nbsp;';
-		    my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
-		    if (@$files) {
+			    $lastsubonly.='<br />';
+			}
                         if ($hide eq 'anon') {
-                            $lastsubonly.='<br />'.&mt('[quant,_1,file] uploaded to this anonymous survey',scalar(@{$files}));
+                            $lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>'; 
                         } else {
-                            $lastsubonly.='<br /><br />'.'<b>'.&mt('Submitted Files:').'</b>'
-                                         .'<br /><span class="LC_warning">';
-                            if(@$files == 1) {
-                                $lastsubonly .= &mt('Like all files provided by users, this file may contain viruses!');
-                            } else {
-                                $lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!');
-                            }
-                            $lastsubonly .= '</span>';
-                            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" alt="" /> '.$file.'</a>';
-                            }
+			    $lastsubonly.='<br /><b>'.&mt('Submitted Answer:').' </b>'.
+			        &cleanRecord($subval,$responsetype,$symb,$partid,
+					     $respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed);
                         }
-			$lastsubonly.='<br />';
+			if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
+			$lastsubonly.='</div>';
 		    }
-                    if ($hide eq 'anon') {
-                        $lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>'; 
-                    } else {
-                        $lastsubonly.='<br /><b>'.&mt('Submitted Answer:').' </b>';
-                        if ($draft) {
-                            $lastsubonly.= ' <span class="LC_warning">'.&mt('Draft Copy').'</span>';
-                        }
-                        $subval =
-			    &cleanRecord($subval,$responsetype,$symb,$partid,
-					 $respid,\%record,$order,undef,$uname,$udom,$type,$trial,$rndseed);
-                        if ($responsetype eq 'essay') {
-                            $subval =~ s{\n}{<br />}g;
-                        }
-                        $lastsubonly.=$subval."\n";
-                    }
-                    if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
-		    $lastsubonly.='</div>';
 		}
 	    }
+	    $lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body
 	}
-	$lastsubonly.='</div>'."\n"; # End: LC_grade_submissions_body
-    }
-    $request->print($lastsubonly);
-    if ($env{'form.lastSub'} eq 'datesub') {
+	$request->print($lastsubonly);
+   } elsif ($env{'form.lastSub'} eq 'datesub') {
         my ($parts,$handgrade,$responseType) = &response_type($symb,\$res_error);
 	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
-    }
-    if ($env{'form.lastSub'} =~ /^(last|all)$/) {
-        my $identifier = (&canmodify($usec)? $counter : '');
+    } elsif ($env{'form.lastSub'} =~ /^(last|all)$/) {
 	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
 								 $env{'request.course.id'},
 								 $last,'.submission',
-								 'Apache::grades::keywords_highlight',
-                                                                 $usec,$identifier));
+								 'Apache::grades::keywords_highlight'));
     }
     $request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
 	.$udom.'" />'."\n");
     # return if view submission with no grading option
     if (!&canmodify($usec)) {
-        $request->print('<p><span class="LC_warning">'.&mt('No grading privileges').'</span></p></div>');
-        return;
+	$request->print('<p><span class="LC_warning">'.&mt('No grading privileges').'</span></p></div>');
+	return;
     } else {
 	$request->print('</div>'."\n");
     }
 
-    # grading message center
-
-    if ($env{'form.compmsg'}) {
-        my $result='<div class="LC_Box">'.
-                   '<h3 class="LC_hcell">'.&mt('Send Message').'</h3>'.
-                   '<div class="LC_grade_message_center_body">';
-        my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});
-        my $msgfor = $givenn.' '.$lastname;
-        if (scalar(@$col_fullnames) > 0) {
-            my $lastone = pop(@$col_fullnames);
-            $msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.';
-        }
-        $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
-        $result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
-                 '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".
-	         '&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
-                 ',\''.$msgfor.'\');" target="_self">'.
-                 &mt('Compose message to student'.(scalar(@$col_fullnames) >= 1 ? 's' : '')).'</a><label> ('.
-                 &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'.
-                 ' <img src="'.$request->dir_config('lonIconsURL').
-                 '/mailbkgrd.gif" width="14" height="10" alt="" name="mailicon'.$counter.'" />'."\n".
-                 '<br />&nbsp;('.
-                 &mt('Message will be sent when you click on Save &amp; Next below.').")\n".
-	         '</div></div>';
-        $request->print($result);
+    # essay grading message center
+#    if ($env{'form.handgrade'} eq 'yes') {
+    if (1) {
+	my $result='<div class="LC_grade_message_center">';
+    
+	$result.='<div class="LC_grade_message_center_header">'.
+	    &mt('Send Message').'</div><div class="LC_grade_message_center_body">';
+	my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});
+	my $msgfor = $givenn.' '.$lastname;
+	if (scalar(@$col_fullnames) > 0) {
+	    my $lastone = pop(@$col_fullnames);
+	    $msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.';
+	}
+	$msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
+	$result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
+	    '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
+	$result.='&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
+	    ',\''.$msgfor.'\');" target="_self">'.
+	    &mt('Compose message to student'.(scalar(@$col_fullnames) >= 1 ? 's' : '')).'</a><label> ('.
+	    &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'.
+	    ' <img src="'.$request->dir_config('lonIconsURL').
+	    '/mailbkgrd.gif" width="14" height="10" alt="" name="mailicon'.$counter.'" />'."\n".
+	    '<br />&nbsp;('.
+	    &mt('Message will be sent when you click on Save &amp; Next below.').")\n";
+	$result.='</div></div>';
+	$request->print($result);
     }
 
     my %seen = ();
@@ -2755,6 +2335,8 @@ sub submission {
 	my $part_resp = join('_',@{ $part_response_id });
 	next if ($seen{$partid} > 0);
 	$seen{$partid}++;
+	next if ($$handgrade{$part_resp} ne 'yes' 
+		 && $env{'form.lastSub'} eq 'hdgrade');
 	push(@partlist,$partid);
 	push(@gradePartRespid,$partid.'.'.$respid);
 	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
@@ -2869,45 +2451,17 @@ sub check_collaborators {
 #--- Retrieve the last submission for all the parts
 sub get_last_submission {
     my ($returnhash)=@_;
-    my (@string,$timestamp,$lastgradetime,$lastsubmittime);
+    my (@string,$timestamp,%lasthidden);
     if ($$returnhash{'version'}) {
 	my %lasthash=();
-        my %prevsolved=();
-        my %solved=();
-	my $version;
+	my ($version);
 	for ($version=1;$version<=$$returnhash{'version'};$version++) {
-            my %handgraded = ();
 	    foreach my $key (sort(split(/\:/,
 					$$returnhash{$version.':keys'}))) {
 		$lasthash{$key}=$$returnhash{$version.':'.$key};
-                if ($key =~ /\.([^.]+)\.regrader$/) {
-                    $handgraded{$1} = 1;
-                } elsif ($key =~ /\.portfiles$/) {
-                    if (($$returnhash{$version.':'.$key} ne '') &&
-                        ($$returnhash{$version.':'.$key} !~ /\.\d+\.\w+$/)) {
-                        $lastsubmittime = $$returnhash{$version.':timestamp'};
-                    }
-                } elsif ($key =~ /\.submission$/) {
-                    if ($$returnhash{$version.':'.$key} ne '') {
-                        $lastsubmittime = $$returnhash{$version.':timestamp'};
-                    }
-                } elsif ($key =~ /\.([^.]+)\.solved$/) {
-                    $prevsolved{$1} = $solved{$1};
-                    $solved{$1} = $lasthash{$key};
-                }
-            }
-            foreach my $partid (keys(%handgraded)) {
-                if (($prevsolved{$partid} eq 'ungraded_attempted') &&
-                    (($solved{$partid} eq 'incorrect_by_override') ||
-                     ($solved{$partid} eq 'correct_by_override'))) {
-                    $lastgradetime = $$returnhash{$version.':timestamp'};
-                }
-                if ($solved{$partid} ne '') {
-                    $prevsolved{$partid} = $solved{$partid};
-                }
-            }
-	    $timestamp = 
-		&Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
+		$timestamp = 
+		    &Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
+	    }
 	}
         my (%typeparts,%randombytry);
         my $showsurv = 
@@ -2946,7 +2500,7 @@ sub get_last_submission {
             }
             unless ($hide) {
                 if (@randomize) {
-                    foreach my $id (@randomize) {
+                    foreach my $id (@hidden) {
                         if ($key =~ /^\Q$id\E/) {
                             $hide = 'rand';
                             last;
@@ -2955,17 +2509,16 @@ sub get_last_submission {
                 }
             }
 	    my ($partid,$foo) = split(/submission$/,$key);
-	    my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ? 1 : 0;
-            push(@string, join(':', $key, $hide, $draft, (
-                ref($lasthash{$key}) eq 'ARRAY' ?
-                    join(',', @{$lasthash{$key}}) : $lasthash{$key}) ));
+	    my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
+		'<span class="LC_warning">Draft Copy</span> ' : '';
+	    push(@string, join(':', $key, $hide, $draft.$lasthash{$key}));
 	}
     }
     if (!@string) {
 	$string[0] =
 	    '<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span>';
     }
-    return (\@string,$timestamp,$lastgradetime,$lastsubmittime);
+    return (\@string,\$timestamp);
 }
 
 #--- High light keywords, with style choosen by user.
@@ -2986,20 +2539,16 @@ sub keywords_highlight {
 sub show_previous_task_version {
     my ($request,$symb) = @_;
     if ($symb eq '') {
-        $request->print(
-            '<span class="LC_error">'.
-            &mt('Unable to handle ambiguous references.').
-            '</span>');
+        $request->print("Unable to handle ambiguous references.");
+
         return '';
     }
     my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});
     my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
     if (!&canview($usec)) {
-        $request->print('<span class="LC_warning">'.
-                        &mt('Unable to view previous version for requested student.').
-                        ' '.&mt('([_1] in section [_2] in course id [_3])',
-                                $uname.':'.$udom,$usec,$env{'request.course.id'}).
-                        '</span>');
+        $request->print('<span class="LC_warning">Unable to view previous version for requested student.('.
+                        $uname.':'.$udom.' in section '.$usec.' in course id '.
+                        $env{'request.course.id'}.')</span>');
         return;
     }
     my $mode = 'both';
@@ -3171,49 +2720,21 @@ sub processHandGrade {
     my $ntstu  = $env{'form.NTSTU'};
     my $cdom   = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum   = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my ($res_error,%queueable);
-    my ($partlist,$handgrade,$responseType,$numresp,$numessay) = &response_type($symb,\$res_error);
-    if ($res_error) {
-        $request->print(&navmap_errormsg());
-        return;
-    } else {
-        foreach my $part (@{$partlist}) {
-            if (ref($responseType->{$part}) eq 'HASH') {
-                foreach my $id (keys(%{$responseType->{$part}})) {
-                    if (($responseType->{$part}->{$id} eq 'essay') ||
-                        (lc($handgrade->{$part.'_'.$id}) eq 'yes')) {
-                        $queueable{$part} = 1;
-                        last;
-                    }
-                }
-            }
-        }
-    }
 
     if ($button eq 'Save & Next') {
 	my $ctr = 0;
 	while ($ctr < $ngrade) {
 	    my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});
-	    my ($errorflag,$pts,$wgt,$numhidden) = 
-                &saveHandGrade($request,$symb,$uname,$udom,$ctr,undef,undef,\%queueable);
+	    my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$symb,$uname,$udom,$ctr);
 	    if ($errorflag eq 'no_score') {
 		$ctr++;
 		next;
 	    }
 	    if ($errorflag eq 'not_allowed') {
-                $request->print(
-                    '<span class="LC_error">'
-                   .&mt('Not allowed to modify grades for [_1]',"$uname:$udom")
-                   .'</span>');
+		$request->print("<span class=\"LC_warning\">Not allowed to modify grades for $uname:$udom</span>");
 		$ctr++;
 		next;
 	    }
-            if ($numhidden) {
-                $request->print(
-                    '<span class="LC_info">'
-                   .&mt('For [_1]: [quant,_2,transaction] hidden',"$uname:$udom",$numhidden)
-                   .'</span><br />');
-            }
 	    my $includemsg = $env{'form.includemsg'.$ctr};
 	    my ($subject,$message,$msgstatus) = ('','','');
 	    my $restitle = &Apache::lonnet::gettitle($symb);
@@ -3250,7 +2771,7 @@ sub processHandGrade {
 		    foreach my $collaborator (@collaborators) {
 			my ($errorflag,$pts,$wgt) = 
 			    &saveHandGrade($request,$symb,$collaborator,$udom,$ctr,
-					   $env{'form.unamedom'.$ctr},$part,\%queueable);
+					   $env{'form.unamedom'.$ctr},$part);
 			if ($errorflag eq 'not_allowed') {
 			    $request->print("<span class=\"LC_error\">".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom")."</span>");
 			    next;
@@ -3272,12 +2793,13 @@ sub processHandGrade {
 	}
     }
 
-    my %keyhash = ();
-    if ($numessay) {
+#    if ($env{'form.handgrade'} eq 'yes') {
+    if (1) {
 	# Keywords sorted in alphabatical order
 	my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
+	my %keyhash = ();
 	$env{'form.keywords'}           =~ s/,\s{0,}|\s+/ /g;
-	$env{'form.keywords'}           =~ s/^\s+|\s+$//g;
+	$env{'form.keywords'}           =~ s/^\s+|\s+$//;
 	my (@keywords) = sort(split(/\s+/,$env{'form.keywords'}));
 	$env{'form.keywords'} = join(' ',@keywords);
 	$keyhash{$symb.'_keywords'}     = $env{'form.keywords'};
@@ -3285,9 +2807,7 @@ sub processHandGrade {
 	$keyhash{$loginuser.'_kwclr'}   = $env{'form.kwclr'};
 	$keyhash{$loginuser.'_kwsize'}  = $env{'form.kwsize'};
 	$keyhash{$loginuser.'_kwstyle'} = $env{'form.kwstyle'};
-    }
 
-    if ($env{'form.compmsg'}) {
 	# message center - Order of message gets changed. Blank line is eliminated.
 	# New messages are saved in env for the next student.
 	# All messages are saved in nohist_handgrade.db
@@ -3310,12 +2830,9 @@ sub processHandGrade {
 	}
 	$env{'form.savemsgN'} = --$idx;
 	$keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'};
-    }
-    if (($numessay) || ($env{'form.compmsg'})) {
 	my $putresult = &Apache::lonnet::put
 	    ('nohist_handgrade',\%keyhash,$cdom,$cnum);
     }
-
     # Called by Save & Refresh from Highlight Attribute Window
     my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
     if ($env{'form.refresh'} eq 'on') {
@@ -3355,6 +2872,7 @@ sub processHandGrade {
 		 }
 		 return $a cmp $b;
 	     } (keys(%$fullname))) {
+# FIXME: this is fishy, looks like the button label
 	if ($nextflg == 1 && $button =~ /Next$/) {
 	    push(@parsedlist,$item);
 	}
@@ -3365,7 +2883,14 @@ sub processHandGrade {
 	}
     }
     $ctr = 0;
+# FIXME: this is fishy, looks like the button label
     @parsedlist = reverse @parsedlist if ($button eq 'Previous');
+    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);
@@ -3415,7 +2940,7 @@ sub processHandGrade {
 	$ctr++;
     }
     if ($total < 0) {
-        my $the_end.='<p>'.&mt('[_1]Message:[_2] No more students for this section or class.','<b>','</b>').'</p>'."\n";
+	my $the_end.='<p>'.&mt('[_1]Message:[_2] No more students for this section or class.','<b>','</b>').'</p>'."\n";
 	$request->print($the_end);
     }
     return '';
@@ -3423,7 +2948,7 @@ sub processHandGrade {
 
 #---- Save the score and award for each student, if changed
 sub saveHandGrade {
-    my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part,$queueable) = @_;
+    my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
     my @version_parts;
     my $usec = &Apache::lonnet::getsection($domain,$stuname,
 					   $env{'request.course.id'});
@@ -3431,14 +2956,9 @@ sub saveHandGrade {
     my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);
     my @parts_graded;
     my %newrecord  = ();
-    my ($pts,$wgt,$totchg) = ('','',0);
+    my ($pts,$wgt) = ('','');
     my %aggregate = ();
     my $aggregateflag = 0;
-    if ($env{'form.HIDE'.$newflg}) {
-        my ($version,$parts) = split(/:/,$env{'form.HIDE'.$newflg},2);
-        my $numchgs = &makehidden($version,$parts,\%record,$symb,$domain,$stuname,1);
-        $totchg += $numchgs;
-    }
     my @parts = split(/:/,$env{'form.partlist'.$newflg});
     foreach my $new_part (@parts) {
 	#collaborator ($submi may vary for different parts
@@ -3535,47 +3055,17 @@ sub saveHandGrade {
 	&Apache::lonnet::cstore(\%newrecord,$symb,
 				$env{'request.course.id'},$domain,$stuname);
 	&check_and_remove_from_queue(\@parts,\%record,\%newrecord,$symb,
-				     $cdom,$cnum,$domain,$stuname,$queueable);
+				     $cdom,$cnum,$domain,$stuname);
     }
     if ($aggregateflag) {
         &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
 			      $cdom,$cnum);
     }
-    return ('',$pts,$wgt,$totchg);
-}
-
-sub makehidden {
-    my ($version,$parts,$record,$symb,$domain,$stuname,$tolog) = @_;
-    return unless (ref($record) eq 'HASH');
-    my %modified;
-    my $numchanged = 0;
-    if (exists($record->{$version.':keys'})) {
-        my $partsregexp = $parts;
-        $partsregexp =~ s/,/|/g;
-        foreach my $key (split(/\:/,$record->{$version.':keys'})) {
-            if ($key =~ /^resource\.(?:$partsregexp)\.([^\.]+)$/) {
-                 my $item = $1;
-                 unless (($item eq 'solved') || ($item =~ /^award(|msg|ed)$/)) {
-                     $modified{$key} = $record->{$version.':'.$key};
-                 }
-            } elsif ($key =~ m{^(resource\.(?:$partsregexp)\.[^\.]+\.)(.+)$}) {
-                $modified{$1.'hidden'.$2} = $record->{$version.':'.$key};
-            } elsif ($key =~ /^(ip|timestamp|host)$/) {
-                $modified{$key} = $record->{$version.':'.$key};
-            }
-        }
-        if (keys(%modified)) {
-            if (&Apache::lonnet::putstore($env{'request.course.id'},$symb,$version,\%modified,
-                                          $domain,$stuname,$tolog) eq 'ok') {
-                $numchanged ++;
-            }
-        }
-    }
-    return $numchanged;
+    return ('',$pts,$wgt);
 }
 
 sub check_and_remove_from_queue {
-    my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname,$queueable) = @_;
+    my ($parts,$record,$newrecord,$symb,$cdom,$cnum,$domain,$stuname) = @_;
     my @ungraded_parts;
     foreach my $part (@{$parts}) {
 	if (    $record->{   'resource.'.$part.'.awarded'} eq ''
@@ -3583,9 +3073,7 @@ sub check_and_remove_from_queue {
 	     && $newrecord->{'resource.'.$part.'.awarded'} eq ''
 	     && $newrecord->{'resource.'.$part.'.solved' } ne 'excused'
 		) {
-            if ($queueable->{$part}) {
-	        push(@ungraded_parts, $part);
-            }
+	    push(@ungraded_parts, $part);
 	}
     }
     if ( !@ungraded_parts ) {
@@ -3611,8 +3099,8 @@ sub handback_files {
 	my $part_resp = join('_',@{ $part_response_id });
         if (($env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'} =~ /^\d+$/) & ($new_part eq $part_id)) {
             for (my $counter=1; $counter<=$env{'form.'.$newflg.'_'.$part_resp.'_countreturndoc'}; $counter++) {
-                # if multiple files are uploaded names will be 'returndoc2','returndoc3'
-		if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) {
+                # if multiple files are uploaded names will be 'returndoc2','returndoc3' 
+                if ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter}) {
                     my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$counter.'.filename'};
                     my ($directory,$answer_file) = 
                         ($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter} =~ /^(.*?)([^\/]*)$/);
@@ -3620,7 +3108,7 @@ sub handback_files {
 		        &file_name_version_ext($answer_file);
 		    my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
                     my $getpropath = 1;
-                    my ($dir_list,$listerror) =
+                    my ($dir_list,$listerror) = 
                         &Apache::lonnet::dirlist($portfolio_root.$portfolio_path,
                                                  $domain,$stuname,$getpropath);
 		    my $version = &get_next_version($answer_name,$answer_ext,$dir_list);
@@ -3641,8 +3129,7 @@ sub handback_files {
 			    $$newrecord{"resource.$new_part.$resp_id.handback"}.=',';
 			}
                         $$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name;
-			$file_msg.='<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />";
-
+			$file_msg.= '<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />";
                     }
                     $request->print('<br />'.&mt('[_1] will be the uploaded filename [_2]','<span class="LC_info">'.$fname.'</span>','<span class="LC_filename">'.$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter}.'</span>'));
                 }
@@ -3653,7 +3140,7 @@ sub handback_files {
         $request->print('<br />');
         my @what = ($symb,$env{'request.course.id'},'handback');
         &Apache::lonnet::mark_as_readonly($domain,$stuname,\@handedback,\@what);
-        my $user_lh = &Apache::loncommon::user_lang($stuname,$domain,$env{'request.course.id'});
+        my $user_lh = &Apache::loncommon::user_lang($stuname,$domain,$env{'request.course.id'});    
         my ($subject,$message);
         if (scalar(@handedback) == 1) {
             $subject = &mt_user($user_lh,'File Handed Back by Instructor');
@@ -3784,8 +3271,8 @@ sub version_portfiles {
                 my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);
 		my ($answer_name,$answer_ver,$answer_ext) =
 		    &file_name_version_ext($answer_file);
-                my $getpropath = 1;
-                my ($dir_list,$listerror) =
+                my $getpropath = 1;    
+                my ($dir_list,$listerror) = 
                     &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,
                                              $stu_name,$getpropath);
                 my $version = &get_next_version($answer_name,$answer_ext,$dir_list);
@@ -3814,14 +3301,14 @@ sub get_next_version {
 	        &file_name_version_ext($file);
             if (($file_name eq $answer_name) && 
 	        ($file_ext eq $answer_ext)) {
-                # gets here if filename and extension match, 
-                # regardless of version
+                     # gets here if filename and extension match, 
+                     # regardless of version
                 if ($file_version ne '') {
                     # a versioned file is found  so save it for later
                     if ($file_version > $version) {
 		        $version = $file_version;
-                    }
-	        }
+	            }
+                }
             }
         }
     }
@@ -3871,7 +3358,6 @@ sub viewgrades_js {
     my ($request) = shift;
 
     my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
-    &js_escape(\$alertmsg);
     $request->print(&Apache::lonhtmlcommon::scripttag(<<VIEWJAVASCRIPT));
    function writePoint(partid,weight,point) {
 	var radioButton = document.classgrade["RADVAL_"+partid];
@@ -4061,86 +3547,19 @@ sub viewgrades {
 	&build_section_inputs().
 	'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".
 
-    #retrieve selected groups
-    my (@groups,$group_display);
-    @groups = &Apache::loncommon::get_env_multiple('form.group');
-    if (grep(/^all$/,@groups)) {
-        @groups = ('all');
-    } elsif (grep(/^none$/,@groups)) {
-        @groups = ('none');
-    } elsif (@groups > 0) {
-        $group_display = join(', ',@groups);
-    }
-
-    my ($common_header,$specific_header,@sections,$section_display);
-    if ($env{'request.course.sec'} ne '') {
-        @sections = ($env{'request.course.sec'});
-    } else {
-        @sections = &Apache::loncommon::get_env_multiple('form.section');
-    }
-
-# Check if Save button should be usable
-    my $disabled = ' disabled="disabled"';
-    if ($perm{'mgr'}) {
-        if (grep(/^all$/,@sections)) {
-            undef($disabled);
-        } else {
-            foreach my $sec (@sections) {
-                if (&canmodify($sec)) {
-                    undef($disabled);
-                    last;
-                }
-            }
-        }
-    }
-    if (grep(/^all$/,@sections)) {
-        @sections = ('all');
-        if ($group_display) {
-            $common_header = &mt('Assign Common Grade to Students in Group(s) [_1]',$group_display);
-            $specific_header = &mt('Assign Grade to Specific Students in Group(s) [_1]',$group_display);
-        } elsif (grep(/^none$/,@groups)) {
-            $common_header = &mt('Assign Common Grade to Students not assigned to any groups');
-            $specific_header = &mt('Assign Grade to Specific Students not assigned to any groups');
-        } else {
-            $common_header = &mt('Assign Common Grade to Class');
-            $specific_header = &mt('Assign Grade to Specific Students in Class');
-        }
-    } elsif (grep(/^none$/,@sections)) {
-        @sections = ('none');
-        if ($group_display) {
-            $common_header = &mt('Assign Common Grade to Students in no Section and in Group(s) [_1]',$group_display);
-            $specific_header = &mt('Assign Grade to Specific Students in no Section and in Group(s)',$group_display);
-        } elsif (grep(/^none$/,@groups)) {
-            $common_header = &mt('Assign Common Grade to Students in no Section and in no Group');
-            $specific_header = &mt('Assign Grade to Specific Students in no Section and in no Group');
-        } else {
-            $common_header = &mt('Assign Common Grade to Students in no Section');
-            $specific_header = &mt('Assign Grade to Specific Students in no Section');
-        }
-    } else {
-        $section_display = join (", ",@sections);
-        if ($group_display) {
-            $common_header = &mt('Assign Common Grade to Students in Section(s) [_1], and in Group(s) [_2]',
-                                 $section_display,$group_display);
-            $specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1], and in Group(s) [_2]',
-                                   $section_display,$group_display);
-        } elsif (grep(/^none$/,@groups)) {
-            $common_header = &mt('Assign Common Grade to Students in Section(s) [_1] and no Group',$section_display);
-            $specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1] and no Group',$section_display);
-        } else {
-            $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);
-        }
-    }
-    my %submit_types = &substatus_options();
-    my $submission_status = $submit_types{$env{'form.submitonly'}};
-
-    if ($env{'form.submitonly'} eq 'all') {
-        $result.= '<h3>'.$common_header.'</h3>';
-    } else {
-        $result.= '<h3>'.$common_header.'&nbsp;'.&mt('(submission status: "[_1]")',$submission_status).'</h3>'; 
+    my ($common_header,$specific_header);
+    if ($env{'form.section'} eq 'all') {
+	$common_header = &mt('Assign Common Grade to Class');
+        $specific_header = &mt('Assign Grade to Specific Students in Class');
+    } elsif ($env{'form.section'} eq 'none') {
+        $common_header = &mt('Assign Common Grade to Students in no Section');
+	$specific_header = &mt('Assign Grade to Specific Students in no Section');
+    } else {
+        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 .= &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 $res_error;
@@ -4157,6 +3576,7 @@ sub viewgrades {
 	my $part_resp = join('_',@{ $part_response_id });
 	next if $seen{$partid};
 	$seen{$partid}++;
+	my $handgrade=$$handgrade{$part_resp};
 	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
 	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
 
@@ -4175,10 +3595,10 @@ sub viewgrades {
 	    $partid.'" size="4" '.'onchange="javascript:writePoint(\''.
 		$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.
 	    $weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n";
-	$line.= '<td><b>'.&mt('Grade Status').':</b>'.
-                '<select name="SELVAL_'.$partid.'" '.
-	        'onchange="javascript:writeRadText(\''.$partid.'\','.
-		$weight{$partid}.')"> '.
+        $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>'.
 	    '<option value="reset status">'.&mt('reset status').'</option>'.
@@ -4202,12 +3622,8 @@ sub viewgrades {
 
     #table listing all the students in a section/class
     #header of table
-    if ($env{'form.submitonly'} eq 'all') { 
-        $result.= '<h3>'.$specific_header.'</h3>';
-    } else {
-        $result.= '<h3>'.$specific_header.'&nbsp;'.&mt('(submission status: "[_1]")',$submission_status).'</h3>';
-    }
-    $result.= &Apache::loncommon::start_data_table().
+    $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";
@@ -4231,8 +3647,8 @@ sub viewgrades {
 	my $display_part=&get_display_part($partid,$symb);
 	if ($display =~ /^Partial Credit Factor/) {
 	    $result.='<th>'.
-                &mt('Score Part: [_1][_2](weight = [_3])',
-                    $display_part,'<br />',$weight{$partid}).'</th>'."\n";
+		&mt('Score Part: [_1][_2](weight = [_3])',
+		    $display_part,'<br />',$weight{$partid}).'</th>'."\n";
 	    next;
 	    
 	} else {
@@ -4253,7 +3669,7 @@ sub viewgrades {
 
     #get info for each student
     #list all the students - with points and grade status
-    my (undef,undef,$fullname) = &getclasslist(\@sections,'1',\@groups);
+    my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
     my $ctr = 0;
     foreach (sort 
 	     {
@@ -4262,142 +3678,35 @@ sub viewgrades {
 		 }
 		 return $a cmp $b;
 	     } (keys(%$fullname))) {
+	$ctr++;
 	$result.=&viewstudentgrade($symb,$env{'request.course.id'},
-				   $_,$$fullname{$_},\@parts,\%weight,\$ctr,\%last_resets);
+				   $_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
     }
     $result.=&Apache::loncommon::end_data_table();
     $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
-    $result.='<input type="button" value="'.&mt('Save').'"'.$disabled.' '.
+    $result.='<input type="button" value="'.&mt('Save').'" '.
 	'onclick="javascript:submit();" target="_self" /></form>'."\n";
-    if ($ctr == 0) {
+    if (scalar(%$fullname) eq 0) {
+	my $colspan=3+scalar(@parts);
+	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
         my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
-        $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>'.
-                '<span class="LC_warning">';
-        if ($env{'form.submitonly'} eq 'all') {
-            if (grep(/^all$/,@sections)) {
-                if (grep(/^all$/,@groups)) {
-                    $result .= &mt('There are no students with enrollment status [_1] to modify or grade.',
-                                   $stu_status);
-                } elsif (grep(/^none$/,@groups)) {
-                    $result .= &mt('There are no students with no group assigned and with enrollment status [_1] to modify or grade.',
-                                   $stu_status);
-                } else {
-                    $result .= &mt('There are no students in group(s) [_1] with enrollment status [_2] to modify or grade.',
-                                   $group_display,$stu_status);
-                }
-            } elsif (grep(/^none$/,@sections)) {
-                if (grep(/^all$/,@groups)) {
-                    $result .= &mt('There are no students in no section with enrollment status [_1] to modify or grade.',
-                                   $stu_status);
-                } elsif (grep(/^none$/,@groups)) {
-                    $result .= &mt('There are no students in no section and no group with enrollment status [_1] to modify or grade.',
-                                   $stu_status);
-                } else {
-                    $result .= &mt('There are no students in no section in group(s) [_1] with enrollment status [_2] to modify or grade.',
-                                   $group_display,$stu_status);
-                }
-            } else {
-                if (grep(/^all$/,@groups)) {
-                    $result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',
-                                   $section_display,$stu_status);
-                } elsif (grep(/^none$/,@groups)) {
-                    $result .= &mt('There are no students in section(s) [_1] and no group with enrollment status [_2] to modify or grade.',
-                                   $section_display,$stu_status);
-                } else {
-                    $result .= &mt('There are no students in section(s) [_1] and group(s) [_2] with enrollment status [_3] to modify or grade.',
-                                   $section_display,$group_display,$stu_status);
-                }
-            }
-        } else {
-            if (grep(/^all$/,@sections)) {
-                if (grep(/^all$/,@groups)) {
-                    $result .= &mt('There are no students with enrollment status [_1] and submission status "[_2]" to modify or grade.',
-                                   $stu_status,$submission_status);
-                } elsif (grep(/^none$/,@groups)) {
-                    $result .= &mt('There are no students with no group assigned with enrollment status [_1] and submission status "[_2]" to modify or grade.',
-                                   $stu_status,$submission_status);
-                } else {
-                    $result .= &mt('There are no students in group(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',
-                                   $group_display,$stu_status,$submission_status);
-                }
-            } elsif (grep(/^none$/,@sections)) {
-                if (grep(/^all$/,@groups)) {
-                    $result .= &mt('There are no students in no section with enrollment status [_1] and submission status "[_2]" to modify or grade.',
-                                   $stu_status,$submission_status);
-                } elsif (grep(/^none$/,@groups)) {
-                    $result .= &mt('There are no students in no section and no group with enrollment status [_1] and submission status "[_2]" to modify or grade.',
-                                   $stu_status,$submission_status);
-                } else {
-                    $result .= &mt('There are no students in no section in group(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',
-                                   $group_display,$stu_status,$submission_status);
-                }
-            } else {
-                if (grep(/^all$/,@groups)) {
-                    $result .= &mt('There are no students in section(s) [_1] with enrollment status [_2] and submission status "[_3]" to modify or grade.',
-                                   $section_display,$stu_status,$submission_status);
-                } elsif (grep(/^none$/,@groups)) {
-                    $result .= &mt('There are no students in section(s) [_1] and no group with enrollment status [_2] and submission status "[_3]" to modify or grade.',
-                                   $section_display,$stu_status,$submission_status);
-                } else {
-                    $result .= &mt('There are no students in section(s) [_1] and group(s) [_2] with enrollment status [_3] and submission status "[_4]" to modify or grade.',
-                                   $section_display,$group_display,$stu_status,$submission_status);
-                }
-            }
-	}
-	$result .= '</span><br />';
+	$result='<span class="LC_warning">'.
+	    &mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade.',
+	        $section_display, $stu_status).
+	    '</span>';
     }
     return $result;
 }
 
-#--- call by previous routine to display each student who satisfies submission filter.
+#--- call by previous routine to display each student
 sub viewstudentgrade {
     my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;
     my ($uname,$udom) = split(/:/,$student);
     my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
-    my $submitonly = $env{'form.submitonly'};
-    unless (($submitonly eq 'all') || ($submitonly eq 'queued')) {
-        my %partstatus = ();
-        if (ref($parts) eq 'ARRAY') {
-            foreach my $apart (@{$parts}) {
-                my ($part,$type) = &split_part_type($apart);
-                my ($status,undef) = split(/_/,$record{"resource.$part.solved"},2);
-                $status = 'nothing' if ($status eq '');
-                $partstatus{$part}      = $status;
-                my $subkey = "resource.$part.submitted_by";
-                $partstatus{$subkey} = $record{$subkey} if ($record{$subkey} ne '');
-            }
-            my $submitted = 0;
-            my $graded = 0;
-            my $incorrect = 0;
-            foreach my $key (keys(%partstatus)) {
-                $submitted = 1 if ($partstatus{$key} ne 'nothing');
-                $graded = 1 if ($partstatus{$key} =~ /^ungraded/);
-                $incorrect = 1 if ($partstatus{$key} =~ /^incorrect/);
-
-                my $partid = (split(/\./,$key))[1];
-                if ($partstatus{'resource.'.$partid.'.'.$key.'.submitted_by'} ne '') {
-                    $submitted = 0;
-                }
-            }
-            return if (!$submitted && ($submitonly eq 'yes' ||
-                                       $submitonly eq 'incorrect' ||
-                                       $submitonly eq 'graded'));
-            return if (!$graded && ($submitonly eq 'graded'));
-            return if (!$incorrect && $submitonly eq 'incorrect');
-        }
-    }
-    if ($submitonly eq 'queued') {
-        my ($cdom,$cnum) = split(/_/,$courseid);
-        my %queue_status =
-            &Apache::bridgetask::get_student_status($symb,$cdom,$cnum,
-                                                    $udom,$uname);
-        return if (!defined($queue_status{'gradingqueue'}));
-    }
-    $$ctr++;
-    my %aggregates = ();
+    my %aggregates = (); 
     my $result=&Apache::loncommon::start_data_table_row().'<td align="right">'.
-	'<input type="hidden" name="ctr'.($$ctr-1).'" value="'.$student.'" />'.
-	"\n".$$ctr.'&nbsp;</td><td>&nbsp;'.
+	'<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'.
+	"\n".$ctr.'&nbsp;</td><td>&nbsp;'.
 	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
 	'\');" target="_self">'.$fullname.'</a> '.
 	'<span class="LC_internal_info">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</span></td>'."\n";
@@ -4461,7 +3770,7 @@ sub editgrades {
 
     my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
     my $title='<h2>'.&mt('Current Grade Status').'</h2>';
-    $title.='<h4><b>'.&mt('Section:').'</b> '.$section_display.'</h4>'."\n";
+    $title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n";
 
     my $result= &Apache::loncommon::start_data_table().
 	&Apache::loncommon::start_data_table_header_row().
@@ -4495,7 +3804,6 @@ sub editgrades {
 	$ctr++;
     }
     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
-    my $totcolspan = 0;
     foreach my $partid (@partid) {
 	$header .= '<th align="center">'.&mt('Old Score').'</th>'.
 	    '<th align="center">'.&mt('New Score').'</th>';
@@ -4512,7 +3820,6 @@ sub editgrades {
 		'<th align="center">'.&mt('New').' '.$display.'</th>';
 	    $columns{$partid}+=2;
 	}
-        $totcolspan += $columns{$partid};
     }
     foreach my $partid (@partid) {
 	my $display_part=&get_display_part($partid,$symb);
@@ -4527,22 +3834,21 @@ sub editgrades {
 	&Apache::loncommon::end_data_table_header_row();
     my @noupdate;
     my ($updateCtr,$noupdateCtr) = (1,1);
-    my ($got_types,%queueable);
     for ($i=0; $i<$env{'form.total'}; $i++) {
+	my $line;
 	my $user = $env{'form.ctr'.$i};
 	my ($uname,$udom)=split(/:/,$user);
 	my %newrecord;
 	my $updateflag = 0;
-        my $usec=$classlist->{"$uname:$udom"}[5];
-        my $canmodify = &canmodify($usec);
-        my $line = '<td'.($canmodify?'':' colspan="2"').'>'.
-                   &nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
-        if (!$canmodify) {
-            push(@noupdate,
-                 $line."<td colspan=\"$totcolspan\"><span class=\"LC_warning\">".
-                 &mt('Not allowed to modify student')."</span></td>");
-            next;
-        }
+	$line .= '<td>'.&nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
+	my $usec=$classlist->{"$uname:$udom"}[5];
+	if (!&canmodify($usec)) {
+	    my $numcols=scalar(@partid)*4+2;
+	    push(@noupdate,
+		 $line."<td colspan=\"$numcols\"><span class=\"LC_warning\">".
+		 &mt('Not allowed to modify student')."</span></td></tr>");
+	    next;
+	}
         my %aggregate = ();
         my $aggregateflag = 0;
 	$user=~s/:/_/; # colon doen't work in javascript for names
@@ -4627,32 +3933,12 @@ sub editgrades {
 					     $udom,$uname);
 		my $all_graded = 1;
 		my $none_graded = 1;
-                unless ($got_types) {
-                    my $error;
-                    my ($plist,$handgrd,$resptype) = &response_type($symb,\$error);
-                    unless ($error) {
-                        foreach my $part (@parts) {
-                            if (ref($resptype->{$part}) eq 'HASH') {
-                                foreach my $id (keys(%{$resptype->{$part}})) {
-                                    if (($resptype->{$part}->{$id} eq 'essay') ||
-                                        (lc($handgrd->{$part.'_'.$id}) eq 'yes')) {
-                                        $queueable{$part} = 1;
-                                        last;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    $got_types = 1;
-                }
 		foreach my $part (@parts) {
-                    if ($queueable{$part}) {
-		        if ( $record{'resource.'.$part.'.awarded'} eq '' ) {
-			    $all_graded = 0;
-		        } else {
-			    $none_graded = 0;
-		        }
-                    }
+		    if ( $record{'resource.'.$part.'.awarded'} eq '' ) {
+			$all_graded = 0;
+		    } else {
+			$none_graded = 0;
+		    }
 		}
 
 		if ($all_graded || $none_graded) {
@@ -4677,7 +3963,8 @@ sub editgrades {
         }
     }
     if (@noupdate) {
-        my $numcols=$totcolspan+2;
+#	my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
+	my $numcols=scalar(@partid)*4+2;
 	$result .= &Apache::loncommon::start_data_table_row('LC_empty_row').
 	    '<td align="center" colspan="'.$numcols.'">'.
 	    &mt('No Changes Occurred For the Students Below').
@@ -4720,8 +4007,6 @@ sub split_part_type {
 sub csvupload_javascript_reverse_associate {
     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');
-  &js_escape(\$error1);
-  &js_escape(\$error2);
   return(<<ENDPICK);
   function verify(vf) {
     var foundsomething=0;
@@ -4762,8 +4047,6 @@ ENDPICK
 sub csvupload_javascript_forward_associate {
     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');
-  &js_escape(\$error1);
-  &js_escape(\$error2);
   return(<<ENDPICK);
   function verify(vf) {
     var foundsomething=0;
@@ -4807,8 +4090,6 @@ sub csvuploadmap_header {
 	$javascript=&csvupload_javascript_forward_associate();
     }
 
-    my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
-    my $ignore=&mt('Ignore First Line');
     $symb = &Apache::lonenc::check_encrypt($symb);
     $request->print('<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">'.
                     &mt('Total number of records found in file: [_1]',$distotal).'<hr />'.
@@ -4817,7 +4098,6 @@ sub csvuploadmap_header {
     $request->print(<<ENDPICK);
 <br />
 <input type="button" value="$reverse" 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" />
 <input type="hidden" name="datatoken"  value="$datatoken" />
@@ -4863,19 +4143,17 @@ sub csvupload_fields {
 
 sub csvuploadmap_footer {
     my ($request,$i,$keyfields) =@_;
-    my $buttontext = &mt('Assign Grades');
     $request->print(<<ENDPICK);
 </table>
 <input type="hidden" name="nfields" value="$i" />
 <input type="hidden" name="keyfields" value="$keyfields" />
-<input type="button" onclick="javascript:verify(this.form)" value="$buttontext" /><br />
+<input type="button" onclick="javascript:verify(this.form)" value="Assign Grades" /><br />
 </form>
 ENDPICK
 }
 
 sub checkforfile_js {
     my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
-    &js_escape(\$alertmsg);
     my $result = &Apache::lonhtmlcommon::scripttag(<<CSVFORMJS);
     function checkUpload(formname) {
 	if (formname.upfile.value == "") {
@@ -4907,12 +4185,11 @@ sub upcsvScores_form {
 <input type="hidden" name="command" value="csvuploadmap" />
 $upfile_select
 <br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
-<label><input type="checkbox" name="noFirstLine" />$ignore</label>
 </form>
 ENDUPFORM
     $result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
                            &mt("How do I create a CSV file from a spreadsheet")).
-            '</td>'.
+             '</td>'.
             &Apache::loncommon::end_data_table_row().
             &Apache::loncommon::end_data_table();
     return $result;
@@ -4920,20 +4197,17 @@ ENDUPFORM
 
 
 sub csvuploadmap {
-    my ($request,$symb) = @_;
+    my ($request,$symb)= @_;
     if (!$symb) {return '';}
 
     my $datatoken;
     if (!$env{'form.datatoken'}) {
 	$datatoken=&Apache::loncommon::upfile_store($request);
     } else {
-        $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
-        if ($datatoken ne '') { 
-	    &Apache::loncommon::load_tmp_file($request,$datatoken);
-        }
+	$datatoken=$env{'form.datatoken'};
+	&Apache::loncommon::load_tmp_file($request);
     }
     my @records=&Apache::loncommon::upfile_record_sep();
-    if ($env{'form.noFirstLine'}) { shift(@records); }
     &csvuploadmap_header($request,$symb,$datatoken,$#records+1);
     my ($i,$keyfields);
     if (@records) {
@@ -4970,8 +4244,6 @@ sub csvuploadmap {
 sub csvuploadoptions {
     my ($request,$symb)= @_;
     my $overwrite=&mt('Overwrite any existing score');
-    my $checked=(($env{'form.noFirstLine'})?'1':'0');
-    my $ignore=&mt('Ignore First Line');
     $request->print(<<ENDPICK);
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
 <input type="hidden" name="command"    value="csvuploadassign" />
@@ -4985,7 +4257,7 @@ ENDPICK
     my %fields=&get_fields();
     if (!defined($fields{'domain'})) {
 	my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain');
-        $request->print("\n<p>".&mt('Users are in domain: [_1]',$domform)."</p>\n");
+	$request->print("\n<p>".&mt('Users are in domain: [_1]',$domform)."</p>\n");
     }
     foreach my $key (sort(keys(%env))) {
 	if ($key !~ /^form\.(.*)$/) { next; }
@@ -4996,7 +4268,7 @@ ENDPICK
     }
     # FIXME do a check for any duplicated user ids...
     # FIXME do a check for any invalid user ids?...
-    $request->print('<input type="submit" value="'.&mt('Assign Grades').'" /><br />
+    $request->print('<input type="submit" value="Assign Grades" /><br />
 <hr /></form>'."\n");
     return '';
 }
@@ -5019,15 +4291,11 @@ sub get_fields {
 }
 
 sub csvuploadassign {
-    my ($request,$symb) = @_;
+    my ($request,$symb)= @_;
     if (!$symb) {return '';}
     my $error_msg = '';
-    my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'});
-    if ($datatoken ne '') {
-        &Apache::loncommon::load_tmp_file($request,$datatoken);
-    }
+    &Apache::loncommon::load_tmp_file($request);
     my @gradedata = &Apache::loncommon::upfile_record_sep();
-    if ($env{'form.noFirstLine'}) { shift(@gradedata); }
     my %fields=&get_fields();
     my $courseid=$env{'request.course.id'};
     my ($classlist) = &getclasslist('all',0);
@@ -5083,7 +4351,7 @@ sub csvuploadassign {
                     my $award=($pcr == 0) ? 'incorrect_by_override'
                                           : 'correct_by_override';
                     if ($pcr>1) {
-                        push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain"));
+                       push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain"));
                     }
                     $grades{"resource.$part.awarded"}=$pcr;
                     $grades{"resource.$part.solved"}=$award;
@@ -5104,7 +4372,7 @@ sub csvuploadassign {
 		$grades{$store_key}=$entries{$fields{$dest}};
 	    }
 	}
-	if (! %grades) {
+	if (! %grades) { 
            push(@skipped,&mt("[_1]: no data to save","$username:$domain")); 
         } else {
 	   $grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
@@ -5119,13 +4387,13 @@ sub csvuploadassign {
                                              $env{'course.'.$env{'request.course.id'}.'.domain'},
                                              $env{'course.'.$env{'request.course.id'}.'.num'},
                                              $domain,$username);
-	   } else {
+              $countdone++;
+           } 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 />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0));
@@ -5155,7 +4423,6 @@ sub pickStudentPage {
     my ($request,$symb) = @_;
 
     my $alertmsg = &mt('Please select the student you wish to grade.');
-    &js_escape(\$alertmsg);
     $request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
 
 function checkPickOne(formname) {
@@ -5175,7 +4442,6 @@ LISTJAVASCRIPT
     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
     my $cnum      = $env{"course.$env{'request.course.id'}.num"};
     my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
-    my $getgroup  = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
 
     my $result='<h3><span class="LC_info">&nbsp;'.
 	&mt('Manual Grading by Page or Sequence').'</span></h3>';
@@ -5194,30 +4460,30 @@ LISTJAVASCRIPT
     # Collection of hidden fields
     my $ctr=0;
     foreach (@$titles) {
-	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
-	$result.='<input type="hidden" name="page'.$ctr.'" value="'.$$symbx{$_}.'" />'."\n";
-	$result.='<input type="hidden" name="title'.$ctr.'" value="'.$showtitle.'" />'."\n";
-	$ctr++;
+        my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
+        $result.='<input type="hidden" name="page'.$ctr.'" value="'.$$symbx{$_}.'" />'."\n";
+        $result.='<input type="hidden" name="title'.$ctr.'" value="'.$showtitle.'" />'."\n";
+        $ctr++;
     }
     $result.='<input type="hidden" name="page" />'."\n".
-	'<input type="hidden" name="title" />'."\n";
+        '<input type="hidden" name="title" />'."\n";
 
     $result.=&build_section_inputs();
     my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
     $result.='<input type="hidden" name="Status"  value="'.$stu_status.'" />'."\n".
-        '<input type="hidden" name="command" value="displayPage" />'."\n".
-        '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
+	'<input type="hidden" name="command" value="displayPage" />'."\n".
+	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
 
     # Show grading options
     $result.=&Apache::lonhtmlcommon::start_pick_box();
     my $select = '<select name="selectpage">'."\n";
     $ctr=0;
     foreach (@$titles) {
-        my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
-        $select.='<option value="'.$ctr.'"'.
-            ($$symbx{$_} =~ /$curpage$/ ? ' selected="selected"' : '').
-            '>'.$showtitle.'</option>'."\n";
-        $ctr++;
+	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
+	$select.='<option value="'.$ctr.'"'.
+	    ($$symbx{$_} =~ /$curpage$/ ? ' selected="selected"' : '').
+	    '>'.$showtitle.'</option>'."\n";
+	$ctr++;
     }
     $select.= '</select>';
 
@@ -5243,7 +4509,7 @@ LISTJAVASCRIPT
        .'<label><input type="radio" name="lastSub" value="all" /> '
            .&mt('all submissions with details').' </label>'
        .&Apache::lonhtmlcommon::row_closure();
-
+    
     $result.=
         &Apache::lonhtmlcommon::row_title(&mt('Use CODE'))
        .'<input type="text" name="CODE" value="" />'
@@ -5265,7 +4531,7 @@ LISTJAVASCRIPT
 	'<th>'.&nameUserString('header').'</th>'.
 	&Apache::loncommon::end_data_table_header_row();
  
-    my (undef,undef,$fullname) = &getclasslist($getsec,'1',$getgroup);
+    my (undef,undef,$fullname) = &getclasslist($getsec,'1');
     my $ptr = 1;
     foreach my $student (sort 
 			 {
@@ -5346,12 +4612,8 @@ sub displayPage {
     &Apache::lonnet::clear_EXT_cache_status();
 
     if (!&canview($usec)) {
-	$request->print(
-            '<span class="LC_warning">'.
-            &mt('Unable to view requested student. ([_1])',
-                $env{'form.student'}).
-            '</span>');
-        return;
+	$request->print('<span class="LC_warning">'.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'</span>');
+	return;
     }
     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)).
@@ -5462,11 +4724,9 @@ sub displayPage {
 		}
 	    } elsif ($env{'form.lastSub'} eq 'all') {
 		my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
-                my $identifier = (&canmodify($usec)? $prob : '');
 		$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom,
 									$env{'request.course.id'},
-									'','.submission',undef,
-                                                                        $usec,$identifier);
+									'','.submission');
  
 	    }
 	    if (&canmodify($usec)) {
@@ -5484,14 +4744,10 @@ sub displayPage {
 	}
         $curRes = $iterator->next();
     }
-    my $disabled;
-    unless (&canmodify($usec)) {
-        $disabled = ' disabled="disabled"';
-    }
 
     $studentTable.=
         '</table>'."\n".
-        '<input type="button" value="'.&mt('Save').'"'.$disabled.' '.
+        '<input type="button" value="'.&mt('Save').'" '.
         'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
         '</form>'."\n";
     $request->print($studentTable);
@@ -5522,7 +4778,7 @@ sub displaySubByDates {
 
     my $interaction;
     my $no_increment = 1;
-    my (%lastrndseed,%lasttype);
+    my %lastrndseed;
     for ($version=1;$version<=$$record{'version'};$version++) {
 	my $timestamp = 
 	    &Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});
@@ -5550,12 +4806,9 @@ sub displaySubByDates {
             if (($type eq 'anonsurvey') || ($type eq 'anonsurveycred')) {
                 $hidden = 1;
             }
-	    my @matchKey;
-            if ($isTask) {
-                @matchKey = sort(grep(/^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys));
-            } else {
-		@matchKey = sort(grep(/^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));
-            }
+	    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) {
@@ -5583,14 +4836,12 @@ sub displaySubByDates {
 		        } else {
 			    $displaySub[0].=&mt('Trial: [_1]',
 					    $$record{"$where.$partid.tries"});
-                            if (($rndseed ne '')  && ($lastrndseed{$partid} ne '')) {
-                                if (($rndseed ne $lastrndseed{$partid}) &&
-                                    (($type eq 'randomizetry') || ($lasttype{$partid} eq 'randomizetry'))) {
+                            if ($rndseed || $lastrndseed{$partid}) {
+                                if ($rndseed ne $lastrndseed{$partid}) {
                                     $newvariation = '&nbsp;('.&mt('New variation this try').')';
                                 }
                             }
                             $lastrndseed{$partid} = $rndseed;
-                            $lasttype{$partid} = $type;
 		        }
 		        my $responseType=($isTask ? 'Task'
                                               : $responseType->{$partid}->{$responseId});
@@ -5688,7 +4939,7 @@ sub updateGradeByPage {
 
     $iterator->next(); # skip the first BEGIN_MAP
     my $curRes = $iterator->next(); # for "current resource"
-    my ($depth,$question,$prob,$changeflag,$hideflag)= (1,1,1,0,0);
+    my ($depth,$question,$prob,$changeflag)= (1,1,1,0);
     while ($depth > 0) {
         if($curRes == $iterator->BEGIN_MAP) { $depth++; }
         if($curRes == $iterator->END_MAP) { $depth--; }
@@ -5709,30 +4960,10 @@ sub updateGradeByPage {
 	    my @displayPts=();
             my %aggregate = ();
             my $aggregateflag = 0;
-            my %queueable;
-            if ($env{'form.HIDE'.$prob}) {
-                my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
-                my ($version,$parts) = split(/:/,$env{'form.HIDE'.$prob},2);
-                my $numchgs = &makehidden($version,$parts,\%record,$symbx,$udom,$uname,1);
-                $hideflag += $numchgs;
-            }
 	    foreach my $partid (@{$parts}) {
 		my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid};
 		my $oldpts = $env{'form.oldpts'.$question.'_'.$partid};
-                my @types = $curRes->responseType($partid);
-                if (grep(/^essay$/,@types)) {
-                    $queueable{$partid} = 1;
-                } else {
-                    my @ids = $curRes->responseIds($partid);
-                    for (my $i=0; $i < scalar(@ids); $i++) {
-                        my $hndgrd = &Apache::lonnet::EXT('resource.'.$partid.'_'.$ids[$i].
-                                                          '.handgrade',$symb);
-                        if (lc($hndgrd) eq 'yes') {
-                            $queueable{$partid} = 1;
-                            last;
-                        }
-                    }
-                }
+
 		my $wgt = $env{'form.WGT'.$question.'_'.$partid} != 0 ? 
 		    $env{'form.WGT'.$question.'_'.$partid} : 1;
 		my $partial = $newpts/$wgt;
@@ -5798,7 +5029,7 @@ sub updateGradeByPage {
 						   $env{'request.course.id'},
 						   $udom,$uname);
 		&check_and_remove_from_queue($parts,\%record,undef,$symbx,
-					     $cdom,$cnum,$udom,$uname,\%queueable);
+					     $cdom,$cnum,$udom,$uname);
 	    }
 	    
             if ($aggregateflag) {
@@ -5819,11 +5050,8 @@ sub updateGradeByPage {
     $studentTable.=&Apache::loncommon::end_data_table();
     my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') :
 		  &mt('The scores were changed for [quant,_1,problem].',
-		  $changeflag).'<br />');
-    my $hidemsg=($hideflag == 0 ? '' :
-                 &mt('Submissions were marked "hidden" for [quant,_1,transaction].',
-                     $hideflag).'<br />');
-    $request->print($hidemsg.$grademsg.$studentTable);
+		  $changeflag));
+    $request->print($grademsg.$studentTable);
 
     return '';
 }
@@ -5858,7 +5086,7 @@ like.
 Next each scanline is checked for any errors of either 'missing
 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 than one letter picked), invalid or duplicated CODE,
+have no more that one letter picked), invalid or duplicated CODE,
 invalid student/employee ID
 
 If the CODE option is used that determines the randomization of the
@@ -5897,7 +5125,7 @@ the homework problem.
 
 sub defaultFormData {
     my ($symb)=@_;
-    return '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />';
+    return '<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />';
 }
 
 
@@ -6050,7 +5278,7 @@ sub scantron_uploads {
 sub scantron_scantab {
     my $result='<select name="scantron_format">'."\n";
     $result.='<option></option>'."\n";
-    my @lines = &Apache::lonnet::get_scantronformat_file();
+    my @lines = &get_scantronformat_file();
     if (@lines > 0) {
         foreach my $line (@lines) {
             next if (($line =~ /^\#/) || ($line eq ''));
@@ -6062,6 +5290,62 @@ sub scantron_scantab {
     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
@@ -6143,58 +5427,47 @@ sub scantron_selectphase {
     if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) ||
         &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
 
-        # Chunk of form to prompt for a scantron file upload.
+	# Chunk of form to prompt for a scantron file upload.
 
         $r->print('
-    <br />');
-        my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
-        my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
-        my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
-        &js_escape(\$alertmsg);
-        my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($cdom);
-        $r->print(&Apache::lonhtmlcommon::scripttag('
+    <br />
+    '.&Apache::loncommon::start_data_table('LC_scantron_action').'
+       '.&Apache::loncommon::start_data_table_header_row().'
+            <th>
+              &nbsp;'.&mt('Specify a bubblesheet data file to upload.').'
+            </th>
+       '.&Apache::loncommon::end_data_table_header_row().'
+       '.&Apache::loncommon::start_data_table_row().'
+            <td>
+');
+    my $default_form_data=&defaultFormData($symb);
+    my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
+    $r->print(&Apache::lonhtmlcommon::scripttag('
     function checkUpload(formname) {
-        if (formname.upfile.value == "") {
-            alert("'.$alertmsg.'");
-            return false;
-        }
-        formname.submit();
-    }'."\n".$formatjs));
-        $r->print('
+	if (formname.upfile.value == "") {
+	    alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
+	    return false;
+	}
+	formname.submit();
+    }'));
+    $r->print('
               <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
                 '.$default_form_data.'
                 <input name="courseid" type="hidden" value="'.$cnum.'" />
                 <input name="domainid" type="hidden" value="'.$cdom.'" />
                 <input name="command" value="scantronupload_save" type="hidden" />
-              '.&Apache::loncommon::start_data_table('LC_scantron_action').'
-              '.&Apache::loncommon::start_data_table_header_row().'
-                <th>
-                &nbsp;'.&mt('Specify a bubblesheet data file to upload.').'
-                </th>
-              '.&Apache::loncommon::end_data_table_header_row().'
-              '.&Apache::loncommon::start_data_table_row().'
-            <td>
-                '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'<br />'."\n");
-        if ($formatoptions) {
-            $r->print('</td>
-                 '.&Apache::loncommon::end_data_table_row().'
-                 '.&Apache::loncommon::start_data_table_row().'
-                 <td>'.$formattitle.('&nbsp;'x2).$formatoptions.'
-                 </td>
-                 '.&Apache::loncommon::end_data_table_row().'
-                 '.&Apache::loncommon::start_data_table_row().'
-                 <td>'
-            );
-        } else {
-            $r->print(' <br />');
-        }
-        $r->print('<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
-              </td>
-             '.&Apache::loncommon::end_data_table_row().'
-             '.&Apache::loncommon::end_data_table().'
-             </form>'
-        );
+                '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
+                <br />
+                <input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
+              </form>
+');
 
+        $r->print('
+            </td>
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::end_data_table().'
+');
     }
 
     # Chunk of form to prompt for a file to grade and how:
@@ -6244,6 +5517,8 @@ sub scantron_selectphase {
    
     $r->print($result);
 
+
+
     # Chunk of the form that prompts to view a scoring office file,
     # corrected file, skipped records in a file.
 
@@ -6305,6 +5580,98 @@ sub scantron_selectphase {
     return;
 }
 
+=pod
+
+=item get_scantron_config
+
+   Parse and return the scantron configuration line selected as a
+   hash of configuration file fields.
+
+ Arguments:
+    which - the name of the configuration to parse from the file.
+
+
+ Returns:
+            If the named configuration is not in the file, an empty
+            hash is returned.
+    a hash with the fields
+      name         - internal name for the this configuration setup
+      description  - text to display to operator that describes this config
+      CODElocation - if 0 or the string 'none'
+                          - no CODE exists for this config
+                     if -1 || the string 'letter'
+                          - a CODE exists for this config and is
+                            a string of letters
+                     Unsupported value (but planned for future support)
+                          if a positive integer
+                               - The CODE exists as the first n items from
+                                 the question section of the form
+                          if the string 'number'
+                               - The CODE exists for this config and is
+                                 a string of numbers
+      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/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
+                    the sheet. (usually either 1 or 10)
+      Qon         - either a single character representing the character used
+                    to signal a bubble was chosen in the positional setup, or
+                    the string 'letter' if the letter of the chosen bubble is
+                    in the final, or 'number' if a number representing the
+                    chosen bubble is in the file (1->A 0->J)
+      Qoff        - the character used to represent that a bubble was
+                    left blank
+      PaperID     - if the scanning process generates a unique number for each
+                    sheet scanned the column that this ID number starts in
+      PaperIDlength - number of columns that comprise the unique ID number
+                      for the sheet of paper
+      FirstName   - column that the first name starts in
+      FirstNameLength - number of columns that the first name spans
+ 
+      LastName    - column that the last name starts in
+      LastNameLength - number of columns that the last name spans
+      BubblesPerRow - number of bubbles available in each row used to 
+                      bubble an answer. (If not specified, 10 assumed).
+
+=cut
+
+sub get_scantron_config {
+    my ($which) = @_;
+    my @lines = &get_scantronformat_file();
+    my %config;
+    #FIXME probably should move to XML it has already gotten a bit much now
+    foreach my $line (@lines) {
+	my ($name,$descrip)=split(/:/,$line);
+	if ($name ne $which ) { next; }
+	chomp($line);
+	my @config=split(/:/,$line);
+	$config{'name'}=$config[0];
+	$config{'description'}=$config[1];
+	$config{'CODElocation'}=$config[2];
+	$config{'CODEstart'}=$config[3];
+	$config{'CODElength'}=$config[4];
+	$config{'IDstart'}=$config[5];
+	$config{'IDlength'}=$config[6];
+	$config{'Qstart'}=$config[7];
+ 	$config{'Qlength'}=$config[8];
+	$config{'Qoff'}=$config[9];
+	$config{'Qon'}=$config[10];
+	$config{'PaperID'}=$config[11];
+	$config{'PaperIDlength'}=$config[12];
+	$config{'FirstName'}=$config[13];
+	$config{'FirstNamelength'}=$config[14];
+	$config{'LastName'}=$config[15];
+	$config{'LastNamelength'}=$config[16];
+        $config{'BubblesPerRow'}=$config[17];
+	last;
+    }
+    return %config;
+}
+
 =pod 
 
 =item username_to_idmap
@@ -6328,17 +5695,8 @@ sub username_to_idmap {
     my ($classlist)= @_;
     my %idmap;
     foreach my $student (keys(%$classlist)) {
-        my $id = $classlist->{$student}->[&Apache::loncoursedata::CL_ID];
-        unless ($id eq '') {
-            if (!exists($idmap{$id})) {
-                $idmap{$id} = $student;
-            } else {
-                my $status = $classlist->{$student}->[&Apache::loncoursedata::CL_STATUS];
-                if ($status eq 'Active') {
-                    $idmap{$id} = $student;
-                }
-            }
-        }
+	$idmap{$classlist->{$student}->[&Apache::loncoursedata::CL_ID]}=
+	    $student;
     }
     return %idmap;
 }
@@ -6350,7 +5708,7 @@ sub username_to_idmap {
    Process a requested correction to a scanline.
 
   Arguments:
-    $scantron_config   - hash from &Apache::lonnet::get_scantron_config()
+    $scantron_config   - hash from &get_scantron_config()
     $scan_data         - hash of correction information 
                           (see &scantron_getfile())
     $line              - existing scanline
@@ -6540,7 +5898,7 @@ sub digits_to_letters {
     totalref         - Ref of scalar used to score total number of bubble
                        lines needed for responses in a scan line (used when
                        randompick in use. 
-
+    
  Returns:
    Hash containing the result of parsing the scanline
 
@@ -6633,7 +5991,7 @@ sub scantron_parse_scanline {
                                          $partids_by_symb,$orderedforcode,
                                          $respnumlookup,$startline);
         if ($total) {
-            $lastpos = $total*$$scantron_config{'Qlength'};
+            $lastpos = $total*$$scantron_config{'Qlength'}; 
         }
         if (ref($totalref)) {
             $$totalref = $total;
@@ -6647,7 +6005,7 @@ sub scantron_parse_scanline {
         if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {
             $answers_needed = $bubble_lines_per_response{$respnumlookup->{$questnum}};
         } else {
-            $answers_needed = $bubble_lines_per_response{$questnum};
+	    $answers_needed = $bubble_lines_per_response{$questnum};
         }
         my $answer_length  = ($$scantron_config{'Qlength'} * $answers_needed)
                              || 1;
@@ -6707,12 +6065,9 @@ sub scantron_parse_scanline {
 }
 
 sub get_master_seq {
-    my ($resources,$master_seq,$symb_to_resource,$need_symb_in_map,$symb_for_examcode) = @_;
-    return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') &&
+    my ($resources,$master_seq,$symb_to_resource) = @_;
+    return unless ((ref($resources) eq 'ARRAY') && (ref($master_seq) eq 'ARRAY') && 
                    (ref($symb_to_resource) eq 'HASH'));
-    if ($need_symb_in_map) {
-        return unless (ref($symb_for_examcode) eq 'HASH');
-    }
     my $resource_error;
     foreach my $resource (@{$resources}) {
         my $ressymb;
@@ -6720,14 +6075,6 @@ sub get_master_seq {
             $ressymb = $resource->symb();
             push(@{$master_seq},$ressymb);
             $symb_to_resource->{$ressymb} = $resource;
-            if ($need_symb_in_map) {
-                unless ($resource->is_map()) {
-                    my $map=(&Apache::lonnet::decode_symb($ressymb))[0];
-                    unless (exists($symb_for_examcode->{$map})) {
-                        $symb_for_examcode->{$map} = $ressymb;
-                    }
-                }
-            }
         } else {
             $resource_error = 1;
             last;
@@ -6797,7 +6144,7 @@ sub scantron_validator_lettnum {
     my $occurrences = 0;
     my $responsenum = $questnum-1;
     if (($randompick || $randomorder) && (ref($respnumlookup) eq 'HASH')) {
-       $responsenum = $respnumlookup->{$questnum-1}
+       $responsenum = $respnumlookup->{$questnum-1} 
     }
     if (($responsetype_per_response{$responsenum} eq 'essayresponse') ||
         ($responsetype_per_response{$responsenum} eq 'formularesponse') ||
@@ -7044,7 +6391,7 @@ sub scantron_filter {
 
 sub scantron_process_corrections {
     my ($r) = @_;
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();
     my $which=$env{'form.scantron_line'};
@@ -7093,11 +6440,7 @@ sub scantron_process_corrections {
 	}
     }
     if ($err) {
-	$r->print(
-            '<p class="LC_error">'
-           .&mt('Unable to accept last correction, an error occurred: [_1]',
-                $errmsg)
-           .'</p>');
+	$r->print("<span class=\"LC_warning\">Unable to accept last correction, an error occurred :$errmsg:</span>");
     } else {
 	&scantron_put_line($scanlines,$scan_data,$which,$line,$skip);
 	&scantron_putfile($scanlines,$scan_data);
@@ -7213,13 +6556,13 @@ sub check_for_error {
 sub scantron_warning_screen {
     my ($button_text,$symb)=@_;
     my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my $CODElist;
     if ($scantron_config{'CODElocation'} &&
 	$scantron_config{'CODEstart'} &&
 	$scantron_config{'CODElength'}) {
 	$CODElist=$env{'form.scantron_CODElist'};
-	if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">'.&mt('None').'</span>'; }
+	if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; }
 	$CODElist=
 	    '<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'.
 	    $env{'form.scantron_CODElist'}.'</tt></td></tr>';
@@ -7233,7 +6576,7 @@ sub scantron_warning_screen {
     return ('
 <p>
 <span class="LC_warning">
-'.&mt("Please double check the information below before clicking on '[_1]'",&mt($button_text)).'</span>
+'.&mt('Please double check the information below before clicking on \'[_1]\'',&mt($button_text)).'</span>
 </p>
 <table>
 <tr><td><b>'.&mt('Sequence to be Graded:').'</b></td><td>'.$title.'</td></tr>
@@ -7345,7 +6688,7 @@ sub scantron_validate_file {
     if (!$symb) {return '';}
     my $default_form_data=&defaultFormData($symb);
     
-    # do the detection of only doing skipped records first before we delete
+    # do the detection of only doing skipped records first befroe we delete
     # them when doing the corrections reset
     if ($env{'form.scantron_options_redo'} ne 'redo_skipped_ready') {
 	&reset_skipping_status();
@@ -7369,7 +6712,7 @@ sub scantron_validate_file {
     #get the student pick code ready
     $r->print(&Apache::loncommon::studentbrowser_javascript());
     my $nav_error;
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config);
     if ($nav_error) {
         $r->print(&navmap_errormsg());
@@ -7396,7 +6739,7 @@ sub scantron_validate_file {
     while (!$stop && $currentphase < scalar(@validate_phases)) {
 	$r->print(&mt('Validating '.$validate_phases[$currentphase]).'<br />');
 	$r->rflush();
-
+     
 	my $which="scantron_validate_".$validate_phases[$currentphase];
 	{
 	    no strict 'refs';
@@ -7426,7 +6769,7 @@ sub scantron_validate_file {
 	    $r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' &rarr; " />');
 	    $r->print(' '.&mt('this error').' <br />');
 
-            $r->print('<p>'.&mt('Or return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p>');
+	    $r->print('<p>'.&mt('Or return to [_1]Grade/Manage/Review Bubblesheets[_2] to start over.','<a href="/adm/grades?symb='.$symb.'&command=scantron_selectphase" class="LC_info">','</a>').'</p>');
 	} else {
             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)" />');
@@ -7805,9 +7148,10 @@ sub scantron_validate_sequence {
 	my @resources=
 	    $navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0);
 	if (@resources) {
-	    $r->print('<p class="LC_warning">'
+	    $r->print(
+                '<p class="LC_warning">'
                .&mt('Some resources in the sequence currently are not set to'
-                   .' exam mode. Grading these resources currently may not'
+                   .' bubblesheet exam mode. Grading these resources currently may not'
                    .' work correctly.')
                .'</p>'
             );
@@ -7828,7 +7172,7 @@ sub scantron_validate_ID {
     my %idmap=&username_to_idmap($classlist);
 
     #get scantron line setup
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
 
     my $nav_error;
@@ -7929,10 +7273,10 @@ sub scantron_get_correction {
 
     if ($error =~ /ID$/) {
 	if ($error eq 'incorrectID') {
-	    $r->print('<p class="LC_warning">'.&mt("The encoded ID is not in the classlist").
+            $r->print('<p class="LC_warning">'.&mt("The encoded ID is not in the classlist").
 		      "</p>\n");
 	} elsif ($error eq 'duplicateID') {
-	    $r->print('<p class="LC_warning">'.&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");
+            $r->print('<p class="LC_warning">'.&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");
 	}
 	$r->print($message);
 	$r->print("<p>".&mt("How should I handle this?")." <br /> \n");
@@ -7952,8 +7296,8 @@ sub scantron_get_correction {
 	} elsif ($error eq 'duplicateCODE') {
 	    $r->print('<p class="LC_warning">'.&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n");
 	}
-        $r->print("<p>".&mt('The CODE on the form is [_1]',
-                            "<tt>'$$scan_record{'scantron.CODE'}'</tt>")
+	$r->print("<p>".&mt('The CODE on the form is [_1]',
+			    "<tt>'$$scan_record{'scantron.CODE'}'</tt>")
                  ."</p>\n");
 	$r->print($message);
 	$r->print("<p>".&mt("How should I handle this?")."</p>\n");
@@ -8050,7 +7394,7 @@ ENDSCRIPT
 	# 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,$randomorder,$randompick,
                                                 $respnumlookup,$startline);
 
@@ -8074,8 +7418,7 @@ 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.");
-    &js_escape(\$warning);
-    my $output = &Apache::lonhtmlcommon::scripttag(<<ENDSCRIPT);
+    my $output = &Apache::lonhtmlcommon::scripttag((<<ENDSCRIPT));
 function verify_bubble_radio(form) {
     var ansnumArray = new Array ("$ansnumstr");
     var need_bubble_count = 0;
@@ -8160,7 +7503,7 @@ sub questions_to_line_list {
             } else {
                 $first = $first_bubble_line{$responsenum} + 1;
             }
-            $count   = $bubble_lines_per_response{$responsenum};
+	    $count   = $bubble_lines_per_response{$responsenum};
         }
         $last = $first+$count-1;
         push(@lines, ($first..$last));
@@ -8191,6 +7534,7 @@ for multi and missing bubble cases).
                   and value is number of first bubble line for current student
                   or code-based randompick and/or randomorder.
 
+
  Implicit inputs:
    %bubble_lines_per_response   - Starting line numbers for each question.
                                   Numbered from 0 (but question numbers are from
@@ -8230,7 +7574,7 @@ sub prompt_for_corrections {
             }
         } else {
             $responsenum = $question-1;
-            $first = $first_bubble_line{$responsenum};
+            $first = $first_bubble_line{$responsenum} + 1;
         }
         $current_line = $first + 1 ;
         my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});
@@ -8243,7 +7587,7 @@ sub prompt_for_corrections {
     } else {
         if (($randomorder || $randompick) && (ref($respnumlookup) eq 'HASH')) {
             $responsenum = $respnumlookup->{$question-1};
-            if (ref($startline) eq 'HASH') {
+            if (ref($startline) eq 'HASH') { 
                 $first = $startline->{$question-1};
             }
         } else {
@@ -8261,7 +7605,16 @@ sub prompt_for_corrections {
             ($responsetype_per_response{$responsenum} eq 'imageresponse') ||
             ($responsetype_per_response{$responsenum} eq 'reactionresponse') ||
             ($responsetype_per_response{$responsenum} eq 'organicresponse')) {
-            $r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the bubblesheet 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 />');
+            $r->print(
+                &mt("Although this particular question type requires handgrading, the instructions for this question in the bubblesheet 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 />");
         }
@@ -8288,7 +7641,7 @@ sub prompt_for_corrections {
 
  Arguments:
     $r           - Apache request object
-    $scan_config - hash from &Apache::lonnet::get_scantron_config()
+    $scan_config - hash from &get_scantron_config()
     $line        - Number of the line being displayed.
     $questionnum - Question number (may include subquestion)
     $error       - Type of error.
@@ -8301,7 +7654,7 @@ sub scantron_bubble_selector {
     my $max=$$scan_config{'Qlength'};
 
     my $scmode=$$scan_config{'Qon'};
-    if ($scmode eq 'number' || $scmode eq 'letter') {
+    if ($scmode eq 'number' || $scmode eq 'letter') { 
         if (($$scan_config{'BubblesPerRow'} =~ /^\d+$/) &&
             ($$scan_config{'BubblesPerRow'} > 0)) {
             $max=$$scan_config{'BubblesPerRow'};
@@ -8452,7 +7805,7 @@ sub get_codes {
 
 sub scantron_validate_CODE {
     my ($r,$currentphase) = @_;
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     if ($scantron_config{'CODElocation'} &&
 	$scantron_config{'CODEstart'} &&
 	$scantron_config{'CODElength'}) {
@@ -8526,7 +7879,7 @@ sub scantron_validate_doublebubble {
         &Apache::lonnet::decode_symb($env{'form.selectpage'});
 
     #get scantron line setup
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
 
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -8544,17 +7897,6 @@ sub scantron_validate_doublebubble {
     if (ref($map)) {
         $randomorder = $map->randomorder();
         $randompick = $map->randompick();
-        unless ($randomorder || $randompick) {
-            foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
-                if ($res->randomorder()) {
-                    $randomorder = 1;
-                }
-                if ($res->randompick()) {
-                    $randompick = 1;
-                }
-                last if ($randomorder || $randompick);
-            }
-        }
         if ($randomorder || $randompick) {
             $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
             if ($nav_error) {
@@ -8631,7 +7973,7 @@ sub scantron_get_maxbubble {
     my $response_number = 0;
     my $bubble_line     = 0;
     foreach my $resource (@resources) {
-        my $resid = $resource->id();
+        my $resid = $resource->id(); 
         my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,
                                                           $udom,undef,$bubbles_per_row);
         if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {
@@ -8682,7 +8024,7 @@ sub scantron_get_maxbubble {
 	        $bubble_lines_per_response{$response_number} = $lines;
                 $responsetype_per_response{$response_number} = 
                     $analysis->{$part_id.'.type'};
-                $masterseq_id_responsenum{$resid.'_'.$part_id} = $response_number;
+                $masterseq_id_responsenum{$resid.'_'.$part_id} = $response_number;  
 	        $response_number++;
 
 	        $bubble_line +=  $lines;
@@ -8719,7 +8061,7 @@ sub scantron_validate_missingbubbles {
         &Apache::lonnet::decode_symb($env{'form.selectpage'});
 
     #get scantron line setup
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
 
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -8738,17 +8080,6 @@ sub scantron_validate_missingbubbles {
     if (ref($map)) {
         $randomorder = $map->randomorder();
         $randompick = $map->randompick();
-        unless ($randomorder || $randompick) {
-            foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
-                if ($res->randomorder()) {
-                    $randomorder = 1;
-                }
-                if ($res->randompick()) {
-                    $randompick = 1;
-                }
-                last if ($randomorder || $randompick);
-            }
-        }
         if ($randomorder || $randompick) {
             $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
             if ($nav_error) {
@@ -8774,9 +8105,9 @@ sub scantron_validate_missingbubbles {
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
 	my $line=&scantron_get_line($scanlines,$scan_data,$i);
 	if ($line=~/^[\s\cz]*$/) { next; }
-        my $scan_record =
+	my $scan_record =
             &scantron_parse_scanline($line,$i,\%scantron_config,$scan_data,undef,\%idmap,
-                                     $randomorder,$randompick,$sequence,\@master_seq,
+				     $randomorder,$randompick,$sequence,\@master_seq,
                                      \%symb_to_resource,\%grader_partids_by_symb,
                                      \%orderedforcode,\%respnumlookup,\%startline);
 	if (!defined($$scan_record{'scantron.missingerror'})) { next; }
@@ -8787,36 +8118,36 @@ sub scantron_validate_missingbubbles {
 	foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
             my $lastbubble;
             if ($missing =~ /^(\d+)\.(\d+)$/) {
-                my $question = $1;
-                my $subquestion = $2;
-                my ($first,$responsenum);
-                if ($randomorder || $randompick) {
-                    $responsenum = $respnumlookup{$question-1};
-                    $first = $startline{$question-1};
-                } else {
-                    $responsenum = $question-1;
-                    $first = $first_bubble_line{$responsenum};
-                }
-                if (!defined($first)) { next; }
-                my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});
-                my $subcount = 1;
-                while ($subcount<$subquestion) {
-                    $first += $subans[$subcount-1];
-                    $subcount ++;
-                }
-                my $count = $subans[$subquestion-1];
-                $lastbubble = $first + $count;
+               my $question = $1;
+               my $subquestion = $2;
+               my ($first,$responsenum);
+               if ($randomorder || $randompick) {
+                   $responsenum = $respnumlookup{$question-1};
+                   $first = $startline{$question-1};
+               } else {
+                   $responsenum = $question-1; 
+                   $first = $first_bubble_line{$responsenum};
+               }
+               if (!defined($first)) { next; }
+               my @subans = split(/,/,$subdivided_bubble_lines{$responsenum});
+               my $subcount = 1;
+               while ($subcount<$subquestion) {
+                   $first += $subans[$subcount-1];
+                   $subcount ++;
+               }
+               my $count = $subans[$subquestion-1];
+               $lastbubble = $first + $count;
             } else {
-                my ($first,$responsenum);
-                if ($randomorder || $randompick) {
-                    $responsenum = $respnumlookup{$missing-1};
-                    $first = $startline{$missing-1};
-                } else {
-                    $responsenum = $missing-1;
-                    $first = $first_bubble_line{$responsenum};
-                }
-                if (!defined($first)) { next; }
-                $lastbubble = $first + $bubble_lines_per_response{$responsenum};
+               my ($first,$responsenum);
+               if ($randomorder || $randompick) {
+                   $responsenum = $respnumlookup{$missing-1};
+                   $first = $startline{$missing-1};
+               } else {
+                   $responsenum = $missing-1;
+                   $first = $first_bubble_line{$responsenum};
+               }
+               if (!defined($first)) { next; }
+               $lastbubble = $first + $bubble_lines_per_response{$responsenum};
             }
             if ($lastbubble > $max_bubble) { next; }
 	    push(@to_correct,$missing);
@@ -8859,12 +8190,12 @@ sub hand_bubble_option {
         }
     }
     if ($needs_hand_bubbles) {
-        my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
+        my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
         my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
         return &mt('The sequence to be graded contains response types which are handgraded.').'<p>'.
                &mt('If you have already graded these by bubbling sheets to indicate points awarded, [_1]what point value is assigned to a filled last bubble in each row?','<br />').
                '<label><input type="radio" name="scantron_lastbubblepoints" value="'.$bubbles_per_row.'" checked="checked" />'.&mt('[quant,_1,point]',$bubbles_per_row).'</label>&nbsp;'.&mt('or').'&nbsp;'.
-               '<label><input type="radio" name="scantron_lastbubblepoints" value="0" />'.&mt('0 points').'</label></p>';
+               '<label><input type="radio" name="scantron_lastbubblepoints" value="0"/>0 points</label></p>';
     }
     return;
 }
@@ -8878,8 +8209,8 @@ sub scantron_process_students {
     }
     my $default_form_data=&defaultFormData($symb);
 
-    my %scantron_config=&Apache::lonnet::get_scantron_config($env{'form.scantron_format'});
-    my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
+    my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config); 
     my ($scanlines,$scan_data)=&scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($classlist);
@@ -8890,21 +8221,10 @@ sub scantron_process_students {
     }
     my $map=$navmap->getResourceByUrl($sequence);
     my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb,
-        %grader_randomlists_by_symb,%symb_for_examcode);
+        %grader_randomlists_by_symb);
     if (ref($map)) {
         $randomorder = $map->randomorder();
         $randompick = $map->randompick();
-        unless ($randomorder || $randompick) {
-            foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
-                if ($res->randomorder()) {
-                    $randomorder = 1;
-                }
-                if ($res->randompick()) {
-                    $randompick = 1;
-                }
-                last if ($randomorder || $randompick);
-            }
-        }
     } else {
         $r->print(&navmap_errormsg());
         return '';
@@ -8912,7 +8232,7 @@ sub scantron_process_students {
     my $nav_error;
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
     if ($randomorder || $randompick) {
-        $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource,1,\%symb_for_examcode);
+        $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
         if ($nav_error) {
             $r->print(&navmap_errormsg());
             return '';
@@ -8957,7 +8277,7 @@ SCANTRONFORM
 	return '';		# Dunno why the other returns return '' rather than just returning.
     }
 
-    my %lettdig = &Apache::lonnet::letter_to_digits();
+    my %lettdig = &letter_to_digits();
     my $numletts = scalar(keys(%lettdig));
     my %orderedforcode;
 
@@ -8974,7 +8294,7 @@ SCANTRONFORM
         my %startline = ();
         my $total;
  	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
- 						 $scan_data,undef,\%idmap,$randomorder,
+                                                 $scan_data,undef,\%idmap,$randomorder,
                                                  $randompick,$sequence,\@master_seq,
                                                  \%symb_to_resource,\%grader_partids_by_symb,
                                                  \%orderedforcode,\%respnumlookup,\%startline,
@@ -9004,7 +8324,7 @@ SCANTRONFORM
 
         my @mapresources = @resources;
         if ($randomorder || $randompick) {
-            @mapresources =
+            @mapresources = 
                 &users_order($user,$scancode,$sequence,\@master_seq,\%symb_to_resource,
                              \%orderedforcode);
         }
@@ -9019,14 +8339,9 @@ SCANTRONFORM
             }
             if ((exists($grader_randomlists_by_symb{$ressymb})) ||
                 (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
-                my $currcode;
-                if (exists($grader_randomlists_by_symb{$ressymb})) {
-                    $currcode = $scancode;
-                }
                 my ($analysis,$parts) =
                     &scantron_partids_tograde($resource,$env{'request.course.id'},
-                                              $uname,$udom,undef,$bubbles_per_row,
-                                              $currcode);
+                                              $uname,$udom,undef,$bubbles_per_row);
                 $partids_by_symb{$ressymb} = $parts;
             } else {
                 $partids_by_symb{$ressymb} = $grader_partids_by_symb{$ressymb};
@@ -9059,16 +8374,11 @@ SCANTRONFORM
         }
 
         if (($scancode) && ($randomorder || $randompick)) {
-            foreach my $key (keys(%symb_for_examcode)) {
-                my $symb_in_map = $symb_for_examcode{$key};
-                if ($symb_in_map ne '') {
-                    my $parmresult =
-                        &Apache::lonparmset::storeparm_by_symb($symb_in_map,
-                                                               '0_examcode',2,$scancode,
-                                                               'string_examcode',$uname,
-                                                               $udom);
-                }
-            }
+            my $parmresult =
+                &Apache::lonparmset::storeparm_by_symb($symb,
+                                                       '0_examcode',2,$scancode,
+                                                       'string_examcode',$uname,
+                                                       $udom);
         }
 	$completedstudents{$uname}={'line'=>$line};
         if ($env{'form.verifyrecord'}) {
@@ -9098,7 +8408,7 @@ SCANTRONFORM
                 if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
                                            \@mapresources,\%partids_by_symb,
                                            $bubbles_per_row,$randomorder,$randompick,
-                                           \%respnumlookup,\%startline)
+                                           \%respnumlookup,\%startline) 
                     eq 'ssi_error') {
                     $ssi_error = 0; # So end of handler error message does not trigger.
                     $r->print("</form>");
@@ -9134,11 +8444,11 @@ SCANTRONFORM
                               &Apache::loncommon::end_data_table_header_row()."\n".
                               &Apache::loncommon::start_data_table_row().
                               '<td>'.&mt('Bubblesheet').'</td>'.
-                              '<td><span class="LC_nobreak" style="white-space: pre;"><tt>'.$studentdata.'</tt></span></td>'.
+                              '<td><span class="LC_nobreak"><tt>'.$studentdata.'</tt></span></td>'.
                               &Apache::loncommon::end_data_table_row().
                               &Apache::loncommon::start_data_table_row().
                               '<td>'.&mt('Stored submissions').'</td>'.
-                              '<td><span class="LC_nobreak" style="white-space: pre;"><tt>'.$studentrecord.'</tt></span></td>'."\n".
+                              '<td><span class="LC_nobreak"><tt>'.$studentrecord.'</tt></span></td>'."\n".
                               &Apache::loncommon::end_data_table_row().
                               &Apache::loncommon::end_data_table().'</p>');
                 } else {
@@ -9191,7 +8501,7 @@ sub graders_resources_pass {
 =item users_order
 
   Returns array of resources in current map, ordered based on either CODE,
-  if this is a CODEd exam, or based on student's identity if this is a
+  if this is a CODEd exam, or based on student's identity if this is a 
   "NAMEd" exam.
 
   Should be used when randomorder and/or randompick applied when the 
@@ -9218,7 +8528,7 @@ sub users_order  {
             if (ref($actual_seq) eq 'ARRAY') {
                 @mapresources = map { $symb_to_resource->{$_}; } @{$actual_seq};
                 if (ref($orderedforcode) eq 'HASH') {
-                    if (@mapresources > 0) {
+                    if (@mapresources > 0) { 
                         $orderedforcode->{$scancode} = \@mapresources;
                     }
                 }
@@ -9231,7 +8541,7 @@ sub users_order  {
                                                            $master_seq,
                                                            $user,undef,1);
         if (ref($actual_seq) eq 'ARRAY') {
-            @mapresources =
+            @mapresources = 
                 map { $symb_to_resource->{$_}; } @{$actual_seq};
         }
     }
@@ -9287,21 +8597,18 @@ sub grade_student_bubbles {
 }
 
 sub scantron_upload_scantron_data {
-    my ($r,$symb) = @_;
+    my ($r,$symb)=@_;
     my $dom = $env{'request.role.domain'};
-    my ($formatoptions,$formattitle,$formatjs) = &scantron_upload_dataformat($dom);
     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',$dom);
     my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.
-                       ('&nbsp'x2).&mt('(shows course personnel)');
+                       ('&nbsp'x2).&mt('(shows course personnel)'); 
     my $default_form_data=&defaultFormData($symb);
     my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');
-    &js_escape(\$nofile_alert);
     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.");
-    &js_escape(\$nocourseid_alert);
     $r->print(&Apache::lonhtmlcommon::scripttag('
     function checkUpload(formname) {
 	if (formname.upfile.value == "") {
@@ -9329,7 +8636,6 @@ sub scantron_upload_scantron_data {
         return;
     }
 
-    '.$formatjs.'
 '));
     $r->print('
 <h3>'.&mt('Send bubblesheet data to a course').'</h3>
@@ -9345,12 +8651,7 @@ sub scantron_upload_scantron_data {
   &Apache::lonhtmlcommon::row_closure().
   &Apache::lonhtmlcommon::row_title(&mt('Domain')).
   '<input name="domainid" type="hidden" />'.$domdesc.
-  &Apache::lonhtmlcommon::row_closure());
-    if ($formatoptions) {
-        $r->print(&Apache::lonhtmlcommon::row_title($formattitle).$formatoptions.
-                  &Apache::lonhtmlcommon::row_closure());
-    }
-    $r->print(
+  &Apache::lonhtmlcommon::row_closure().
   &Apache::lonhtmlcommon::row_title(&mt('File to upload')).
   '<input type="file" name="upfile" size="50" />'.
   &Apache::lonhtmlcommon::row_closure(1).
@@ -9363,87 +8664,9 @@ sub scantron_upload_scantron_data {
     return '';
 }
 
-sub scantron_upload_dataformat {
-    my ($dom) = @_;
-    my ($formatoptions,$formattitle,$formatjs);
-    $formatjs = <<'END';
-function toggleScantab(form) {
-   return;
-}
-END
-    my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$dom);
-    if (ref($domconfig{'scantron'}) eq 'HASH') {
-        if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {
-            if (keys(%{$domconfig{'scantron'}{'config'}}) > 1) {
-                if (($domconfig{'scantron'}{'config'}{'dat'}) &&
-                    (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH')) {
-                    if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
-                        if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) {
-                            my ($onclick,$formatextra,$singleline);
-                            my @lines = &Apache::lonnet::get_scantronformat_file();
-                            my $count = 0;
-                            foreach my $line (@lines) {
-                                next if (($line =~ /^\#/) || ($line eq ''));
-                                $singleline = $line;
-                                $count ++;
-                            }
-                            if ($count > 1) {
-                                $formatextra = '<div style="display:none" id="bubbletype">'.
-                                               '<span class="LC_nobreak">'.
-                                               &mt('Bubblesheet type').':&nbsp;'.
-                                               &scantron_scantab().'</span></div>';
-                                $onclick = ' onclick="toggleScantab(this.form);"';
-                                $formatjs = <<"END";
-function toggleScantab(form) {
-    var divid = 'bubbletype';
-    if (document.getElementById(divid)) {
-        var radioname = 'fileformat';
-        var num = form.elements[radioname].length;
-        if (num) {
-            for (var i=0; i<num; i++) {
-                if (form.elements[radioname][i].checked) {
-                    var chosen = form.elements[radioname][i].value;
-                    if (chosen == 'dat') {
-                        document.getElementById(divid).style.display = 'none';
-                    } else if (chosen == 'csv') {
-                        document.getElementById(divid).style.display = 'block';
-                    }
-                }
-            }
-        }
-    }
-    return;
-}
-
-END
-                            } elsif ($count == 1) {
-                                my $formatname = (split(/:/,$singleline,2))[0];
-                                $formatextra = '<input type="hidden" name="scantron_format" value="'.$formatname.'" />';
-                            }
-                            $formattitle = &mt('File format');
-                            $formatoptions = '<label><input name="fileformat" type="radio" value="dat" checked="checked"'.$onclick.' />'.
-                                             &mt('Plain Text (no delimiters)').
-                                             '</label>'.('&nbsp;'x2).
-                                             '<label><input name="fileformat" type="radio" value="csv"'.$onclick.' />'.
-                                             &mt('Comma separated values').'</label>'.$formatextra;
-                        }
-                    }
-                }
-            } elsif (keys(%{$domconfig{'scantron'}{'config'}}) == 1) {
-                if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
-                    if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}})) {
-                        $formattitle = &mt('Bubblesheet type');
-                        $formatoptions = &scantron_scantab();
-                    }
-                }
-            }
-        }
-    }
-    return ($formatoptions,$formattitle,$formatjs);
-}
 
 sub scantron_upload_scantron_data_save {
-    my ($r,$symb) = @_;
+    my($r,$symb)=@_;
     my $doanotherupload=
 	'<br /><form action="/adm/grades" method="post">'."\n".
 	'<input type="hidden" name="command" value="scantronupload" />'."\n".
@@ -9453,67 +8676,30 @@ sub scantron_upload_scantron_data_save {
 	!&Apache::lonnet::allowed('usc',
 			    $env{'form.domainid'}.'_'.$env{'form.courseid'})) {
 	$r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />");
-        unless ($symb) {
+	unless ($symb) {
 	    $r->print($doanotherupload);
 	}
 	return '';
     }
     my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
     my $uploadedfile;
-    $r->print('<p>'.&mt("Uploading file to [_1]",$coursedata{'description'}).'</p>');
+    $r->print('<h3>'.&mt("Uploading file to [_1]",$coursedata{'description'}).'</h3>');
     if (length($env{'form.upfile'}) < 2) {
-        $r->print(
-            &Apache::lonhtmlcommon::confirm_success(
-                &mt('The file: [_1] you attempted to upload contained no information. Please check that you entered the correct filename.',
-                        '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'),1));
-    } else {
-        my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$env{'form.domainid'});
-        my $parser;
-        if (ref($domconfig{'scantron'}) eq 'HASH') {
-            if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {
-                my $is_csv;
-                my @possibles = keys(%{$domconfig{'scantron'}{'config'}});
-                if (@possibles > 1) {
-                    if ($env{'form.fileformat'} eq 'csv') {
-                        if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {
-                            if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
-                                if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) {
-                                    $is_csv = 1;
-                                }
-                            }
-                        }
-                    }
-                } elsif (@possibles == 1) {
-                    if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {
-                        if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
-                            if (keys(%{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}) > 1) {
-                                $is_csv = 1;
-                            }
-                        }
-                    }
-                }
-                if ($is_csv) {
-                   $parser = $domconfig{'scantron'}{'config'}{'csv'};
-                }
-            }
-        }
-        my $result =
-            &Apache::lonnet::userfileupload('upfile','scantron','scantron',$parser,'','',
+        $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::userfileupload('upfile','','scantron','','','',
                                             $env{'form.courseid'},$env{'form.domainid'});
 	if ($result =~ m{^/uploaded/}) {
-            $r->print(
-                &Apache::lonhtmlcommon::confirm_success(&mt('Upload successful')).'<br />'.
-                &mt('Uploaded [_1] bytes of data into location: [_2]',
-                        (length($env{'form.upfile'})-1),
-                        '<span class="LC_filename">'.$result.'</span>'));
+	    $r->print(&mt('[_1]Success:[_2] Successfully uploaded [_3] bytes of data into location: [_4]',
+                          '<span class="LC_success">','</span>',(length($env{'form.upfile'})-1),
+			  '<span class="LC_filename">'.$result.'</span>'));
             ($uploadedfile) = ($result =~ m{/([^/]+)$});
             $r->print(&validate_uploaded_scantron_file($env{'form.domainid'},
                                                        $env{'form.courseid'},$uploadedfile));
 	} else {
-            $r->print(
-                &Apache::lonhtmlcommon::confirm_success(&mt('Upload failed'),1).'<br />'.
-                    &mt('An error ([_1]) occurred when attempting to upload the file: [_2]',
-                          $result,
+	    $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>'));
 	}
     }
@@ -9535,7 +8721,7 @@ sub validate_uploaded_scantron_file {
     my $output;
     if (@lines) {
         my (%counts,$max_match_format);
-        my ($found_match_count,$max_match_count,$max_match_pct) = (0,0,0);
+        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)) {
@@ -9543,9 +8729,9 @@ sub validate_uploaded_scantron_file {
             $idmap{$lckey} = $idmap{$key};
         }
         my %unique_formats;
-        my @formatlines = &Apache::lonnet::get_scantronformat_file();
+        my @formatlines = &get_scantronformat_file();
         foreach my $line (@formatlines) {
-            next if (($line =~ /^\#/) || ($line eq ''));
+            chomp($line);
             my @config = split(/:/,$line);
             my $idstart = $config[5];
             my $idlength = $config[6];
@@ -9578,7 +8764,6 @@ sub validate_uploaded_scantron_file {
                 if (($max_match_format eq '') || ($percent_match > $max_match_pct)) {
                     $max_match_pct = $percent_match;
                     $max_match_format = $key;
-                    $found_match_count = $counts{$key}{'found'};
                     $max_match_count = $counts{$key}{'total'};
                 }
             }
@@ -9597,40 +8782,17 @@ sub validate_uploaded_scantron_file {
                 }
             }
             my $showpct = sprintf("%.0f",$max_match_pct).'%';
-            $output .= '<br />';
-            if ($found_match_count == $max_match_count) {
-                # 100% matching entries
-                $output .= &Apache::lonhtmlcommon::confirm_success(
-                     &mt('Comparison of student IDs: [_1] matching ([quant,_2,entry,entries])',
-                            '<b>'.$showpct.'</b>',$found_match_count)).'<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);
-            } else {
-                # Not all entries matching? -> Show warning and additional info
-                $output .=
-                    &Apache::lonhtmlcommon::confirm_success(
-                        &mt('Comparison of student IDs: [_1] matching ([_2]/[quant,_3,entry,entries])',
-                                '<b>'.$showpct.'</b>',$found_match_count,$max_match_count).'<br />'.
-                        &mt('Not all entries could be matched!'),1).'<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).
-                    '<p class="LC_info">'.
-                    &mt('A low percentage of matches results from one of the following:').
-                    '</p><ul>'.
-                    '<li>'.&mt('The file was uploaded to the wrong course.').'</li>'.
-                    '<li>'.&mt('The data is 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>';
-            }
+            $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 = '<p class="LC_warning">'.&mt('Uploaded file contained no data').'</p>';
+        $output = '<span class="LC_warning">'.&mt('Uploaded file contained no data').'</span>';
     }
     return $output;
 }
@@ -9644,7 +8806,7 @@ sub valid_file {
 }
 
 sub scantron_download_scantron_data {
-    my ($r,$symb) = @_;
+    my ($r,$symb)=@_;
     my $default_form_data=&defaultFormData($symb);
     my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -9665,7 +8827,7 @@ sub scantron_download_scantron_data {
     &Apache::lonnet::allowuploaded('/adm/grades',$skipped);
     $r->print('
     <p>
-	'.&mt('[_1]Original[_2] file as uploaded by the bubblesheet scanning office.',
+	'.&mt('[_1]Original[_2] file as uploaded by the scantron office.',
 	      '<a href="'.$orig.'">','</a>').'
     </p>
     <p>
@@ -9684,14 +8846,14 @@ sub checkscantron_results {
     my ($r,$symb) = @_;
     if (!$symb) {return '';}
     my $cid = $env{'request.course.id'};
-    my %lettdig = &Apache::lonnet::letter_to_digits();
+    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::lonnet::get_scantron_config($env{'form.scantron_format'});
+        &Apache::grades::get_scantron_config($env{'form.scantron_format'});
     my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
     my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();
@@ -9704,20 +8866,9 @@ sub checkscantron_results {
     my $map=$navmap->getResourceByUrl($sequence);
     my ($randomorder,$randompick,@master_seq,%symb_to_resource,%grader_partids_by_symb,
         %grader_randomlists_by_symb,%orderedforcode);
-    if (ref($map)) {
+    if (ref($map)) { 
         $randomorder=$map->randomorder();
         $randompick=$map->randompick();
-        unless ($randomorder || $randompick) {
-            foreach my $res ($navmap->retrieveResources($map,sub { $_[0]->is_map() },1,0,1)) {
-                if ($res->randomorder()) {
-                    $randomorder = 1;
-                }
-                if ($res->randompick()) {
-                    $randompick = 1;
-                }
-                last if ($randomorder || $randompick);
-            }
-        }
     }
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
     my $nav_error = &get_master_seq(\@resources,\@master_seq,\%symb_to_resource);
@@ -9737,15 +8888,14 @@ sub checkscantron_results {
 
     my $count=&get_todo_count($scanlines,$scan_data);
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);
-    my ($username,$domain,$started);
+    my ($username,$domain,$started,%ordered);
     &scantron_get_maxbubble(\$nav_error,\%scantron_config); # 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');
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,'Processing first student');
     my $start=&Time::HiRes::time();
     my $i=-1;
 
@@ -9755,8 +8905,7 @@ sub checkscantron_results {
         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');
+            &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
         }
         $started=1;
         my $scan_record=
@@ -9814,14 +8963,10 @@ sub checkscantron_results {
             my $ressymb = $resource->symb();
             if ((exists($grader_randomlists_by_symb{$ressymb})) ||
                 (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
-                my $currcode;
-                if (exists($grader_randomlists_by_symb{$ressymb})) {
-                    $currcode = $scancode;
-                }
                 (my $analysis,$parts) =
                     &scantron_partids_tograde($resource,$env{'request.course.id'},
                                               $username,$domain,undef,
-                                              $bubbles_per_row,$currcode);
+                                              $bubbles_per_row);
             } else {
                 $parts = $grader_partids_by_symb{$ressymb};
             }
@@ -9853,14 +8998,14 @@ sub checkscantron_results {
 '<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>'.&mt('Submissions').'</td><td>'.$showrecord.'</td></tr>'."\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>'.&mt('Submissions').'</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".
+'<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".
 '</tr>'."\n";
                     $failed ++;
                 }
@@ -9868,19 +9013,21 @@ sub checkscantron_results {
             }
         }
     }
-    $r->print('<p>'.
-              &mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).',
-                  '<b>',
-                  $numstudents,
-                  '</b>',
-                  $env{'form.scantron_maxbubble'}).
-              '</p>'
+    $r->print(
+        '<p>'
+       .&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).',
+            '<b>',
+            $numstudents,
+            '</b>',
+            $env{'form.scantron_maxbubble'})
+       .'</p>'
     );
     $r->print('<p>'
              .&mt('Exact matches for [_1][quant,_2,student][_3].','<b>',$passed,'</b>')
              .'<br />'
              .&mt('Discrepancies detected for [_1][quant,_2,student][_3].','<b>',$failed,'</b>')
-             .'</p>');
+             .'</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".
@@ -10026,6 +9173,23 @@ sub verify_scantron_grading {
     return ($counter,$record);
 }
 
+sub letter_to_digits {
+    my %lettdig = (
+                    A => 1,
+                    B => 2,
+                    C => 3,
+                    D => 4,
+                    E => 5,
+                    F => 6,
+                    G => 7,
+                    H => 8,
+                    I => 9,
+                    J => 0,
+                  );
+    return %lettdig;
+}
+
+
 #-------- end of section for handling grading scantron forms -------
 #
 #-------------------------------------------------------------------
@@ -10045,7 +9209,7 @@ sub grading_menu {
 
     my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
                   'command'=>'individual');
-
+    
     my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
 
     $fields{'command'}='ungraded';
@@ -10059,7 +9223,7 @@ sub grading_menu {
 
     $fields{'command'}='downloadfilesselect';
     my $url1e=&Apache::lonhtmlcommon::build_url('grades/',\%fields);
-    
+
     $fields{'command'} = 'csvform';
     my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
     
@@ -10071,74 +9235,64 @@ sub grading_menu {
 
     $fields{'command'} = 'initialverifyreceipt';
     my $url5 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-
-    my %permissions;
-    if ($perm{'mgr'}) {
-        $permissions{'either'} = 'F';
-        $permissions{'mgr'} = 'F';
-    }
-    if ($perm{'vgr'}) {
-        $permissions{'either'} = 'F';
-        $permissions{'vgr'} = 'F';
-    }
-
+    
     my @menu = ({	categorytitle=>'Hand Grading',
             items =>[
-                        {       linktext => 'Select individual students to grade',
-                                url => $url1a,
-                                permission => $permissions{'either'},
-                                icon => 'grade_students.png',
-                                linktitle => 'Grade current resource for a selection of students.'
-                        },
-                        {       linktext => 'Grade ungraded submissions',
+                        {	linktext => 'Select individual students to grade',
+                    		url => $url1a,
+                    		permission => 'F',
+                    		icon => 'grade_students.png',
+                    		linktitle => 'Grade current resource for a selection of students.'
+                        }, 
+                        {       linktext => 'Grade ungraded submissions.',
                                 url => $url1b,
-                                permission => $permissions{'either'},
+                                permission => 'F',
                                 icon => 'ungrade_sub.png',
                                 linktitle => 'Grade all submissions that have not been graded yet.'
                         },
 
                         {       linktext => 'Grading table',
                                 url => $url1c,
-                                permission => $permissions{'either'},
+                                permission => 'F',
                                 icon => 'grading_table.png',
                                 linktitle => 'Grade current resource for all students.'
                         },
                         {       linktext => 'Grade page/folder for one student',
                                 url => $url1d,
-                                permission => $permissions{'either'},
+                                permission => 'F',
                                 icon => 'grade_PageFolder.png',
                                 linktitle => 'Grade all resources in current page/sequence/folder for one student.'
                         },
-                        {       linktext => 'Download submitted files',
+                        {       linktext => 'Download submissions',
                                 url => $url1e,
-                                permission => $permissions{'either'},
+                                permission => 'F',
                                 icon => 'download_sub.png',
-                                linktitle => 'Download all files submitted by students.'
+                                linktitle => 'Download all students submissions.'
                         }]},
                          { categorytitle=>'Automated Grading',
                items =>[
 
                 	    {	linktext => 'Upload Scores',
                     		url => $url2,
-                    		permission => $permissions{'mgr'},
+                    		permission => 'F',
                     		icon => 'uploadscores.png',
                     		linktitle => 'Specify a file containing the class scores for current resource.'
                 	    },
                 	    {	linktext => 'Process Clicker',
                     		url => $url3,
-                    		permission => $permissions{'mgr'},
+                    		permission => 'F',
                     		icon => 'addClickerInfoFile.png',
                     		linktitle => 'Specify a file containing the clicker information for this resource.'
                 	    },
                 	    {	linktext => 'Grade/Manage/Review Bubblesheets',
                     		url => $url4,
-                    		permission => $permissions{'mgr'},
+                    		permission => 'F',
                     		icon => 'bubblesheet.png',
                     		linktitle => 'Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.'
                 	    },
                             {   linktext => 'Verify Receipt Number',
                                 url => $url5,
-                                permission => $permissions{'either'},
+                                permission => 'F',
                                 icon => 'receipt_number.png',
                                 linktitle => 'Verify a system-generated receipt number for correct problem solution.'
                             }
@@ -10156,6 +9310,7 @@ sub grading_menu {
     return $Str;    
 }
 
+
 sub ungraded {
     my ($request)=@_;
     &submit_options($request);
@@ -10188,7 +9343,7 @@ sub submit_options_table {
     $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
         '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
 
-    $result.=&selectfield(1).
+    $result.=&selectfield(0).
             '<input type="hidden" name="command" value="viewgrades" />
             <div>
               <input type="submit" value="'.&mt('Next').' &rarr;" />
@@ -10202,34 +9357,15 @@ sub submit_options_download {
     my ($request,$symb) = @_;
     if (!$symb) {return '';}
 
-    my $res_error;
-    my ($partlist,$handgrade,$responseType,$numresp,$numessay,$numdropbox) =
-        &response_type($symb,\$res_error);
-    if ($res_error) {
-        $request->print(&mt('An error occurred retrieving response types'));
-        return;
-    }
-    unless ($numessay) {
-        $request->print(&mt('No essayresponse items found'));
-        return;
-    }
-    my $table;
-    if (ref($partlist) eq 'ARRAY') {
-        if (scalar(@$partlist) > 1 ) {
-            $table = &showResourceInfo($symb,$partlist,$responseType,'gradingMenu',1,1);
-        }
-    }
-
     &commonJSfunctions($request);
 
     my $result='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
-        $table."\n".
-        '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
+        '<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
     $result.='
 <h2>
-  '.&mt('Select Students for whom to Download Submitted Files').'
+  '.&mt('Select Students for Which to Download Submissions').'
 </h2>'.&selectfield(1).'
-                <input type="hidden" name="command" value="downloadfileslink" />
+                <input type="hidden" name="command" value="downloadfileslink" /> 
               <input type="submit" value="'.&mt('Next').' &rarr;" />
             </div>
           </div>
@@ -10250,43 +9386,42 @@ sub submit_options {
     $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
 	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
     $result.=&selectfield(1).'
-                <input type="hidden" name="command" value="submission" />
-              <input type="submit" value="'.&mt('Next').' &rarr;" />
+                <input type="hidden" name="command" value="submission" /> 
+	      <input type="submit" value="'.&mt('Next').' &rarr;" />
             </div>
           </div>
+
+
   </form>';
     return $result;
 }
 
 sub selectfield {
    my ($full)=@_;
-   my %options =
-       (&substatus_options,
-        'select_form_order' => ['yes','queued','graded','incorrect','all']);
-
-  #
-  # PrepareClasslist() needs to be called to avoid getting a sections list
-  # for a different course from the @Sections global in lonstatistics.pm,
-  # populated by an earlier request.
-  #
-   &Apache::lonstatistics::PrepareClasslist();
-
+   my %options = 
+          (&Apache::lonlocal::texthash(
+             'yes'       => 'with submissions',
+             'queued'    => 'in grading queue',
+             'graded'    => 'with ungraded submissions',
+             'incorrect' => 'with incorrect submissions',
+             'all'       => 'with any status'),
+             'select_form_order' => ['yes','queued','graded','incorrect','all']);
    my $result='<div class="LC_columnSection">
-
+  
     <fieldset>
       <legend>
        '.&mt('Sections').'
       </legend>
       '.&Apache::lonstatistics::SectionSelect('section','multiple',5).'
     </fieldset>
-
+  
     <fieldset>
       <legend>
         '.&mt('Groups').'
       </legend>
       '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
     </fieldset>
- 
+  
     <fieldset>
       <legend>
         '.&mt('Access Status').'
@@ -10294,7 +9429,7 @@ sub selectfield {
       '.&Apache::lonhtmlcommon::StatusOptions(undef,undef,5,undef,'mult').'
     </fieldset>';
     if ($full) {
-        $result.='
+       $result.='
     <fieldset>
       <legend>
         '.&mt('Submission Status').'
@@ -10306,24 +9441,6 @@ sub selectfield {
     return $result;
 }
 
-sub substatus_options {
-    return &Apache::lonlocal::texthash(
-                                      'yes'       => 'with submissions',
-                                      'queued'    => 'in grading queue',
-                                      'graded'    => 'with ungraded submissions',
-                                      'incorrect' => 'with incorrect submissions',
-                                      'all'       => 'with any status',
-                                      );
-}
-
-sub transtatus_options {
-    return &Apache::lonlocal::texthash(
-                                       'yes'       => 'with score transactions',
-                                       'incorrect' => 'with less than full credit',
-                                       'all'       => 'with any status',
-                                      );
-}
-
 sub reset_perm {
     undef(%perm);
 }
@@ -10457,7 +9574,7 @@ sub process_clicker {
     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',
+						   {'iclicker' => 'i>clicker',
                                                     'interwrite' => 'interwrite PRS',
                                                     'turning' => 'Turning Technologies'});
     $symb = &Apache::lonenc::check_encrypt($symb);
@@ -10518,12 +9635,12 @@ ENDUPFORM
 <input type="text" name="givenanswer" size="50" />
 <input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />
 ENDGRADINGFORM
-    $result.='</td>'.&Apache::loncommon::end_data_table_row().
+         $result.='</td>'.&Apache::loncommon::end_data_table_row().
                      &Apache::loncommon::start_data_table_row().'<td>'.(<<ENDPERCFORM);
       <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>
+</form>'
 ENDPERCFORM
     $result.='</td>'.
              &Apache::loncommon::end_data_table_row().
@@ -10532,7 +9649,7 @@ ENDPERCFORM
 }
 
 sub process_clicker_file {
-    my ($r,$symb) = @_;
+    my ($r,$symb)=@_;
     if (!$symb) {return '';}
 
     my %Saveable_Parameters=&clicker_grading_parameters();
@@ -10590,34 +9707,16 @@ sub process_clicker_file {
 	    $number++;
 	}
         $result.="</p>\n";
-        if ($number==0) {
-            $result .=
-                 &Apache::lonhtmlcommon::confirm_success(
-                     &mt('No IDs found to determine correct answer'),1);
-            return $result;
-        }
+	if ($number==0) {
+	    $result.='<span class="LC_error">'.&mt('No IDs found to determine correct answer').'</span>';
+	    return $result;
+	}
     }
     if (length($env{'form.upfile'}) < 2) {
-        $result .=
-            &Apache::lonhtmlcommon::confirm_success(
-                &mt('The file: [_1] you attempted to upload contained no information. Please check that you entered the correct filename.',
-                        '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'),1);
-        return $result;
-    }
-    my $mimetype;
-    if ($env{'form.upfiletype'} eq 'iclicker') {
-        my $mm = new File::MMagic;
-        $mimetype = $mm->checktype_contents($env{'form.upfile'});
-        unless (($mimetype eq 'text/plain') || ($mimetype eq 'text/html')) {
-            $result.= '<p>'.
-                &Apache::lonhtmlcommon::confirm_success(
-                    &mt('File format is neither csv (iclicker 6) nor xml (iclicker 7)'),1).'</p>';
-            return $result;
-        }
-    } elsif (($env{'form.upfiletype'} ne 'interwrite') && ($env{'form.upfiletype'} ne 'turning')) {
-        $result .= '<p>'.
-            &Apache::lonhtmlcommon::confirm_success(
-                &mt('Invalid clicker type: choose one of: i>clicker, Interwrite PRS, or Turning Technologies.'),1).'</p>';
+        $result.=&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>');
         return $result;
     }
 
@@ -10646,14 +9745,12 @@ ENDHEADER
     my $errormsg='';
     my $number=0;
     if ($env{'form.upfiletype'} eq 'iclicker') {
-        if ($mimetype eq 'text/plain') {
-            ($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses);
-        } elsif ($mimetype eq 'text/html') {
-            ($errormsg,$number)=&iclickerxml_eval(\@questiontitles,\%responses);
-        }
-    } elsif ($env{'form.upfiletype'} eq 'interwrite') {
+	($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses);
+    }
+    if ($env{'form.upfiletype'} eq 'interwrite') {
         ($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);
-    } elsif ($env{'form.upfiletype'} eq 'turning') {
+    }
+    if ($env{'form.upfiletype'} eq 'turning') {
         ($errormsg,$number)=&turning_eval(\@questiontitles,\%responses);
     }
     $result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.
@@ -10706,7 +9803,7 @@ ENDHEADER
                    "\n".&mt("Username").": <input type='text' name='uname".$id."' />&nbsp;".
                    "\n".&mt("Domain").": ".
                    &Apache::loncommon::select_dom_form($env{'course.'.$env{'request.course.id'}.'.domain'},'udom'.$id).'&nbsp;'.
-                   &Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id,'',$id);
+                   &Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id,0,$id);
           $unknown_count++;
        }
     }
@@ -10761,49 +9858,6 @@ sub iclicker_eval {
     return ($errormsg,$number);
 }
 
-sub iclickerxml_eval {
-    my ($questiontitles,$responses)=@_;
-    my $number=0;
-    my $errormsg='';
-    my @state;
-    my %respbyid;
-    my $p = HTML::Parser->new
-    (
-        xml_mode => 1,
-        start_h =>
-            [sub {
-                 my ($tagname,$attr) = @_;
-                 push(@state,$tagname);
-                 if ("@state" eq "ssn p") {
-                     my $title = $attr->{qn};
-                     $title =~ s/(^\s+|\s+$)//g;
-                     $questiontitles->[$number]=$title;
-                 } elsif ("@state" eq "ssn p v") {
-                     my $id = $attr->{id};
-                     my $entry = $attr->{ans};
-                     $id=~s/^[\#0]+//;
-                     $entry =~s/[^a-zA-Z0-9\.\*\-\+]+//g;
-                     $respbyid{$id}[$number] = $entry;
-                 }
-            }, "tagname, attr"],
-         end_h =>
-               [sub {
-                   my ($tagname) = @_;
-                   if ("@state" eq "ssn p") {
-                       $number++;
-                   }
-                   pop(@state);
-                }, "tagname"],
-    );
-
-    $p->parse($env{'form.upfile'});
-    $p->eof;
-    foreach my $id (keys(%respbyid)) {
-        $responses->{$id}=join(',',@{$respbyid{$id}});
-    }
-    return ($errormsg,$number);
-}
-
 sub interwrite_eval {
     my ($questiontitles,$responses)=@_;
     my $number=0;
@@ -10860,8 +9914,9 @@ sub turning_eval {
     return ($errormsg,$number);
 }
 
+
 sub assign_clicker_grades {
-    my ($r,$symb) = @_;
+    my ($r,$symb)=@_;
     if (!$symb) {return '';}
 # See which part we are saving to
     my $res_error;
@@ -10872,11 +9927,11 @@ sub assign_clicker_grades {
 # FIXME: This should probably look for the first handgradeable part
     my $part=$$partlist[0];
 # Start screen output
-    my $result = &Apache::loncommon::start_data_table(). 
-                 &Apache::loncommon::start_data_table_header_row().
-                 '<th>'.&mt('Assigning grades based on clicker file').'</th>'.
-                 &Apache::loncommon::end_data_table_header_row().
-                 &Apache::loncommon::start_data_table_row().'<td>';
+    my $result=&Apache::loncommon::start_data_table().
+             &Apache::loncommon::start_data_table_header_row().
+             '<th>'.&mt('Assigning grades based on clicker file').'</th>'.
+             &Apache::loncommon::end_data_table_header_row().
+             &Apache::loncommon::start_data_table_row().'<td>';
 # Get correct result
 # FIXME: Possibly need delimiter other than ":"
     my @correct=();
@@ -10931,14 +9986,14 @@ sub assign_clicker_grades {
                       &mt('More than one entry found for [_1]!','<tt>'.$user.'</tt>').
                       '</span><br />';
           }
-          $users{$user}=1;
+          $users{$user}=1; 
           my @answer=split(/\,/,$env{$key});
           my $sum=0;
           my $realnumber=$number;
           for (my $i=0;$i<$number;$i++) {
              if  ($correct[$i] eq '-') {
                 $realnumber--;
-             } elsif (($answer[$i]) || ($answer[$i]=~/^[0\.]+$/)) {
+             } elsif (($answer[$i]) || ($answer[$i]=~/^[0\.]+$/))  {
                 if ($gradingmechanism eq 'attendance') {
                    $sum+=$pcorrect;
                 } elsif ($correct[$i] eq '*') {
@@ -10997,33 +10052,24 @@ sub navmap_errormsg {
 }
 
 sub startpage {
-    my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$head_extra,$onload,$divforres) = @_;
-    my %args;
-    if ($onload) {
-         my %loaditems = (
-                        'onload' => $onload,
-                      );
-         $args{'add_entries'} = \%loaditems;
-    }
+    my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js) = @_;
     if ($nomenu) {
-        $args{'only_body'} = 1;
-        $r->print(&Apache::loncommon::start_page("Student's Version",$head_extra,\%args));
+        $r->print(&Apache::loncommon::start_page("Student's Version",$js,{'only_body' => '1'}));
     } else {
-        if ($env{'request.course.id'}) {
-            unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});
-        }
-        $args{'bread_crumbs'} = $crumbs;
-        $r->print(&Apache::loncommon::start_page('Grading',$head_extra,\%args));
+        unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});
+        $r->print(&Apache::loncommon::start_page('Grading',$js,
+                                                 {'bread_crumbs' => $crumbs}));
+        &Apache::lonquickgrades::startGradeScreen($r,($env{'form.symb'}?'probgrading':'grading'));
     }
     unless ($nodisplayflag) {
-       $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp,$divforres));
+       $r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp));
     }
 }
 
 sub select_problem {
     my ($r)=@_;
     $r->print('<h3>'.&mt('Select the problem or one of the problems you want to grade').'</h3><form action="/adm/grades">');
-    $r->print(&Apache::lonstathelpers::problem_selector('.',undef,1,undef,undef,1));
+    $r->print(&Apache::lonstathelpers::problem_selector('.',undef,1));
     $r->print('<input type="hidden" name="command" value="gradingmenu" />');
     $r->print('<input type="submit" value="'.&mt('Next').' &rarr;" /></form>');
 }
@@ -11039,7 +10085,7 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
 
 # see what command we need to execute
- 
+
     my @commands=&Apache::loncommon::get_env_multiple('form.command');
     my $command=$commands[0];
 
@@ -11075,98 +10121,62 @@ sub handler {
     if (($symb eq '' || $command eq '') && ($env{'request.course.id'})) {
 #
 # Not called from a resource, but inside a course
-#
+#    
         &startpage($request,undef,[],1,1);
         &select_problem($request);
     } else {
-        if ($command eq 'submission' && $perm{'vgr'}) {
-            my ($stuvcurrent,$stuvdisp,$versionform,$js,$onload);
+	if ($command eq 'submission' && $perm{'vgr'}) {
+            my ($stuvcurrent,$stuvdisp,$versionform,$js);
             if (($env{'form.student'} ne '') && ($env{'form.userdom'} ne '')) {
                 ($stuvcurrent,$stuvdisp,$versionform,$js) =
                     &choose_task_version_form($symb,$env{'form.student'},
                                               $env{'form.userdom'});
             }
-            my $divforres;
-            if ($env{'form.student'} eq '') {
-                $js .= &part_selector_js();
-                $onload = "toggleParts('gradesub');";
-            } else {
-                $divforres = 1;
-            }
-            my $head_extra = $js;
-            unless ($env{'form.vProb'} eq 'no') {
-                my $csslinks = &Apache::loncommon::css_links($symb);
-                if ($csslinks) {
-                    $head_extra .= "\n$csslinks";
-                }
-            }
-            &startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef,
-                       $stuvcurrent,$stuvdisp,undef,$head_extra,$onload,$divforres);
+            &startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef,$stuvcurrent,$stuvdisp,undef,$js);
             if ($versionform) {
-                if ($divforres) {
-                    $request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>');
-                }
                 $request->print($versionform);
             }
-            ($env{'form.student'} eq '' ? &listStudents($request,$symb,'',$divforres) : &submission($request,0,0,$symb,$divforres,$command));
+            $request->print('<br clear="all" />');
+	    ($env{'form.student'} eq '' ? &listStudents($request,$symb) : &submission($request,0,0,$symb));
         } elsif ($command eq 'versionsub' && $perm{'vgr'}) {
             my ($stuvcurrent,$stuvdisp,$versionform,$js) =
                 &choose_task_version_form($symb,$env{'form.student'},
                                           $env{'form.userdom'},
                                           $env{'form.inhibitmenu'});
-            my $head_extra = $js;
-            unless ($env{'form.vProb'} eq 'no') {
-                my $csslinks = &Apache::loncommon::css_links($symb);
-                if ($csslinks) {
-                    $head_extra .= "\n$csslinks";
-                }
-            }
-            &startpage($request,$symb,[{href=>"", text=>"Previous Student Version"}],undef,undef,
-                       $stuvcurrent,$stuvdisp,$env{'form.inhibitmenu'},$head_extra);
+            &startpage($request,$symb,[{href=>"", text=>"Previous Student Version"}],undef,undef,$stuvcurrent,$stuvdisp,$env{'form.inhibitmenu'},$js);
             if ($versionform) {
                 $request->print($versionform);
             }
             $request->print('<br clear="all" />');
             $request->print(&show_previous_task_version($request,$symb));
-        } elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
+	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
             &startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},
                                        {href=>'',text=>'Select student'}],1,1);
-            &pickStudentPage($request,$symb);
-        } elsif ($command eq 'displayPage' && $perm{'vgr'}) {
-            my $csslinks;
-            unless ($env{'form.vProb'} eq 'no') {
-                $csslinks = &Apache::loncommon::css_links($symb,'map');
-            }
+	    &pickStudentPage($request,$symb);
+	} elsif ($command eq 'displayPage' && $perm{'vgr'}) {
             &startpage($request,$symb,
                                       [{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},
                                        {href=>'',text=>'Select student'},
-                                       {href=>'',text=>'Grade student'}],1,1,undef,undef,undef,$csslinks);
-            &displayPage($request,$symb);
-        } elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {
+                                       {href=>'',text=>'Grade student'}],1,1);
+	    &displayPage($request,$symb);
+	} elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},
                                        {href=>'',text=>'Select student'},
                                        {href=>'',text=>'Grade student'},
                                        {href=>'',text=>'Store grades'}],1,1);
-            &updateGradeByPage($request,$symb);
-        } elsif ($command eq 'processGroup' && $perm{'vgr'}) {
-            my $csslinks;
-            unless ($env{'form.vProb'} eq 'no') {
-                $csslinks = &Apache::loncommon::css_links($symb);
-            }
+	    &updateGradeByPage($request,$symb);
+	} elsif ($command eq 'processGroup' && $perm{'vgr'}) {
             &startpage($request,$symb,[{href=>'',text=>'...'},
-                                       {href=>'',text=>'Modify grades'}],undef,undef,undef,undef,undef,$csslinks,undef,1);
-            &processGroup($request,$symb);
-        } elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
+                                       {href=>'',text=>'Modify grades'}]);
+	    &processGroup($request,$symb);
+	} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
             &startpage($request,$symb);
-            $request->print(&grading_menu($request,$symb));
-        } elsif ($command eq 'individual' && $perm{'vgr'}) {
+	    $request->print(&grading_menu($request,$symb));
+	} elsif ($command eq 'individual' && $perm{'vgr'}) {
             &startpage($request,$symb,[{href=>'',text=>'Select individual students to grade'}]);
-            $request->print(&submit_options($request,$symb));
+	    $request->print(&submit_options($request,$symb));
         } elsif ($command eq 'ungraded' && $perm{'vgr'}) {
-            my $js = &part_selector_js();
-            my $onload = "toggleParts('gradesub');";
-            &startpage($request,$symb,[{href=>'',text=>'Grade ungraded submissions'}],
-                       undef,undef,undef,undef,undef,$js,$onload);
+            &startpage($request,$symb,[{href=>'',text=>'Grade ungraded submissions'}]);
             $request->print(&listStudents($request,$symb,'graded'));
         } elsif ($command eq 'table' && $perm{'vgr'}) {
             &startpage($request,$symb,[{href=>"", text=>"Grading table"}]);
@@ -11174,26 +10184,26 @@ sub handler {
         } elsif ($command eq 'all_for_one' && $perm{'vgr'}) {
             &startpage($request,$symb,[{href=>'',text=>'Grade page/folder for one student'}],1,1);
             $request->print(&submit_options_sequence($request,$symb));
-        } elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
+	} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
             &startpage($request,$symb,[{href=>&href_symb_cmd($symb,"table"), text=>"Grading table"},{href=>'', text=>"Modify grades"}]);
-            $request->print(&viewgrades($request,$symb));
-        } elsif ($command eq 'handgrade' && $perm{'mgr'}) {
+	    $request->print(&viewgrades($request,$symb));
+	} elsif ($command eq 'handgrade' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>'',text=>'...'},
                                        {href=>'',text=>'Store grades'}]);
-            $request->print(&processHandGrade($request,$symb));
-        } elsif ($command eq 'editgrades' && $perm{'mgr'}) {
+	    $request->print(&processHandGrade($request,$symb));
+	} elsif ($command eq 'editgrades' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>&href_symb_cmd($symb,"table"), text=>"Grading table"},
                                        {href=>&href_symb_cmd($symb,'viewgrades').'&group=all&section=all&Status=Active',
                                                                              text=>"Modify grades"},
                                        {href=>'', text=>"Store grades"}]);
-            $request->print(&editgrades($request,$symb));
+	    $request->print(&editgrades($request,$symb));
         } elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) {
             &startpage($request,$symb,[{href=>'',text=>'Verify Receipt Number'}]);
             $request->print(&initialverifyreceipt($request,$symb));
-        } elsif ($command eq 'verify' && $perm{'vgr'}) {
+	} elsif ($command eq 'verify' && $perm{'vgr'}) {
             &startpage($request,$symb,[{href=>&href_symb_cmd($symb,"initialverifyreceipt"),text=>'Verify Receipt Number'},
                                        {href=>'',text=>'Verification Result'}]);
-            $request->print(&verifyreceipt($request,$symb));
+	    $request->print(&verifyreceipt($request,$symb));
         } elsif ($command eq 'processclicker' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>'', text=>'Process clicker'}]);
             $request->print(&process_clicker($request,$symb));
@@ -11206,84 +10216,81 @@ sub handler {
                                        {href=>'', text=>'Process clicker file'},
                                        {href=>'', text=>'Store grades'}]);
             $request->print(&assign_clicker_grades($request,$symb));
-        } elsif ($command eq 'csvform' && $perm{'mgr'}) {
+	} elsif ($command eq 'csvform' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
-            $request->print(&upcsvScores_form($request,$symb));
-        } elsif ($command eq 'csvupload' && $perm{'mgr'}) {
+	    $request->print(&upcsvScores_form($request,$symb));
+	} elsif ($command eq 'csvupload' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
-            $request->print(&csvupload($request,$symb));
-        } elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
+	    $request->print(&csvupload($request,$symb));
+	} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
             &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
-            $request->print(&csvuploadmap($request,$symb));
-        } elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {
-            if ($env{'form.associate'} ne 'Reverse Association') {
+	    $request->print(&csvuploadmap($request,$symb));
+	} elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {
+	    if ($env{'form.associate'} ne 'Reverse Association') {
                 &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
-                $request->print(&csvuploadoptions($request,$symb));
-            } else {
-                if ( $env{'form.upfile_associate'} ne 'reverse' ) {
-                    $env{'form.upfile_associate'} = 'reverse';
-                } else {
-                    $env{'form.upfile_associate'} = 'forward';
-                }
+		$request->print(&csvuploadoptions($request,$symb));
+	    } else {
+		if ( $env{'form.upfile_associate'} ne 'reverse' ) {
+		    $env{'form.upfile_associate'} = 'reverse';
+		} else {
+		    $env{'form.upfile_associate'} = 'forward';
+		}
                 &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
-                $request->print(&csvuploadmap($request,$symb));
-            }
-        } elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
+		$request->print(&csvuploadmap($request,$symb));
+	    }
+	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
             &startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
-            $request->print(&csvuploadassign($request,$symb));
-        } elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
-            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1,
-                       undef,undef,undef,undef,'toggleScantab(document.rules);');
-            $request->print(&scantron_selectphase($request,undef,$symb));
-        } elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
+	    $request->print(&csvuploadassign($request,$symb));
+	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
+            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
+	    $request->print(&scantron_selectphase($request,undef,$symb));
+ 	} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
+            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
+ 	    $request->print(&scantron_do_warning($request,$symb));
+	} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
-            $request->print(&scantron_do_warning($request,$symb));
-        } elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
+	    $request->print(&scantron_validate_file($request,$symb));
+	} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
             &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
-            $request->print(&scantron_validate_file($request,$symb));
-        } elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
+	    $request->print(&scantron_process_students($request,$symb));
+ 	} elsif ($command eq 'scantronupload' && 
+ 		 (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})||
+		  &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
             &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
-            $request->print(&scantron_process_students($request,$symb));
-        } elsif ($command eq 'scantronupload' &&
-                 (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})||
-                  &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
-            &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1,
-                       undef,undef,undef,undef,'toggleScantab(document.rules);');
-            $request->print(&scantron_upload_scantron_data($request,$symb));
-        } elsif ($command eq 'scantronupload_save' &&
-                 (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})||
-                  &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
+ 	    $request->print(&scantron_upload_scantron_data($request,$symb)); 
+ 	} elsif ($command eq 'scantronupload_save' &&
+ 		 (&Apache::lonnet::allowed('usc',$env{'request.role.domain'})||
+		  &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
             &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
-            $request->print(&scantron_upload_scantron_data_save($request,$symb));
-        } elsif ($command eq 'scantron_download' &&
-                 &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
+ 	    $request->print(&scantron_upload_scantron_data_save($request,$symb));
+ 	} elsif ($command eq 'scantron_download' &&
+		 &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
             &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
-            $request->print(&scantron_download_scantron_data($request,$symb));
+ 	    $request->print(&scantron_download_scantron_data($request,$symb));
         } elsif ($command eq 'checksubmissions' && $perm{'vgr'}) {
             &startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
             $request->print(&checkscantron_results($request,$symb));
         } elsif ($command eq 'downloadfilesselect' && $perm{'vgr'}) {
-            my $js = &part_selector_js();
-            my $onload = "toggleParts('gradingMenu');";
-            &startpage($request,$symb,[{href=>'', text=>'Select which submissions to download'}],
-                       undef,undef,undef,undef,undef,$js,$onload);
+            &startpage($request,$symb,[{href=>'', text=>'Select which submissions to download'}]);
             $request->print(&submit_options_download($request,$symb));
          } elsif ($command eq 'downloadfileslink' && $perm{'vgr'}) {
             &startpage($request,$symb,
    [{href=>&href_symb_cmd($symb,'downloadfilesselect'), text=>'Select which submissions to download'},
-    {href=>'', text=>'Download submitted files'}],
-               undef,undef,undef,undef,undef,undef,undef,1);
-            $request->print('<div style="padding:0;clear:both;margin:0;border:0"></div>');
+    {href=>'', text=>'Download submissions'}]);
             &submit_download_link($request,$symb);
-        } elsif ($command) {
+	} elsif ($command) {
             &startpage($request,$symb,[{href=>'', text=>'Access denied'}]);
-            $request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>');
-        }
+	    $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());
+    if ($env{'form.inhibitmenu'}) {
+        $request->print(&Apache::loncommon::end_page());
+    } else {
+        &Apache::lonquickgrades::endGradeScreen($request);
+    }
     &reset_caches();
     return OK;
 }
@@ -11318,11 +10325,11 @@ At least the logic that drives this has
 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 problem, no text is appended to the
+                     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 LON-CAPA BZ 5631 see:
+                     in LonCAPA BZ 5631 see:
                      http://bugs.lon-capa.org/show_bug.cgi?id=5631
                      by informing the user that this happened.
 
@@ -11354,6 +10361,75 @@ ssi_with_retries()
 
 =over
 
+=head1 Routines to display previous version of a Task for a specific student
+
+Tasks are graded pass/fail. Students who have yet to pass a particular Task
+can receive another opportunity. Access to tasks is slot-based. If a slot
+requires a proctor to check-in the student, a new version of the Task will
+be created when the student is checked in to the new opportunity.
+
+If a particular student has tried two or more versions of a particular task,
+the submission screen provides a user with vgr privileges (e.g., a Course
+Coordinator) the ability to display a previous version worked on by the
+student.  By default, the current version is displayed. If a previous version
+has been selected for display, submission data are only shown that pertain
+to that particular version, and the interface to submit grades is not shown.
+
+=over 4
+
+=item show_previous_task_version()
+
+Displays a specified version of a student's Task, as the student sees it.
+
+Inputs: 2
+        request - request object
+        symb    - unique symb for current instance of resource
+
+Output: None.
+
+Side Effects: calls &show_problem() to print version of Task, with
+              version contained in form item: $env{'form.previousversion'}
+
+=item choose_task_version_form()
+
+Displays a web form used to select which version of a student's view of a
+Task should be displayed.  Either launches a pop-up window, or replaces
+content in existing pop-up, or replaces page in main window.
+
+Inputs: 4
+        symb    - unique symb for current instance of resource
+        uname   - username of student
+        udom    - domain of student
+        nomenu  - 1 if display is in a pop-up window, and hence no menu
+                  breadcrumbs etc., are displayed
+
+Output: 4
+        current   - student's current version
+        displayed - student's version being displayed
+        result    - scalar containing HTML for web form used to switch to
+                    a different version (or a link to close window, if pop-up).
+        js        - javascript for processing selection in versions web form
+
+Side Effects: None.
+
+=item previous_display_javascript()
+
+Inputs: 2
+        nomenu  - 1 if display is in a pop-up window, and hence no menu
+                  breadcrumbs etc., are displayed.
+        current - student's current version number.
+
+Output: 1
+        js      - javascript for processing selection in versions web form.
+
+Side Effects: None.
+
+=back
+
+=head1 Routines to process bubblesheet data.
+
+=over 4
+
 =item scantron_get_correction() : 
 
    Builds the interface screen to interact with the operator to fix a
@@ -11363,7 +10439,7 @@ ssi_with_retries()
     $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 &Apache::lonnet::get_scantron_config()
+    $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',
@@ -11380,8 +10456,8 @@ ssi_with_retries()
          - missingbubble - array ref of the bubble lines that have missing
                            bubble errors
 
-   $randomorder - True if exam folder (or a sub-folder) has randomorder set
-   $randompick  - True if exam folder (or a sub-folder) has randompick set
+   $randomorder - True if exam folder has randomorder set
+   $randompick  - True if exam folder has randompick set
    $respnumlookup - Reference to HASH mapping question numbers in bubble lines
                      for current line to question number used for same question
                      in "Master Seqence" (as seen by Course Coordinator).
@@ -11390,6 +10466,7 @@ ssi_with_retries()
                   or code-based randompick and/or randomorder.
 
 
+
 =item  scantron_get_maxbubble() : 
 
    Arguments:
@@ -11469,7 +10546,9 @@ ssi_with_retries()
 =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.  
+   Should be called whenever the request to instantiate a navmap object fails.
+
+=back
 
 =back