--- loncom/homework/grades.pm	2002/11/27 16:39:37	1.62
+++ loncom/homework/grades.pm	2003/11/04 19:38:09	1.146
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.62 2002/11/27 16:39:37 albertel Exp $
+# $Id: grades.pm,v 1.146 2003/11/04 19:38:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,9 @@
 # 8/20 Gerd Kortemeyer
 # Year 2002
 # June-August H.K. Ng
+# Year 2003
+# February, March H.K. Ng
+# July, H. K. Ng
 #
 
 package Apache::grades;
@@ -39,24 +42,48 @@ use Apache::style;
 use Apache::lonxml;
 use Apache::lonnet;
 use Apache::loncommon;
+use Apache::lonhtmlcommon;
+use Apache::lonnavmaps;
 use Apache::lonhomework;
 use Apache::loncoursedata;
 use Apache::lonmsg qw(:user_normal_msg);
 use Apache::Constants qw(:common);
+use String::Similarity;
 
-# ----- These first few routines are general use routines.-----
+my %oldessays=();
+my %perm=();
+
+# ----- These first few routines are general use routines.----
 #
-# --- Retrieve the parts that matches stores_\d+ from the metadata file.---
+# --- Retrieve the parts from the metadata file.---
 sub getpartlist {
-    my ($url) = @_;
-    my @parts =();
-    my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
-    foreach my $key (@metakeys) {
-	if ( $key =~ m/stores_(\w+)_.*/) {
-	    push(@parts,$key);
+    my ($url,$symb) = @_;
+    my $partorder = &Apache::lonnet::metadata($url, 'partorder');
+    my @parts;
+    if ($partorder) {
+	for my $part (split (/,/,$partorder)) {
+	    if (!&Apache::loncommon::check_if_partid_hidden($part,$symb)) {
+		push(@parts, $part);
+	    }
+	}	    
+    } else {
+	my $metadata = &Apache::lonnet::metadata($url, 'packages');
+	foreach (split(/\,/,$metadata)) {
+	    if ($_ =~ /^part_(.*)$/) {
+		if (!&Apache::loncommon::check_if_partid_hidden($1,$symb)) {
+		    push(@parts, $1);
+		}
+	    }
+	}
+    }
+    my @stores;
+    foreach my $part (@parts) {
+	my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
+	foreach my $key (@metakeys) {
+	    if ($key =~ m/^stores_\Q$part\E_/) { push(@stores,$key); }
 	}
     }
-    return @parts;
+    return @stores;
 }
 
 # --- Get the symbolic name of a problem and the url
@@ -87,10 +114,23 @@ sub get_fullname {
     return $fullname;
 }
 
+#--- Format fullname, username:domain if different for display
+#--- Use anywhere where the student names are listed
+sub nameUserString {
+    my ($type,$fullname,$uname,$udom) = @_;
+    if ($type eq 'header') {
+	return '<b>&nbsp;Fullname&nbsp;</b><font color="#999999">(Username)</font>&nbsp;';
+    } else {
+	return '&nbsp;'.$fullname.'<font color="#999999">&nbsp;('.$uname.
+	    ($ENV{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';
+    }
+}
+
 #--- Get the partlist and the response type for a given problem. ---
 #--- Indicate if a response type is coded handgraded or not. ---
 sub response_type {
-    my ($url) = shift;
+    my ($url,$symb) = shift;
+    $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');
     my $allkeys = &Apache::lonnet::metadata($url,'keys');
     my %seen = ();
     my (@partlist,%handgrade);
@@ -98,7 +138,12 @@ sub response_type {
 	if (/^\w+response_\w+.*/) {
 	    my ($responsetype,$part) = split(/_/,$_,2);
 	    my ($partid,$respid) = split(/_/,$part);
-	    $handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no');
+	    if (&Apache::loncommon::check_if_partid_hidden($partid,$symb)) {
+		next;
+	    }
+	    $responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!
+	    my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb);
+	    $handgrade{$part} = $responsetype.':'.($value eq 'yes' ? 'yes' : 'no'); 
 	    next if ($seen{$partid} > 0);
 	    $seen{$partid}++;
 	    push @partlist,$partid;
@@ -107,10 +152,106 @@ sub response_type {
     return \@partlist,\%handgrade;
 }
 
+#--- Show resource title
+#--- and parts and response type
+sub showResourceInfo {
+    my ($url,$probTitle) = @_;
+    my $result ='<table border="0">'.
+	'<tr><td colspan=3><font size=+1><b>Current Resource: </b>'.$probTitle.'</font></td></tr>'."\n";
+    my ($partlist,$handgrade) = &response_type($url);
+    my %resptype = ();
+    my $hdgrade='no';
+    for (sort keys(%$handgrade)) {
+	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
+	my $partID = (split(/_/))[0];
+	$resptype{$partID} = $responsetype;
+	$hdgrade = $handgrade if ($handgrade eq 'yes');
+	$result.='<tr><td><b>Part </b>'.$partID.'</td>'.
+	    '<td><b>Type: </b>'.$responsetype.'</td></tr>';
+#	    '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
+    }
+    $result.='</table>'."\n";
+    return $result,\%resptype,$hdgrade,$partlist,$handgrade;
+}
+
+#--- Clean response type for display
+#--- Currently filters option response type only.
+sub cleanRecord {
+    my ($answer,$response,$symb) = @_;
+    if ($response eq 'option') {
+	my (@IDs,@ans);
+	foreach (split(/\&/,&Apache::lonnet::unescape($answer))) {
+	    my ($optionID,$ans) = split(/=/);
+	    push @IDs,$optionID.'</font>';
+	    push @ans,$ans;
+	}
+	my $grayFont = '<font color="#999999">';
+	return '<blockquote><table border="1">'.
+	    '<tr valign="top"><td>Answer</td><td>'.
+	    (join '</td><td>',@ans).'</td></tr>'.
+	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td><td>'.$grayFont.
+	    (join '</td><td>'.$grayFont,@IDs).'</font></td></tr>'.
+	    '</table></blockquote>';
+    }
+    if ($response eq 'essay') {
+	if (! exists ($ENV{'form.'.$symb})) {
+	    my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',
+						  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+						  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+	    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'} : '';
+	    $ENV{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
+	}
+	return '<br /><br /><blockquote><pre>'.&keywords_highlight($answer).'</pre></blockquote>';
+    }
+    return $answer;
+}
+
+#-- A couple of common js functions
+sub commonJSfunctions {
+    my $request = shift;
+    $request->print(<<COMMONJSFUNCTIONS);
+<script type="text/javascript" language="javascript">
+    function radioSelection(radioButton) {
+	var selection=null;
+	if (radioButton.length > 1) {
+	    for (var i=0; i<radioButton.length; i++) {
+		if (radioButton[i].checked) {
+		    return radioButton[i].value;
+		}
+	    }
+	} else {
+	    if (radioButton.checked) return radioButton.value;
+	}
+	return selection;
+    }
+
+    function pullDownSelection(selectOne) {
+	var selection="";
+	if (selectOne.length > 1) {
+	    for (var i=0; i<selectOne.length; i++) {
+		if (selectOne[i].selected) {
+		    return selectOne[i].value;
+		}
+	    }
+	} else {
+            // only one value it must be the selected one
+	    return selectOne.value;
+	}
+    }
+</script>
+COMMONJSFUNCTIONS
+}
+
 #--- Dumps the class list with usernames,list of sections,
 #--- section, ids and fullnames for each user.
 sub getclasslist {
-    my ($getsec,$hideexpired) = @_;
+    my ($getsec,$filterlist) = @_;
+    $getsec = $getsec eq '' ? 'all' : $getsec;
     my $classlist=&Apache::loncoursedata::get_classlist();
     # Bail out if we were unable to get the classlist
     return if (! defined($classlist));
@@ -121,59 +262,68 @@ sub getclasslist {
         # the following undefs are for 'domain', and 'username' respectively.
 	my (undef,undef,$end,$start,$id,$section,$fullname,$status)=
             @{$classlist->{$_}};
-	# still a student?
-	if (($hideexpired) && ($status ne 'Active')) {
-            delete ($classlist->{$_});
-            next;
-        }
+	# filter students according to status selected
+	if ($filterlist && $ENV{'form.Status'} ne 'Any') {
+	    if ($ENV{'form.Status'} ne $status) {
+		delete ($classlist->{$_});
+		next;
+	    }
+	}
 	$section = ($section ne '' ? $section : 'no');
-	if ($getsec eq 'all' || $getsec eq $section) {
-            $sections{$section}++;
-            $fullnames{$_}=$fullname;
-        } else {
-            delete($classlist->{$_});
-        }
+	if (&canview($section)) {
+	    if ($getsec eq 'all' || $getsec eq $section) {
+		$sections{$section}++;
+		$fullnames{$_}=$fullname;
+	    } else {
+		delete($classlist->{$_});
+	    }
+	} else {
+	    delete($classlist->{$_});
+	}
     }
     my %seen = ();
     my @sections = sort(keys(%sections));
     return ($classlist,\@sections,\%fullnames);
 }
 
-#find user domain
-sub finduser {
-    my ($name) = @_;
-    my $domain = '';
-    if ( $Apache::grades::viewgrades eq 'F' ) {
-	my %classlist=&Apache::lonnet::dump('classlist',
-					    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-					    $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-	my (@fields) = grep /^$name:/, keys %classlist;
-	($name, $domain) = split(/:/,$fields[0]);
-	return ($name,$domain);
-    } else {
-	return ($ENV{'user.name'},$ENV{'user.domain'});
+sub canmodify {
+    my ($sec)=@_;
+    if ($perm{'mgr'}) {
+	if (!defined($perm{'mgr_section'})) {
+	    # can modify whole class
+	    return 1;
+	} else {
+	    if ($sec eq $perm{'mgr_section'}) {
+		#can modify the requested section
+		return 1;
+	    } else {
+		# can't modify the request section
+		return 0;
+	    }
+	}
     }
+    #can't modify
+    return 0;
 }
 
-#--- Prompts a user to enter a username.
-sub moreinfo {
-    my ($request,$reason) = @_;
-    $request->print("Unable to process request: $reason");
-    if ( $Apache::grades::viewgrades eq 'F' ) {
-	$request->print('<form action="/adm/grades" method="post">'."\n");
-	if ($ENV{'form.url'}) {
-	    $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");
-	}
-	if ($ENV{'form.symb'}) {
-	    $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
-	}
-	$request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />'."\n");
-	$request->print("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'" />'."<br />\n");
-	$request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'" />'."<br />\n");
-	$request->print('<input type="submit" name="submit" value="ReSubmit" />'."<br />\n");
-	$request->print('</form>');
+sub canview {
+    my ($sec)=@_;
+    if ($perm{'vgr'}) {
+	if (!defined($perm{'vgr_section'})) {
+	    # can modify whole class
+	    return 1;
+	} else {
+	    if ($sec eq $perm{'vgr_section'}) {
+		#can modify the requested section
+		return 1;
+	    } else {
+		# can't modify the request section
+		return 0;
+	    }
+	}
     }
-    return '';
+    #can't modify
+    return 0;
 }
 
 #--- Retrieve the grade status of a student for all the parts
@@ -182,7 +332,7 @@ sub student_gradeStatus {
     my %record     = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
     my %partstatus = ();
     foreach (@$partlist) {
-	my ($status,$foo)    = split(/_/,$record{"resource.$_.solved"},2);
+	my ($status,undef)   = split(/_/,$record{"resource.$_.solved"},2);
 	$status              = 'nothing' if ($status eq '');
 	$partstatus{$_}      = $status;
 	my $subkey           = "resource.$_.submitted_by";
@@ -206,6 +356,9 @@ sub jscriptNform {
     $jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n".
 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
+	'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
+	'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n".
+	'<input type="hidden" name="Status"  value="'.$ENV{'form.Status'}.'" />'."\n".
 	'<input type="hidden" name="command" value="submission" />'."\n".
 	'<input type="hidden" name="student" value="" />'."\n".
 	'<input type="hidden" name="userdom" value="" />'."\n".
@@ -214,6 +367,50 @@ sub jscriptNform {
 }
 
 #------------------ End of general use routines --------------------
+
+#
+# Find most similar essay
+#
+
+sub most_similar {
+    my ($uname,$udom,$uessay)=@_;
+
+# ignore spaces and punctuation
+
+    $uessay=~s/\W+/ /gs;
+
+# these will be returned. Do not care if not at least 50 percent similar
+    my $limit=0.6;
+    my $sname='';
+    my $sdom='';
+    my $scrsid='';
+    my $sessay='';
+# go through all essays ...
+    foreach my $tkey (keys %oldessays) {
+	my ($tname,$tdom,$tcrsid)=split(/\./,$tkey);
+# ... except the same student
+        if (($tname ne $uname) || ($tdom ne $udom)) {
+	    my $tessay=$oldessays{$tkey};
+            $tessay=~s/\W+/ /gs;
+# String similarity gives up if not even limit
+            my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit);
+# Found one
+            if ($tsimilar>$limit) {
+		$limit=$tsimilar;
+                $sname=$tname;
+                $sdom=$tdom;
+                $scrsid=$tcrsid;
+                $sessay=$oldessays{$tkey};
+            }
+        } 
+    }
+    if ($limit>0.6) {
+       return ($sname,$sdom,$scrsid,$sessay,$limit);
+    } else {
+       return ('','','','',0);
+    }
+}
+
 #-------------------------------------------------------------------
 
 #------------------------------------ Receipt Verification Routines
@@ -234,7 +431,7 @@ sub verifyreceipt {
 
     my $title.='<h3><font color="#339933">Verifying Submission Receipt '.
 	$receipt.'</h3></font>'."\n".
-	'<font size=+1><b>Resource: </b>'.$ENV{'form.url'}.'</font><br><br>'."\n";
+	'<font size=+1><b>Resource: </b>'.$ENV{'form.probTitle'}.'</font><br><br>'."\n";
 
     my ($string,$contents,$matches) = ('','',0);
     my (undef,undef,$fullname) = &getclasslist('all','0');
@@ -276,145 +473,184 @@ sub verifyreceipt {
 sub listStudents {
     my ($request) = shift;
 
-    my ($symb,$url) = &get_symb_and_url();
+    my ($symb,$url) = &get_symb_and_url($request);
     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 $submitonly= $ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'};
 
-    my $result;
-    my ($partlist,$handgrade) = &response_type($url);
-    for (sort keys(%$handgrade)) {
-	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
-	$ENV{'form.handgrade'} = 'yes' if ($handgrade eq 'yes');
-	$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
-	    '<td><b>Type: </b>'.$responsetype.'</td>'.
-	    '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
-    }
-    $result.='</table>';
+    my $viewgrade = $ENV{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
+    $ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ? 
+	&Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};
 
-    my $viewgrade;
-    if ($ENV{'form.handgrade'} eq 'yes') {
-	$viewgrade = 'View/Grade';
-    } else {
-	$viewgrade = 'View';
-    }
+    my $result='<h3><font color="#339933">&nbsp;'.$viewgrade.
+	' Submissions for a Student or a Group of Students</font></h3>';
 
-    $result='<h3><font color="#339933">&nbsp;'.
-	$viewgrade.
-	    ' Submissions for a Student or a Group of Students</font></h3>'.
-		'<table border="0"><tr><td colspan=3><font size=+1>'.
-		    '<b>Resource: </b>'.$url.'</font></td></tr>'.$result;
+    my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'});
+    $result.=$table;
 
     $request->print(<<LISTJAVASCRIPT);
 <script type="text/javascript" language="javascript">
-  function checkSelect(checkBox) {
-    var ctr=0;
-    var sense="";
-    if (checkBox.length > 1) {
-       for (var i=0; i<checkBox.length; i++) {
-	  if (checkBox[i].checked) {
-	     ctr++;
-	  }
-       }
-       sense = "a student or group of students";
-    } else {
-       if (checkBox.checked) {
-	   ctr = 1;
-       }
-       sense = "the student";
-    }
-    if (ctr == 0) {
-       alert("Please select "+sense+" before clicking on the $viewgrade button.");
-       return false;
+    function checkSelect(checkBox) {
+	var ctr=0;
+	var sense="";
+	if (checkBox.length > 1) {
+	    for (var i=0; i<checkBox.length; i++) {
+		if (checkBox[i].checked) {
+		    ctr++;
+		}
+	    }
+	    sense = "a student or group of students";
+	} else {
+	    if (checkBox.checked) {
+		ctr = 1;
+	    }
+	    sense = "the student";
+	}
+	if (ctr == 0) {
+	    alert("Please select "+sense+" before clicking on the Next button.");
+	    return false;
+	}
+	document.gradesub.submit();
+    }
+
+    function reLoadList(formname) {
+	if (formname.saveStatusOld.value == pullDownSelection(formname.Status)) {return;}
+	formname.command.value = 'submission';
+	formname.submit();
     }
-    document.gradesub.submit();
-  }
 </script>
 LISTJAVASCRIPT
 
+    &commonJSfunctions($request);
     $request->print($result);
 
-    my $checkhdgrade = $ENV{'form.handgrade'} eq 'yes' ? 'checked' : '';
-    my $checklastsub = $ENV{'form.handgrade'} eq 'yes' ? '' : 'checked';
-
+    my $checkhdgrade = ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked' : '';
+    my $checklastsub = $checkhdgrade eq '' ? 'checked' : '';
     my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'."\n".
-	'&nbsp;<b>View Problem: </b><input type="radio" name="vProb" value="no" /> no '."\n".
-	'<input type="radio" name="vProb" value="yes" checked /> one student '."\n".
+	'&nbsp;<b>View Problem Text: </b><input type="radio" name="vProb" value="no" checked="on" /> no '."\n".
+	'<input type="radio" name="vProb" value="yes" /> one student '."\n".
 	'<input type="radio" name="vProb" value="all" /> all students <br />'."\n".
+	'&nbsp;<b>View Answer: </b><input type="radio" name="vAns" value="no"  /> no '."\n".
+	'<input type="radio" name="vAns" value="yes" /> one student '."\n".
+	'<input type="radio" name="vAns" value="all" checked="on" /> all students <br />'."\n".
 	'&nbsp;<b>Submissions: </b>'."\n";
-    if ($ENV{'form.handgrade'} eq 'yes') {
-	$gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> handgrade only'."\n";
+    if ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
+	$gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only'."\n";
     }
-    $gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last sub only'."\n".
-	'<input type="radio" name="lastSub" value="last" /> last sub & parts info'."\n".
+
+    my $saveStatus = $ENV{'form.Status'} eq '' ? 'Active' : $ENV{'form.Status'};
+    $ENV{'form.Status'} = $saveStatus;
+
+    $gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only'."\n".
+	'<input type="radio" name="lastSub" value="last" /> last submission & parts info'."\n".
+	'<input type="radio" name="lastSub" value="datesub" /> by dates and submissions'."\n".
 	'<input type="radio" name="lastSub" value="all" /> all details'."\n".
 	'<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
 	'<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
-	'<input type="hidden" name="response"    value="'.$ENV{'form.response'}.'" />'."\n".
-	'<input type="hidden" name="handgrade": #falue="'.$ENV{'form.handgrade'}.'" /><br />'."\n".
+	'<input type="hidden" name="handgrade"   value="'.$ENV{'form.handgrade'}.'" /><br />'."\n".
 	'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" /><br />'."\n".
+	'<input type="hidden" name="saveState"   value="'.$ENV{'form.saveState'}.'" />'."\n".
+	'<input type="hidden" name="probTitle"   value="'.$ENV{'form.probTitle'}.'" />'."\n".
 	'<input type="hidden" name="url"  value="'.$url.'" />'."\n".
 	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
-	'To '.lc($viewgrade).' a submission, click on the check box next to the student\'s name. Then '."\n".
-	'click on the '.$viewgrade.' button. To view the submissions for a group of students, click'."\n".
-	' on the check boxes for the group of students.<br />'."\n".
-	'<input type="hidden" name="command" value="processGroup" />'."\n".
-	'<input type="button" '."\n".
+	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
+
+    if (exists($ENV{'form.gradingMenu'}) && exists($ENV{'form.Status'})) {
+	$gradeTable.='<input type="hidden" name="Status"   value="'.$ENV{'form.Status'}.'" />'."\n";
+    } else {
+	$gradeTable.='<b>Student Status:</b> '.
+	    &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
+    }
+
+    $gradeTable.='To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
+	'next to the student\'s name(s). Then click on the Next button.<br />'."\n".
+	'<input type="hidden" name="command" value="processGroup" />'."\n";
+    $gradeTable.='<input type="button" '."\n".
 	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
-	'value="'.$viewgrade.'" />'."\n";
- 
-    my (undef,undef,$fullname) = &getclasslist($getsec,'0');
-    
+	'value="Next->" />'."\n";
+    $gradeTable.='<input type="checkbox" name="checkPlag" checked="on">Check For Plagiarism</input>';
+    my (undef, undef, $fullname) = &getclasslist($getsec,'1');  
     $gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
-	'<table border="0"><tr bgcolor="#e6ffff">'.
-	'<td><b>&nbsp;Select&nbsp;</b></td><td><b>&nbsp;Fullname&nbsp;</b></td>'.
-	'<td><b>&nbsp;Username&nbsp;</b></td><td><b>&nbsp;Domain&nbsp;</b></td>';
-    foreach (sort(@$partlist)) {
-	$gradeTable.='<td><b>&nbsp;Part '.(split(/_/))[0].' Status&nbsp;</b></td>';
+	'<table border="0"><tr bgcolor="#e6ffff">';
+    my $loop = 0;
+    while ($loop < 2) {
+	$gradeTable.='<td><b>&nbsp;No.</b>&nbsp;</td><td><b>&nbsp;Select&nbsp;</b></td>'.
+	    '<td>'.&nameUserString('header').'</td>';
+	if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+	    foreach (sort(@$partlist)) {
+		$gradeTable.='<td><b>&nbsp;Part '.(split(/_/))[0].' Status&nbsp;</b></td>';
+	    }
+	}
+	$loop++;
+#	$gradeTable.='<td></td>' if ($loop%2 ==1);
     }
     $gradeTable.='</tr>'."\n";
 
     my $ctr = 0;
     foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
 	my ($uname,$udom) = split(/:/,$student);
-	my (%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
-	my $statusflg = '';
-	foreach (keys(%status)) {
-	    $statusflg = 1 if ($status{$_} ne 'nothing');
-	    my ($foo,$partid,$foo1) = split(/\./,$_);
-	    if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
-		$statusflg = '';
-		$gradeTable.='<input type="hidden" name="'.
-		    $student.':submitted_by" value="'.
-		    $status{'resource.'.$partid.'.submitted_by'}.'" />';
+	my %status = ();
+	if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+	    (%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
+	    my $submitted = 0;
+	    my $graded = 1;
+	    foreach (keys(%status)) {
+		$submitted = 1 if ($status{$_} ne 'nothing');
+		$graded = 0 if ($status{$_} =~ /^correct/);
+		my ($foo,$partid,$foo1) = split(/\./,$_);
+		if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
+		    $submitted = 0;
+		    $gradeTable.='<input type="hidden" name="'.
+			$student.':submitted_by" value="'.
+			$status{'resource.'.$partid.'.submitted_by'}.'" />';
+		}
 	    }
+	    next if (!$submitted && ($submitonly eq 'yes' || $submitonly eq 'graded'));
+	    next if (!$graded && $submitonly eq 'graded');
 	}
-	next if ($statusflg eq '' && $submitonly eq 'yes');
 
 	$ctr++;
-	if ( $Apache::grades::viewgrades eq 'F' ) {
-	    $gradeTable.='<tr bgcolor="#ffffe6">'.
+	if ( $perm{'vgr'} eq 'F' ) {
+	    $gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);
+	    $gradeTable.='<td align="right">'.$ctr.'&nbsp;</td>'.
 		'<td align="center"><input type=checkbox name="stuinfo" value="'.
-		$student.':'.$$fullname{$student}.'"></td>'."\n".
-		'<td>&nbsp;'.$$fullname{$student}.'&nbsp;</td>'."\n".
-		'<td>&nbsp;'.$uname.'&nbsp;</td>'."\n".
-		'<td align="middle">&nbsp;'.$udom.'&nbsp;</td>'."\n";
-	    
-	    foreach (sort keys(%status)) {
-		next if (/^resource.*?submitted_by$/);
-		$gradeTable.='<td align="middle">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
+		$student.':'.$$fullname{$student}.'&nbsp;"></td>'."\n".
+		'<td>'.&nameUserString(undef,$$fullname{$student},$uname,$udom).'</td>'."\n";
+
+	    if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+		foreach (sort keys(%status)) {
+		    next if (/^resource.*?submitted_by$/);
+		    $gradeTable.='<td align="middle">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
+		}
 	    }
-	    $gradeTable.='</tr>'."\n";
+#	    $gradeTable.='<td></td>' if ($ctr%2 ==1);
+	    $gradeTable.='</tr>'."\n" if ($ctr%2 ==0);
 	}
     }
+    if ($ctr%2 ==1) {
+	$gradeTable.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>';
+	    if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+		foreach (@$partlist) {
+		    $gradeTable.='<td>&nbsp;</td>';
+		}
+	    }
+	$gradeTable.='</tr>';
+    }
+
     $gradeTable.='</table></td></tr></table>'.
 	'<input type="button" '.
 	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
-	'value="'.$viewgrade.'" /></form>'."\n";
+	'value="Next->" /></form>'."\n";
     if ($ctr == 0) {
-	$gradeTable='<br />&nbsp;<font color="red">'.
-	    'No submission found for this resource.</font><br />';
+	my $num_students=(scalar(keys(%$fullname)));
+	if ($num_students eq 0) {
+	    $gradeTable='<br />&nbsp;<font color="red">There are no students currently enrolled.</font>';
+	} else {
+	    $gradeTable='<br />&nbsp;<font color="red">'.
+		'No submissions found for this resource for any students. ('.$num_students.
+		' checked for submissions)</font><br />';
+	}
     } elsif ($ctr == 1) {
 	$gradeTable =~ s/type=checkbox/type=checkbox checked/;
     }
@@ -453,102 +689,194 @@ sub sub_page_js {
     my $request = shift;
     $request->print(<<SUBJAVASCRIPT);
 <script type="text/javascript" language="javascript">
-  function updateRadio(radioButton,formtextbox,formsel,scores,weight) {
-     var pts = formtextbox.value;
-     var resetbox =false;
-     if (isNaN(pts) || pts < 0) {
-        alert("A number equal or greater than 0 is expected. Entered value = "+pts);
-        for (var i=0; i<radioButton.length; i++) {
-           if (radioButton[i].checked) {
-	      formtextbox.value = i;
-	      resetbox = true;
-	   }
+    function updateRadio(formname,id,weight) {
+	var gradeBox = formname["GD_BOX"+id];
+	var radioButton = formname["RADVAL"+id];
+	var oldpts = formname["oldpts"+id].value;
+	var pts = checkSolved(formname,id) == 'update' ? gradeBox.value : oldpts;
+	gradeBox.value = pts;
+	var resetbox = false;
+	if (isNaN(pts) || pts < 0) {
+	    alert("A number equal or greater than 0 is expected. Entered value = "+pts);
+	    for (var i=0; i<radioButton.length; i++) {
+		if (radioButton[i].checked) {
+		    gradeBox.value = i;
+		    resetbox = true;
+		}
+	    }
+	    if (!resetbox) {
+		formtextbox.value = "";
+	    }
+	    return;
 	}
-	if (!resetbox) {
-	   formtextbox.value = "";
+
+	if (pts > weight) {
+	    var resp = confirm("You entered a value ("+pts+
+			       ") greater than the weight for the part. Accept?");
+	    if (resp == false) {
+		gradeBox.value = oldpts;
+		return;
+	    }
 	}
-	return;
-     }
 
-     if (pts > weight) {
-        var resp = confirm("You entered a value ("+pts+
-      		     ") greater than the weight for the part. Accept?");
-        if (resp == false) {
-           formtextbox.value = "";
-           return;
-       }
+	for (var i=0; i<radioButton.length; i++) {
+	    radioButton[i].checked=false;
+	    if (pts == i && pts != "") {
+		radioButton[i].checked=true;
+	    }
+	}
+	updateSelect(formname,id);
+	formname["stores"+id].value = "0";
     }
 
-    for (var i=0; i<radioButton.length; i++) {
-	radioButton[i].checked=false;
-	if (pts == i) {
-	   radioButton[i].checked=true;
+    function writeBox(formname,id,pts) {
+	var gradeBox = formname["GD_BOX"+id];
+	if (checkSolved(formname,id) == 'update') {
+	    gradeBox.value = pts;
+	} else {
+	    var oldpts = formname["oldpts"+id].value;
+	    gradeBox.value = oldpts;
+	    var radioButton = formname["RADVAL"+id];
+	    for (var i=0; i<radioButton.length; i++) {
+		radioButton[i].checked=false;
+		if (i == oldpts) {
+		    radioButton[i].checked=true;
+		}
+	    }
 	}
+	formname["stores"+id].value = "0";
+	updateSelect(formname,id);
+	return;
     }
-    updateSelect(formsel);
-    scores.value = "0";
-  }
 
-  function writeBox(formrad,formsel,pts,scores) {
-    formrad.value = pts;
-    scores.value = "0";
-    updateSelect(formsel,pts);
-    return;
-  }
+    function clearRadBox(formname,id) {
+	if (checkSolved(formname,id) == 'noupdate') {
+	    updateSelect(formname,id);
+	    return;
+	}
+	gradeSelect = formname["GD_SEL"+id];
+	for (var i=0; i<gradeSelect.length; i++) {
+	    if (gradeSelect[i].selected) {
+		var selectx=i;
+	    }
+	}
+	var stores = formname["stores"+id];
+	if (selectx == stores.value) { return };
+	var gradeBox = formname["GD_BOX"+id];
+	gradeBox.value = "";
+	var radioButton = formname["RADVAL"+id];
+	for (var i=0; i<radioButton.length; i++) {
+	    radioButton[i].checked=false;
+	}
+	stores.value = selectx;
+    }
 
-  function clearRadBox(radioButton,formbox,formsel,scores) {
-    for (var i=0; i<formsel.length; i++) {
-	if (formsel[i].selected) {
-	    var selectx=i;
+    function checkSolved(formname,id) {
+	if (formname["solved"+id].value == "correct_by_student" && formname.overRideScore.value == 'no') {
+	    var reply = confirm("This problem has been graded correct by the computer. Do you want to change the score?");
+	    if (!reply) {return "noupdate";}
+	    formname.overRideScore.value = 'yes';
 	}
+	return "update";
     }
-    if (selectx == scores.value) { return };
-    formbox.value = "";
-    for (var i=0; i<radioButton.length; i++) {
-	radioButton[i].checked=false;
+
+    function updateSelect(formname,id) {
+	formname["GD_SEL"+id][0].selected = true;
+	return;
     }
-    scores.value = selectx;
-  }
 
-  function updateSelect(formsel) {
-    formsel[0].selected = true;
-    return;
-  }
+//=========== Check that a point is assigned for all the parts  ============
+    function checksubmit(formname,val,total,parttot) {
+	formname.gradeOpt.value = val;
+	if (val == "Save & Next") {
+	    for (i=0;i<=total;i++) {
+		for (j=0;j<parttot;j++) {
+		    var partid = formname["partid"+i+"_"+j].value;
+		    if (formname["GD_SEL"+i+"_"+partid][0].selected) {
+			var points = formname["GD_BOX"+i+"_"+partid].value;
+			if (points == "") {
+			    var name = formname["name"+i].value;
+			    var studentID = (name != '' ? name : formname["unamedom"+i].value);
+			    var resp = confirm("You did not assign a score for "+studentID+
+					       ", part "+partid+". Continue?");
+			    if (resp == false) {
+				formname["GD_BOX"+i+"_"+partid].focus();
+				return false;
+			    }
+			}
+		    }
+		    
+		}
+	    }
+	    
+	}
+	if (val == "Grade Student") {
+	    formname.showgrading.value = "yes";
+	    if (formname.Status.value == "") {
+		formname.Status.value = "Active";
+	    }
+	    formname.studentNo.value = total;
+	}
+	formname.submit();
+    }
+
+//======= Check that a score is assigned for all the problems (page/sequence grading only) =========
+    function checkSubmitPage(formname,total) {
+	noscore = new Array(100);
+	var ptr = 0;
+	for (i=1;i<total;i++) {
+	    var partid = formname["q_"+i].value;
+	    if (formname["GD_SEL"+i+"_"+partid][0].selected) {
+		var points = formname["GD_BOX"+i+"_"+partid].value;
+		var status = formname["solved"+i+"_"+partid].value;
+		if (points == "" && status != "correct_by_student") {
+		    noscore[ptr] = i;
+		    ptr++;
+		}
+	    }
+	}
+	if (ptr != 0) {
+	    var sense = ptr == 1 ? ": " : "s: ";
+	    var prolist = "";
+	    if (ptr == 1) {
+		prolist = noscore[0];
+	    } else {
+		var i = 0;
+		while (i < ptr-1) {
+		    prolist += noscore[i]+", ";
+		    i++;
+		}
+		prolist += "and "+noscore[i];
+	    }
+	    var resp = confirm("You did not assign any score for the following problem"+sense+prolist+". Continue?");
+	    if (resp == false) {
+		return false;
+	    }
+	}
+
+	formname.submit();
+    }
+</script>
+SUBJAVASCRIPT
+}
 
-//=================== Check that a point is assigned for all the parts  ==============
-  function checksubmit(val,total,parttot) {
-     document.SCORE.gradeOpt.value = val;
-     if (val == "Save & Next") {
-	for (i=0;i<=total;i++) {
-	   for (j=0;j<parttot;j++) {
-	      var partid = eval("document.SCORE.partid"+i+"_"+j+".value");
-	      var selopt = eval("document.SCORE.GD_SEL"+i+"_"+partid);
-	      if (selopt[0].selected) {
-		 var points = eval("document.SCORE.GD_BOX"+i+"_"+partid+".value");
-		 if (points == "") {
-		     var name = eval("document.SCORE.name"+i+".value");
-		     alert("Please assign a score for "+name+", part "+partid+".");
-		     return false;
-		 }
-	      }
-
-	  }
-       }
-
-     }
-     document.SCORE.submit();
- }
+#--- javascript for essay type problem --
+sub sub_page_kw_js {
+    my $request = shift;
+    my $iconpath = $request->dir_config('lonIconsURL');
+    &commonJSfunctions($request);
+    $request->print(<<SUBJAVASCRIPT);
+<script type="text/javascript" language="javascript">
 
 //===================== Show list of keywords ====================
-  function keywords(keyform) {
-    var keywds = keyform.value;
-    var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keywds);
+  function keywords(formname) {
+    var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",formname.keywords.value);
     if (nret==null) return;
-    keyform.value = nret;
+    formname.keywords.value = nret;
 
-    document.SCORE.refresh.value = "on";
-    if (document.SCORE.keywords.value != "") {
-	document.SCORE.submit();
+    if (formname.keywords.value != "") {
+	formname.refresh.value = "on";
+	formname.submit();
     }
     return;
   }
@@ -574,35 +902,42 @@ sub sub_page_js {
     }
     var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);
     if (nret==null) return;
-    var curlist = document.SCORE.keywords.value;
-    document.SCORE.keywords.value = curlist+" "+nret;
-    document.SCORE.refresh.value = "on";
+    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();
+   img1.src = "$iconpath/mailbkgrd.gif";
+   img2 = new Image();
+   img2.src = "$iconpath/mailto.gif";
+
   function msgCenter(msgform,usrctr,fullname) {
     var Nmsg  = msgform.savemsgN.value;
     savedMsgHeader(Nmsg,usrctr,fullname);
     var subject = msgform.msgsub.value;
-    var rtrchk  = eval("document.SCORE.includemsg"+usrctr);
-    var msgchk = rtrchk.value;
+    var msgchk = document.SCORE["includemsg"+usrctr].value;
     re = /msgsub/;
     var shwsel = "";
     if (re.test(msgchk)) { shwsel = "checked" }
-    displaySubject(subject,shwsel);
+    subject = (document.SCORE.shownSub.value == 0 ? checkEntities(subject) : subject);
+    displaySubject(checkEntities(subject),shwsel);
     for (var i=1; i<=Nmsg; i++) {
-	var testpt = "savemsg"+i+",";
-	re = /testpt/;
+	var testmsg = "savemsg"+i+",";
+	re = new RegExp(testmsg,"g");
 	shwsel = "";
 	if (re.test(msgchk)) { shwsel = "checked" }
-	var message = eval("document.SCORE.savemsg"+i+".value");
-	displaySavedMsg(i,message,shwsel);
+	var message = document.SCORE["savemsg"+i].value;
+	message = (document.SCORE["shownOnce"+i].value == 0 ? checkEntities(message) : message);
+	displaySavedMsg(i,message,shwsel); //I do not get it. w/o checkEntities on saved messages,
+	                                   //any &lt; is already converted to <, etc. However, only once!!
     }
-    newmsg = eval("document.SCORE.newmsg"+usrctr+".value");
+    newmsg = document.SCORE["newmsg"+usrctr].value;
     shwsel = "";
     re = /newmsg/;
     if (re.test(msgchk)) { shwsel = "checked" }
@@ -611,91 +946,125 @@ sub sub_page_js {
     return;
   }
 
+  function checkEntities(strx) {
+    if (strx.length == 0) return strx;
+    var orgStr = ["&", "<", ">", '"']; 
+    var newStr = ["&amp;", "&lt;", "&gt;", "&quot;"];
+    var counter = 0;
+    while (counter < 4) {
+	strx = strReplace(strx,orgStr[counter],newStr[counter]);
+	counter++;
+    }
+    return strx;
+  }
+
+  function strReplace(strx, orgStr, newStr) {
+    return strx.split(orgStr).join(newStr);
+  }
+
   function savedMsgHeader(Nmsg,usrctr,fullname) {
-    var height = 30*Nmsg+250;
+    var height = 70*Nmsg+250;
     var scrollbar = "no";
     if (height > 600) {
 	height = 600;
 	scrollbar = "yes";
     }
-/*    if (window.pWin)
-	window.pWin.close(); */
-    pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx=70,screeny=75,width=600,height='+height);
-    pWin.document.write("<html><head>");
-    pWin.document.write("<title>Message Central</title>");
-
-    pWin.document.write("<script language=javascript>");
-    pWin.document.write("function checkInput() {");
-    pWin.document.write("  opener.document.SCORE.msgsub.value = document.msgcenter.msgsub.value;");
-    pWin.document.write("  var nmsg   = opener.document.SCORE.savemsgN.value;");
-    pWin.document.write("  var usrctr = document.msgcenter.usrctr.value;");
-    pWin.document.write("  var newval = eval(\\"opener.document.SCORE.newmsg\\"+usrctr);");
-    pWin.document.write("  newval.value = document.msgcenter.newmsg.value;");
-
-    pWin.document.write("  var msgchk = \\"\\";");
-    pWin.document.write("  if (document.msgcenter.subchk.checked) {");
-    pWin.document.write("     msgchk = \\"msgsub,\\";");
-    pWin.document.write("  }");
-    pWin.document.write(   "for (var i=1; i<=nmsg; i++) {");
-    pWin.document.write("      var opnmsg = eval(\\"opener.document.SCORE.savemsg\\"+i);");
-    pWin.document.write("      var frmmsg = eval(\\"document.msgcenter.msg\\"+i);");
-    pWin.document.write("      opnmsg.value = frmmsg.value;");
-    pWin.document.write("      var chkbox = eval(\\"document.msgcenter.msgn\\"+i);");
-    pWin.document.write("      if (chkbox.checked) {");
-    pWin.document.write("         msgchk += \\"savemsg\\"+i+\\",\\";");
-    pWin.document.write("      }");
-    pWin.document.write("  }");
-    pWin.document.write("  if (document.msgcenter.newmsgchk.checked) {");
-    pWin.document.write("     msgchk += \\"newmsg\\"+usrctr;");
-    pWin.document.write("  }");
-    pWin.document.write("  var includemsg = eval(\\"opener.document.SCORE.includemsg\\"+usrctr);");
-    pWin.document.write("  includemsg.value = msgchk;");
-
-    pWin.document.write("  self.close()");
-
-    pWin.document.write("}");
-
-    pWin.document.write("<");
-    pWin.document.write("/script>");
-
-    pWin.document.write("</head><body bgcolor=white>");
-
-    pWin.document.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
-    pWin.document.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
-    pWin.document.write("<font color=\\"green\\" size=+1>&nbsp;Compose Message for \"+fullname+\"</font><br><br>");
-
-    pWin.document.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
-    pWin.document.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
-    pWin.document.write("<td><b>Type</b></td><td><b>Include</b></td><td><b>Message</td></tr>");
+    var xpos = (screen.width-600)/2;
+    xpos = (xpos < 0) ? '0' : xpos;
+    var ypos = (screen.height-height)/2-30;
+    ypos = (ypos < 0) ? '0' : ypos;
+
+    pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);
+    pWin.focus();
+    pDoc = pWin.document;
+    pDoc.open('text/html','replace');
+    pDoc.write("<html><head>");
+    pDoc.write("<title>Message Central</title>");
+
+    pDoc.write("<script language=javascript>");
+    pDoc.write("function checkInput() {");
+    pDoc.write("  opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);");
+    pDoc.write("  var nmsg   = opener.document.SCORE.savemsgN.value;");
+    pDoc.write("  var usrctr = document.msgcenter.usrctr.value;");
+    pDoc.write("  var newval = opener.document.SCORE[\\"newmsg\\"+usrctr];");
+    pDoc.write("  newval.value = opener.checkEntities(document.msgcenter.newmsg.value);");
+
+    pDoc.write("  var msgchk = \\"\\";");
+    pDoc.write("  if (document.msgcenter.subchk.checked) {");
+    pDoc.write("     msgchk = \\"msgsub,\\";");
+    pDoc.write("  }");
+    pDoc.write("  var includemsg = 0;");
+    pDoc.write("  for (var i=1; i<=nmsg; i++) {");
+    pDoc.write("      var opnmsg = opener.document.SCORE[\\"savemsg\\"+i];");
+    pDoc.write("      var frmmsg = document.msgcenter[\\"msg\\"+i];");
+    pDoc.write("      opnmsg.value = opener.checkEntities(frmmsg.value);");
+    pDoc.write("      var showflg = opener.document.SCORE[\\"shownOnce\\"+i];");
+    pDoc.write("      showflg.value = \\"1\\";");
+    pDoc.write("      var chkbox = document.msgcenter[\\"msgn\\"+i];");
+    pDoc.write("      if (chkbox.checked) {");
+    pDoc.write("         msgchk += \\"savemsg\\"+i+\\",\\";");
+    pDoc.write("         includemsg = 1;");
+    pDoc.write("      }");
+    pDoc.write("  }");
+    pDoc.write("  if (document.msgcenter.newmsgchk.checked) {");
+    pDoc.write("     msgchk += \\"newmsg\\"+usrctr;");
+    pDoc.write("     includemsg = 1;");
+    pDoc.write("  }");
+    pDoc.write("  imgformname = opener.document.SCORE[\\"mailicon\\"+usrctr];");
+    pDoc.write("  imgformname.src = \\"$iconpath/\\"+((includemsg) ? \\"mailto.gif\\" : \\"mailbkgrd.gif\\");");
+    pDoc.write("  var includemsg = opener.document.SCORE[\\"includemsg\\"+usrctr];");
+    pDoc.write("  includemsg.value = msgchk;");
+
+    pDoc.write("  self.close()");
+
+    pDoc.write("}");
+
+    pDoc.write("<");
+    pDoc.write("/script>");
+
+    pDoc.write("</head><body bgcolor=white>");
+
+    pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
+    pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
+    pDoc.write("<font color=\\"green\\" size=+1>&nbsp;Compose Message for \"+fullname+\"</font><br><br>");
+
+    pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
+    pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
+    pDoc.write("<td><b>Type</b></td><td><b>Include</b></td><td><b>Message</td></tr>");
 }
     function displaySubject(msg,shwsel) {
-    pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
-    pWin.document.write("<td>Subject</td>");
-    pWin.document.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
-    pWin.document.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"></td></tr>");
+    pDoc = pWin.document;
+    pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
+    pDoc.write("<td>Subject</td>");
+    pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
+    pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"></td></tr>");
 }
 
-function displaySavedMsg(ctr,msg,shwsel) {
-    pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
-    pWin.document.write("<td align=\\"center\\">"+ctr+"</td>");
-    pWin.document.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"></td>");
-    pWin.document.write("<td><input name=\\"msg"+ctr+"\\" type=\\"text\\" value=\\""+msg+"\\" size=\\"60\\" maxlength=\\"80\\"></td></tr>");
+  function displaySavedMsg(ctr,msg,shwsel) {
+    pDoc = pWin.document;
+    pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
+    pDoc.write("<td align=\\"center\\">"+ctr+"</td>");
+    pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"></td>");
+    pDoc.write("<td><textarea name=\\"msg"+ctr+"\\" cols=\\"60\\" rows=\\"3\\">"+msg+"</textarea></td></tr>");
 }
 
   function newMsg(newmsg,shwsel) {
-    pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
-    pWin.document.write("<td align=\\"center\\">New</td>");
-    pWin.document.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
-    pWin.document.write("<td><input name=\\"newmsg\\" type=\\"text\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" value=\\""+newmsg+"\\" size=\\"60\\" maxlength=\\"80\\"></td></tr>");
+    pDoc = pWin.document;
+    pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
+    pDoc.write("<td align=\\"center\\">New</td>");
+    pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
+    pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"</textarea></td></tr>");
 }
 
   function msgTail() {
-    pWin.document.write("</table>");
-    pWin.document.write("</td></tr></table>&nbsp;");
-    pWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
-    pWin.document.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
-    pWin.document.write("</form>");
-    pWin.document.write("</body></html>");
+    pDoc = pWin.document;
+    pDoc.write("</table>");
+    pDoc.write("</td></tr></table>&nbsp;");
+    pDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
+    pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+    pDoc.write("</form>");
+    pDoc.write("</body></html>");
+    pDoc.close();
 }
 
 //====================== Script for keyword highlight options ==============
@@ -729,97 +1098,174 @@ function displaySavedMsg(ctr,msg,shwsel)
     return;
   }
 
-
   function highlightCentral() {
-    hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx=100,screeny=75');
-    hwdWin.document.write("<html><head>");
-    hwdWin.document.write("<title>Highlight Central</title>");
-
-    hwdWin.document.write("<script language=javascript>");
-    hwdWin.document.write("function updateChoice(flag) {");
-    hwdWin.document.write("  opener.document.SCORE.kwclr.value = radioSelection(document.hlCenter.kwdclr);");
-    hwdWin.document.write("  opener.document.SCORE.kwsize.value = radioSelection(document.hlCenter.kwdsize);");
-    hwdWin.document.write("  opener.document.SCORE.kwstyle.value = radioSelection(document.hlCenter.kwdstyle);");
-    hwdWin.document.write("  opener.document.SCORE.refresh.value = \\"on\\";");
-    hwdWin.document.write("  if (opener.document.SCORE.keywords.value!=\\"\\"){");
-    hwdWin.document.write("     opener.document.SCORE.submit();");
-    hwdWin.document.write("  }");
-    hwdWin.document.write("  self.close()");
-    hwdWin.document.write("}");
-
-    hwdWin.document.write("function radioSelection(radioButton) {");
-    hwdWin.document.write("    var selection=null;");
-    hwdWin.document.write("    for (var i=0; i<radioButton.length; i++) {");
-    hwdWin.document.write("        if (radioButton[i].checked) {");
-    hwdWin.document.write("            selection=radioButton[i].value;");
-    hwdWin.document.write("            return selection;");
-    hwdWin.document.write("        }");
-    hwdWin.document.write("    }");
-    hwdWin.document.write("}");
-
-    hwdWin.document.write("<");
-    hwdWin.document.write("/script>");
-
-    hwdWin.document.write("</head><body bgcolor=white>");
-
-    hwdWin.document.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
-    hwdWin.document.write("<font color=\\"green\\" size=+1>&nbsp;Keyword Highlight Options</font><br><br>");
-
-    hwdWin.document.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
-    hwdWin.document.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
-    hwdWin.document.write("<td><b>Text Color</b></td><td><b>Font Size</b></td><td><b>Font Style</td></tr>");
+//    if (window.hwdWin) window.hwdWin.close();
+    var xpos = (screen.width-400)/2;
+    xpos = (xpos < 0) ? '0' : xpos;
+    var ypos = (screen.height-330)/2-30;
+    ypos = (ypos < 0) ? '0' : ypos;
+
+    hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos);
+    hwdWin.focus();
+    var hDoc = hwdWin.document;
+    hDoc.open('text/html','replace');
+    hDoc.write("<html><head>");
+    hDoc.write("<title>Highlight Central</title>");
+
+    hDoc.write("<script language=javascript>");
+    hDoc.write("function updateChoice(flag) {");
+    hDoc.write("  opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);");
+    hDoc.write("  opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);");
+    hDoc.write("  opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);");
+    hDoc.write("  opener.document.SCORE.refresh.value = \\"on\\";");
+    hDoc.write("  if (opener.document.SCORE.keywords.value!=\\"\\"){");
+    hDoc.write("     opener.document.SCORE.submit();");
+    hDoc.write("  }");
+    hDoc.write("  self.close()");
+    hDoc.write("}");
+
+    hDoc.write("<");
+    hDoc.write("/script>");
+
+    hDoc.write("</head><body bgcolor=white>");
+
+    hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
+    hDoc.write("<font color=\\"green\\" size=+1>&nbsp;Keyword Highlight Options</font><br><br>");
+
+    hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
+    hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
+    hDoc.write("<td><b>Text Color</b></td><td><b>Font Size</b></td><td><b>Font Style</td></tr>");
   }
 
   function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) { 
-    hwdWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
-    hwdWin.document.write("<td align=\\"left\\">");
-    hwdWin.document.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+">&nbsp;"+clrtxt+"</td>");
-    hwdWin.document.write("<td align=\\"left\\">");
-    hwdWin.document.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+">&nbsp;"+sztxt+"</td>");
-    hwdWin.document.write("<td align=\\"left\\">");
-    hwdWin.document.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+">&nbsp;"+sytxt+"</td>");
-    hwdWin.document.write("</tr>");
+    var hDoc = hwdWin.document;
+    hDoc.write("<tr bgcolor=\\"#ffffdd\\">");
+    hDoc.write("<td align=\\"left\\">");
+    hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+">&nbsp;"+clrtxt+"</td>");
+    hDoc.write("<td align=\\"left\\">");
+    hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+">&nbsp;"+sztxt+"</td>");
+    hDoc.write("<td align=\\"left\\">");
+    hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+">&nbsp;"+sytxt+"</td>");
+    hDoc.write("</tr>");
   }
 
   function highlightend() { 
-    hwdWin.document.write("</table>");
-    hwdWin.document.write("</td></tr></table>&nbsp;");
-//    hwdWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(0)\\">&nbsp;&nbsp;");
-    hwdWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
-    hwdWin.document.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
-    hwdWin.document.write("</form>");
-    hwdWin.document.write("</body></html>");
+    var hDoc = hwdWin.document;
+    hDoc.write("</table>");
+    hDoc.write("</td></tr></table>&nbsp;");
+    hDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
+    hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+    hDoc.write("</form>");
+    hDoc.write("</body></html>");
+    hDoc.close();
   }
 
 </script>
 SUBJAVASCRIPT
 }
 
+#--- displays the grading box, used in essay type problem and grading by page/sequence
+sub gradeBox {
+    my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
+
+    my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+	'/check.gif" height="16" border="0" />';
+
+    my $wgt    = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
+    my $wgtmsg = ($wgt > 0 ? '(problem weight)' : 
+		  '<font color="red">problem weight assigned by computer</font>');
+    $wgt       = ($wgt > 0 ? $wgt : '1');
+    my $score  = ($$record{'resource.'.$partid.'.awarded'} eq '' ?
+		  '' : $$record{'resource.'.$partid.'.awarded'}*$wgt);
+    my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";
+
+    $result.='<table border="0"><tr><td>'.
+	'<b>Part </b>'.$partid.' <b>Points: </b></td><td>'."\n";
+
+    my $ctr = 0;
+    $result.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
+    while ($ctr<=$wgt) {
+	$result.= '<td><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+	    'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
+	    $ctr.')" value="'.$ctr.'" '.
+	    ($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
+	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+	$ctr++;
+    }
+    $result.='</tr></table>';
+
+    $result.='</td><td>&nbsp;<b>or</b>&nbsp;</td>'."\n";
+    $result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
+	($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
+	'onChange="javascript:updateRadio(this.form,\''.$counter.'_'.$partid.'\','.
+	$wgt.')" /></td>'."\n";
+    $result.='<td>/'.$wgt.' '.$wgtmsg.
+	($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? '&nbsp;'.$checkIcon : '').
+	' </td><td>'."\n";
+
+    $result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
+	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
+    if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
+	$result.='<option> </option>'.
+	    '<option selected="on">excused</option>';
+    } else {
+	$result.='<option selected="on"> </option>'.
+	    '<option>excused</option>';
+    }
+    $result.='<option>reset status</option></select>'."\n";
+    $result.="&nbsp&nbsp\n";
+    $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
+	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
+	'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.
+	$$record{'resource.'.$partid.'.solved'}.'" />'."\n";
+    $result.='</td></tr></table>'."\n";
+    return $result;
+}
 
 sub show_problem {
-    my ($request,$symb,$uname,$udom,$removeform) = @_;
-    my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
-						      $ENV{'request.course.id'});
+    my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode) = @_;
+    my $rendered;
+    if ($mode eq 'both' or $mode eq 'text') {
+	$rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
+					     $ENV{'request.course.id'});
+    }
     if ($removeform) {
 	$rendered=~s|<form(.*?)>||g;
 	$rendered=~s|</form>||g;
 	$rendered=~s|name="submit"|name="would_have_been_submit"|g;
     }
-    my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
-							   $ENV{'request.course.id'});
+    my $companswer;
+    if ($mode eq 'both' or $mode eq 'answer') {
+	$companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+						    $ENV{'request.course.id'});
+    }
     if ($removeform) {
 	$companswer=~s|<form(.*?)>||g;
 	$companswer=~s|</form>||g;
-	$rendered=~s|name="submit"|name="would_have_been_submit"|g;
+	$companswer=~s|name="submit"|name="would_have_been_submit"|g;
     }
     my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
-    $result.='<table border="0" width="100%"><tr><td bgcolor="#e6ffff">';
-    $result.='<b> View of the problem - '.$ENV{'form.fullname'}.
-	'</b></td></tr><tr><td bgcolor="#ffffff">'.$rendered.'<br />';
-    $result.='<b>Correct answer:</b><br />'.$companswer;
+    $result.='<table border="0" width="100%">';
+    if ($viewon) {
+	$result.='<tr><td bgcolor="#e6ffff"><b> ';
+	if ($mode eq 'both' or $mode eq 'text') {
+	    $result.='View of the problem - ';
+	} else {
+	    $result.='Correct answer: ';
+	}
+	$result.=$ENV{'form.fullname'}.'</b></td></tr>';
+    }
+    if ($mode eq 'both') {
+	$result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';
+	$result.='<b>Correct answer:</b><br />'.$companswer;
+    } elsif ($mode eq 'text') {
+	$result.='<tr><td bgcolor="#ffffff">'.$rendered;
+    } elsif ($mode eq 'answer') {
+	$result.='<tr><td bgcolor="#ffffff">'.$companswer;
+    }
     $result.='</td></tr></table>';
     $result.='</td></tr></table><br />';
-    $request->print($result);
+    return $result;
 }
 
 # --------------------------- show submissions of a student, option to grade 
@@ -827,33 +1273,60 @@ sub submission {
     my ($request,$counter,$total) = @_;
 
     (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
-#    if ($ENV{'form.student'} eq '') { &moreinfo($request,'Need student login id'); return ''; }
     my ($uname,$udom)     = ($ENV{'form.student'},$ENV{'form.userdom'});
-    ($uname,$udom)        = &finduser($uname) if $udom eq '';
+    $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'} = &get_fullname ($uname,$udom) if $ENV{'form.fullname'} eq '';
-#    if ($uname eq '') { &moreinfo($request,'Unable to find student'); return ''; }
 
     my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
     if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
+
+    if (!&canview($usec)) {
+	$request->print('<font color="red">Unable to view requested student.('.
+			$uname.$udom.$usec.$ENV{'request.course.id'}.')</font>');
+	$request->print(&show_grading_menu_form($symb,$url));
+	return;
+    }
+
+    $ENV{'form.lastSub'} = ($ENV{'form.lastSub'} eq '' ? 'datesub' : $ENV{'form.lastSub'});
     my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
-#    $ENV{'form.vProb'} = $ENV{'form.vProb'} ne '' ? $ENV{'form.vProb'} : 'yes';
+    my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+	'/check.gif" height="16" border="0" />';
 
     # header info
     if ($counter == 0) {
 	&sub_page_js($request);
+	&sub_page_kw_js($request) if ($ENV{'form.handgrade'} eq 'yes');
+	$ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ? 
+	    &Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};
+
 	$request->print('<h3>&nbsp;<font color="#339933">Submission Record</font></h3>'."\n".
-			'<font size=+1>&nbsp;<b>Resource: </b>'.$url.'</font>'."\n");
+			'<font size=+1>&nbsp;<b>Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
+
+	if ($ENV{'form.handgrade'} eq 'no') {
+	    my $checkMark='<br /><br />&nbsp;<b>Note:</b> Part(s) graded correct by the computer is marked with a '.
+		$checkIcon.' symbol.'."\n";
+	    $request->print($checkMark);
+	}
 
 	# option to display problem, only once else it cause problems 
         # with the form later since the problem has a form.
-	if ($ENV{'form.vProb'} eq 'yes') {
-	    &show_problem($request,$symb,$uname,$udom,0);
+	if ($ENV{'form.vProb'} eq 'yes' or $ENV{'form.vAns'} eq 'yes') {
+	    my $mode;
+	    if ($ENV{'form.vProb'} eq 'yes' && $ENV{'form.vAns'} eq 'yes') {
+		$mode='both';
+	    } elsif ($ENV{'form.vProb'} eq 'yes') {
+		$mode='text';
+	    } elsif ($ENV{'form.vAns'} eq 'yes') {
+		$mode='answer';
+	    }
+	    $request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
 	}
 	
 	# kwclr is the only variable that is guaranteed to be non blank 
         # if this subroutine has been called once.
 	my %keyhash = ();
-	if ($ENV{'form.kwclr'} eq '') {
+	if ($ENV{'form.kwclr'} eq '' && $ENV{'form.handgrade'} eq 'yes') {
 	    %keyhash = &Apache::lonnet::dump('nohist_handgrade',
 					     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 					     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
@@ -864,76 +1337,105 @@ sub submission {
 	    $ENV{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
 	    $ENV{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
 	    $ENV{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ? 
-		$keyhash{$symb.'_subject'} : &Apache::lonnet::metadata($url,'title');
+		$keyhash{$symb.'_subject'} : $ENV{'form.probTitle'};
 	    $ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
-
 	}
+	my $overRideScore = $ENV{'form.overRideScore'} eq '' ? 'no' : $ENV{'form.overRideScore'};
 
 	$request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".
 			'<input type="hidden" name="command"    value="handgrade" />'."\n".
+			'<input type="hidden" name="saveState"  value="'.$ENV{'form.saveState'}.'" />'."\n".
+			'<input type="hidden" name="Status"     value="'.$ENV{'form.Status'}.'" />'."\n".
+			'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".
+			'<input type="hidden" name="probTitle"  value="'.$ENV{'form.probTitle'}.'" />'."\n".
 			'<input type="hidden" name="refresh"    value="off" />'."\n".
+			'<input type="hidden" name="studentNo"  value="" />'."\n".
+			'<input type="hidden" name="gradeOpt"   value="" />'."\n".
 			'<input type="hidden" name="symb"       value="'.$symb.'" />'."\n".
 			'<input type="hidden" name="url"        value="'.$url.'" />'."\n".
 			'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" />'."\n".
 			'<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="section"    value="'.$ENV{'form.section'}.'">'."\n".
 			'<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
-			'<input type="hidden" name="response"   value="'.$ENV{'form.response'}.'">'."\n".
 			'<input type="hidden" name="handgrade"  value="'.$ENV{'form.handgrade'}.'">'."\n".
-			'<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="msgsub"     value="'.$ENV{'form.msgsub'}.'" />'."\n".
-			'<input type="hidden" name="savemsgN"   value="'.$ENV{'form.savemsgN'}.'" />'."\n".
 			'<input type="hidden" name="NCT"'.
 			' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : $total+1).'" />'."\n");
+	if ($ENV{'form.handgrade'} eq 'yes') {
+	    $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="msgsub"   value="'.$ENV{'form.msgsub'}.'" />'."\n".
+			    '<input type="hidden" name="shownSub" value="0" />'."\n".
+			    '<input type="hidden" name="savemsgN" value="'.$ENV{'form.savemsgN'}.'" />'."\n");
+	}
 	
 	my ($cts,$prnmsg) = (1,'');
 	while ($cts <= $ENV{'form.savemsgN'}) {
 	    $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
-		($keyhash{$symb.'_savemsg'.$cts} eq '' ? $ENV{'form.savemsg'.$cts} : $keyhash{$symb.'_savemsg'.$cts}).
-		'" />'."\n";
+		(!exists($keyhash{$symb.'_savemsg'.$cts}) ? 
+		 &Apache::lonfeedback::clear_out_html($ENV{'form.savemsg'.$cts}) :
+		 &Apache::lonfeedback::clear_out_html($keyhash{$symb.'_savemsg'.$cts})).
+		'" />'."\n".
+		'<input type="hidden" name="shownOnce'.$cts.'" value="0" />'."\n";
 	    $cts++;
 	}
 	$request->print($prnmsg);
 
 	if ($ENV{'form.handgrade'} eq 'yes' && $ENV{'form.showgrading'} eq 'yes') {
+#
+# Print out the keyword options line
+#
 	    $request->print(<<KEYWORDS);
 &nbsp;<b>Keyword Options:</b>&nbsp;
-<a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>List</a>&nbsp; &nbsp;
+<a href="javascript:keywords(document.SCORE)"; TARGET=_self>List</a>&nbsp; &nbsp;
 <a href="#" onMouseDown="javascript:getSel(); return false"
  CLASS="page">Paste Selection to List</a>&nbsp; &nbsp;
 <a href="javascript:kwhighlight()"; TARGET=_self>Highlight Attribute</a><br /><br />
 KEYWORDS
+#
+# Load the other essays for similarity check
+#
+            my $essayurl=&Apache::lonnet::declutter($url);
+	    my ($adom,$aname,$apath)=($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
+	    $apath=&Apache::lonnet::escape($apath);
+	    $apath=~s/\W/\_/gs;
+	    %oldessays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);
         }
     }
 
-    if ($ENV{'form.vProb'} eq 'all') {
-	$request->print('<br /><br /><br />');
-	&show_problem($request,$symb,$uname,$udom,1);
+    if ($ENV{'form.vProb'} eq 'all' or $ENV{'form.vAns'} eq 'all') {
+	$request->print('<br /><br /><br />') if ($counter > 0);
+	my $mode;
+	if ($ENV{'form.vProb'} eq 'all' && $ENV{'form.vAns'} eq 'all') {
+	    $mode='both';
+	} elsif ($ENV{'form.vProb'} eq 'all' ) {
+	    $mode='text';
+	} elsif ($ENV{'form.vAns'} eq 'all') {
+	    $mode='answer';
+	}
+	$request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode));
     }
 
     my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
-    my ($partlist,$handgrade) = &response_type($url);
+
+    my ($partlist,$handgrade) = &response_type($url,$symb);
 
     # Display student info
     $request->print(($counter == 0 ? '' : '<br />'));
     my $result='<table border="0" width=100%><tr><td bgcolor="#777777">'."\n".
 	'<table border="0" width=100%><tr bgcolor="#edffff"><td>'."\n";
 
-    $result.='<b>Fullname: </b>'.$ENV{'form.fullname'}.
-	'<font color="#999999">&nbsp; &nbsp;Username: '.$uname.'</font>'.
-	'<font color="#999999">&nbsp; &nbsp;Domain: '.$udom.'</font><br />'."\n";
+    $result.='<b>Fullname: </b>'.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).'<br />'."\n";
     $result.='<input type="hidden" name="name'.$counter.
 	'" value="'.$ENV{'form.fullname'}.'" />'."\n";
 
-    # If this is handgraded, then check for collaborators
+    # If any part of the problem is an essay-response (handgraded), then check for collaborators
     my @col_fullnames;
     my ($classlist,$fullname);
     if ($ENV{'form.handgrade'} eq 'yes') {
-	my @col_list;
 	($classlist,undef,$fullname) = &getclasslist('all','0');
 	for (keys (%$handgrade)) {
 	    my $ncol = &Apache::lonnet::EXT('resource.'.$_.
@@ -942,50 +1444,46 @@ KEYWORDS
 	    next if ($ncol <= 0);
             s/\_/\./g;
             next if ($record{'resource.'.$_.'.collaborators'} eq '');
-            my (@collaborators) = split(/,?\s+/,
-                                   $record{'resource.'.$_.'.collaborators'});
-            my (@badcollaborators);
-            if (scalar(@collaborators) != 0) {
+            my @goodcollaborators = ();
+            my @badcollaborators  = ();
+	    foreach (split(/,?\s+/,$record{'resource.'.$_.'.collaborators'})) { 
+		$_ =~ s/[\$\^\(\)]//g;
+		next if ($_ eq '');
+		my ($co_name,$co_dom) = split /\@|:/,$_;
+		$co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i);
+		next if ($co_name eq $uname && $co_dom eq $udom);
+		# Doing this grep allows 'fuzzy' specification
+		my @Matches = grep /^$co_name:$co_dom$/i,keys %$classlist;
+		if (! scalar(@Matches)) {
+		    push @badcollaborators,$_;
+		} else {
+		    push @goodcollaborators, @Matches;
+		}
+	    }
+            if (scalar(@goodcollaborators) != 0) {
                 $result.='<b>Collaborators: </b>';
-                foreach my $collaborator (@collaborators) {
-                    my ($co_name,$co_dom) = split /\@|:/,$collaborator;
-                    $co_dom = $udom if (! defined($co_dom));
-                    next if ($co_name eq $uname && $co_dom eq $udom);
-                    # Doing this grep allows 'fuzzy' specification
-                    my @Matches = grep /^$co_name:$co_dom/i,
-                    keys %$classlist;
-                    if (! scalar(@Matches)) {
-                        push @badcollaborators,$collaborator;
-                        next;
-                    }
-                    push @col_list, @Matches;
-                    foreach (@Matches) {
-                        my ($lastname,$givenn) = split(/,/,$$fullname{$_});
-                        push @col_fullnames, $givenn.' '.$lastname;
-                        $result.=$$fullname{$_}.'&nbsp; &nbsp; &nbsp;';
-                    }
-                }
+                foreach (@goodcollaborators) {
+		    my ($lastname,$givenn) = split(/,/,$$fullname{$_});
+		    push @col_fullnames, $givenn.' '.$lastname;
+		    $result.=$$fullname{$_}.'&nbsp; &nbsp; &nbsp;';
+		}
                 $result.='<br />'."\n";
-                if (scalar(@badcollaborators) > 0) {
-                    $result.='<table border="0"><tr bgcolor="#ffbbbb"><td>';
-                    $result.='This student has submitted ';
-                    if (scalar(@badcollaborators) == 1) {
-                        $result .= 'an invalid collaborator';
-                    } else {
-                        $result .= 'invalid collaborators';
-                    }
-                    $result .= ': '.join(', ',@badcollaborators);
-                    
-                }
-                if (scalar(@collaborators > $ncol)) {
-                    $result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>';
-                    $result .= 'This student has sumbitted too many '.
-                        'collaborators.  Maximum is '.$ncol;
-                    $result .= '</td></tr></table>';
-                }
-                $result.='<input type="hidden" name="collaborator'.$counter.
-                    '" value="'.(join ':',@col_list).'" />'."\n";
-            }
+		$result.='<input type="hidden" name="collaborator'.$counter.
+		    '" value="'.(join ':',@goodcollaborators).'" />'."\n";
+	    }
+	    if (scalar(@badcollaborators) > 0) {
+		$result.='<table border="0"><tr bgcolor="#ffbbbb"><td>';
+		$result.='This student has submitted ';
+		$result.=(scalar(@badcollaborators) == 1) ? 'an invalid collaborator' : 'invalid collaborators';
+		$result .= ': '.join(', ',@badcollaborators);
+		$result .= '</td></tr></table>';
+	    }         
+	    if (scalar(@badcollaborators > $ncol)) {
+		$result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>';
+		$result .= 'This student has submitted too many '.
+		    'collaborators.  Maximum is '.$ncol.'.';
+		$result .= '</td></tr></table>';
+	    }
 	}
     }
     $request->print($result."\n");
@@ -1006,124 +1504,130 @@ KEYWORDS
 		$$fullname{$ENV{'form.'.$uname.':'.$udom.':submitted_by'}}.'</a>';
 	    $request->print($submitby);
 	} else {
-	    my ($string,$timestamp)=
-		&get_last_submission (%record);
-	    my $lastsubonly.=''.
+	    my ($string,$timestamp)= &get_last_submission (\%record);
+	    my $lastsubonly=''.
 		($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
-		 $$timestamp).'';
+		 $$timestamp)."</td></tr>\n";
 	    if ($$timestamp eq '') {
-		$lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0].'</td></tr>'."\n";
+		$lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0]; 
 	    } else {
 		for my $part (sort keys(%$handgrade)) {
-		    foreach (@$string) {
-			my ($partid,$respid) = /^resource\.(\d+)\.(\d+)\.submission/;
-			if ($part eq ($partid.'_'.$respid)) {
-			    my ($ressub,$subval) = split(/:/,$_,2);
-			    $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
-				$partid.'</b> <font color="#999999">( ID '.$respid.
-				' )</font>&nbsp; &nbsp;<b>Answer: </b>'.
-				&keywords_highlight($subval).'</td></tr>'."\n"
-				if ($ENV{'form.lastSub'} eq 'lastonly' || 
-				    ($ENV{'form.lastSub'} eq 'hdgrade' && 
-				     $$handgrade{$part} =~ /:yes$/));
+		    my ($responsetype,$foo) = split(/:/,$$handgrade{$part});
+		    my ($partid,$respid) = split(/_/,$part);
+		    if (!exists($record{'resource.'.$partid.'.'.$respid.'.submission'})) {
+			$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
+			    $partid.'</b> <font color="#999999">( ID '.$respid.
+			    ' )</font>&nbsp; &nbsp;'.
+			    '<font color="red">Nothing submitted - no attempts</font><br /><br />';
+ 		    } else {
+			foreach (@$string) {
+			    my ($partid,$respid) = /^resource\.(\w+)\.(\w+)\.submission/;
+			    if ($part eq ($partid.'_'.$respid)) {
+				my ($ressub,$subval) = split(/:/,$_,2);
+                            # Similarity check
+				my $similar='';
+				my $oname;
+				my $odom;
+				my $ocrsid;
+				my $oessay;
+				my $osim;
+				if($ENV{'form.checkPlag'}){
+				    ($oname,$odom,$ocrsid,$oessay,$osim)=&most_similar($uname,$udom,$subval);
+				    if ($osim) {
+					$osim=int($osim*100.0);
+					$similar='<hr /><h3><font color="#FF0000">Essay is '.$osim.
+					    '% similar to an essay by '.&Apache::loncommon::plainname($oname,$odom).
+					    '</font></h3><blockquote><i>'.
+					    &keywords_highlight($oessay).'</i></blockquote><hr />';
+				    }
+				}
+				$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
+				    $partid.'</b> <font color="#999999">( ID '.$respid.
+				    ' )</font>&nbsp; &nbsp;'.
+				    ($record{"resource.$partid.$respid.uploadedurl"}?
+				     '<a href="'.
+				     &Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).
+				     '"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> '.
+				     '<font color="red" size="1">Like all files provided by users, '.
+				     'this file may contain virusses</font><br />':'').
+				     '<b>Submitted Answer: </b>'.
+				     &cleanRecord($subval,$responsetype,$symb).
+				     '<br /><br />'.$similar."\n"
+				     if ($ENV{'form.lastSub'} eq 'lastonly' || 
+					 ($ENV{'form.lastSub'} eq 'hdgrade' && 
+					  $$handgrade{$part} =~ /:yes$/));
+			    }
 			}
 		    }
 		}
 	    }
-	    $lastsubonly.='</td></tr>'."\n";
+	    $lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
 	    $request->print($lastsubonly);
 	}
-    } else {
+    } elsif ($ENV{'form.lastSub'} eq 'datesub') {
+	my (undef,$responseType,undef,$parts) = &showResourceInfo($url);
+	$request->print(&displaySubByDates(\$symb,\%record,$parts,$responseType,$checkIcon));
+    } elsif ($ENV{'form.lastSub'} =~ /^(last|all)$/) {
 	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
 								 $ENV{'request.course.id'},
 								 $last,'.submission',
 								 'Apache::grades::keywords_highlight'));
     }
+
+    $request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
+	.$udom.'" />'."\n");
     
     # return if view submission with no grading option
-    if ($ENV{'form.showgrading'} eq '') {
-	$request->print('</td></tr></table></td></tr></table></form>'."\n");
+    if ($ENV{'form.showgrading'} eq '' || (!&canmodify($usec))) {
+	my $toGrade.='<input type="button" value="Grade Student" '.
+	    'onClick="javascript:checksubmit(this.form,\'Grade Student\',\''
+	    .$counter.'\');" TARGET=_self> &nbsp;'."\n" if (&canmodify($usec));
+	$toGrade.='</td></tr></table></td></tr></table></form>'."\n";
+	$toGrade.=&show_grading_menu_form($symb,$url) 
+	    if (($ENV{'form.command'} eq 'submission') || 
+		($ENV{'form.command'} eq 'processGroup' && $counter == $total));
+	$request = print($toGrade);
 	return;
     }
 
-    # Grading options
-    $result='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".
-	'<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
-	'<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
-	.$udom.'" />'."\n";
-    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.'.';
-    }
-    $result.='<tr><td bgcolor="#ffffff">'."\n".
-	'&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
-	',\''.$msgfor.'\')"; TARGET=_self>'.
-	'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a>'.
-	'<br />&nbsp;(Message will be sent when you click on Save & Next below.)'."\n" 
-	if ($ENV{'form.handgrade'} eq 'yes');
-    $request->print($result);
+    # essay grading message center
+    if ($ENV{'form.handgrade'} eq 'yes') {
+	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>'.
+	    'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> &nbsp;'.
+	    '<img src="'.$request->dir_config('lonIconsURL').
+	    '/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
+	    '<br />&nbsp;(Message will be sent when you click on Save & Next below.)'."\n" 
+	    if ($ENV{'form.handgrade'} eq 'yes');
+	$request->print($result);
+    }
 
     my %seen = ();
     my @partlist;
+    my @gradePartRespid;
     for (sort keys(%$handgrade)) {
 	my ($partid,$respid) = split(/_/);
 	next if ($seen{$partid} > 0);
 	$seen{$partid}++;
-	next if ($$handgrade{$_} =~ /:no$/);
+	next if ($$handgrade{$_} =~ /:no$/ && $ENV{'form.lastSub'} =~ /^(hdgrade)$/);
 	push @partlist,$partid;
-	my $wgt    = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
-	my $wgtmsg = ($wgt > 0 ? '(problem weight)' : 
-		      '<font color="red">problem weight assigned by computer</font>');
-	$wgt       = ($wgt > 0 ? $wgt : '1');
-	my $score  = ($record{'resource.'.$partid.'.awarded'} eq '' ?
-		      '' : $record{'resource.'.$partid.'.awarded'}*$wgt);
-	$result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />';
-	$result.='<table border="0"><tr><td><b>Part </b>'.$partid.' <b>Points: </b></td><td>';
+	push @gradePartRespid,$partid.'.'.$respid;
 
-	my $ctr = 0;
-	$result.='<table border="0"><tr>';  # display radio buttons in a nice table 10 across
-	while ($ctr<=$wgt) {
-	    $result.= '<td><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
-		'onclick="javascript:writeBox(this.form.GD_BOX'.$counter.'_'.$partid.
-		',this.form.GD_SEL'.$counter.'_'.$partid.','.$ctr.
-		',this.form.stores'.$counter.'_'.$partid.')" '.
-		($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
-	    $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
-	    $ctr++;
-	}
-	$result.='</tr></table>';
-
-	$result.='</td><td>&nbsp;<b>or</b>&nbsp;</td>';
-	$result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
-	    ($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
-	    'onChange="javascript:updateRadio(this.form.RADVAL'.$counter.'_'.$partid.
-	    ',this.form.GD_BOX'.$counter.'_'.$partid.
-	    ',this.form.GD_SEL'.$counter.'_'.$partid.
-	    ',this.form.stores'.$counter.'_'.$partid.
-	    ','.$wgt.')" /></td>'."\n";
-	$result.='<td>/'.$wgt.' '.$wgtmsg.' </td><td>';
-
-	$result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
-	    'onChange="javascript:clearRadBox(this.form.RADVAL'.$counter.'_'.$partid.
-	    ',this.form.GD_BOX'.$counter.'_'.$partid.
-	    ',this.form.GD_SEL'.$counter.'_'.$partid.
-	    ',this.form.stores'.$counter.'_'.$partid.')" >'."\n";
-	if ($record{'resource.'.$partid.'.solved'} eq 'excused') {
-	    $result.='<option> </option>'.
-		'<option selected="on">excused</option></select>';
-	} else {
-	    $result.='<option selected="on"> </option>'.
-		'<option>excused</option></select>';
-	}
-	$result.="&nbsp&nbsp\n";
-	$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="0" />';
-	$result.='</td></tr></table>'."\n";
-	$request->print($result);
+	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
     }
     $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="'.
@@ -1134,28 +1638,22 @@ KEYWORDS
 
     # print end of form
     if ($counter == $total) {
-	my $endform='<table border="0"><tr><td>'.
-	    '<input type="hidden" name="gradeOpt" value="" />'."\n";
-	if ($ENV{'form.handgrade'} eq 'yes') {
-	    $endform.='<input type="button" value="Save & Next" '.
-		'onClick="javascript:checksubmit(\'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="on">$nsel</;
-	    $endform.=$ntstu.'student(s) &nbsp;&nbsp;';
-	} else {
-	    $endform.='<input type="hidden" name="NTSTU" value="1" />'."\n";
-	}
-	$endform.='<input type="button" value="Next" '.
-	    'onClick="javascript:checksubmit(\'Next\');" TARGET=_self> &nbsp;'."\n".
-	    '<input type="button" value="Previous" '.
-	    'onClick="javascript:checksubmit(\'Previous\');" TARGET=_self> &nbsp;';
-	$endform.='(Next and Previous do not save the scores.)'."\n" 
-	    if ($ENV{'form.handgrade'} eq 'yes');
+	my $endform='<table border="0"><tr><td>'."\n";
+	$endform.='<input type="button" value="Save & Next" '.
+	    'onClick="javascript:checksubmit(this.form,\'Save & Next\','.
+	    $total.','.scalar(@partlist).');" TARGET=_self> &nbsp;'."\n";
+	my $ntstu ='<select name="NTSTU">'.
+	    '<option>1</option><option>2</option>'.
+	    '<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="on">$nsel</;
+	$endform.=$ntstu.'student(s) &nbsp;&nbsp;';
+	$endform.='<input type="button" value="Previous" '.
+	    'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self> &nbsp;'."\n".
+	    '<input type="button" value="Next" '.
+	    'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self> &nbsp;';
+	$endform.='(Next and Previous (student) do not save the scores.)'."\n" ;
 	$endform.='</td><tr></table></form>';
 	$endform.=&show_grading_menu_form($symb,$url);
 	$request->print($endform);
@@ -1165,17 +1663,15 @@ KEYWORDS
 
 #--- Retrieve the last submission for all the parts
 sub get_last_submission {
-    my (%returnhash)=@_;
+    my ($returnhash)=@_;
     my (@string,$timestamp);
-    if ($returnhash{'version'}) {
+    if ($$returnhash{'version'}) {
 	my %lasthash=();
 	my ($version);
-	for ($version=1;$version<=$returnhash{'version'};$version++) {
-	    foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
-		$lasthash{$_}=$returnhash{$version.':'.$_};
-#		if ($returnhash{$version.':'.$_} =~ /(SUBMITTED|DRAFT)$/) {
-		   $timestamp = scalar(localtime($returnhash{$version.':timestamp'}));
-#	       } 
+	for ($version=1;$version<=$$returnhash{'version'};$version++) {
+	    foreach (sort(split(/\:/,$$returnhash{$version.':keys'}))) {
+		$lasthash{$_}=$$returnhash{$version.':'.$_};
+		   $timestamp = scalar(localtime($$returnhash{$version.':timestamp'}));
 	    }
 	}
 	foreach ((keys %lasthash)) {
@@ -1187,7 +1683,7 @@ sub get_last_submission {
 	    }
 	}
     }
-    @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string;
+    @string = $string[0] eq '' ? '<font color="red">Nothing submitted - no attempts.</font>' : @string;
     return \@string,\$timestamp;
 }
 
@@ -1199,13 +1695,8 @@ sub keywords_highlight {
     (my $styleoff = $styleon) =~ s/\</\<\//;
     my @keylist   = split(/[,\s+]/,$ENV{'form.keywords'});
     foreach (@keylist) {
-	$string =~ s/\b\Q$_\E(\b|\.)/\<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff\<\/font\>/gi;
+	$string =~ s/\b\Q$_\E(\b|\.)/<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff<\/font>/gi;
     }
-    # This is not really the right place to do this, but I cannot find a
-    # better one at this time.  So here we go - the m in the s:::mg causes
-    # ^ to match the beginning of a new line.  So we replace(???) the beginning
-    # of the line with <br /> to make things formatted a little better.
-    $string =~ s:^:<br />:mg;
     return $string;
 }
 
@@ -1217,13 +1708,20 @@ sub processHandGrade {
     my $button = $ENV{'form.gradeOpt'};
     my $ngrade = $ENV{'form.NCT'};
     my $ntstu  = $ENV{'form.NTSTU'};
-
     if ($button eq 'Save & Next') {
 	my $ctr = 0;
 	while ($ctr < $ngrade) {
 	    my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
-	    my ($errorflag) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
-
+	    my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
+	    if ($errorflag eq 'no_score') {
+		$ctr++;
+		next;
+	    }
+	    if ($errorflag eq 'not_allowed') {
+		$request->print("<font color=\"red\">Not allowed to modify grades for $uname:$udom</font>");
+		$ctr++;
+		next;
+	    }
 	    my $includemsg = $ENV{'form.includemsg'.$ctr};
 	    my ($subject,$message,$msgstatus) = ('','','');
 	    if ($includemsg =~ /savemsg|newmsg\Q$ctr\E/) {
@@ -1232,19 +1730,28 @@ sub processHandGrade {
 		foreach (@msgnum) {
 		    $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
 		}
-		$message =~ s/\s+/ /g;
+		$message =&Apache::lonfeedback::clear_out_html($message);
+		$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
+		$message.=" for <a href=\"".
+		    &Apache::lonnet::clutter($url).
+		    "?symb=$symb\">$ENV{'form.probTitle'}</a>";
 		$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,
 							       $ENV{'form.msgsub'},$message);
 	    }
 	    if ($ENV{'form.collaborator'.$ctr}) {
 		my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
 		foreach (@collaborators) {
-		    &saveHandGrade($request,$url,$symb,$_,$udom,$ctr,
-				   $ENV{'form.unamedom'.$ctr});
-		    if ($message ne '') {
-			$msgstatus = &Apache::lonmsg::user_normal_msg ($_,$udom,
-								       $ENV{'form.msgsub'},
-								       $message);
+		    my ($errorflag,$pts,$wgt) = 
+			&saveHandGrade($request,$url,$symb,$_,$udom,$ctr,$ENV{'form.unamedom'.$ctr});
+		    if ($errorflag eq 'not_allowed') {
+			$request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");
+			next;
+		    } else {
+			if ($message ne '') {
+			    $msgstatus = &Apache::lonmsg::user_normal_msg ($_,$udom,
+									   $ENV{'form.msgsub'},
+									   $message);
+			}
 		    }
 		}
 	    }
@@ -1252,69 +1759,87 @@ sub processHandGrade {
 	}
     }
 
-    # 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+$//;
-    my (@keywords) = sort(split(/\s+/,$ENV{'form.keywords'}));
-    $ENV{'form.keywords'} = join(' ',@keywords);
-    $keyhash{$symb.'_keywords'}     = $ENV{'form.keywords'};
-    $keyhash{$symb.'_subject'}      = $ENV{'form.msgsub'};
-    $keyhash{$loginuser.'_kwclr'}   = $ENV{'form.kwclr'};
-    $keyhash{$loginuser.'_kwsize'}  = $ENV{'form.kwsize'};
-    $keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
-
-    # 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
-    my ($ctr,$idx) = (1,1);
-    while ($ctr <= $ENV{'form.savemsgN'}) {
-	if ($ENV{'form.savemsg'.$ctr} ne '') {
-	    $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
-	    $idx++;
+    if ($ENV{'form.handgrade'} eq 'yes') {
+	# 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+$//;
+	my (@keywords) = sort(split(/\s+/,$ENV{'form.keywords'}));
+	$ENV{'form.keywords'} = join(' ',@keywords);
+	$keyhash{$symb.'_keywords'}     = $ENV{'form.keywords'};
+	$keyhash{$symb.'_subject'}      = $ENV{'form.msgsub'};
+	$keyhash{$loginuser.'_kwclr'}   = $ENV{'form.kwclr'};
+	$keyhash{$loginuser.'_kwsize'}  = $ENV{'form.kwsize'};
+	$keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
+
+	# 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
+	my ($ctr,$idx) = (1,1);
+	while ($ctr <= $ENV{'form.savemsgN'}) {
+	    if ($ENV{'form.savemsg'.$ctr} ne '') {
+		$keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
+		$idx++;
+	    }
+	    $ctr++;
 	}
-	$ctr++;
-    }
-    $ctr = 0;
-    while ($ctr < $ngrade) {
-	if ($ENV{'form.newmsg'.$ctr} ne '') {
-	    $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
-	    $ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
-	    $idx++;
+	$ctr = 0;
+	while ($ctr < $ngrade) {
+	    if ($ENV{'form.newmsg'.$ctr} ne '') {
+		$keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+		$ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+		$idx++;
+	    }
+	    $ctr++;
 	}
-	$ctr++;
+	$ENV{'form.savemsgN'} = --$idx;
+	$keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
+	my $putresult = &Apache::lonnet::put
+	    ('nohist_handgrade',\%keyhash,
+	     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+	     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
     }
-    $ENV{'form.savemsgN'} = --$idx;
-    $keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
-    my $putresult = &Apache::lonnet::put
-	('nohist_handgrade',\%keyhash,
-	 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-	 $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
     # Called by Save & Refresh from Highlight Attribute Window
+    my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
     if ($ENV{'form.refresh'} eq 'on') {
-	my $ctr = 0;
-	$ENV{'form.NTSTU'}=$ngrade;
+	my ($ctr,$total) = (0,0);
 	while ($ctr < $ngrade) {
-	    ($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$ENV{'form.unamedom'.$ctr});
-	    &submission($request,$ctr,$ngrade-1);
+	    $total++ if  $ENV{'form.unamedom'.$ctr} ne '';
+	    $ctr++;
+	}
+	$ENV{'form.NTSTU'}=$ngrade;
+	$ctr = 0;
+	while ($ctr < $total) {
+	    my $processUser = $ENV{'form.unamedom'.$ctr};
+	    ($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$processUser);
+	    $ENV{'form.fullname'} = $$fullname{$processUser};
+	    &submission($request,$ctr,$total-1);
 	    $ctr++;
 	}
 	return '';
     }
 
+# Go directly to grade student - from submission or link from chart page
+    if ($button eq 'Grade Student') {
+	(undef,undef,$ENV{'form.handgrade'},undef,undef) = &showResourceInfo($url);
+	my $processUser = $ENV{'form.unamedom'.$ENV{'form.studentNo'}};
+	($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$processUser);
+	$ENV{'form.fullname'} = $$fullname{$processUser};
+	&submission($request,0,0);
+	return '';
+    }
+
     # Get the next/previous one or group of students
     my $firststu = $ENV{'form.unamedom0'};
     my $laststu = $ENV{'form.unamedom'.($ngrade-1)};
-    $ctr = 2;
+    my $ctr = 2;
     while ($laststu eq '') {
 	$laststu  = $ENV{'form.unamedom'.($ngrade-$ctr)};
 	$ctr++;
 	$laststu = $firststu if ($ctr > $ngrade);
     }
 
-    my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'0');
     my (@parsedlist,@nextlist);
     my ($nextflg) = 0;
     foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
@@ -1328,21 +1853,29 @@ sub processHandGrade {
 	}
     }
     $ctr = 0;
-    my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
     @parsedlist = reverse @parsedlist if ($button eq 'Previous');
+    my ($partlist) = &response_type($url);
     foreach my $student (@parsedlist) {
+	my $submitonly=$ENV{'form.submitonly'};
 	my ($uname,$udom) = split(/:/,$student);
-	if ($ENV{'form.submitonly'} eq 'yes') {
-	    my (%status) = &student_gradeStatus($ENV{'form.url'},$symb,$udom,$uname,$partlist) ;
-	    my $statusflg = '';
+	if ($submitonly =~ /^(yes|graded)$/) {
+#	    my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+	    my %status=&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
+	    my $submitted = 0;
+	    my $graded = 1;
 	    foreach (keys(%status)) {
-		$statusflg = 1 if ($status{$_} ne 'nothing');
-		my ($foo,$partid,$foo1) = split(/\./);
-		$statusflg = '' if ($status{'resource.'.$partid.'.submitted_by'} ne '');
+		$submitted = 1 if ($status{$_} ne 'nothing');
+		$graded = 0 if ($status{$_} =~ /^correct/);
+		my ($foo,$partid,$foo1) = split(/\./,$_);
+		if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
+		    $submitted = 0;
+		}
 	    }
-	    next if ($statusflg eq '');
+	    next if (!$submitted && ($submitonly eq 'yes' || $submitonly eq 'graded'));
+	    next if (!$graded && $submitonly eq 'graded');
 	}
 	push @nextlist,$student if ($ctr < $ntstu);
+	last if ($ctr == $ntstu);
 	$ctr++;
     }
 
@@ -1354,8 +1887,6 @@ sub processHandGrade {
 	$ENV{'form.student'}  = $uname;
 	$ENV{'form.userdom'}  = $udom;
 	$ENV{'form.fullname'} = $$fullname{$_};
-#	$ENV{'form.'.$_.':submitted_by'} = $submitter;
-#	print "submitter=$ENV{'form.'.$_.':submitted_by'}= $submitter:<br>";
 	&submission($request,$ctr,$total);
 	$ctr++;
     }
@@ -1372,23 +1903,38 @@ sub processHandGrade {
 #---- Save the score and award for each student, if changed
 sub saveHandGrade {
     my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter) = @_;
-    my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
-    my %newrecord;
+    my $usec = &Apache::lonnet::getsection($domain,$stuname,
+					   $ENV{'request.course.id'});
+    if (!&canmodify($usec)) { return('not_allowed'); }
+    my %record     = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
+    my %newrecord  = ();
+    my ($pts,$wgt) = ('','');
     foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
-	if ($ENV{'form.GD_SEL'.$newflg.'_'.$_} eq 'excused') {
+	my $dropMenu = $ENV{'form.GD_SEL'.$newflg.'_'.$_};
+	if ($dropMenu eq 'excused') {
 	    if ($record{'resource.'.$_.'.solved'} ne 'excused') {
 		$newrecord{'resource.'.$_.'.solved'} = 'excused';
 		if (exists($record{'resource.'.$_.'.awarded'})) {
 		    $newrecord{'resource.'.$_.'.awarded'} = '';
 		}
+	    $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
 	    }
-	} else {
-	    my $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ? 
-		       $ENV{'form.GD_BOX'.$newflg.'_'.$_} : 
-		       $ENV{'form.RADVAL'.$newflg.'_'.$_});
-	    my $wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 : 
+	} elsif ($dropMenu eq 'reset status'
+		 && exists($record{'resource.'.$_.'.solved'})) { #don't bother if no old records -> no attempts
+	    $newrecord{'resource.'.$_.'.tries'} = 0;
+	    $newrecord{'resource.'.$_.'.solved'} = '';
+	    $newrecord{'resource.'.$_.'.award'} = '';
+	    $newrecord{'resource.'.$_.'.awarded'} = 0;
+	    $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+	} elsif ($dropMenu eq '') {
+	    $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ? 
+		    $ENV{'form.GD_BOX'.$newflg.'_'.$_} : 
+		    $ENV{'form.RADVAL'.$newflg.'_'.$_});
+	    return 'no_score' if ($pts eq '' && $ENV{'form.GD_SEL'.$newflg.'_'.$_} eq '');
+	    $wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 : 
 		$ENV{'form.WGT'.$newflg.'_'.$_};
 	    my $partial= $pts/$wgt;
+	    next if ($partial eq $record{'resource.'.$_.'.awarded'}); #do not update score for part if not changed.
 	    $newrecord{'resource.'.$_.'.awarded'}  = $partial 
 		if ($record{'resource.'.$_.'.awarded'} ne $partial);
 	    my $reckey = 'resource.'.$_.'.solved';
@@ -1401,15 +1947,15 @@ sub saveHandGrade {
 	    }
 	    $newrecord{'resource.'.$_.'.submitted_by'} = $submitter 
 		if ($submitter && ($record{'resource.'.$_.'.submitted_by'} ne $submitter));
+	    $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
 	}
     }
 
     if (scalar(keys(%newrecord)) > 0) {
-	$newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
 	&Apache::lonnet::cstore(\%newrecord,$symb,
 				$ENV{'request.course.id'},$domain,$stuname);
     }
-    return '';
+    return '',$pts,$wgt;
 }
 
 #--------------------------------------------------------------------------------------
@@ -1423,12 +1969,12 @@ sub viewgrades_js {
     $request->print(<<VIEWJAVASCRIPT);
 <script type="text/javascript" language="javascript">
    function writePoint(partid,weight,point) {
-	var radioButton = eval("document.classgrade.RADVAL_"+partid);
-	var textbox = eval("document.classgrade.TEXTVAL_"+partid);
+	var radioButton = document.classgrade["RADVAL_"+partid];
+	var textbox = document.classgrade["TEXTVAL_"+partid];
 	if (point == "textval") {
-	    var point = eval("document.classgrade.TEXTVAL_"+partid+".value");
-	    if (isNaN(point) || point < 0) {
-		alert("A number equal or greater than 0 is expected. Entered value = "+point);
+	    point = document.classgrade["TEXTVAL_"+partid].value;
+	    if (isNaN(point) || parseFloat(point) < 0) {
+		alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
 		var resetbox = false;
 		for (var i=0; i<radioButton.length; i++) {
 		    if (radioButton[i].checked) {
@@ -1441,8 +1987,8 @@ sub viewgrades_js {
 		}
 		return;
 	    }
-	    if (point > weight) {
-		var resp = confirm("You entered a value ("+point+
+	    if (parseFloat(point) > parseFloat(weight)) {
+		var resp = confirm("You entered a value ("+parseFloat(point)+
 				   ") greater than the weight for the part. Accept?");
 		if (resp == false) {
 		    textbox.value = "";
@@ -1451,21 +1997,19 @@ sub viewgrades_js {
 	    }
 	    for (var i=0; i<radioButton.length; i++) {
 		radioButton[i].checked=false;
-		if (point == i) {
+		if (parseFloat(point) == i) {
 		    radioButton[i].checked=true;
 		}
 	    }
 
 	} else {
-	    textbox.value = point;
+	    textbox.value = parseFloat(point);
 	}
 	for (i=0;i<document.classgrade.total.value;i++) {
-	    var user = eval("document.classgrade.ctr"+i+".value");
-	    var scorename = eval("document.classgrade.GD_"+user+
-				 "_"+partid+"_awarded");
-	    var saveval   = eval("document.classgrade.GD_"+user+
-				 "_"+partid+"_solved_s.value");
-	    var selname   = eval("document.classgrade.GD_"+user+"_"+partid+"_solved");
+	    var user = document.classgrade["ctr"+i].value;
+	    var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
+	    var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
+	    var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
 	    if (saveval != "correct") {
 		scorename.value = point;
 		if (selname[0].selected != true) {
@@ -1473,15 +2017,14 @@ sub viewgrades_js {
 		}
 	    }
 	}
-	var selval   = eval("document.classgrade.SELVAL_"+partid);
-	selval[0].selected = true;
+	document.classgrade["SELVAL_"+partid][0].selected = true;
     }
 
     function writeRadText(partid,weight) {
-	var selval   = eval("document.classgrade.SELVAL_"+partid);
-	var radioButton = eval("document.classgrade.RADVAL_"+partid);
-	var textbox = eval("document.classgrade.TEXTVAL_"+partid);
-	if (selval[1].selected) {
+	var selval   = document.classgrade["SELVAL_"+partid];
+	var radioButton = document.classgrade["RADVAL_"+partid];
+	var textbox = document.classgrade["TEXTVAL_"+partid];
+	if (selval[1].selected || selval[2].selected) {
 	    for (var i=0; i<radioButton.length; i++) {
 		radioButton[i].checked=false;
 
@@ -1489,30 +2032,29 @@ sub viewgrades_js {
 	    textbox.value = "";
 
 	    for (i=0;i<document.classgrade.total.value;i++) {
-		var user = eval("document.classgrade.ctr"+i+".value");
-		var scorename = eval("document.classgrade.GD_"+user+
-				     "_"+partid+"_awarded");
-		var saveval   = eval("document.classgrade.GD_"+user+
-				     "_"+partid+"_solved_s.value");
-		var selname   = eval("document.classgrade.GD_"+user+
-				     "_"+partid+"_solved");
+		var user = document.classgrade["ctr"+i].value;
+		var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
+		var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
+		var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
 		if (saveval != "correct") {
 		    scorename.value = "";
-		    selname[1].selected = true;
+		    if (selval[1].selected) {
+			selname[1].selected = true;
+		    } else {
+			selname[2].selected = true;
+			if (Number(document.classgrade["GD_"+user+"_"+partid+"_tries"].value)) 
+			{document.classgrade["GD_"+user+"_"+partid+"_tries"].value = '0';}
+		    }
 		}
 	    }
 	} else {
 	    for (i=0;i<document.classgrade.total.value;i++) {
-		var user = eval("document.classgrade.ctr"+i+".value");
-		var scorename = eval("document.classgrade.GD_"+user+
-				     "_"+partid+"_awarded");
-		var saveval   = eval("document.classgrade.GD_"+user+
-				     "_"+partid+"_solved_s.value");
-		var selname   = eval("document.classgrade.GD_"+user+
-				     "_"+partid+"_solved");
+		var user = document.classgrade["ctr"+i].value;
+		var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
+		var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
+		var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
 		if (saveval != "correct") {
-		    scorename.value = eval("document.classgrade.GD_"+user+
-				     "_"+partid+"_awarded_s.value");;
+		    scorename.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
 		    selname[0].selected = true;
 		}
 	    }
@@ -1520,18 +2062,18 @@ sub viewgrades_js {
     }
 
     function changeSelect(partid,user) {
-	var selval = eval("document.classgrade.GD_"+user+'_'+partid+"_solved");
-	var textbox = eval("document.classgrade.GD_"+user+'_'+partid+"_awarded");
+	var selval = document.classgrade["GD_"+user+'_'+partid+"_solved"];
+	var textbox = document.classgrade["GD_"+user+'_'+partid+"_awarded"];
 	var point  = textbox.value;
-	var weight = eval("document.classgrade.weight_"+partid+".value");
+	var weight = document.classgrade["weight_"+partid].value;
 
-	if (isNaN(point) || point < 0) {
-	    alert("A number equal or greater than 0 is expected. Entered value = "+point);
+	if (isNaN(point) || parseFloat(point) < 0) {
+	    alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
 	    textbox.value = "";
 	    return;
 	}
-	if (point > weight) {
-	    var resp = confirm("You entered a value ("+point+
+	if (parseFloat(point) > parseFloat(weight)) {
+	    var resp = confirm("You entered a value ("+parseFloat(point)+
 			       ") greater than the weight of the part. Accept?");
 	    if (resp == false) {
 		textbox.value = "";
@@ -1542,19 +2084,21 @@ sub viewgrades_js {
     }
 
     function changeOneScore(partid,user) {
-	var selval = eval("document.classgrade.GD_"+user+'_'+partid+"_solved");
-	if (selval[1].selected) {
-	    var boxval = eval("document.classgrade.GD_"+user+'_'+partid+"_awarded");
-	    boxval.value = "";
+	var selval = document.classgrade["GD_"+user+'_'+partid+"_solved"];
+	if (selval[1].selected || selval[2].selected) {
+	    document.classgrade["GD_"+user+'_'+partid+"_awarded"].value = "";
+	    if (selval[2].selected) {
+		document.classgrade["GD_"+user+'_'+partid+"_tries"].value = "0";
+	    }
 	}
     }
 
     function resetEntry(numpart) {
 	for (ctpart=0;ctpart<numpart;ctpart++) {
-	    var partid = eval("document.classgrade.partid_"+ctpart+".value");
-	    var radioButton = eval("document.classgrade.RADVAL_"+partid);
-	    var textbox = eval("document.classgrade.TEXTVAL_"+partid);
-	    var selval  = eval("document.classgrade.SELVAL_"+partid);
+	    var partid = document.classgrade["partid_"+ctpart].value;
+	    var radioButton = document.classgrade["RADVAL_"+partid];
+	    var textbox = document.classgrade["TEXTVAL_"+partid];
+	    var selval  = document.classgrade["SELVAL_"+partid];
 	    for (var i=0; i<radioButton.length; i++) {
 		radioButton[i].checked=false;
 
@@ -1563,16 +2107,13 @@ sub viewgrades_js {
 	    selval[0].selected = true;
 
 	    for (i=0;i<document.classgrade.total.value;i++) {
-		var user = eval("document.classgrade.ctr"+i+".value");
-		var resetscore = eval("document.classgrade.GD_"+user+
-				      "_"+partid+"_awarded");
-		resetscore.value = eval("document.classgrade.GD_"+user+
-					"_"+partid+"_awarded_s.value");
-
-		var saveselval   = eval("document.classgrade.GD_"+user+
-				     "_"+partid+"_solved_s.value");
-
-		var selname   = eval("document.classgrade.GD_"+user+"_"+partid+"_solved");
+		var user = document.classgrade["ctr"+i].value;
+		var resetscore = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
+		resetscore.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
+		var resettries = document.classgrade["GD_"+user+"_"+partid+"_tries"];
+		resettries.value = document.classgrade["GD_"+user+"_"+partid+"_tries_s"].value;
+		var saveselval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
+		var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
 		if (saveselval == "excused") {
 		    if (selname[1].selected == false) { selname[1].selected = true;}
 		} else {
@@ -1594,7 +2135,7 @@ sub viewgrades {
     my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'}); 
     my $result='<h3><font color="#339933">Manual Grading</font></h3>';
 
-    $result.='<font size=+1><b>Resource: </b>'.$ENV{'form.url'}.'</font>'."\n";
+    $result.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";
 
     #view individual student submission form - called using Javascript viewOneStudent
     $result.=&jscriptNform($url,$symb);
@@ -1604,26 +2145,25 @@ sub viewgrades {
 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
 	'<input type="hidden" name="command" value="editgrades" />'."\n".
-	'<input type="hidden" name="section" value="'.$ENV{'form.section'}.'" />'."\n";
-    $result.='<h3>Assign Common Grade To ';
+	'<input type="hidden" name="section" value="'.$ENV{'form.section'}.'" />'."\n".
+	'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
+	'<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
+	'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n";
+
+    my $sectionClass;
     if ($ENV{'form.section'} eq 'all') {
-	$result.='Class </h3>';
+	$sectionClass='Class </h3>';
     } elsif ($ENV{'form.section'} eq 'no') {
-	$result.='Students in no Section </h3>';
+	$sectionClass='Students in no Section </h3>';
     } else {
-	$result.='Students in Section '.$ENV{'form.section'}.'</h3>';
+	$sectionClass='Students in Section '.$ENV{'form.section'}.'</h3>';
     }
+    $result.='<h3>Assign Common Grade To '.$sectionClass;
     $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
 	'<table border=0><tr bgcolor="#ffffdd"><td>';
-#    $result.='To assign the same score for all the students use the radio buttons or '.
-#	'text box below. To assign scores individually fill in the score boxes for '.
-#	'each student in the table below. <font color="red">A part that has already '.
-#	'been graded does not get changed using the radio buttons or text box. '.
-#	'If needed, it has to be changed individually.</font>';
-#    $result.='</td></tr><tr><td>';
     #radio buttons/text box for assigning points for a section or class.
     #handles different parts of a problem
-    my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
+    my ($partlist,$handgrade) = &response_type($url,$symb);
     my %weight = ();
     my $ctsparts = 0;
     $result.='<table border="0">';
@@ -1659,32 +2199,25 @@ sub viewgrades {
 	    'onChange="javascript:writeRadText(\''.$partid.'\','.
 		$weight{$partid}.')"> '.
 	    '<option selected="on"> </option>'.
-	    '<option>excused</option></select></td></tr>'."\n";
+	    '<option>excused</option>'.
+	    '<option>reset status</option></select></td></tr>'."\n";
 	$ctsparts++;
     }
     $result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
 	'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
     $result.='<input type="button" value="Reset" '.
-	'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self> &nbsp; &nbsp;';
-    $result.='<input type="button" value="Submit Changes" '.
-	'onClick="javascript:submit();" TARGET=_self />'."\n";
+	'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self>';
 
     #table listing all the students in a section/class
     #header of table
-    $result.= '<h3>Assign Grade to Specific Students in ';
-    if ($ENV{'form.section'} eq 'all') {
-	$result.='the Class </h3>';
-    } elsif ($ENV{'form.section'} eq 'no') {
-	$result.='no Section </h3>';
-    } else {
-	$result.='Section '.$ENV{'form.section'}.'</h3>';
-    }
+    $result.= '<h3>Assign Grade to Specific Students in '.$sectionClass;
     $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
-	'<table border=0><tr bgcolor="#deffff">'.
-	'<td><b>Fullname</b></td><td><b>Username</b></td><td><b>Domain</b></td>'."\n";
-    my (@parts) = sort(&getpartlist($url));
+	'<table border=0><tr bgcolor="#deffff"><td>&nbsp;<b>No.</b>&nbsp;</td>'.
+	'<td>'.&nameUserString('header')."</td>\n";
+    my (@parts) = sort(&getpartlist($url,$symb));
     foreach my $part (@parts) {
 	my $display=&Apache::lonnet::metadata($url,$part.'.display');
+	$display =~ s|^Number of Attempts|Tries<br />|; # makes the column narrower
 	if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
 	if ($display =~ /^Partial Credit Factor/) {
 	    my ($partid) = &split_part_type($part);
@@ -1699,62 +2232,68 @@ sub viewgrades {
 
     #get info for each student
     #list all the students - with points and grade status
-    my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'0');
+    my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
     my $ctr = 0;
     foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
-	my ($uname,$udom) = split(/:/);
+	my $uname = $_;
+	$uname=~s/:/_/;
 	$result.='<input type="hidden" name="ctr'.$ctr.'" value="'.$uname.'" />'."\n";
-	$result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
-				   $_,$$fullname{$_},\@parts,\%weight);
 	$ctr++;
+	$result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
+				   $_,$$fullname{$_},\@parts,\%weight,$ctr);
     }
     $result.='</table></td></tr></table>';
     $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
-    $result.='<input type="button" value="Submit Changes" '.
+    $result.='<input type="button" value="Save" '.
 	'onClick="javascript:submit();" TARGET=_self /></form>'."\n";
+    if (scalar(%$fullname) eq 0) {
+	my $colspan=3+scalar(@parts);
+	$result='<font color="red">There are no students in section "'.$ENV{'form.section'}.
+	    '" with enrollment status "'.$ENV{'form.Status'}.'" to modify or grade.</font>';
+    }
     $result.=&show_grading_menu_form($symb,$url);
     return $result;
 }
 
 #--- call by previous routine to display each student
 sub viewstudentgrade {
-    my ($url,$symb,$courseid,$student,$fullname,$parts,$weight) = @_;
+    my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr) = @_;
     my ($uname,$udom) = split(/:/,$student);
+    $student=~s/:/_/;
     my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
-    my $result='<tr bgcolor="#ffffdd"><td>'.
+    my $result='<tr bgcolor="#ffffdd"><td align="right">'.$ctr.'&nbsp;</td><td>&nbsp;'.
 	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
-	'\')"; TARGET=_self>'.$fullname.'</a>'.
-	'</td><td>'.$uname.'</td><td align="middle">'.$udom.'</td>'."\n";
-    foreach my $part (@$parts) {
-	my ($part,$type) = &split_part_type($part);
+	'\')"; TARGET=_self>'.$fullname.'</a> '.
+	'<font color="#999999">('.$uname.($ENV{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
+    foreach my $apart (@$parts) {
+	my ($part,$type) = &split_part_type($apart);
 	my $score=$record{"resource.$part.$type"};
 	if ($type eq 'awarded') {
 	    my $pts = $score eq '' ? '' : $score*$$weight{$part};
 	    $result.='<input type="hidden" name="'.
-		'GD_'.$uname.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
+		'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
 	    $result.='<td align="middle"><input type="text" name="'.
-		'GD_'.$uname.'_'.$part.'_awarded" '.
-		'onChange="javascript:changeSelect(\''.$part.'\',\''.$uname.
+		'GD_'.$student.'_'.$part.'_awarded" '.
+		'onChange="javascript:changeSelect(\''.$part.'\',\''.$student.
 		'\')" value="'.$pts.'" size="4" /></td>'."\n";
 	} elsif ($type eq 'solved') {
 	    my ($status,$foo)=split(/_/,$score,2);
 	    $status = 'nothing' if ($status eq '');
-	    $result.='<input type="hidden" name="'.'GD_'.$uname.'_'.
+	    $result.='<input type="hidden" name="'.'GD_'.$student.'_'.
 		$part.'_solved_s" value="'.$status.'" />'."\n";
-	    $result.='<td align="middle"><select name="'.
-		'GD_'.$uname.'_'.$part.'_solved" '.
-		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$uname.'\')" >'."\n";
-	    my $optsel = '<option selected="on"> </option><option>excused</option>'."\n";
-	    $optsel = '<option> </option><option selected="on">excused</option>'."\n"
-		if ($status eq 'excused');
-	    $result.=$optsel;
-	    $result.="</select></td>\n";
+	    $result.='<td align="middle">&nbsp;<select name="'.
+		'GD_'.$student.'_'.$part.'_solved" '.
+		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
+	    $result.= (($status eq 'excused') ? '<option> </option><option selected="on">excused</option>' 
+		: '<option selected="on"> </option><option>excused</option>')."\n";
+	    $result.='<option>reset status</option>';
+	    $result.="</select>&nbsp;</td>\n";
 	} else {
 	    $result.='<input type="hidden" name="'.
-		'GD_'.$uname.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
+		'GD_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
 		    "\n";
 	    $result.='<td align="middle"><input type="text" name="'.
-		'GD_'.$uname.'_'.$part.'_'.$type.'" '.
+		'GD_'.$student.'_'.$part.'_'.$type.'" '.
 		'value="'.$score.'" size="4" /></td>'."\n";
 	}
     }
@@ -1770,12 +2309,13 @@ sub editgrades {
     my $symb=$ENV{'form.symb'};
     my $url =$ENV{'form.url'};
     my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
-    $title.='<font size=+1><b>Resource: </b>'.$ENV{'form.url'}.'</font><br />'."\n";
+    $title.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font><br />'."\n";
     $title.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\n";
-    $title.= &show_grading_menu_form ($symb,$url);
+
     my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";
     $result.= '<table border="0"><tr bgcolor="#deffff">'.
-	'<td rowspan=2><b>Username</b></td><td rowspan=2><b>Fullname</b></td>'."\n";
+	'<td rowspan=2 valign="center">&nbsp;<b>No.</b>&nbsp;</td>'.
+	'<td rowspan=2 valign="center">'.&nameUserString('header')."</td>\n";
 
     my %scoreptr = (
 		    'correct'  =>'correct_by_override',
@@ -1791,7 +2331,7 @@ sub editgrades {
     my %columns = ();
     my ($i,$ctr,$count,$rec_update) = (0,0,0,0);
 
-    my (@parts) = sort(&getpartlist($url));
+    my (@parts) = sort(&getpartlist($url,$symb));
     my $header;
     while ($ctr < $ENV{'form.totalparts'}) {
 	my $partid = $ENV{'form.partid_'.$ctr};
@@ -1809,8 +2349,9 @@ sub editgrades {
 	    if ($type eq 'awarded' || $type eq 'solved') { next; }
 	    my $display=&Apache::lonnet::metadata($url,$stores.'.display');
 	    $display =~ s/\[Part: (\w)+\]//;
-	    $header .= '<td align="center">&nbsp;<b>Old</b> '.$display.'&nbsp;</td>'.
-		'<td align="center">&nbsp;<b>New</b> '.$display.'&nbsp;</td>';
+	    $display =~ s/Number of Attempts/Tries/;
+	    $header .= '<td align="center">&nbsp;<b>Old '.$display.'</b>&nbsp;</td>'.
+		'<td align="center">&nbsp;<b>New '.$display.'</b>&nbsp;</td>';
 	    $columns{$partid}+=2;
 	}
     }
@@ -1823,16 +2364,23 @@ sub editgrades {
     $result .= '</tr><tr bgcolor="#deffff">';
     $result .= $header;
     $result .= '</tr>'."\n";
-
+    my $noupdate;
+    my ($updateCtr,$noupdateCtr) = (1,1);
     for ($i=0; $i<$ENV{'form.total'}; $i++) {
+	my $line;
 	my $user = $ENV{'form.ctr'.$i};
+	my $usercolon = $user;
+	$usercolon =~s/_/:/;
+	my ($uname,$udom)=split(/_/,$user);
 	my %newrecord;
 	my $updateflag = 0;
-	my @userdom = grep /^$user:/,keys %$classlist;
-	my (undef,$udom) = split(/:/,$userdom[0]);
-
-	$result .= '<tr bgcolor="#ffffde"><td>'.$user.'&nbsp;</td><td>'.
-	    $$fullname{$userdom[0]}.'&nbsp;</td>';
+	$line .= '<td>'.&nameUserString(undef,$$fullname{$usercolon},$uname,$udom).'</td>';
+	my $usec=$classlist->{"$uname:$udom"}[5];
+	if (!&canmodify($usec)) {
+	    my $numcols=scalar(@partid)*4+2;
+	    $noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>";
+	    next;
+	}
 	foreach (@partid) {
 	    my $old_aw    = $ENV{'form.GD_'.$user.'_'.$_.'_awarded_s'};
 	    my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1);
@@ -1850,19 +2398,29 @@ sub editgrades {
 	    } elsif ($partial == 0) {
 		$score = 'incorrect_by_override';
 	    }
-	    $score = 'excused' if (($ENV{'form.GD_'.$user.'_'.$_.'_solved'} eq 'excused') &&
-				   ($score ne 'excused'));
-	    $result .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
-		'<td align="center">'.$awarded.
-		($score eq 'excused' ? $score : '').'&nbsp;</td>';
+	    my $dropMenu = $ENV{'form.GD_'.$user.'_'.$_.'_solved'};
+	    $score = 'excused' if (($dropMenu eq 'excused') && ($score ne 'excused'));
 
-	    if (!($old_part eq $partial && $old_score eq $score)) {
+	    if ($dropMenu eq 'reset status' &&
+		$old_score ne '') { # ignore if no previous attempts => nothing to reset
+		$newrecord{'resource.'.$_.'.tries'} = 0;
+		$newrecord{'resource.'.$_.'.solved'} = '';
+		$newrecord{'resource.'.$_.'.award'} = '';
+		$newrecord{'resource.'.$_.'.awarded'} = 0;
+		$newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+		$updateflag = 1;
+	    } elsif (!($old_part eq $partial && $old_score eq $score)) {
 		$updateflag = 1;
 		$newrecord{'resource.'.$_.'.awarded'}  = $partial if $partial ne '';
 		$newrecord{'resource.'.$_.'.solved'}   = $score;
 		$rec_update++;
 	    }
 
+	    $line .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
+		'<td align="center">'.$awarded.
+		($score eq 'excused' ? $score : '').'&nbsp;</td>';
+
+
 	    my $partid=$_;
 	    foreach my $stores (@parts) {
 		my ($part,$type) = &split_part_type($stores);
@@ -1872,22 +2430,33 @@ sub editgrades {
 		my $awarded   = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type};
 		if ($awarded ne '' && $awarded ne $old_aw) {
 		    $newrecord{'resource.'.$part.'.'.$type}= $awarded;
+		    $newrecord{'resource.'.$part.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
 		    $updateflag=1;
 		}
-		$result .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
+		$line .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
 		    '<td align="center">'.$awarded.'&nbsp;</td>';
 	    }
 	}
-	$result .= '</tr>'."\n";
+	$line.='</tr>'."\n";
 	if ($updateflag) {
 	    $count++;
-	    $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
 	    &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},
-				    $udom,$user);
+				    $udom,$uname);
+	    $result.='<tr bgcolor="#ffffde"><td align="right">&nbsp;'.$updateCtr.'&nbsp;</td>'.$line;
+	    $updateCtr++;
+	} else {
+	    $noupdate.='<tr bgcolor="#ffffde"><td align="right">&nbsp;'.$noupdateCtr.'&nbsp;</td>'.$line;
+	    $noupdateCtr++;
 	}
     }
-    $result .= '</table></td></tr></table>'."\n";
-    my $msg = '<b>Number of records updated = '.$rec_update.
+    if ($noupdate) {
+#	my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
+	my $numcols=scalar(@partid)*4+2;
+	$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr>'.$noupdate;
+    }
+    $result .= '</table></td></tr></table>'."\n".
+	&show_grading_menu_form ($symb,$url);
+    my $msg = '<br /><b>Number of records updated = '.$rec_update.
 	' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'.
 	'<b>Total number of students = '.$ENV{'form.total'}.'</b><br />';
     return $title.$msg.$result;
@@ -1993,19 +2562,8 @@ sub csvuploadmap_header {
 	$javascript=&csvupload_javascript_forward_associate();
     }
 
-    my $result='<table border="0">';
-    $result.='<tr><td colspan=3><font size=+1><b>Resource: </b>'.$url.'</font></td></tr>';
-    my ($partlist,$handgrade) = &response_type($url);
-    my ($resptype,$hdgrade)=('','no');
-    for (sort keys(%$handgrade)) {
-	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
-	$resptype = $responsetype;
-	$hdgrade = $handgrade if ($handgrade eq 'yes');
-	$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
-	    '<td><b>Type: </b>'.$responsetype.'</td>'.
-	    '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
-    }
-    $result.='</table>';
+    my ($result) = &showResourceInfo($url,$ENV{'form.probTitle'});
+
     $request->print(<<ENDPICK);
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
 <h3><font color="#339933">Uploading Class Grades</font></h3>
@@ -2025,19 +2583,21 @@ to this page if the data selected is ins
                                        value="$ENV{'form.upfile_associate'}" />
 <input type="hidden" name="symb"       value="$symb" />
 <input type="hidden" name="url"        value="$url" />
+<input type="hidden" name="saveState"  value="$ENV{'form.saveState'}" />
+<input type="hidden" name="probTitle"  value="$ENV{'form.probTitle'}" />
 <input type="hidden" name="command"    value="csvuploadassign" />
 <hr />
 <script type="text/javascript" language="Javascript">
 $javascript
 </script>
 ENDPICK
-return '';
+    return '';
 
 }
 
 sub csvupload_fields {
-    my ($url) = @_;
-    my (@parts) = &getpartlist($url);
+    my ($url,$symb) = @_;
+    my (@parts) = &getpartlist($url,$symb);
     my @fields=(['username','Student Username'],['domain','Student Domain']);
     foreach my $part (sort(@parts)) {
 	my @datum;
@@ -2061,10 +2621,54 @@ sub csvuploadmap_footer {
 ENDPICK
 }
 
+sub upcsvScores_form {
+    my ($request) = shift;
+    my ($symb,$url)=&get_symb_and_url($request);
+    if (!$symb) {return '';}
+    my $result =<<CSVFORMJS;
+<script type="text/javascript" language="javascript">
+    function checkUpload(formname) {
+	if (formname.upfile.value == "") {
+	    alert("Please use the browse button to select a file from your local directory.");
+	    return false;
+	}
+	formname.submit();
+    }
+    </script>
+CSVFORMJS
+    $ENV{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
+    my ($table) = &showResourceInfo($url,$ENV{'form.probTitle'});
+    $result.=$table;
+    $result.='<br /><table width=100% border=0><tr><td bgcolor="#777777">'."\n";
+    $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
+    $result.='&nbsp;<b>Specify a file containing the class scores for current resource'.
+	'.</b></td></tr>'."\n";
+    $result.='<tr bgcolor=#ffffe6><td>'."\n";
+    my $upfile_select=&Apache::loncommon::upfile_select_html();
+    $result.=<<ENDUPFORM;
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
+<input type="hidden" name="symb" value="$symb" />
+<input type="hidden" name="url" value="$url" />
+<input type="hidden" name="command" value="csvuploadmap" />
+<input type="hidden" name="probTitle" value="$ENV{'form.probTitle'}" />
+<input type="hidden" name="saveState"  value="$ENV{'form.saveState'}" />
+$upfile_select
+<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scores" />
+
+</form>
+ENDUPFORM
+    $result.='</td></tr></table>'."\n";
+    $result.='</td></tr></table><br /><br />'."\n";
+    $result.=&show_grading_menu_form($symb,$url);
+    return $result;
+}
+
+
 sub csvuploadmap {
     my ($request)= @_;
     my ($symb,$url)=&get_symb_and_url($request);
     if (!$symb) {return '';}
+
     my $datatoken;
     if (!$ENV{'form.datatoken'}) {
 	$datatoken=&Apache::loncommon::upfile_store($request);
@@ -2076,7 +2680,7 @@ sub csvuploadmap {
     &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
     my ($i,$keyfields);
     if (@records) {
-	my @fields=&csvupload_fields($url);
+	my @fields=&csvupload_fields($url,$symb);
 
 	if ($ENV{'form.upfile_associate'} eq 'reverse') {	
 	    &Apache::loncommon::csv_print_samples($request,\@records);
@@ -2093,6 +2697,8 @@ sub csvuploadmap {
 	}
     }
     &csvuploadmap_footer($request,$i,$keyfields);
+    $request->print(&show_grading_menu_form($symb,$url));
+
     return '';
 }
 
@@ -2117,7 +2723,8 @@ sub csvuploadassign {
     }
     $request->print('<h3>Assigning Grades</h3>');
     my $courseid=$ENV{'request.course.id'};
-    my ($classlist) = &getclasslist('all','1');
+    my ($classlist) = &getclasslist('all',0);
+    my @notallowed;
     my @skipped;
     my $countdone=0;
     foreach my $grade (@gradedata) {
@@ -2128,6 +2735,11 @@ sub csvuploadassign {
 	    push(@skipped,"$username:$domain");
 	    next;
 	}
+	my $usec=$classlist->{"$username:$domain"}[5];
+	if (!&canmodify($usec)) {
+	    push(@notallowed,"$username:$domain");
+	    next;
+	}
 	my %grades;
 	foreach my $dest (keys(%fields)) {
 	    if ($dest eq 'username' || $dest eq 'domain') { next; }
@@ -2146,209 +2758,957 @@ sub csvuploadassign {
     }
     $request->print("<br />Stored $countdone students\n");
     if (@skipped) {
-	$request->print('<br /><font size="+1"><b>Skipped Students</b></font><br />');
-	foreach my $student (@skipped) { $request->print("<br />$student"); }
+	$request->print('<p<font size="+1"><b>Skipped Students</b></font></p>');
+	foreach my $student (@skipped) { $request->print("$student<br />\n"); }
+    }
+    if (@notallowed) {
+	$request->print('<p><font size="+1" color="red"><b>Students Not Allowed to Modify</b></font></p>');
+	foreach my $student (@notallowed) { $request->print("$student<br />\n"); }
     }
-    $request->print(&view_edit_entire_class_form($symb,$url));
+    $request->print("<br />\n");
     $request->print(&show_grading_menu_form($symb,$url));
     return '';
 }
 #------------- end of section for handling csv file upload ---------
 #
 #-------------------------------------------------------------------
+#
+#-------------- Next few routines handle grading by page/sequence
+#
+#--- Select a page/sequence and a student to grade
+sub pickStudentPage {
+    my ($request) = shift;
+
+    $request->print(<<LISTJAVASCRIPT);
+<script type="text/javascript" language="javascript">
+
+function checkPickOne(formname) {
+    if (radioSelection(formname.student) == null) {
+	alert("Please select the student you wish to grade.");
+	return;
+    }
+    ptr = pullDownSelection(formname.selectpage);
+    formname.page.value = formname["page"+ptr].value;
+    formname.title.value = formname["title"+ptr].value;
+    formname.submit();
+}
+
+</script>
+LISTJAVASCRIPT
+    &commonJSfunctions($request);
+    my ($symb,$url) = &get_symb_and_url($request);
+    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 $result='<h3><font color="#339933">&nbsp;'.
+	'Manual Grading by Page or Sequence</font></h3>';
+
+    $result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
+    $result.='&nbsp;<b>Problems from:</b> <select name="selectpage">'."\n";
+    my ($titles,$symbx) = &getSymbMap($request);
+    my ($curpage) =&Apache::lonnet::decode_symb($symb); 
+#    my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); 
+#    my $type=($curpage =~ /\.(page|sequence)/);
+    my $ctr=0;
+    foreach (@$titles) {
+	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
+	$result.='<option value="'.$ctr.'" '.
+	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="on"' : '').
+	    '>'.$showtitle.'</option>'."\n";
+	$ctr++;
+    }
+    $result.= '</select>'."<br>\n";
+    $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++;
+    }
+    $result.='<input type="hidden" name="page" />'."\n".
+	'<input type="hidden" name="title" />'."\n";
+
+    $result.='&nbsp;<b>View Problems Text: </b><input type="radio" name="vProb" value="no" checked="on" /> no '."\n".
+	'<input type="radio" name="vProb" value="yes" /> yes '."<br>\n";
+
+    $result.='&nbsp;<b>Submission Details: </b>'.
+	'<input type="radio" name="lastSub" value="none" /> none'."\n".
+	'<input type="radio" name="lastSub" value="datesub" checked /> by dates and submissions'."\n".
+	'<input type="radio" name="lastSub" value="all" /> all details'."\n";
+
+    $result.='<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
+	'<input type="hidden" name="Status"  value="'.$ENV{'form.Status'}.'" />'."\n".
+	'<input type="hidden" name="command" value="displayPage" />'."\n".
+	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
+	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
+	'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."<br />\n";
+
+    $result.='&nbsp;<input type="button" '.
+	'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";
+
+    $request->print($result);
+
+    my $studentTable.='&nbsp;<b>Select a student you wish to grade and then click on the Next button.</b><br>'.
+	'<table border="0"><tr><td bgcolor="#777777">'.
+	'<table border="0"><tr bgcolor="#e6ffff">'.
+	'<td align="right">&nbsp;<b>No.</b></td>'.
+	'<td>'.&nameUserString('header').'</td>'.
+	'<td align="right">&nbsp;<b>No.</b></td>'.
+	'<td>'.&nameUserString('header').'</td></tr>';
+ 
+    my (undef,undef,$fullname) = &getclasslist($getsec,'1');
+    my $ptr = 1;
+    foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+	my ($uname,$udom) = split(/:/,$student);
+	$studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>');
+	$studentTable.='<td align="right">'.$ptr.'&nbsp;</td>';
+	$studentTable.='<td>&nbsp;<input type="radio" name="student" value="'.$student.'" /> '
+	    .&nameUserString(undef,$$fullname{$student},$uname,$udom)."\n";
+	$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
+	$ptr++;
+    }
+    $studentTable.='</td><td>&nbsp;</td><td>&nbsp;' if ($ptr%2 == 0);
+    $studentTable.='</td></tr></table></td></tr></table>'."\n";
+    $studentTable.='<input type="button" '.
+	'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";
+
+    $studentTable.=&show_grading_menu_form($symb,$url);
+    $request->print($studentTable);
+
+    return '';
+}
+
+sub getSymbMap {
+    my ($request) = @_;
+    my $navmap = Apache::lonnavmaps::navmap->new();
+
+    my %symbx = ();
+    my @titles = ();
+    my $minder = 0;
+
+    # Gather every sequence that has problems.
+    my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); }, 1);
+    for my $sequence ($navmap->getById('0.0'), @sequences) {
+	if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {
+	    my $title = $minder.'.'.$sequence->compTitle();
+	    push @titles, $title; # minder in case two titles are identical
+	    $symbx{$title} = $sequence->symb();
+	    $minder++;
+	}
+    }
+
+    $navmap->untieHashes();
+    return \@titles,\%symbx;
+}
 
-#-------------------------- Menu interface -------------------------
 #
-#--- Show a Grading Menu button - Calls the next routine ---
-sub show_grading_menu_form {
-    my ($symb,$url)=@_;
-    my $result.='<form action="/adm/grades" method="post">'."\n".
-	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
-	'<input type="hidden" name="url" value="'.$url.'" />'."\n".
-	'<input type="hidden" name="command" value="gradingmenu" />'."\n".
-	'<input type="submit" name="submit" value="Grading Menu" />'."\n".
+#--- Displays a page/sequence w/wo problems, w/wo submissions
+sub displayPage {
+    my ($request) = shift;
+
+    my ($symb,$url) = &get_symb_and_url($request);
+    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 $pageTitle = $ENV{'form.page'};
+    my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
+    my ($uname,$udom) = split(/:/,$ENV{'form.student'});
+    my $usec=$classlist->{$ENV{'form.student'}}[5];
+    if (!&canview($usec)) {
+	$request->print('<font color="red">Unable to view requested student.('.$ENV{'form.student'}.')</font>');
+	$request->print(&show_grading_menu_form($symb,$url));
+	return;
+    }
+    my $result='<h3><font color="#339933">&nbsp;'.$ENV{'form.title'}.'</font></h3>';
+    $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$$fullname{$ENV{'form.student'}},$uname,$udom).
+	'</h3>'."\n";
+    &sub_page_js($request);
+    $request->print($result);
+
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($ENV{'form.page'});
+    my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
+
+    my $iterator = $navmap->getIterator($map->map_start(),
+					$map->map_finish());
+
+    my $studentTable='<form action="/adm/grades" method="post" name="gradePage">'."\n".
+	'<input type="hidden" name="command" value="gradeByPage" />'."\n".
+	'<input type="hidden" name="fullname" value="'.$$fullname{$ENV{'form.student'}}.'" />'."\n".
+	'<input type="hidden" name="student" value="'.$ENV{'form.student'}.'" />'."\n".
+	'<input type="hidden" name="page"    value="'.$pageTitle.'" />'."\n".
+	'<input type="hidden" name="title"   value="'.$ENV{'form.title'}.'" />'."\n".
+	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
+	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
+	'<input type="hidden" name="overRideScore" value="no" />'."\n".
+	'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n";
+
+    my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+	'/check.gif" height="16" border="0" />';
+
+    $studentTable.='&nbsp;<b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.
+	' symbol.'."\n".
+	'<table border="0"><tr><td bgcolor="#777777">'.
+	'<table border="0"><tr bgcolor="#e6ffff">'.
+	'<td align="center"><b>&nbsp;Prob.&nbsp;</b></td>'.
+	'<td><b>&nbsp;'.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
+
+    my ($depth,$question) = (1,1);
+    $iterator->next(); # skip the first BEGIN_MAP
+    my $curRes = $iterator->next(); # for "current resource"
+    while ($depth > 0) {
+        if($curRes == $iterator->BEGIN_MAP) { $depth++; }
+        if($curRes == $iterator->END_MAP) { $depth--; }
+
+        if (ref($curRes) && $curRes->is_problem()) {
+	    my $parts = $curRes->parts();
+            my $title = $curRes->compTitle();
+	    my $symbx = $curRes->symb();
+	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.
+		(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
+	    $studentTable.='<td valign="top">';
+	    if ($ENV{'form.vProb'} eq 'yes' ) {
+		$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
+					     undef,'both');
+	    } else {
+		my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$ENV{'request.course.id'});
+		$companswer =~ s|<form(.*?)>||g;
+		$companswer =~ s|</form>||g;
+#		while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
+#		    $companswer =~ s/$1/ /ms;
+#		    $request->print('match='.$1."<br>\n");
+#		}
+#		$companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
+		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br>&nbsp;<b>Correct answer:</b><br>'.$companswer;
+	    }
+
+	    my %record = &Apache::lonnet::restore($symbx,$ENV{'request.course.id'},$udom,$uname);
+
+	    if ($ENV{'form.lastSub'} eq 'datesub') {
+		if ($record{'version'} eq '') {
+		    $studentTable.='<br />&nbsp;<font color="red">No recorded submission for this problem</font><br />';
+		} else {
+		    my %responseType = ();
+		    foreach my $partid (@{$parts}) {
+			$responseType{$partid} = $curRes->responseType($partid);
+		    }
+		    $studentTable.= &displaySubByDates(\$symbx,\%record,$parts,\%responseType,$checkIcon);
+		}
+	    } elsif ($ENV{'form.lastSub'} eq 'all') {
+		my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
+		$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom,
+									$ENV{'request.course.id'},
+									'','.submission');
+ 
+	    }
+	    if (&canmodify($usec)) {
+		foreach my $partid (@{$parts}) {
+		    $studentTable.=&gradeBox($request,$symbx,$uname,$udom,$question,$partid,\%record);
+		    $studentTable.='<input type="hidden" name="q_'.$question.'" value="'.$partid.'" />'."\n";
+		    $question++;
+		}
+	    }
+	    $studentTable.='</td></tr>';
+
+	}
+        $curRes = $iterator->next();
+    }
+
+    $navmap->untieHashes();
+
+    $studentTable.='</td></tr></table></td></tr></table>'."\n".
+	'<input type="button" value="Save" '.
+	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.
 	'</form>'."\n";
+    $studentTable.=&show_grading_menu_form($symb,$url);
+    $request->print($studentTable);
+
+    return '';
+}
+
+sub displaySubByDates {
+    my ($symbx,$record,$parts,$responseType,$checkIcon) = @_;
+    my $studentTable='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
+	'<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
+	'<td><b>Date/Time</b></td>'.
+	'<td><b>Submission</b></td>'.
+	'<td><b>Status&nbsp;</b></td></tr>';
+    my ($version);
+    my %mark;
+    $mark{'correct_by_student'} = $checkIcon;
+    return '<br />&nbsp;<font color="red">Nothing submitted - no attempts</font><br />' 
+	if (!exists($$record{'1:timestamp'}));
+    for ($version=1;$version<=$$record{'version'};$version++) {
+	my $timestamp = scalar(localtime($$record{$version.':timestamp'}));
+	$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
+	my @versionKeys = split(/\:/,$$record{$version.':keys'});
+	my @displaySub = ();
+	foreach my $partid (@{$parts}) {
+	    my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;
+#	    next if ($$record{"$version:resource.$partid.solved"} eq '');
+	    $displaySub[0].=(exists $$record{$version.':'.$matchKey[0]}) ? 
+		'<b>Part&nbsp;'.$partid.'&nbsp;'.
+		($$record{"$version:resource.$partid.tries"} eq '' ? 'Trial&nbsp;not&nbsp;counted' :
+		 'Trial&nbsp;'.$$record{"$version:resource.$partid.tries"}).'</b>&nbsp; '.
+		 &cleanRecord($$record{$version.':'.$matchKey[0]},$$responseType{$partid},$$symbx).'<br />' : '';
+	    $displaySub[1].=(exists $$record{"$version:resource.$partid.award"}) ?
+		'<b>Part&nbsp;'.$partid.'</b> &nbsp;'.
+		lc($$record{"$version:resource.$partid.award"}).' '.
+		$mark{$$record{"$version:resource.$partid.solved"}}.'<br />' : '';
+	    $displaySub[2].=(exists $$record{"$version:resource.$partid.regrader"}) ?
+		$$record{"$version:resource.$partid.regrader"}.' (<b>Part:</b> '.$partid.')' : '';
+	}
+	$displaySub[2].=(exists $$record{"$version:resource.regrader"}) ?
+	    $$record{"$version:resource.regrader"} : ''; # needed because old essay regrader has not parts info
+	$studentTable.='<td>'.$displaySub[0].'&nbsp;</td><td>'.$displaySub[1].
+	    ($displaySub[2] eq '' ? '' : 'Manually graded by '.$displaySub[2]).'&nbsp;</td></tr>';
+    }
+    $studentTable.='</table></td></tr></table>';
+    return $studentTable;
+}
+
+sub updateGradeByPage {
+    my ($request) = shift;
+
+    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 $pageTitle = $ENV{'form.page'};
+    my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
+    my ($uname,$udom) = split(/:/,$ENV{'form.student'});
+    my $usec=$classlist->{$ENV{'form.student'}}[5];
+    if (!&canmodify($usec)) {
+	$request->print('<font color="red">Unable to modify requested student.('.$ENV{'form.student'}.'</font>');
+	$request->print(&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'}));
+	return;
+    }
+    my $result='<h3><font color="#339933">&nbsp;'.$ENV{'form.title'}.'</font></h3>';
+    $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).
+	'</h3>'."\n";
+
+    $request->print($result);
+
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $ENV{'form.page'});
+    my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
+
+    my $iterator = $navmap->getIterator($map->map_start(),
+					$map->map_finish());
+
+    my $studentTable='<table border="0"><tr><td bgcolor="#777777">'.
+	'<table border="0"><tr bgcolor="#e6ffff">'.
+	'<td align="center"><b>&nbsp;Prob.&nbsp;</b></td>'.
+	'<td><b>&nbsp;Title&nbsp;</b></td>'.
+	'<td><b>&nbsp;Previous Score&nbsp;</b></td>'.
+	'<td><b>&nbsp;New Score&nbsp;</b></td></tr>';
+
+    $iterator->next(); # skip the first BEGIN_MAP
+    my $curRes = $iterator->next(); # for "current resource"
+    my ($depth,$question,$changeflag)= (1,1,0);
+    while ($depth > 0) {
+        if($curRes == $iterator->BEGIN_MAP) { $depth++; }
+        if($curRes == $iterator->END_MAP) { $depth--; }
+
+        if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
+	    my $parts = $curRes->parts();
+            my $title = $curRes->compTitle();
+	    my $symbx = $curRes->symb();
+	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.
+		(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
+	    $studentTable.='<td valign="top">&nbsp;<b>'.$title.'</b>&nbsp;</td>';
+
+	    my %newrecord=();
+	    my @displayPts=();
+	    foreach my $partid (@{$parts}) {
+		my $newpts = $ENV{'form.GD_BOX'.$question.'_'.$partid};
+		my $oldpts = $ENV{'form.oldpts'.$question.'_'.$partid};
+
+		my $wgt = $ENV{'form.WGT'.$question.'_'.$partid} != 0 ? 
+		    $ENV{'form.WGT'.$question.'_'.$partid} : 1;
+		my $partial = $newpts/$wgt;
+		my $score;
+		if ($partial > 0) {
+		    $score = 'correct_by_override';
+		} elsif ($newpts ne '') { #empty is taken as 0
+		    $score = 'incorrect_by_override';
+		}
+		my $dropMenu = $ENV{'form.GD_SEL'.$question.'_'.$partid};
+		if ($dropMenu eq 'excused') {
+		    $partial = '';
+		    $score = 'excused';
+		} elsif ($dropMenu eq 'reset status'
+			 && $ENV{'form.solved'.$question.'_'.$partid} ne '') { #update only if previous record exists
+		    $newrecord{'resource.'.$partid.'.tries'} = 0;
+		    $newrecord{'resource.'.$partid.'.solved'} = '';
+		    $newrecord{'resource.'.$partid.'.award'} = '';
+		    $newrecord{'resource.'.$partid.'.awarded'} = 0;
+		    $newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}";
+		    $changeflag++;
+		    $newpts = '';
+		}
+
+		my $oldstatus = $ENV{'form.solved'.$question.'_'.$partid};
+		$displayPts[0].='&nbsp;<b>Part</b> '.$partid.' = '.
+		    (($oldstatus eq 'excused') ? 'excused' : $oldpts).
+		    '&nbsp;<br>';
+		$displayPts[1].='&nbsp;<b>Part</b> '.$partid.' = '.
+		     (($score eq 'excused') ? 'excused' : $newpts).
+		    '&nbsp;<br>';
+
+		$question++;
+		next if ($dropMenu eq 'reset status' || ($newpts == $oldpts && $score ne 'excused'));
+
+		$newrecord{'resource.'.$partid.'.awarded'}  = $partial if $partial ne '';
+		$newrecord{'resource.'.$partid.'.solved'}   = $score if $score ne '';
+		$newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}"
+		    if (scalar(keys(%newrecord)) > 0);
+
+		$changeflag++;
+	    }
+	    if (scalar(keys(%newrecord)) > 0) {
+		&Apache::lonnet::cstore(\%newrecord,$symbx,$ENV{'request.course.id'},
+					$udom,$uname);
+	    }
+
+	    $studentTable.='<td valign="top">'.$displayPts[0].'</td>'.
+		'<td valign="top">'.$displayPts[1].'</td>'.
+		'</tr>';
+
+	}
+        $curRes = $iterator->next();
+    }
+
+    $navmap->untieHashes();
+
+    $studentTable.='</td></tr></table></td></tr></table>';
+    $studentTable.=&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'});
+    my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
+		  'The scores were changed for '.
+		  $changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));
+    $request->print($grademsg.$studentTable);
+
+    return '';
+}
+
+#-------- end of section for handling grading by page/sequence ---------
+#
+#-------------------------------------------------------------------
+
+#--------------------Scantron Grading-----------------------------------
+#
+#------ start of section for handling grading by page/sequence ---------
+
+sub defaultFormData {
+    my ($symb,$url)=@_;
+    return '
+      <input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
+     '<input type="hidden" name="url"     value="'.$url.'" />'."\n".
+     '<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
+     '<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n";
+}
+
+sub getSequenceDropDown {
+    my ($request,$symb)=@_;
+    my $result='<select name="selectpage">'."\n";
+    my ($titles,$symbx) = &getSymbMap($request);
+    my ($curpage)=&Apache::lonnet::decode_symb($symb); 
+    my $ctr=0;
+    foreach (@$titles) {
+	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
+	$result.='<option value="'.$$symbx{$_}.'" '.
+	    ($$symbx{$_} =~ /$curpage$/ ? 'selected="on"' : '').
+	    '>'.$showtitle.'</option>'."\n";
+	$ctr++;
+    }
+    $result.= '</select>';
     return $result;
 }
 
-#--- Displays the main menu page -------
-sub gradingmenu {
-    my ($request) = @_;
-    my ($symb,$url)=&get_symb_and_url($request);
-    if (!$symb) {return '';}
-    my $result='<h3>&nbsp;<font color="#339933">Select a Grading Method</font></h3>';
-    $result.='<table border="0">';
-    $result.='<tr><td colspan=3><font size=+1><b>Resource: </b>'.$url.'</font></td></tr>';
-    my ($partlist,$handgrade) = &response_type($url);
-    my ($resptype,$hdgrade)=('','no');
-    for (sort keys(%$handgrade)) {
-	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
-	$resptype = $responsetype;
-	$hdgrade = $handgrade if ($handgrade eq 'yes');
-	$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
-	    '<td><b>Type: </b>'.$responsetype.'</td>'.
-	    '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
-    }
-    $result.='</table>';
-    $result.=&view_edit_entire_class_form($symb,$url).'<br />';
-    $result.=&upcsvScores_form($symb,$url).'<br />';
-    $result.=&viewGradeaStu_form($symb,$url,$resptype,$hdgrade).'<br />';
-    $result.=&verifyReceipt_form($symb,$url) 
-	if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb));
- 
+sub scantron_uploads {
+    if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''};
+    my $result=	'<select name="scantron_selectfile">';
+    opendir(DIR,$Apache::lonnet::perlvar{'lonScansDir'});
+    my @files=sort(readdir(DIR));
+    foreach my $filename (@files) {
+	if ($filename eq '.' or $filename eq '..') { next; }
+	$result.="<option>$filename</option>\n";
+    }
+    closedir(DIR);
+    $result.="</select>";
     return $result;
 }
 
-#--- Menu for grading a section or the whole class ---
-sub view_edit_entire_class_form {
-    my ($symb,$url)=@_;
-    my ($classlist,$sections,undef) = &getclasslist('all','0');
-    my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
-    $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
-    $result.='&nbsp;<b>Grade Entire Section or Class</b></td></tr>'."\n";
-    $result.='<tr bgcolor=#ffffe6><td>'."\n";
-    $result.='<form action="/adm/grades" method="post">'."\n".
-	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
-	'<input type="hidden" name="url" value="'.$url.'" />'."\n".
-	'<input type="hidden" name="command" value="viewgrades" />'."\n";
-    $result.='&nbsp;<b>Select section:</b> <select name="section">'."\n";
-    if (ref($sections)) {
-	foreach (sort (@$sections)) {
-	    $result.= '<option>'.$_.'</option>'."\n";
-	}
+sub scantron_scantab {
+    my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+    my $result='<select name="scantron_format">'."\n";
+    foreach my $line (<$fh>) {
+	my ($name,$descrip)=split(/:/,$line);
+	if ($name =~ /^\#/) { next; }
+	$result.='<option value="'.$name.'">'.$descrip.'</option>'."\n";
     }
-    $result.='<option selected="on">all</select>'."<br />\n";
-    $result.='&nbsp;<input type="button" onClick="submit();" value="Grade" /></form>'."\n";
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
+    $result.='</select>'."\n";
+
     return $result;
 }
 
-#--- Menu to upload a csv scores ---
-sub upcsvScores_form {
-    my ($symb,$url) = @_;
+sub scantron_selectphase {
+    my ($r) = @_;
+    my ($symb,$url)=&get_symb_and_url($r);
     if (!$symb) {return '';}
-    my $result = '<script type="text/javascript" language="javascript">'."\n".
-	'  function checkUpload(formname) {'."\n".
-	'    if (formname.upfile.value == "") {'."\n".
-	'       alert("Please use the browse button to select a file from your local directory.");'."\n".
-	'       return false;'."\n".
-	'    }'."\n".
-	'    formname.submit();'."\n".
-	'  }'."\n".
-	'</script>'."\n";
-
-    $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
-    $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
-    $result.='&nbsp;<b>Specify a file containing the class scores for above resource</b></td></tr>'."\n";
-    $result.='<tr bgcolor=#ffffe6><td>'."\n";
-    my $upfile_select=&Apache::loncommon::upfile_select_html();
-  $result.=<<ENDUPFORM;
-<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
-<input type="hidden" name="symb" value="$symb" />
-<input type="hidden" name="url" value="$url" />
-<input type="hidden" name="command" value="csvuploadmap" />
-$upfile_select
-<br />&nbsp;<input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Grades" />
+    my $sequence_selector=&getSequenceDropDown($r,$symb);
+    my $default_form_data=&defaultFormData($symb,$url);
+    my $grading_menu_button=&show_grading_menu_form($symb,$url);
+    my $file_selector=&scantron_uploads();
+    my $format_selector=&scantron_scantab();
+    my $result;
+    $result.= <<SCANTRONFORM;
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantro_process">
+  <input type="hidden" name="command" value="scantron_validate" />
+  $default_form_data
+  <table width="100%" border="0">
+    <tr>
+      <td bgcolor="#777777">
+        <table width="100%" border="0">
+          <tr bgcolor="#e6ffff">
+            <td>
+              &nbsp;<b>Specify file location and which Folder/Sequence to grade</b>
+            </td>
+          </tr>
+          <tr bgcolor="#ffffe6">
+            <td>
+               Sequence to grade: $sequence_selector
+	    </td>
+          </tr>
+          <tr bgcolor="#ffffe6">
+            <td>
+		Filename of scoring office file: $file_selector
+	    </td>
+          </tr>
+          <tr bgcolor="#ffffe6">
+            <td>
+              Format of data file: $format_selector
+	    </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+  <input type="submit" value="Validate Scantron Records" />
 </form>
-ENDUPFORM
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
+$grading_menu_button
+SCANTRONFORM
+
     return $result;
 }
 
-#--- Handgrading problems ---
-sub viewGradeaStu_form {
-    my ($symb,$url,$response,$handgrade) = @_;
-    my ($classlist,$sections) = &getclasslist('all','0');
-    my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
-    $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
-    $result.='&nbsp;<b>';
-    if ($handgrade eq 'yes') {
-	$result.="View/Grade ";
-    } else {
-	$result.="View ";
+sub get_scantron_config {
+    my ($which) = @_;
+    my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+    my %config;
+    foreach my $line (<$fh>) {
+	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];
+	last;
+    }
+    return %config;
+}
+
+sub username_to_idmap {
+    my ($classlist)= @_;
+    my %idmap;
+    foreach my $student (keys(%$classlist)) {
+	$idmap{$classlist->{$student}->[&Apache::loncoursedata::CL_ID]}=
+	    $student;
+    }
+    return %idmap;
+}
+
+sub scantron_parse_scanline {
+    my ($line,$scantron_config)=@_;
+    my %record;
+    my $questions=substr($line,$$scantron_config{'Qstart'}-1);
+    my $data=substr($line,0,$$scantron_config{'Qstart'}-1);
+    if ($$scantron_config{'CODElocation'} ne 0) {
+	if ($$scantron_config{'CODElocation'} < 0) {
+	    $record{'scantron.CODE'}=substr($data,$$scantron_config{'CODEstart'}-1,
+					    $$scantron_config{'CODElength'});
+	} else {
+	    #FIXME interpret first N questions
+	}
     }
-    $result.='an Individual Student\'s Submission</b></td></tr>'."\n";
-    $result.='<tr bgcolor=#ffffe6><td>'."\n";
-    $result.='<form action="/adm/grades" method="post">'."\n".
-	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
-	'<input type="hidden" name="url" value="'.$url.'" />'."\n".
-	'<input type="hidden" name="response" value="'.$response.'" />'."\n".
-	'<input type="hidden" name="handgrade" value="'.$handgrade.'" />'."\n".
-	'<input type="hidden" name="showgrading" value="yes" />'."\n".
-	'<input type="hidden" name="command" value="submission" />'."\n";
+    $record{'scantron.ID'}=substr($data,$$scantron_config{'IDstart'}-1,
+				  $$scantron_config{'IDlength'});
+    my @alphabet=('A'..'Z');
+    my $questnum=0;
+    while ($questions) {
+	$questnum++;
+	my $currentquest=substr($questions,0,$$scantron_config{'Qlength'});
+	substr($questions,0,$$scantron_config{'Qlength'})='';
+	if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }
+	my (@array)=split(/$$scantron_config{'Qon'}/,$currentquest);
+	if (scalar(@array) gt 2) {
+	    #FIXME do something intelligent with double bubbles
+	    Apache->request->print("<br ><b>Wha!!!</b> <pre>".scalar(@array).
+				   '-'.$currentquest.'-'.$questnum.'</pre><br />');
+	}
+	if (length($array[0]) eq $$scantron_config{'Qlength'}) {
+	    $record{"scantron.$questnum.answer"}='';
+	} else {
+	    $record{"scantron.$questnum.answer"}=$alphabet[length($array[0])];
+	}
+    }
+    $record{'scantron.maxquest'}=$questnum;
+    return \%record;
+}
 
-    $result.='&nbsp;<b>Select section:</b> <select name="section">'."\n";
-    if (ref($sections)) {
-	foreach (sort (@$sections)) {$result.='<option>'.$_.'</option>'."\n";}
+sub scantron_add_delay {
+    my ($delayqueue,$scanline,$errormessage,$errorcode)=@_;
+    Apache->request->print('add_delay_error '.$_[2] );
+    push(@$delayqueue,
+	 {'line' => $scanline, 'emsg' => $errormessage,
+	  'ecode' => $errorcode }
+	 );
+}
+
+sub scantron_find_student {
+    my ($scantron_record,$idmap)=@_;
+    my $scanID=$$scantron_record{'scantron.ID'};
+    foreach my $id (keys(%$idmap)) {
+	#Apache->request->print('<pre>checking studnet -'.$id.'- againt -'.$scanID.'- </pre>');
+	if (lc($id) eq lc($scanID)) {
+	    #Apache->request->print('success');
+	    return $$idmap{$id};
+	}
     }
-    $result.= '<option selected="on">all</select>'."\n";
-    $result.='&nbsp;&nbsp;<b>Display students who has: </b>'.
-	'<input type="radio" name="submitonly" value="yes" checked> submitted'.
-	'<input type="radio" name="submitonly" value="all"> everybody <br />';
-    if (ref($sections)) {
-	$result.='&nbsp;(Section "no" implies the students were not assigned a section.)<br />' 
-	    if (grep /no/,@$sections);
+    return undef;
+}
+
+sub scantron_filter {
+    my ($curres)=@_;
+    if (ref($curres) && $curres->is_problem() && !$curres->randomout) {
+	return 1;
     }
+    return 0;
+}
 
+#FIXME I think I am doing this in the wrong order, I think it would be
+#better to make a several passes analyzing all of the lines in the
+#file for common errors wrong/invalid PID/username duplicated
+#PID/username, missing bubbles, double bubbles, missing/invalid CODE
+#and then get the instructor to fix all of these errors, then grade
+#the corrected one, I'll still need to catch error conditions, but
+#maybe most will taken care even before we start
 
-    $result.='<br />&nbsp;<input type="button" onClick="submit();" value="';
-    if ($handgrade eq 'yes') {
-	$result.="View/Grade";
-    } else {
-	$result.="View";
+sub scantron_validate_file {
+    my ($r) = @_;
+}
+
+sub scantron_process_students {
+    my ($r) = @_;
+    my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($ENV{'form.selectpage'});
+    my ($symb,$url)=&get_symb_and_url($r);
+    if (!$symb) {return '';}
+    my $default_form_data=&defaultFormData($symb,$url);
+
+    my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+    my $scanlines=Apache::File->new($Apache::lonnet::perlvar{'lonScansDir'}."/$ENV{'form.scantron_selectfile'}");
+    my @scanlines=<$scanlines>;
+    my $classlist=&Apache::loncoursedata::get_classlist();
+    my %idmap=&username_to_idmap($classlist);
+    my $navmap=Apache::lonnavmaps::navmap->new();
+    my $map=$navmap->getResourceByUrl($sequence);
+    my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
+#    $r->print("geto ".scalar(@resources)."<br />");
+    my $result= <<SCANTRONFORM;
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
+  <input type="hidden" name="command" value="scantron_configphase" />
+  $default_form_data
+SCANTRONFORM
+    $r->print($result);
+
+    my @delayqueue;
+    my %completedstudents;
+    
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,
+	           'Scantron Status','Scantron Progress',scalar(@scanlines));
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+					  'Processing first student');
+    my $start=&Time::HiRes::time();
+    foreach my $line (@scanlines) {
+	$r->print('<pre>line is'.$line.'</pre>');
+
+	chomp($line);
+	my $scan_record=&scantron_parse_scanline($line,\%scantron_config);
+	my ($uname,$udom);
+	unless ($uname=&scantron_find_student($scan_record,\%idmap)) {
+	    &scantron_add_delay(\@delayqueue,$line,
+				'Unable to find a student that matches',1);
+	    next;
+	}
+	if (exists $completedstudents{$uname}) {
+	    &scantron_add_delay(\@delayqueue,$line,
+				'Student '.$uname.' has multiple sheets',2);
+	    next;
+	}
+	$r->print('<pre>doing studnet'.$uname.'</pre>');
+	($uname,$udom)=split(/:/,$uname);
+	&Apache::lonnet::delenv('form.counter');
+	&Apache::lonnet::appenv(%$scan_record);
+#    &Apache::lonhomework::showhash(%ENV);
+#    $Apache::lonxml::debug=1;
+#	&Apache::lonxml::debug("line is $line");
+	
+	    my $i=0;
+	foreach my $resource (@resources) {
+	    $i++;
+	    my $result=&Apache::lonnet::ssi($resource->src(),
+				 ('submitted'     =>'scantron',
+				  'grade_target'  =>'grade',
+				  'grade_username'=>$uname,
+				  'grade_domain'  =>$udom,
+				  'grade_courseid'=>$ENV{'request.course.id'},
+				  'grade_symb'    =>$resource->symb()));
+#	    my %score=&Apache::lonnet::restore($resource->symb(),
+#					       $ENV{'request.course.id'},
+#					       $udom,$uname);
+#	    foreach my $part ($resource->{PARTS}) {
+#		if ($score{'resource.'.$part.'.solved'} =~ /^correct/) {
+#		    $studentcorrect++;
+#		    $totalcorrect++;
+#		} else {
+#		    $studentincorrect++;
+#		    $totalincorrect++;
+#		}
+#	    }
+#	    $r->print('<pre>'.
+#		      $resource->symb().'-'.
+#		      $resource->src().'-'.'</pre>result is'.$result);
+#	    &Apache::lonhomework::showhash(%score);
+	#    if ($i eq 3) {last;}
+	}
+	$completedstudents{$uname}={'line'=>$line};
+    } continue {
+	&Apache::lonnet::delenv('form.counter');
+	&Apache::lonnet::delenv('scantron\.');
+	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+						 'last student');
+	#last;
+	#FIXME
+	#get iterator for $sequence
+	#foreach question 'submit' the students answer to the server
+	#   through grade target {
+	#   generate data to pass back that includes grade recevied
+	#}
+    }
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+    my $lasttime = &Time::HiRes::time()-$start;
+    $r->print("<p>took $lasttime</p>");
+
+    #$Apache::lonxml::debug=0;
+    foreach my $delay (@delayqueue) {
+	#FIXME
+	#print out each delayed student with interface to select how
+	#  to repair student provided info
+	#Expected errors include
+	#  1 bad/no stuid/username
+	#  2 invalid bubblings
+	
     }
-    $result.='" />'."\n".'</form>'."\n";
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
+    #FIXME
+    # if delay queue exists 2 submits one to process delayed students one
+    #     to ignore delayed students, possibly saving the delay queue for later
+    
+    $navmap->untieHashes();
+}
+#-------- end of section for handling grading scantron forms -------
+#
+#-------------------------------------------------------------------
+
+
+#-------------------------- Menu interface -------------------------
+#
+#--- Show a Grading Menu button - Calls the next routine ---
+sub show_grading_menu_form {
+    my ($symb,$url)=@_;
+    my $result.='<br /><form action="/adm/grades" method="post">'."\n".
+	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+	'<input type="hidden" name="url" value="'.$url.'" />'."\n".
+	'<input type="hidden" name="saveState"  value="'.$ENV{'form.saveState'}.'" />'."\n".
+	'<input type="hidden" name="command" value="gradingmenu" />'."\n".
+	'<input type="submit" name="submit" value="Grading Menu" />'."\n".
+	'</form>'."\n";
     return $result;
 }
 
-#--- Form to input a receipt number ---
-sub verifyReceipt_form {
-    my ($symb,$url) = @_;
-    my $result = '<script type="text/javascript" language="javascript">'."\n".
-	'  function checkEntry(formname) {'."\n".
-	'    var receipt = formname.receipt.value;'."\n".
-	'    if (isNaN(receipt) || receipt == "") {'."\n".
-	'       alert("Please enter a receipt number given by a student in the box.");'."\n".
-	'       return false;'."\n".
-	'    }'."\n".
-	'    formname.submit();'."\n".
-	'  }'."\n".
-	'</script>'."\n";
+# -- Retrieve choices for grading form
+sub savedState {
+    my %savedState = ();
+    if ($ENV{'form.saveState'}) {
+	foreach (split(/:/,$ENV{'form.saveState'})) {
+	    my ($key,$value) = split(/=/,$_,2);
+	    $savedState{$key} = $value;
+	}
+    }
+    return \%savedState;
+}
 
-    my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});
+#--- Displays the main menu page -------
+sub gradingmenu {
+    my ($request) = @_;
+    my ($symb,$url)=&get_symb_and_url($request);
+    if (!$symb) {return '';}
+    my $probTitle = &Apache::lonnet::gettitle($symb);
 
-    $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
-    $result.='<table width=100% border=0><tr><td bgcolor=#e6ffff>'."\n";
-    $result.='&nbsp;<b>Verify a Submission Receipt Issued by this Server</td></tr>'."\n";
-    $result.='<tr bgcolor=#ffffe6><td>'."\n";
-    $result.='<form action="/adm/grades" method="post" name="verifyform">'."\n";
-    $result.='&nbsp;<tt>'.$hostver.'-<input type="text" name="receipt" size="4"></tt><br />'."\n";
-    $result.='&nbsp;<input type="button" onClick="javascript:checkEntry(this.form);"'.
-	' value="Verify Receipt">'."\n";
-    $result.='<input type="hidden" name="command" value="verify">'."\n";
-    if ($ENV{'form.url'}) {
-	$result.='<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />';
+    $request->print(<<GRADINGMENUJS);
+<script type="text/javascript" language="javascript">
+    function checkChoice(formname,val,cmdx) {
+	if (val <= 2) {
+	    var cmd = radioSelection(formname.radioChoice);
+	    var cmdsave = cmd;
+	} else {
+	    cmd = cmdx;
+	    cmdsave = 'submission';
+	}
+	formname.command.value = cmd;
+	formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
+	    ":saveSub="+pullDownSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
+	if (val < 5) formname.submit();
+	if (val == 5) {
+	    if (!checkReceiptNo(formname,'notOK')) { return false;}
+	    formname.submit();
+	}
     }
-    if ($ENV{'form.symb'}) {
-	$result.='<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />';
+
+    function checkReceiptNo(formname,nospace) {
+	var receiptNo = formname.receipt.value;
+	var checkOpt = false;
+	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
+	if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
+	if (checkOpt) {
+	    alert("Please enter a receipt number given by a student in the receipt box.");
+	    formname.receipt.value = "";
+	    formname.receipt.focus();
+	    return false;
+	}
+	return true;
     }
-    $result.='</form>';
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
+</script>
+GRADINGMENUJS
+    &commonJSfunctions($request);
+    my $result='<h3>&nbsp;<font color="#339933">Manual Grading/View Submission</font></h3>';
+    my ($table,undef,$hdgrade) = &showResourceInfo($url,$probTitle);
+    $result.=$table;
+    my (undef,$sections) = &getclasslist('all','0');
+    my $savedState = &savedState();
+    my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
+    my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});
+    my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
+    my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});
+
+    $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
+	'<input type="hidden" name="symb"        value="'.$symb.'" />'."\n".
+	'<input type="hidden" name="url"         value="'.$url.'" />'."\n".
+	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
+	'<input type="hidden" name="probTitle"   value="'.$probTitle.'" />'."\n".
+	'<input type="hidden" name="command"     value="" />'."\n".
+	'<input type="hidden" name="saveState"   value="" />'."\n".
+	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
+	'<input type="hidden" name="showgrading" value="yes" />'."\n";
+
+    $result.='<table width="100%" border=0><tr><td bgcolor=#777777>'."\n".
+	'<table width=100% border=0><tr bgcolor="#e6ffff"><td colspan="2">'."\n".
+	'&nbsp;<b>Select a Grading/Viewing Option</b></td></tr>'."\n".
+	'<tr bgcolor="#ffffe6" valign="top"><td>'."\n";
+
+    $result.='<table width="100%" border=0>';
+    $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
+	'&nbsp;Select Section: <select name="section">'."\n";
+    if (ref($sections)) {
+	foreach (sort (@$sections)) {$result.='<option value="'.$_.'" '.
+					 ($saveSec eq $_ ? 'selected="on"' : '').'>'.$_.'</option>'."\n";}
+    }
+    $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> &nbsp; ';
+
+    $result.='Student Status:</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
+
+    if (ref($sections)) {
+	$result.='&nbsp;(Section "no" implies the students were not assigned a section.)<br />' 
+	    if (grep /no/,@$sections);
+    }
+    $result.='</td></tr>';
+
+    $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+	'<input type="radio" name="radioChoice" value="submission" '.
+	($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>Current Resource:</b> For one or more students '.
+	'<select name="submitonly">'.
+	'<option value="yes" '.
+	($saveSub eq 'yes' ? 'selected="on"' : '').'>with submissions</option>'.
+	'<option value="graded" '.
+	($saveSub eq 'graded' ? 'selected="on"' : '').'>with ungraded submissions</option>'.
+	'<option value="all" '.
+	($saveSub eq 'all' ? 'selected="on"' : '').'>with any status</option></select></td></tr>'."\n";
+
+    $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+	'<input type="radio" name="radioChoice" value="viewgrades" '.
+	($saveCmd eq 'viewgrades' ? 'checked' : '').'> '.
+	'<b>Current Resource:</b> For all students in selected section or course</td></tr>'."\n";
+
+    $result.='<tr bgcolor="#ffffe6" valign="top"><td>'.
+	'<input type="radio" name="radioChoice" value="pickStudentPage" '.
+	($saveCmd eq 'pickStudentPage' ? 'checked' : '').'> '.
+	'The <b>complete</b> set/page/sequence: For one student</td></tr>'."\n";
+
+    $result.='<tr bgcolor="#ffffe6"><td><br />'.
+	'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
+	'</td></tr></table>'."\n";
+
+    $result.='</td><td valign="top">';
+
+    $result.='<table width="100%" border=0>';
+    $result.='<tr bgcolor="#ffffe6"><td>'.
+	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="Upload" />'.
+	' scores from file </td></tr>'."\n";
+
+    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+	'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
+	'" value="Grade" /> scantron forms</td></tr>'."\n";
+
+    if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb)) {
+	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+	    '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="Verify" />'.
+	    ' submission Receipt no: '.unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).
+	    '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')">'.
+	    '</td></tr>'."\n";
+    } 
+
+    $result.='</form></td></tr></table>'."\n".
+	'</td></tr></table>'."\n".
+	'</td></tr></table>'."\n";
     return $result;
 }
 
 sub handler {
     my $request=$_[0];
-    
+
+    undef(%perm);
     if ($ENV{'browser.mathml'}) {
-	$request->content_type('text/xml');
+	&Apache::loncommon::content_type($request,'text/xml');
     } else {
-	$request->content_type('text/html');
+	&Apache::loncommon::content_type($request,'text/html');
     }
     $request->send_http_header;
     return '' if $request->header_only;
@@ -2358,7 +3718,7 @@ sub handler {
     my $command=$ENV{'form.command'};
     if (!$url) {
 	my ($temp1,$temp2);
-	($temp1,$temp2,$ENV{'form.url'})=split(/___/,$symb);
+	($temp1,$temp2,$ENV{'form.url'})=&Apache::lonnet::decode_symb($symb);
 	$url = $ENV{'form.url'};
     }
     &send_header($request);
@@ -2371,17 +3731,16 @@ sub handler {
 		my ($tsymb,$tuname,$tudom,$tcrsid)=
 		    &Apache::lonnet::checkin($token);
 		if ($tsymb) {
-		    my ($map,$id,$url)=split(/\_\_\_/,$tsymb);
+		    my ($map,$id,$url)=&Apache::lonnet::decode_symb($tsymb);
 		    if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
-			$request->print(
-					&Apache::lonnet::ssi('/res/'.$url,
-							     ('grade_username' => $tuname,
-							      'grade_domain' => $tudom,
-							      'grade_courseid' => $tcrsid,
-							      'grade_symb' => $tsymb)));
+			$request->print(&Apache::lonnet::ssi_body('/res/'.$url,
+					  ('grade_username' => $tuname,
+					   'grade_domain' => $tudom,
+					   'grade_courseid' => $tcrsid,
+					   'grade_symb' => $tsymb)));
 		    } else {
 			$request->print('<h3>Not authorized: '.$token.'</h3>');
-		    }           
+		    }
 		} else {
 		    $request->print('<h3>Not a valid DocID: '.$token.'</h3>');
 		}
@@ -2390,29 +3749,48 @@ sub handler {
 	    }
 	}
     } else {
-	$Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
-	if ($command eq 'submission') {
-	    &listStudents($request) if ($ENV{'form.student'} eq '');
-	    &submission($request,0,0) if ($ENV{'form.student'} ne '');
-	} elsif ($command eq 'processGroup') {
+	if (!($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}))) {
+	    if ($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {
+		$perm{'vgr_section'}=$ENV{'request.course.sec'};
+	    } else {
+		delete($perm{'vgr'});
+	    }
+	}
+	if (!($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) {
+	    if ($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {
+		$perm{'mgr_section'}=$ENV{'request.course.sec'};
+	    } else {
+		delete($perm{'mgr'});
+	    }
+	}
+
+	if ($command eq 'submission' && $perm{'vgr'}) {
+	    ($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
+	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
+	    &pickStudentPage($request);
+	} elsif ($command eq 'displayPage' && $perm{'vgr'}) {
+	    &displayPage($request);
+	} elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {
+	    &updateGradeByPage($request);
+	} elsif ($command eq 'processGroup' && $perm{'vgr'}) {
 	    &processGroup($request);
-	} elsif ($command eq 'gradingmenu') {
+	} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
 	    $request->print(&gradingmenu($request));
-	} elsif ($command eq 'viewgrades') {
+	} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
 	    $request->print(&viewgrades($request));
-	} elsif ($command eq 'handgrade') {
+	} elsif ($command eq 'handgrade' && $perm{'mgr'}) {
 	    $request->print(&processHandGrade($request));
-	} elsif ($command eq 'editgrades') {
+	} elsif ($command eq 'editgrades' && $perm{'mgr'}) {
 	    $request->print(&editgrades($request));
-	} elsif ($command eq 'verify') {
+	} elsif ($command eq 'verify' && $perm{'vgr'}) {
 	    $request->print(&verifyreceipt($request));
-	} elsif ($command eq 'csvupload') {
+	} elsif ($command eq 'csvform' && $perm{'mgr'}) {
+	    $request->print(&upcsvScores_form($request));
+	} elsif ($command eq 'csvupload' && $perm{'mgr'}) {
 	    $request->print(&csvupload($request));
-	} elsif ($command eq 'viewclasslist') {
-	    $request->print(&viewclasslist($request));
-	} elsif ($command eq 'csvuploadmap') {
+	} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
 	    $request->print(&csvuploadmap($request));
-	} elsif ($command eq 'csvuploadassign') {
+	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'}) {
 	    if ($ENV{'form.associate'} ne 'Reverse Association') {
 		$request->print(&csvuploadassign($request));
 	    } else {
@@ -2423,8 +3801,14 @@ sub handler {
 		}
 		$request->print(&csvuploadmap($request));
 	    }
-	} else {
-	    $request->print("Unknown action: $command:");
+	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
+	    $request->print(&scantron_selectphase($request));
+	} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
+	    $request->print(&scantron_validate_file($request));
+	} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
+	    $request->print(&scantron_process_students($request));
+	} elsif ($command) {
+	    $request->print("Access Denied");
 	}
     }
     &send_footer($request);