--- loncom/homework/grades.pm	2024/08/23 20:52:28	1.596.2.12.2.60.2.6
+++ loncom/homework/grades.pm	2018/11/20 19:14:14	1.753
@@ -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.6 2024/08/23 20:52:28 raeburn Exp $
+# $Id: grades.pm,v 1.753 2018/11/20 19:14:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,11 +44,10 @@ 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 String::Similarity;
-use HTML::Parser();
-use File::MMagic;
 use LONCAPA;
 
 use POSIX qw(floor);
@@ -147,7 +146,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) = @_;
@@ -165,7 +163,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);
@@ -175,20 +172,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 {
@@ -215,129 +205,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();
@@ -446,7 +313,7 @@ sub reset_caches {
                     $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') {
@@ -476,7 +343,7 @@ sub cleanRecord {
     if ($response =~ /^(option|rank)$/) {
 	my %answer=&Apache::lonnet::str2hash($answer);
         my @answer = %answer;
-        %answer = map {&HTML::Entities::encode($_, '"<>&')} @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) {
@@ -494,7 +361,7 @@ sub cleanRecord {
     } elsif ($response eq 'match') {
 	my %answer=&Apache::lonnet::str2hash($answer);
         my @answer = %answer;
-        %answer = map {&HTML::Entities::encode($_, '"<>&')} @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);
@@ -553,6 +420,7 @@ sub cleanRecord {
 	}
         $answer = &Apache::lontexconvert::msgtexconverted($answer);
 	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>"');
@@ -669,7 +537,7 @@ sub getclasslist {
         $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);
+        ($partlist,my $handgrade,my $responseType) = &response_type($symb,\$res_error);
     }
     foreach my $student (keys(%$classlist)) {
         my $end      = 
@@ -785,7 +653,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;
 	    }
 	}
@@ -798,19 +666,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;
 }
 
@@ -951,14 +819,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";
@@ -1039,7 +907,7 @@ 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 $is_tool   = ($symb =~ /ext\.tool$/);
     my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
@@ -1047,23 +915,12 @@ sub listStudents {
     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 (
 		'multiple' => 'Please select a student or group of students before clicking on the Next button.',
@@ -1105,8 +962,8 @@ LISTJAVASCRIPT
     $request->print($result);
 
     my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
-	"\n".$table;
-
+	"\n";
+	
     $gradeTable .= &Apache::lonhtmlcommon::start_pick_box();
     unless ($is_tool) {
         $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('View Problem Text'))
@@ -1121,6 +978,7 @@ LISTJAVASCRIPT
                       .&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;
@@ -1140,7 +998,7 @@ LISTJAVASCRIPT
                           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".
@@ -1159,77 +1017,48 @@ LISTJAVASCRIPT
     } else {
         $viewtitle = &mt('View Submissions');
     }
-    my ($compmsg,$nocompmsg);
-    $nocompmsg = ' checked="checked"';
-    if ($numessay) {
-        $compmsg = $nocompmsg;
-        $nocompmsg = '';
-    }
     $gradeTable .= &Apache::lonhtmlcommon::row_title($viewtitle)
-                  .$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>'
+                  .$submission_options
                   .&Apache::lonhtmlcommon::row_closure();
 
-        $gradeTable .= 
-                   &Apache::lonhtmlcommon::row_title(&mt('Grading Increments'))
+    my $closure;
+    if (($is_tool) && (exists($env{'form.Status'}))) {
+        $closure = 1;
+    }
+    $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($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'))
+        if ($is_tool) {
+            $closure = 1;
+        }
+        $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status'))
                       .&Apache::lonhtmlcommon::StatusOptions(
-                           $saveStatus,undef,1,'javascript:reLoadList(this.form);');
+                           $saveStatus,undef,1,'javascript:reLoadList(this.form);')
+                      .&Apache::lonhtmlcommon::row_closure($closure);
     }
-    if ($numessay) {
-        $gradeTable .= &Apache::lonhtmlcommon::row_closure()
-                      .&Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))
-                      .'<input type="checkbox" name="checkPlag" checked="checked" />';
+
+    unless ($is_tool) {
+        $closure = 1;
+        $gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Check For Plagiarism'))
+                      .'<input type="checkbox" name="checkPlag" checked="checked" />'
+                      .&Apache::lonhtmlcommon::row_closure($closure);
     }
-    $gradeTable .= &Apache::lonhtmlcommon::row_closure(1)
-                  .&Apache::lonhtmlcommon::end_pick_box();
+    $gradeTable .= &Apache::lonhtmlcommon::end_pick_box();
     my $regrademsg;
     if ($is_tool) {
         $regrademsg =&mt("To view/grade/regrade, click on the check box(es) next to the student's name(s). Then click on the Next button.");
@@ -1383,8 +1212,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];
@@ -1429,7 +1258,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;
@@ -1617,8 +1446,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);
@@ -1664,17 +1493,55 @@ 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 %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(
                 comp => 'Compose Message for: ',
                 incl => 'Include',
@@ -1684,11 +1551,29 @@ INNERJS
                 new  => 'New',
                 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 view submitted by ==================
   function viewSubmitter(submitter) {
     document.SCORE.refresh.value = "on";
@@ -1698,6 +1583,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("$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 composing message ==============
    // preload images
    img1 = new Image();
@@ -1799,6 +1704,7 @@ INNERJS
 
   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 />");
@@ -1807,107 +1713,6 @@ INNERJS
     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;
@@ -2098,8 +1903,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) {
@@ -2118,7 +1922,7 @@ sub handback_box {
 	    if ($file =~ /\/portfolio\//) {
                 $file_counter++;
     	        my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|);
-    	        my ($name,$version,$ext) = &file_name_version_ext($file_disp);
+    	        my ($name,$version,$ext) = &Apache::lonnet::file_name_version_ext($file_disp);
     	        $file_disp = "$name.$ext";
     	        $file = $file_path.$file_disp;
     	        $result.=&mt('Return commented version of [_1] to student.',
@@ -2205,7 +2009,7 @@ sub files_exist {
         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/);
@@ -2220,8 +2024,8 @@ 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'));
@@ -2241,23 +2045,33 @@ sub download_all_link {
 sub submit_download_link {
     my ($request,$symb) = @_;
     if (!$symb) { return ''; }
+#FIXME: Figure out which type of problem this is and provide appropriate download
     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 ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);
+    if (ref($res_error)) {
+        if ($$res_error) {
+            $request->print(&mt('An error occurred retrieving response types'));
+            return;
+        }
     }
-    my @chosenparts = &Apache::loncommon::get_env_multiple('form.vPart');
-    if (@chosenparts) {
-        $request->print(&showResourceInfo($symb,$partlist,$responseType,
-                                          undef,undef,1));
+    my ($numupload,$numessay) = (0,0);
+    if (ref($responseType) eq 'HASH') {
+        foreach my $part (sort(keys(%$responseType))) {
+            foreach my $id (sort(keys(%{ $responseType->{$part} }))) {
+                my $responsetype = $responseType->{$part}->{$id};
+                if ($responsetype eq 'essay') {
+                    my $uploadedfiletypes =
+                        &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes",$symb);
+                    if ($uploadedfiletypes) {
+                        $numupload++;
+                    } else {
+                        $numessay++;
+                    }
+                }
+            }
+        }
     }
-    if ($numessay) {
+    if (($numupload) || ($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'};
@@ -2266,12 +2080,10 @@ sub submit_download_link {
             my @students = map { $_.':'.$fullname->{$_} } (keys(%{$fullname}));
             if (@students) {
                 @{$env{'form.stuinfo'}} = @students;
-                if ($numdropbox) {
+                if ($numupload) {
                     &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
+# FIXME Need to provide a mechanism to download essays, i.e., if $numessay > 0
 # 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'));
@@ -2300,14 +2112,14 @@ 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 $is_tool = ($symb =~ /ext\.tool$/);
     my ($essayurl,%coursedesc_by_cid);
 
@@ -2321,22 +2133,11 @@ sub submission {
 	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'; }
-    unless ($is_tool) {
+    unless ($is_tool) { 
         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').
@@ -2344,17 +2145,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.
@@ -2371,27 +2163,24 @@ sub submission {
 	    $request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
 	}
 
+	# kwclr is the only variable that is guaranteed not to be 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".
@@ -2405,23 +2194,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="'.
@@ -2434,7 +2224,8 @@ sub submission {
 	}
 	$request->print($prnmsg);
 
-	if ($numessay) {
+#	if ($env{'form.handgrade'} eq 'yes') {
+        unless ($is_tool) {
 
             my %lt = &Apache::lonlocal::texthash(
                           keyh => 'Keyword Highlighting for Essays',
@@ -2442,7 +2233,7 @@ sub submission {
                           list => 'List',
                           past => 'Paste Selection to List',
                           high => 'Highlight Attribute',
-                     );
+                     );    
 #
 # Print out the keyword options line
 #
@@ -2522,6 +2313,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 />'));
@@ -2534,238 +2331,100 @@ sub submission {
               .'<h3 class="LC_hcell">'.$boxtitle.'</h3>';
     $result.='<input type="hidden" name="name'.$counter.
              '" value="'.$env{'form.fullname'}.'" />'."\n";
-    if (($numresp > $numessay) && !$is_tool) {
+#    if ($env{'form.handgrade'} eq 'no') {
+    unless ($is_tool) {
         $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') {
+    unless ($is_tool) {
 	(my $sub_result,$fullname,$col_fullnames)=
 	    &check_collaborators($symb,$uname,$udom,\%record,$handgrade,
 				 $counter);
 	$result.=$sub_result;
     }
     $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 ($lastsubonly,$partinfo) =
-        &show_last_submission($uname,$udom,$symb,$essayurl,$responseType,$env{'form.lastSub'},
-                              $is_tool,$fullname,\%record,\%coursedesc_by_cid);
-    $request->print($partinfo);
-    $request->print($lastsubonly);
-
-    if ($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 : '');
-	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
-								 $env{'request.course.id'},
-								 $last,'.submission',
-								 'Apache::grades::keywords_highlight',
-                                                                 $usec,$identifier));
-    }
-    $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;
-    } 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);
-    }
-
-    my %seen = ();
-    my @partlist;
-    my @gradePartRespid;
-    my @part_response_id;
-    if ($is_tool) {
-        @part_response_id = ([0,'']);
-    } else {
-        @part_response_id = &flatten_responseType($responseType);
-    }
-    $request->print(
-        '<div class="LC_Box">'
-       .'<h3 class="LC_hcell">'.&mt('Assign Grades').'</h3>'
-    );
-    $request->print(&gradeBox_start());
-    foreach my $part_response_id (@part_response_id) {
-    	my ($partid,$respid) = @{ $part_response_id };
-	my $part_resp = join('_',@{ $part_response_id });
-	next if ($seen{$partid} > 0);
-	$seen{$partid}++;
-	push(@partlist,$partid);
-	push(@gradePartRespid,$partid.'.'.$respid);
-	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
-    }
-    $request->print(&gradeBox_end()); # </div>
-    $request->print('</div>');
-
-    $request->print('<div class="LC_grade_info_links">');
-    $request->print('</div>');
-
-    $result='<input type="hidden" name="partlist'.$counter.
-	'" value="'.(join ":",@partlist).'" />'."\n";
-    $result.='<input type="hidden" name="gradePartRespid'.
-	'" value="'.(join ":",@gradePartRespid).'" />'."\n" if ($counter == 0);
-    my $ctr = 0;
-    while ($ctr < scalar(@partlist)) {
-	$result.='<input type="hidden" name="partid'.$counter.'_'.$ctr.'" value="'.
-	    $partlist[$ctr].'" />'."\n";
-	$ctr++;
-    }
-    $request->print($result.''."\n");
-
-# Done with printing info for one student
-
-    $request->print('</div>');#LC_grade_show_user
-
-
-    # print end of form
-    if ($counter == $total) {
-        my $endform='<br /><hr /><table border="0"><tr><td>'."\n";
-	$endform.='<input type="button" value="'.&mt('Save &amp; Next').'" '.
-	    'onclick="javascript:checksubmit(this.form,\'Save & Next\','.
-	    $total.','.scalar(@partlist).');" target="_self" /> &nbsp;'."\n";
-	my $ntstu ='<select name="NTSTU">'.
-	    '<option>1</option><option>2</option>'.
-	    '<option>3</option><option>5</option>'.
-	    '<option>7</option><option>10</option></select>'."\n";
-	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
-	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
-        $endform.=&mt('[_1]student(s)',$ntstu);
-	$endform.='&nbsp;&nbsp;<input type="button" value="'.&mt('Previous').'" '.
-	    'onclick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> &nbsp;'."\n".
-	    '<input type="button" value="'.&mt('Next').'" '.
-	    'onclick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> &nbsp;';
-        $endform.='<span class="LC_warning">'.
-                  &mt('(Next and Previous (student) do not save the scores.)').
-                  '</span>'."\n" ;
-        $endform.="<input type='hidden' value='".&get_increment().
-            "' name='increment' />";
-	$endform.='</td></tr></table></form>';
-	$request->print($endform);
-    }
-    return '';
-}
+    # 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
+    
+    my ($string,$timestamp)= &get_last_submission(\%record,$is_tool);
+	
+    my $lastsubonly;
 
-sub show_last_submission {
-    my ($uname,$udom,$symb,$essayurl,$responseType,$viewtype,$is_tool,$fullname,
-        $record,$coursedesc_by_cid) = @_;
-    my ($string,$timestamp,$lastgradetime,$lastsubmittime) =
-        &get_last_submission($record,$is_tool);
-
-    my ($lastsubonly,$partinfo);
-    if ($timestamp eq '') {
-        $lastsubonly.='<div class="LC_grade_submissions_body">'.$string->[0].'</div>';
+    if ($$timestamp eq '') {
+        $lastsubonly.='<div class="LC_grade_submissions_body">'.$$string[0].'</div>'; 
     } elsif ($is_tool) {
         $lastsubonly =
             '<div class="LC_grade_submissions_body">'
-           .'<b>'.&mt('Date Grade Passed Back:').'</b> '.$timestamp."</div>\n";
+           .'<b>'.&mt('Date Grade Passed Back:').'</b> '.$$timestamp."</div>\n";
     } 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";
-        }
+           .'<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 %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;
-                $partinfo .=
+	    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"})) {
+                    '<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
+	       	    '<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"};
+                    $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 ($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 />';
+			    $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]',
@@ -2775,8 +2434,8 @@ sub show_last_submission {
                             } else {
                                 my %old_course_desc;
                                 if ($ocrsid ne '') {
-                                    if (ref($coursedesc_by_cid->{$ocrsid}) eq 'HASH') {
-                                        %old_course_desc = %{$coursedesc_by_cid->{$ocrsid}};
+                                    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'}) {
@@ -2784,7 +2443,7 @@ sub show_last_submission {
                                         }
                                         %old_course_desc =
                                             &Apache::lonnet::coursedescription($ocrsid,$args);
-                                        $coursedesc_by_cid->{$ocrsid} = \%old_course_desc;
+                                        $coursedesc_by_cid{$ocrsid} = \%old_course_desc;
                                     }
                                     $similar .=
                                         '<h3><span class="LC_warning">'.
@@ -2808,21 +2467,21 @@ sub show_last_submission {
                                         &keywords_highlight($oessay).
                                         '</i></blockquote><hr />';
                         }
-                    }
-                }
-                my $order=&get_order($partid,$respid,$symb,$uname,$udom,
+	            }
+		}
+		my $order=&get_order($partid,$respid,$symb,$uname,$udom,
                                      undef,$type,$trial,$rndseed);
-                if (($viewtype eq 'lastonly') ||
-                    ($viewtype eq 'datesub')  ||
-                    ($viewtype =~ /^(last|all)$/)) {
-                    my $display_part=&get_display_part($partid,$symb);
+                if ($env{'form.lastSub'} eq 'lastonly' || $env{'form.lastSub'} eq 'datesub' || $env{'form.lastSub'} =~ /^(last|all)$/ || ($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) {
+		    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 {
@@ -2833,37 +2492,162 @@ sub show_last_submission {
                             } else {
                                 $lastsubonly .= &mt('Like all files provided by users, these files may contain viruses!');
                             }
-                            $lastsubonly .= '</span>';
+                            $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 />';
+			$lastsubonly.='<br />';
                     }
                     if ($hide eq 'anon') {
-                        $lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>';
+                        $lastsubonly.='<br /><b>'.&mt('Anonymous Survey').'</b>'; 
                     } else {
-                        $lastsubonly.='<br /><b>'.&mt('Submitted Answer:').' </b>';
+             	        $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);
+			    &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>';
-                }
+	            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') {
+        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 : '');
+        $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
+								 $env{'request.course.id'},
+								 $last,'.submission',
+								 'Apache::grades::keywords_highlight',
+                                                                 $usec,$identifier));
+    }
+    $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;
+    } else {
+	$request->print('</div>'."\n");
+    }
+
+    # 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 = ();
+    my @partlist;
+    my @gradePartRespid;
+    my @part_response_id;
+    if ($is_tool) {
+        @part_response_id = ([0,'']);
+    } else {
+        @part_response_id = &flatten_responseType($responseType);
+    }
+    $request->print(
+        '<div class="LC_Box">'
+       .'<h3 class="LC_hcell">'.&mt('Assign Grades').'</h3>'
+    );
+    $request->print(&gradeBox_start());
+    foreach my $part_response_id (@part_response_id) {
+    	my ($partid,$respid) = @{ $part_response_id };
+	my $part_resp = join('_',@{ $part_response_id });
+	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));
+    }
+    $request->print(&gradeBox_end()); # </div>
+    $request->print('</div>');
+
+    $request->print('<div class="LC_grade_info_links">');
+    $request->print('</div>');
+
+    $result='<input type="hidden" name="partlist'.$counter.
+	'" value="'.(join ":",@partlist).'" />'."\n";
+    $result.='<input type="hidden" name="gradePartRespid'.
+	'" value="'.(join ":",@gradePartRespid).'" />'."\n" if ($counter == 0);
+    my $ctr = 0;
+    while ($ctr < scalar(@partlist)) {
+	$result.='<input type="hidden" name="partid'.$counter.'_'.$ctr.'" value="'.
+	    $partlist[$ctr].'" />'."\n";
+	$ctr++;
     }
-    return ($lastsubonly,$partinfo);
+    $request->print($result.''."\n");
+
+# Done with printing info for one student
+
+    $request->print('</div>');#LC_grade_show_user
+
+
+    # print end of form
+    if ($counter == $total) {
+        my $endform='<br /><hr /><table border="0"><tr><td>'."\n";
+	$endform.='<input type="button" value="'.&mt('Save &amp; Next').'" '.
+	    'onclick="javascript:checksubmit(this.form,\'Save & Next\','.
+	    $total.','.scalar(@partlist).');" target="_self" /> &nbsp;'."\n";
+	my $ntstu ='<select name="NTSTU">'.
+	    '<option>1</option><option>2</option>'.
+	    '<option>3</option><option>5</option>'.
+	    '<option>7</option><option>10</option></select>'."\n";
+	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
+	$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</;
+        $endform.=&mt('[_1]student(s)',$ntstu);
+	$endform.='&nbsp;&nbsp;<input type="button" value="'.&mt('Previous').'" '.
+	    'onclick="javascript:checksubmit(this.form,\'Previous\');" target="_self" /> &nbsp;'."\n".
+	    '<input type="button" value="'.&mt('Next').'" '.
+	    'onclick="javascript:checksubmit(this.form,\'Next\');" target="_self" /> &nbsp;';
+        $endform.='<span class="LC_warning">'.
+                  &mt('(Next and Previous (student) do not save the scores.)').
+                  '</span>'."\n" ;
+        $endform.="<input type='hidden' value='".&get_increment().
+            "' name='increment' />";
+	$endform.='</td></tr></table></form>';
+	$request->print($endform);
+    }
+    return '';
 }
 
 sub check_collaborators {
@@ -2925,51 +2709,18 @@ sub check_collaborators {
 #--- Retrieve the last submission for all the parts
 sub get_last_submission {
     my ($returnhash,$is_tool)=@_;
-    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 is for last transaction for this resource, which does not
-# necessarily correspond to the time of last submission for problem (or part).
-#
-        if ($lasthash{'timestamp'} ne '') {
-            $timestamp = &Apache::lonlocal::locallocaltime($lasthash{'timestamp'});
-        }
         my (%typeparts,%randombytry);
         my $showsurv = 
             &Apache::lonnet::allowed('vas',$env{'request.course.id'});
@@ -3032,7 +2783,7 @@ sub get_last_submission {
 	$string[0] =
 	    '<span class="LC_warning">'.$msg.'</span>';
     }
-    return (\@string,$timestamp,$lastgradetime,$lastsubmittime);
+    return (\@string,\$timestamp);
 }
 
 #--- High light keywords, with style choosen by user.
@@ -3062,11 +2813,12 @@ sub show_previous_task_version {
     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">'.
+            &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>');
         return;
     }
     my $mode = 'both';
@@ -3238,37 +2990,19 @@ 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);
+                &saveHandGrade($request,$symb,$uname,$udom,$ctr);
 	    if ($errorflag eq 'no_score') {
 		$ctr++;
 		next;
 	    }
 	    if ($errorflag eq 'not_allowed') {
-                $request->print(
+		$request->print(
                     '<span class="LC_error">'
                    .&mt('Not allowed to modify grades for [_1]',"$uname:$udom")
                    .'</span>');
@@ -3317,7 +3051,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;
@@ -3339,12 +3073,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'};
@@ -3352,9 +3087,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
@@ -3377,12 +3110,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') {
@@ -3422,6 +3152,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);
 	}
@@ -3432,7 +3163,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);
@@ -3482,7 +3220,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 '';
@@ -3490,7 +3228,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'});
@@ -3602,7 +3340,7 @@ 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,
@@ -3642,7 +3380,7 @@ sub makehidden {
 }
 
 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 ''
@@ -3650,9 +3388,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 ) {
@@ -3678,19 +3414,19 @@ 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} =~ /^(.*?)([^\/]*)$/);
                     my ($answer_name,$answer_ver,$answer_ext) =
-		        &file_name_version_ext($answer_file);
+		        &Apache::lonnet::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);
+		    my $version = &Apache::lonnet::get_next_version($answer_name,$answer_ext,$dir_list);
                     # fix filename
                     my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
                     my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,
@@ -3708,8 +3444,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>'));
                 }
@@ -3720,7 +3455,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');
@@ -3840,93 +3575,20 @@ sub version_portfiles {
     my $version_parts = join('|',@$v_flag);
     my @returned_keys;
     my $parts = join('|', @$parts_graded);
-    my $portfolio_root = '/userfiles/portfolio';
     foreach my $key (keys(%$record)) {
         my $new_portfiles;
         if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
             my @versioned_portfiles;
             my @portfiles = split(/\s*,\s*/,$$record{$key});
-            foreach my $file (@portfiles) {
-                &Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file);
-                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) =
-                    &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,
-                                             $stu_name,$getpropath);
-                my $version = &get_next_version($answer_name,$answer_ext,$dir_list);
-                my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
-                if ($new_answer ne 'problem getting file') {
-                    push(@versioned_portfiles, $directory.$new_answer);
-                    &Apache::lonnet::mark_as_readonly($domain,$stu_name,
-                        [$directory.$new_answer],
-                        [$symb,$env{'request.course.id'},'graded']);
-                }
+            if (@portfiles) {
+                &Apache::lonnet::portfiles_versioning($symb,$domain,$stu_name,\@portfiles,
+                                                      \@versioned_portfiles);
             }
             $$record{$key} = join(',',@versioned_portfiles);
             push(@returned_keys,$key);
         }
-    }
-    return (@returned_keys);
-}
-
-sub get_next_version {
-    my ($answer_name, $answer_ext, $dir_list) = @_;
-    my $version;
-    if (ref($dir_list) eq 'ARRAY') {
-        foreach my $row (@{$dir_list}) {
-            my ($file) = split(/\&/,$row,2);
-            my ($file_name,$file_version,$file_ext) =
-	        &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
-                if ($file_version ne '') {
-                    # a versioned file is found  so save it for later
-                    if ($file_version > $version) {
-		        $version = $file_version;
-                    }
-	        }
-            }
-        }
-    }
-    $version ++;
-    return($version);
-}
-
-sub version_selected_portfile {
-    my ($domain,$stu_name,$directory,$file_name,$version) = @_;
-    my ($answer_name,$answer_ver,$answer_ext) =
-        &file_name_version_ext($file_name);
-    my $new_answer;
-    $env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stu_name/portfolio$directory$file_name");
-    if($env{'form.copy'} eq '-1') {
-        $new_answer = 'problem getting file';
-    } else {
-        $new_answer = $answer_name.'.'.$version.'.'.$answer_ext;
-        my $copy_result = &Apache::lonnet::finishuserfileupload(
-                            $stu_name,$domain,'copy',
-		        '/portfolio'.$directory.$new_answer);
-    }    
-    return ($new_answer);
-}
-
-sub file_name_version_ext {
-    my ($file)=@_;
-    my @file_parts = split(/\./, $file);
-    my ($name,$version,$ext);
-    if (@file_parts > 1) {
-	$ext=pop(@file_parts);
-	if (@file_parts > 1 && $file_parts[-1] =~ /^\d+$/) {
-	    $version=pop(@file_parts);
-	}
-	$name=join('.',@file_parts);
-    } else {
-	$name=join('.',@file_parts);
-    }
-    return($name,$version,$ext);
+    } 
+    return (@returned_keys);   
 }
 
 #--------------------------------------------------------------------------------------
@@ -4145,26 +3807,7 @@ sub viewgrades {
     }
 
     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;
-                }
-            }
-        }
-    }
+    @sections = &Apache::loncommon::get_env_multiple('form.section');
     if (grep(/^all$/,@sections)) {
         @sections = ('all');
         if ($group_display) {
@@ -4174,7 +3817,7 @@ sub viewgrades {
             $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');
+	    $common_header = &mt('Assign Common Grade to Class');
             $specific_header = &mt('Assign Grade to Specific Students in Class');
         }
     } elsif (grep(/^none$/,@sections)) {
@@ -4187,7 +3830,7 @@ sub viewgrades {
             $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');
+	    $specific_header = &mt('Assign Grade to Specific Students in no Section');
         }
     } else {
         $section_display = join (", ",@sections);
@@ -4201,7 +3844,7 @@ sub viewgrades {
             $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);
+	    $specific_header = &mt('Assign Grade to Specific Students in Section(s) [_1]',$section_display);
         }
     }
     my %submit_types = &substatus_options();
@@ -4240,6 +3883,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;
 
@@ -4258,10 +3902,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>'.
@@ -4320,8 +3964,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 {
@@ -4356,7 +4000,7 @@ sub viewgrades {
     }
     $result.=&Apache::loncommon::end_data_table();
     $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
-    $result.='<input type="button" value="'.&mt('Save').'"'.$disabled.' '.
+    $result.='<input type="button" value="'.&mt('Save').'" '.
 	'onclick="javascript:submit();" target="_self" /></form>'."\n";
     if ($ctr == 0) {
         my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
@@ -4369,7 +4013,7 @@ sub viewgrades {
                                    $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);
+                                   $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);
@@ -4422,8 +4066,8 @@ sub viewgrades {
                 }
             } 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);
+	            $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);
@@ -4432,13 +4076,13 @@ sub viewgrades {
                                    $section_display,$group_display,$stu_status,$submission_status);
                 }
             }
-	}
+        }
 	$result .= '</span><br />';
     }
     return $result;
 }
 
-#--- call by previous routine to display each student who satisfies submission filter.
+#--- call by previous routine to display each student who satisfies submission filter. 
 sub viewstudentgrade {
     my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets,$is_tool) = @_;
     my ($uname,$udom) = split(/:/,$student);
@@ -4553,7 +4197,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().
@@ -4619,22 +4263,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 $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;
-        }
+	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;
+	}
         my %aggregate = ();
         my $aggregateflag = 0;
 	$user=~s/:/_/; # colon doen't work in javascript for names
@@ -4719,32 +4362,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) {
@@ -4810,7 +4433,7 @@ sub split_part_type {
 #
 #--- Javascript to handle csv upload
 sub csvupload_javascript_reverse_associate {
-    my $error1=&mt('You need to specify the username or the student/employee ID');
+    my $error1=&mt('You need to specify the username, the student/employee ID, or the clicker ID');
     my $error2=&mt('You need to specify at least one grading field');
   &js_escape(\$error1);
   &js_escape(\$error2);
@@ -4819,13 +4442,15 @@ sub csvupload_javascript_reverse_associa
     var foundsomething=0;
     var founduname=0;
     var foundID=0;
+    var foundclicker=0;
     for (i=0;i<=vf.nfields.value;i++) {
       tw=eval('vf.f'+i+'.selectedIndex');
       if (i==0 && tw!=0) { foundID=1; }
       if (i==1 && tw!=0) { founduname=1; }
-      if (i!=0 && i!=1 && i!=2 && tw!=0) { foundsomething=1; }
+      if (i==2 && tw!=0) { foundclicker=1; }
+      if (i!=0 && i!=1 && i!=2 && i!=3 && tw!=0) { foundsomething=1; }
     }
-    if (founduname==0 && foundID==0) {
+    if (founduname==0 && foundID==0 && foundclicker==0) {
 	alert('$error1');
 	return;
     }
@@ -4852,7 +4477,7 @@ ENDPICK
 }
 
 sub csvupload_javascript_forward_associate {
-    my $error1=&mt('You need to specify the username or the student/employee ID');
+    my $error1=&mt('You need to specify the username, the student/employee ID, or the clicker ID');
     my $error2=&mt('You need to specify at least one grading field');
   &js_escape(\$error1);
   &js_escape(\$error2);
@@ -4861,13 +4486,15 @@ sub csvupload_javascript_forward_associa
     var foundsomething=0;
     var founduname=0;
     var foundID=0;
+    var foundclicker=0;
     for (i=0;i<=vf.nfields.value;i++) {
       tw=eval('vf.f'+i+'.selectedIndex');
       if (tw==1) { foundID=1; }
       if (tw==2) { founduname=1; }
-      if (tw>3) { foundsomething=1; }
+      if (tw==3) { foundclicker=1; }
+      if (tw>4) { foundsomething=1; }
     }
-    if (founduname==0 && foundID==0) {
+    if (founduname==0 && foundID==0 && ƒoundclicker==0) {
 	alert('$error1');
 	return;
     }
@@ -4899,8 +4526,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 />'.
@@ -4909,7 +4534,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" />
@@ -4941,13 +4565,14 @@ sub csvupload_fields {
 
     my @fields=(['ID','Student/Employee ID'],
 		['username','Student Username'],
+		['clicker','Clicker ID'],
 		['domain','Student Domain']);
     my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
     foreach my $part (sort(@parts)) {
 	my @datum;
 	my $display=&Apache::lonnet::metadata($url,$part.'.display',$toolsymb);
 	my $name=$part;
-	if  (!$display) { $display = $name; }
+	if (!$display) { $display = $name; }
 	@datum=($name,$display);
 	if ($name=~/^stores_(.*)_awarded/) {
 	    push(@fields,['stores_'.$1.'_points',"Points [Part: $1]"]);
@@ -5003,12 +4628,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;
@@ -5016,20 +4640,19 @@ 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 '') { 
+	$datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
+        if ($datatoken ne '') {
 	    &Apache::loncommon::load_tmp_file($request,$datatoken);
         }
     }
     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) {
@@ -5066,8 +4689,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" />
@@ -5081,7 +4702,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; }
@@ -5115,15 +4736,14 @@ 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 '') {
+    if ($datatoken ne '') { 
         &Apache::loncommon::load_tmp_file($request,$datatoken);
     }
     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);
@@ -5145,13 +4765,45 @@ sub csvuploadassign {
 	if (!$username) {
 	    my $id=$entries{$fields{'ID'}};
 	    $id=~s/\s//g;
-	    my %ids=&Apache::lonnet::idget($domain,$id);
-	    $username=$ids{$id};
+            if ($id ne '') {
+	        my %ids=&Apache::lonnet::idget($domain,[$id]);
+	        $username=$ids{$id};
+            } else {
+                if ($entries{$fields{'clicker'}}) {
+                    my $clicker = $entries{$fields{'clicker'}};
+                    $clicker=~s/\s//g;
+                    if ($clicker ne '') {
+                        my %clickers = &Apache::lonnet::idget($domain,[$clicker],'clickers');
+                        if ($clickers{$clicker} ne '') {  
+                            my $match = 0;
+                            my @inclass;
+                            foreach my $poss (split(/,/,$clickers{$clicker})) {
+                                if (exists($$classlist{"$poss:$domain"})) {
+                                    $username = $poss;
+                                    push(@inclass,$poss);
+                                    $match ++;
+                                    
+                                }
+                            }
+                            if ($match > 1) {
+                                undef($username); 
+                                $request->print('<p class="LC_warning">'.
+                                                &mt('Score not saved for clicker: [_1] (matched multiple usernames: [_2])',
+                                                $clicker,join(', ',@inclass)).'</p>');
+                            }
+                        }
+                    }
+                }
+            }
 	}
 	if (!exists($$classlist{"$username:$domain"})) {
 	    my $id=$entries{$fields{'ID'}};
 	    $id=~s/\s//g;
-	    if ($id) {
+            my $clicker = $entries{$fields{'clicker'}};
+            $clicker=~s/\s//g;
+            if ($clicker) {
+                push(@skipped,"$clicker:$domain");
+	    } elsif ($id) {
 		push(@skipped,"$id:$domain");
 	    } else {
 		push(@skipped,"$username:$domain");
@@ -5179,7 +4831,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;
@@ -5200,7 +4852,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'}";
@@ -5215,13 +4867,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));
@@ -5271,7 +4923,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>';
@@ -5290,30 +4941,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>';
 
@@ -5339,7 +4990,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="" />'
@@ -5361,7 +5012,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 
 			 {
@@ -5442,10 +5093,10 @@ sub displayPage {
     &Apache::lonnet::clear_EXT_cache_status();
 
     if (!&canview($usec)) {
-	$request->print(
+        $request->print(
             '<span class="LC_warning">'.
             &mt('Unable to view requested student. ([_1])',
-                $env{'form.student'}).
+                    $env{'form.student'}).
             '</span>');
         return;
     }
@@ -5528,7 +5179,7 @@ sub displayPage {
             } else {
 	        if ($env{'form.vProb'} eq 'yes' ) {
 		    $studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
-			   		         undef,'both',\%form);
+					         undef,'both',\%form);
 	        } else {
 		    my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'},%form);
 		    $companswer =~ s|<form(.*?)>||g;
@@ -5539,7 +5190,7 @@ sub displayPage {
 #		    }
 #		    $companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
 		    $studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br />&nbsp;<b>'.&mt('Correct answer').':</b><br />'.$companswer;
-                }
+		}
 	    }
 
 	    my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
@@ -5563,11 +5214,10 @@ sub displayPage {
 			$responseType{$partid} = \%responseIds;
 		    }
 		    $studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);
-
 		}
 	    } elsif ($env{'form.lastSub'} eq 'all') {
 		my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
-                my $identifier = (&canmodify($usec)? $prob : '');
+                my $identifier = (&canmodify($usec)? $prob : ''); 
 		$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom,
 									$env{'request.course.id'},
 									'','.submission',undef,
@@ -5589,14 +5239,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);
@@ -5626,7 +5272,7 @@ sub displaySubByDates {
         if ($is_tool) {
             return '<br />&nbsp;<span class="LC_warning">'.&mt('No grade passed back.').'</span><br />';
         } else {
-	    return '<br />&nbsp;<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />';
+            return '<br />&nbsp;<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />';
         }
     }
 
@@ -5660,13 +5306,13 @@ sub displaySubByDates {
             if (($type eq 'anonsurvey') || ($type eq 'anonsurveycred')) {
                 $hidden = 1;
             }
-	    my @matchKey;
+            my @matchKey;
             if ($isTask) {
-                @matchKey = sort(grep(/^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys));
+                @matchKey = sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys);
             } elsif ($is_tool) {
-                @matchKey = sort(grep(/^resource\.\Q$partid\E\.awarded$/,@versionKeys));
+                @matchKey = sort(grep /^resource\.\Q$partid\E\.awarded$/,@versionKeys);
             } else {
-		@matchKey = sort(grep(/^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys));
+                @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);
             }
 #	    next if ($$record{"$version:resource.$partid.solved"} eq '');
 	    my $display_part=&get_display_part($partid,$symb);
@@ -5677,7 +5323,7 @@ sub displaySubByDates {
                         $displaySub[0].=$$record{"$version:resource.$partid.awarded"};
                     } else {
 		        my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
-			    	                   : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
+				                   : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
                         $displaySub[0].='<span class="LC_nobreak">';
                         $displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
                                        .' <span class="LC_internal_info">'
@@ -5696,8 +5342,8 @@ sub displaySubByDates {
 			        $displaySub[0].=&mt('Trial not counted');
 		            } else {
 			        $displaySub[0].=&mt('Trial: [_1]',
-				    	        $$record{"$where.$partid.tries"});
-                                if (($rndseed ne '')  && ($lastrndseed{$partid} ne '')) {
+					        $$record{"$where.$partid.tries"});
+                                if (($rndseed ne '') && ($lastrndseed{$partid} ne '')) {
                                     if (($rndseed ne $lastrndseed{$partid}) &&
                                         (($type eq 'randomizetry') || ($lasttype{$partid} eq 'randomizetry'))) {
                                         $newvariation = '&nbsp;('.&mt('New variation this try').')';
@@ -5705,12 +5351,12 @@ sub displaySubByDates {
                                 }
                                 $lastrndseed{$partid} = $rndseed;
                                 $lasttype{$partid} = $type;
-		           }
-		           my $responseType=($isTask ? 'Task'
-                                                  : $responseType->{$partid}->{$responseId});
-		           if (!exists($orders{$partid})) { $orders{$partid}={}; }
-		           if ((!exists($orders{$partid}->{$responseId})) || ($trial)) {
-			       $orders{$partid}->{$responseId}=
+		            }
+		            my $responseType=($isTask ? 'Task'
+                                              : $responseType->{$partid}->{$responseId});
+		            if (!exists($orders{$partid})) { $orders{$partid}={}; }
+		            if ((!exists($orders{$partid}->{$responseId})) || ($trial)) {
+			        $orders{$partid}->{$responseId}=
 			            &get_order($partid,$responseId,$symb,$uname,$udom,
                                                $no_increment,$type,$trial,$rndseed);
 		            }
@@ -5732,16 +5378,16 @@ sub displaySubByDates {
 		    lc($$record{"$where.$partid.award"}).' '.
 		    $mark{$$record{"$where.$partid.solved"}}.
 		    '<br />';
-            } elsif (($is_tool) && (exists($$record{"$version:resource.$partid.solved"}))) {
-                if ($$record{"$version:resource.$partid.solved"} =~ /^(in|)correct_by_passback$/) {
-                    $displaySub[1].=&mt('Grade passed back by external tool');
-                }
+	    } elsif (($is_tool) && (exists($$record{"$version:resource.$partid.solved"}))) {
+		if ($$record{"$version:resource.$partid.solved"} =~ /^(in|)correct_by_passback$/) {
+		    $displaySub[1].=&mt('Grade passed back by external tool');
+		}
 	    }
 	    if (exists $$record{"$where.$partid.regrader"}) {
 		$displaySub[2].=$$record{"$where.$partid.regrader"};
-                unless ($is_tool) {
+		unless ($is_tool) {
 		    $displaySub[2].=' (<b>'.&mt('Part').':</b> '.$display_part.')';
-                }
+		}
 	    } elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) {
 		$displaySub[2].=
 		    $$record{"$version:resource.$partid.regrader"};
@@ -5832,7 +5478,6 @@ 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);
@@ -5842,20 +5487,7 @@ sub updateGradeByPage {
 	    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;
@@ -5921,7 +5553,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) {
@@ -6020,7 +5652,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).'" />';
 }
 
 
@@ -6173,7 +5805,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 ''));
@@ -6185,6 +5817,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
@@ -6266,58 +5954,49 @@ 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'};
+    my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
+    &js_escape(\$alertmsg);
+    $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("'.$alertmsg.'");
+	    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:
@@ -6367,6 +6046,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.
 
@@ -6428,12 +6109,106 @@ sub scantron_selectphase {
     return;
 }
 
+=pod
+
+=item get_scantron_config
+
+   Parse and return the bubblesheet 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
 
     creates a hash keyed by student/employee ID with values of the corresponding
-    student username:domain.
+    student username:domain. If a single ID occurs for more than one student,
+    the status of the student is checked, and if Active, the value in the hash
+    will be set to the Active student.
 
   Arguments:
 
@@ -6473,7 +6248,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
@@ -6633,12 +6408,12 @@ sub digits_to_letters {
 
 =item scantron_parse_scanline
 
-  Decodes a scanline from the selected scantron file
+  Decodes a scanline from the selected bubblesheet file
 
  Arguments:
-    line             - The text of the scantron file line to process
+    line             - The text of the bubblesheet file line to process
     whichline        - Line number
-    scantron_config  - Hash describing the format of the scantron lines.
+    scantron_config  - Hash describing the format of the bubblesheet lines.
     scan_data        - Hash of extra information about the scanline
                        (see scantron_getfile for more information)
     just_header      - True if should not process question answers but only
@@ -6663,7 +6438,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
 
@@ -6756,7 +6531,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;
@@ -6770,7 +6545,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;
@@ -6830,12 +6605,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;
@@ -6843,14 +6615,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;
@@ -6920,7 +6684,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') ||
@@ -7167,7 +6931,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'};
@@ -7216,7 +6980,7 @@ sub scantron_process_corrections {
 	}
     }
     if ($err) {
-	$r->print(
+        $r->print(
             '<p class="LC_error">'
            .&mt('Unable to accept last correction, an error occurred: [_1]',
                 $errmsg)
@@ -7336,7 +7100,7 @@ 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'} &&
@@ -7492,7 +7256,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());
@@ -7519,7 +7283,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';
@@ -7549,7 +7313,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)" />');
@@ -7928,9 +7692,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>'
             );
@@ -7951,7 +7716,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;
@@ -8052,10 +7817,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");
@@ -8075,8 +7840,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");
@@ -8173,7 +7938,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);
 
@@ -8198,7 +7963,7 @@ sub verify_bubbles_checked {
     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;
@@ -8283,7 +8048,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));
@@ -8314,6 +8079,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
@@ -8366,7 +8132,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 {
@@ -8384,7 +8150,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 />");
         }
@@ -8411,7 +8186,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.
@@ -8424,7 +8199,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'};
@@ -8575,7 +8350,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'}) {
@@ -8649,7 +8424,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();
@@ -8667,17 +8442,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) {
@@ -8754,7 +8518,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')) {
@@ -8805,7 +8569,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;
@@ -8842,7 +8606,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();
@@ -8861,17 +8625,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) {
@@ -8897,9 +8650,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; }
@@ -8910,36 +8663,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);
@@ -8982,7 +8735,7 @@ 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 />').
@@ -9001,8 +8754,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);
@@ -9013,21 +8766,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 '';
@@ -9035,7 +8777,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 '';
@@ -9080,7 +8822,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;
 
@@ -9097,7 +8839,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,
@@ -9127,7 +8869,7 @@ SCANTRONFORM
 
         my @mapresources = @resources;
         if ($randomorder || $randompick) {
-            @mapresources =
+            @mapresources = 
                 &users_order($user,$scancode,$sequence,\@master_seq,\%symb_to_resource,
                              \%orderedforcode);
         }
@@ -9182,16 +8924,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'}) {
@@ -9221,7 +8958,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>");
@@ -9314,7 +9051,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 
@@ -9341,7 +9078,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;
                     }
                 }
@@ -9354,7 +9091,7 @@ sub users_order  {
                                                            $master_seq,
                                                            $user,undef,1);
         if (ref($actual_seq) eq 'ARRAY') {
-            @mapresources =
+            @mapresources = 
                 map { $symb_to_resource->{$_}; } @{$actual_seq};
         }
     }
@@ -9410,16 +9147,15 @@ 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);
@@ -9452,7 +9188,6 @@ sub scantron_upload_scantron_data {
         return;
     }
 
-    '.$formatjs.'
 '));
     $r->print('
 <h3>'.&mt('Send bubblesheet data to a course').'</h3>
@@ -9468,12 +9203,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).
@@ -9486,87 +9216,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".
@@ -9576,54 +9228,24 @@ 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('<p>'.&mt('Uploading file to [_1]','"'.$coursedata{'description'}.'"').'</p>');
     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,'','',
+        my $result = 
+            &Apache::lonnet::userfileupload('upfile','','scantron','','','',
                                             $env{'form.courseid'},$env{'form.domainid'});
-	if ($result =~ m{^/uploaded/}) {
+        if ($result =~ m{^/uploaded/}) {
             $r->print(
                 &Apache::lonhtmlcommon::confirm_success(&mt('Upload successful')).'<br />'.
                 &mt('Uploaded [_1] bytes of data into location: [_2]',
@@ -9632,7 +9254,7 @@ sub scantron_upload_scantron_data_save {
             ($uploadedfile) = ($result =~ m{/([^/]+)$});
             $r->print(&validate_uploaded_scantron_file($env{'form.domainid'},
                                                        $env{'form.courseid'},$uploadedfile));
-	} else {
+        } else {
             $r->print(
                 &Apache::lonhtmlcommon::confirm_success(&mt('Upload failed'),1).'<br />'.
                     &mt('An error ([_1]) occurred when attempting to upload the file: [_2]',
@@ -9666,9 +9288,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];
@@ -9767,7 +9389,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'};
@@ -9807,14 +9429,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();
@@ -9827,20 +9449,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);
@@ -9867,8 +9478,7 @@ sub checkscantron_results {
         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;
 
@@ -9878,8 +9488,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=
@@ -9991,19 +9600,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".
@@ -10149,6 +9760,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 -------
 #
 #-------------------------------------------------------------------
@@ -10168,7 +9796,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';
@@ -10182,7 +9810,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);
     
@@ -10194,74 +9822,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.'
                             }
@@ -10279,6 +9897,7 @@ sub grading_menu {
     return $Str;    
 }
 
+
 sub ungraded {
     my ($request)=@_;
     &submit_options($request);
@@ -10326,35 +9945,16 @@ 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);
-        }
-    }
-
     my $is_tool = ($symb =~ /ext\.tool$/);
     &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 whom to Download Submissions').'
 </h2>'.&selectfield(1,$is_tool).'
-                <input type="hidden" name="command" value="downloadfileslink" />
+                <input type="hidden" name="command" value="downloadfileslink" /> 
               <input type="submit" value="'.&mt('Next').' &rarr;" />
             </div>
           </div>
@@ -10376,10 +9976,12 @@ 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,$is_tool).'
-                <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;
 }
@@ -10392,34 +9994,26 @@ sub selectfield {
            (&transtatus_options,
             'select_form_order' => ['yes','incorrect','all']);
    } else {
-       %options =
+       %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 $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').'
@@ -10594,7 +10188,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);
@@ -10655,12 +10249,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().
@@ -10669,7 +10263,7 @@ ENDPERCFORM
 }
 
 sub process_clicker_file {
-    my ($r,$symb) = @_;
+    my ($r,$symb)=@_;
     if (!$symb) {return '';}
 
     my %Saveable_Parameters=&clicker_grading_parameters();
@@ -10741,22 +10335,6 @@ sub process_clicker_file {
                         '<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>';
-        return $result;
-    }
 
 # Were able to get all the info needed, now analyze the file
 
@@ -10783,14 +10361,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 />'.
@@ -10843,7 +10419,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++;
        }
     }
@@ -10898,49 +10474,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;
@@ -10997,8 +10530,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;
@@ -11009,11 +10543,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=();
@@ -11068,14 +10602,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 '*') {
@@ -11134,108 +10668,28 @@ 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,undef,undef,undef,undef,1));
     $r->print('<input type="hidden" name="command" value="gradingmenu" />');
     $r->print('<input type="submit" value="'.&mt('Next').' &rarr;" /></form>');
 }
 
-#----- display problem, answer, and submissions for a single student (no grading)
-
-sub view_as_user {
-    my ($symb,$vuname,$vudom,$hasperm) = @_;
-    my $plainname = &Apache::loncommon::plainname($vuname,$vudom,'lastname');
-    my $displayname = &nameUserString('',$plainname,$vuname,$vudom);
-    my $output = &Apache::loncommon::get_student_view($symb,$vuname,$vudom,
-                                                      $env{'request.course.id'},
-                                                      undef,{'disable_submit' => 1}).
-                 "\n\n".
-                 '<div class="LC_grade_show_user">'.
-                 '<h2>'.$displayname.'</h2>'.
-                 "\n".
-                 &Apache::loncommon::track_student_link('View recent activity',
-                                                        $vuname,$vudom,'check').' '.
-                 "\n";
-    if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||
-        (($env{'request.course.sec'} ne '') &&
-         &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.$env{'request.course.sec'}))) {
-        $output .= &Apache::loncommon::pprmlink(&mt('Set/Change parameters'),
-                                               $vuname,$vudom,$symb,'check');
-    }
-    $output .= "\n";
-    my $companswer = &Apache::loncommon::get_student_answers($symb,$vuname,$vudom,
-                                                             $env{'request.course.id'});
-    $companswer=~s|<form(.*?)>||g;
-    $companswer=~s|</form>||g;
-    $companswer=~s|name="submit"|name="would_have_been_submit"|g;
-    $output .= '<div class="LC_Box">'.
-               '<h3 class="LC_hcell">'.&mt('Correct answer for[_1]',$displayname).'</h3>'.
-               $companswer.
-               '</div>'."\n";
-    my $is_tool = ($symb =~ /ext\.tool$/);
-    my ($essayurl,%coursedesc_by_cid);
-    (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
-    my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$vudom,$vuname);
-    my $res_error;
-    my ($partlist,$handgrade,$responseType,$numresp,$numessay) =
-        &response_type($symb,\$res_error);
-    my $fullname;
-    my $collabinfo;
-    if ($numessay) {
-        unless ($hasperm) {
-            &init_perm();
-        }
-        ($collabinfo,$fullname)=
-            &check_collaborators($symb,$vuname,$vudom,\%record,$handgrade,0);
-        unless ($hasperm) {
-            &reset_perm();
-        }
-    }
-    my $checkIcon = '<img alt="'.&mt('Check Mark').
-                    '" src="'.$Apache::lonnet::perlvar{'lonIconsURL'}.
-                    '/check.gif" height="16" border="0" />';
-    my ($lastsubonly,$partinfo) =
-        &show_last_submission($vuname,$vudom,$symb,$essayurl,$responseType,'datesub',
-                              '',$fullname,\%record,\%coursedesc_by_cid);
-    $output .= '<div class="LC_Box">'.
-               '<h3 class="LC_hcell">'.&mt('Submissions').'</h3>'."\n".$collabinfo."\n";
-    if (($numresp > $numessay) & !$is_tool) {
-        $output .='<p class="LC_info">'.
-                  &mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon).
-                  "</p>\n";
-    }
-    $output .= $partinfo;
-    $output .= $lastsubonly;
-    $output .= &displaySubByDates($symb,\%record,$partlist,$responseType,$checkIcon,$vuname,$vudom);
-    $output .= '</div></div>'."\n";
-    return $output;
-}
-
 sub handler {
     my $request=$_[0];
     &reset_caches();
@@ -11247,7 +10701,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];
 
@@ -11283,98 +10737,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"}]);
@@ -11382,26 +10800,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));
@@ -11414,84 +10832,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'}) {
+ 	    $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_validate_file($request,$symb));
-        } elsif ($command eq 'scantron_process' && $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_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_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_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($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_download_scantron_data($request,$symb));
+ 	    $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));
         } 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 submitted files'}]);
             &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;
 }
@@ -11515,7 +10930,7 @@ described at http://www.lon-capa.org.
 =head1 OVERVIEW
 
 Do an ssi with retries:
-While I'd love to factor out this with the vesrion in lonprintout,
+While I'd love to factor out this with the version in lonprintout,
 that would either require a data coupling between modules, which I refuse to perpetuate (there's quite enough of that already), or would require the invention of another infrastructure
 I'm not quite ready to invent (e.g. an ssi_with_retry object).
 
@@ -11562,6 +10977,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
@@ -11571,7 +11055,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',
@@ -11588,8 +11072,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).
@@ -11598,6 +11082,7 @@ ssi_with_retries()
                   or code-based randompick and/or randomorder.
 
 
+
 =item  scantron_get_maxbubble() : 
 
    Arguments:
@@ -11677,7 +11162,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