--- loncom/homework/grades.pm	2003/07/21 13:32:49	1.121
+++ loncom/homework/grades.pm	2003/07/29 14:24:24	1.127
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.121 2003/07/21 13:32:49 ng Exp $
+# $Id: grades.pm,v 1.127 2003/07/29 14:24:24 ng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@
 # June-August H.K. Ng
 # Year 2003
 # February, March H.K. Ng
+# July, H. K. Ng
 #
 
 package Apache::grades;
@@ -98,7 +99,8 @@ sub get_fullname {
 #--- 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);
@@ -107,7 +109,8 @@ sub response_type {
 	    my ($responsetype,$part) = split(/_/,$_,2);
 	    my ($partid,$respid) = split(/_/,$part);
 	    $responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!
-	    $handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no');
+	    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;
@@ -123,23 +126,25 @@ sub showResourceInfo {
     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,$hdgrade)=('','no');
+    my %resptype = ();
+    my $hdgrade='no';
     for (sort keys(%$handgrade)) {
 	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
-	$resptype = $responsetype;
+	my $partID = (split(/_/))[0];
+	$resptype{$partID} = $responsetype;
 	$hdgrade = $handgrade if ($handgrade eq 'yes');
-	$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
+	$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;
+    return $result,\%resptype,$hdgrade,$partlist,$handgrade;
 }
 
 #--- Clean response type for display
 #--- Currently filters option response type only.
 sub cleanRecord {
-    my ($answer,$response) = @_;
+    my ($answer,$response,$symb) = @_;
     if ($response eq 'option') {
 	my (@IDs,@ans);
 	foreach (split(/\&/,&Apache::lonnet::unescape($answer))) {
@@ -148,12 +153,27 @@ sub cleanRecord {
 	    push @ans,$ans;
 	}
 	my $grayFont = '<font color="#999999">';
-	return '<table border="1">'.
+	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>';
+	    '</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>'.&keywords_highlight($answer).'</blockquote>';
     }
     return $answer;
 }
@@ -304,6 +324,7 @@ sub jscriptNform {
 	'<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".
@@ -431,7 +452,7 @@ sub listStudents {
     my $result='<h3><font color="#339933">&nbsp;'.$viewgrade.
 	' Submissions for a Student or a Group of Students</font></h3>';
 
-    my ($table,$resptype,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'});
+    my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'});
     $result.=$table;
 
     $request->print(<<LISTJAVASCRIPT);
@@ -453,7 +474,7 @@ sub listStudents {
 	    sense = "the student";
 	}
 	if (ctr == 0) {
-	    alert("Please select "+sense+" before clicking on the $viewgrade button.");
+	    alert("Please select "+sense+" before clicking on the Next button.");
 	    return false;
 	}
 	document.gradesub.submit();
@@ -486,10 +507,10 @@ LISTJAVASCRIPT
 
     $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".
+	'<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"   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".
@@ -498,23 +519,27 @@ LISTJAVASCRIPT
 	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
 	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
 
-    $gradeTable.='<b>Student Status:</b> '.
-	&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
+    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, 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".
+    $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";
+	'value="Next->" />'."\n";
 
     my (undef, undef, $fullname) = &getclasslist($getsec,'1');  
     $gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
 	'<table border="0"><tr bgcolor="#e6ffff">';
     my $loop = 0;
     while ($loop < 2) {
-	$gradeTable.='<td><b>&nbsp;Select&nbsp;</b></td><td><b>&nbsp;Fullname&nbsp;</b>'.
+	$gradeTable.='<td><b>&nbsp;No.</b>&nbsp;</td><td><b>&nbsp;Select&nbsp;</b></td>'.
+	    '<td><b>&nbsp;Fullname&nbsp;</b>'.
 	    '<font color="#999999">(Username)</font>&nbsp;</td>';
 	if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
 	    foreach (sort(@$partlist)) {
@@ -522,6 +547,7 @@ LISTJAVASCRIPT
 	    }
 	}
 	$loop++;
+#	$gradeTable.='<td></td>' if ($loop%2 ==1);
     }
     $gradeTable.='</tr>'."\n";
 
@@ -548,7 +574,8 @@ LISTJAVASCRIPT
 	$ctr++;
 	if ( $perm{'vgr'} eq 'F' ) {
 	    $gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);
-	    $gradeTable.='<td align="center"><input type=checkbox name="stuinfo" value="'.
+	    $gradeTable.='<td align="right">'.$ctr.'&nbsp;</td>'.
+		'<td align="center"><input type=checkbox name="stuinfo" value="'.
 		$student.':'.$$fullname{$student}.'&nbsp;"></td>'."\n".
 		'<td>&nbsp;'.$$fullname{$student}.'&nbsp;'."\n".
 		'<font color="#999999">('.$uname.')</font></td>'."\n";
@@ -559,11 +586,12 @@ LISTJAVASCRIPT
 		    $gradeTable.='<td align="middle">&nbsp;'.$status{$_}.'&nbsp;</td>'."\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>';
+	$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>';
@@ -575,7 +603,7 @@ LISTJAVASCRIPT
     $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) {
 	my $num_students=(scalar(keys(%$fullname)));
 	if ($num_students eq 0) {
@@ -624,9 +652,9 @@ sub sub_page_js {
     $request->print(<<SUBJAVASCRIPT);
 <script type="text/javascript" language="javascript">
     function updateRadio(formname,id,weight) {
-	var gradeBox = eval("formname.GD_BOX"+id);
-	var radioButton = eval("formname.RADVAL"+id);
-	var oldpts = eval("formname.oldpts"+id+".value");
+	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;
@@ -648,7 +676,7 @@ sub sub_page_js {
 	    var resp = confirm("You entered a value ("+pts+
 			       ") greater than the weight for the part. Accept?");
 	    if (resp == false) {
-		gradeBox.value = "";
+		gradeBox.value = oldpts;
 		return;
 	    }
 	}
@@ -660,18 +688,17 @@ sub sub_page_js {
 	    }
 	}
 	updateSelect(formname,id);
-	var stores = eval("formname.stores"+id);
-	stores.value = "0";
+	formname["stores"+id].value = "0";
     }
 
     function writeBox(formname,id,pts) {
-	var gradeBox = eval("formname.GD_BOX"+id);
+	var gradeBox = formname["GD_BOX"+id];
 	if (checkSolved(formname,id) == 'update') {
 	    gradeBox.value = pts;
 	} else {
-	    var oldpts = eval("formname.oldpts"+id+".value");
+	    var oldpts = formname["oldpts"+id].value;
 	    gradeBox.value = oldpts;
-	    var radioButton = eval("formname.RADVAL"+id);
+	    var radioButton = formname["RADVAL"+id];
 	    for (var i=0; i<radioButton.length; i++) {
 		radioButton[i].checked=false;
 		if (i == oldpts) {
@@ -679,8 +706,7 @@ sub sub_page_js {
 		}
 	    }
 	}
-	var stores = eval("formname.stores"+id);
-	stores.value = "0";
+	formname["stores"+id].value = "0";
 	updateSelect(formname,id);
 	return;
     }
@@ -690,17 +716,17 @@ sub sub_page_js {
 	    updateSelect(formname,id);
 	    return;
 	}
-	gradeSelect = eval("formname.GD_SEL"+id);
+	gradeSelect = formname["GD_SEL"+id];
 	for (var i=0; i<gradeSelect.length; i++) {
 	    if (gradeSelect[i].selected) {
 		var selectx=i;
 	    }
 	}
-	var stores = eval("formname.stores"+id);
+	var stores = formname["stores"+id];
 	if (selectx == stores.value) { return };
-	var gradeBox = eval("formname.GD_BOX"+id);
+	var gradeBox = formname["GD_BOX"+id];
 	gradeBox.value = "";
-	var radioButton = eval("formname.RADVAL"+id);
+	var radioButton = formname["RADVAL"+id];
 	for (var i=0; i<radioButton.length; i++) {
 	    radioButton[i].checked=false;
 	}
@@ -708,7 +734,7 @@ sub sub_page_js {
     }
 
     function checkSolved(formname,id) {
-	if (eval("formname.solved"+id+".value") == "correct_by_student" && formname.overRideScore.value == 'no') {
+	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';
@@ -717,8 +743,7 @@ sub sub_page_js {
     }
 
     function updateSelect(formname,id) {
-	var gradeSelect = eval("formname.GD_SEL"+id);
-	gradeSelect[0].selected = true;
+	formname["GD_SEL"+id][0].selected = true;
 	return;
     }
 
@@ -728,15 +753,14 @@ sub sub_page_js {
 	if (val == "Save & Next") {
 	    for (i=0;i<=total;i++) {
 		for (j=0;j<parttot;j++) {
-		    var partid = eval("formname.partid"+i+"_"+j+".value");
-		    var selopt = eval("formname.GD_SEL"+i+"_"+partid);
-		    if (selopt[0].selected) {
-			var points = eval("formname.GD_BOX"+i+"_"+partid+".value");
+		    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 = eval("formname.name"+i+".value");
+			    var name = formname["name"+i].value;
 			    var resp = confirm("You did not assign a score for "+name+", part "+partid+". Continue?");
 			    if (resp == false) {
-				eval("formname.GD_BOX"+i+"_"+partid+".focus()");
+				formname["GD_BOX"+i+"_"+partid].focus();
 				return false;
 			    }
 			}
@@ -761,11 +785,10 @@ sub sub_page_js {
 	noscore = new Array(100);
 	var ptr = 0;
 	for (i=1;i<total;i++) {
-	    var partid = eval("formname.q_"+i+".value");
-	    var selopt = eval("formname.GD_SEL"+i+"_"+partid);
-	    if (selopt[0].selected) {
-		var points = eval("formname.GD_BOX"+i+"_"+partid+".value");
-		var status = eval("formname.solved"+i+"_"+partid+".value");
+	    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++;
@@ -806,14 +829,14 @@ sub sub_page_kw_js {
 <script type="text/javascript" language="javascript">
 
 //===================== Show list of keywords ====================
-  function keywords(keyform) {
-    var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keyform.value);
+  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();
+    formname.refresh.value = "on";
+    if (formname.keywords.value != "") {
+	formname.submit();
     }
     return;
   }
@@ -839,10 +862,9 @@ sub sub_page_kw_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;
@@ -859,21 +881,23 @@ sub sub_page_kw_js {
     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" }
@@ -882,6 +906,22 @@ sub sub_page_kw_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 = 70*Nmsg+250;
     var scrollbar = "no";
@@ -903,11 +943,11 @@ sub sub_page_kw_js {
 
     pDoc.write("<script language=javascript>");
     pDoc.write("function checkInput() {");
-    pDoc.write("  opener.document.SCORE.msgsub.value = document.msgcenter.msgsub.value;");
+    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 = eval(\\"opener.document.SCORE.newmsg\\"+usrctr);");
-    pDoc.write("  newval.value = document.msgcenter.newmsg.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) {");
@@ -915,10 +955,12 @@ sub sub_page_kw_js {
     pDoc.write("  }");
     pDoc.write("  var includemsg = 0;");
     pDoc.write("  for (var i=1; i<=nmsg; i++) {");
-    pDoc.write("      var opnmsg = eval(\\"opener.document.SCORE.savemsg\\"+i);");
-    pDoc.write("      var frmmsg = eval(\\"document.msgcenter.msg\\"+i);");
-    pDoc.write("      opnmsg.value = frmmsg.value;");
-    pDoc.write("      var chkbox = eval(\\"document.msgcenter.msgn\\"+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;");
@@ -928,9 +970,9 @@ sub sub_page_kw_js {
     pDoc.write("     msgchk += \\"newmsg\\"+usrctr;");
     pDoc.write("     includemsg = 1;");
     pDoc.write("  }");
-    pDoc.write("  imgformname = eval(\\"opener.document.SCORE.mailicon\\"+usrctr);");
+    pDoc.write("  imgformname = opener.document.SCORE[\\"mailicon\\"+usrctr];");
     pDoc.write("  imgformname.src = \\"$iconpath/\\"+((includemsg) ? \\"mailto.gif\\" : \\"mailbkgrd.gif\\");");
-    pDoc.write("  var includemsg = eval(\\"opener.document.SCORE.includemsg\\"+usrctr);");
+    pDoc.write("  var includemsg = opener.document.SCORE[\\"includemsg\\"+usrctr];");
     pDoc.write("  includemsg.value = msgchk;");
 
     pDoc.write("  self.close()");
@@ -1122,11 +1164,12 @@ sub gradeBox {
 	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
     if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
 	$result.='<option> </option>'.
-	    '<option selected="on">excused</option></select>'."\n";
+	    '<option selected="on">excused</option>';
     } else {
 	$result.='<option selected="on"> </option>'.
-	    '<option>excused</option></select>'."\n";
+	    '<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".
@@ -1183,8 +1226,10 @@ sub submission {
 	return;
     }
 
-    $ENV{'form.lastSub'} = ($ENV{'form.lastSub'} eq '' ? 'all' : $ENV{'form.lastSub'});
+    $ENV{'form.lastSub'} = ($ENV{'form.lastSub'} eq '' ? 'datesub' : $ENV{'form.lastSub'});
     my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
+    my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+	'/check.gif" height="16" border="0" />';
 
     # header info
     if ($counter == 0) {
@@ -1197,8 +1242,6 @@ sub submission {
 			'<font size=+1>&nbsp;<b>Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
 
 	if ($ENV{'form.handgrade'} eq 'no') {
-	    my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
-		'/check.gif" height="16" border="0" />';
 	    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);
@@ -1226,7 +1269,6 @@ sub submission {
 	    $ENV{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ? 
 		$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'};
 
@@ -1246,24 +1288,27 @@ sub submission {
 			'<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 '' ? 
+		(!exists($keyhash{$symb.'_savemsg'.$cts}) ? 
 		 &Apache::lonfeedback::clear_out_html($ENV{'form.savemsg'.$cts}) :
 		 &Apache::lonfeedback::clear_out_html($keyhash{$symb.'_savemsg'.$cts})).
-		'" />'."\n";
+		'" />'."\n".
+		'<input type="hidden" name="shownOnce'.$cts.'" value="0" />'."\n";
 	    $cts++;
 	}
 	$request->print($prnmsg);
@@ -1274,7 +1319,7 @@ sub submission {
 #
 	    $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 />
@@ -1295,7 +1340,8 @@ KEYWORDS
 	$request->print(&show_problem($request,$symb,$uname,$udom,1,1));
     }
     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 />'));
@@ -1393,7 +1439,8 @@ KEYWORDS
 		    if (!exists($record{'resource.'.$partid.'.'.$respid.'.submission'})) {
 			$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
 			    $partid.'</b> <font color="#999999">( ID '.$respid.
-			    ' )</font>&nbsp; &nbsp;Nothing submitted<br /><br />';
+			    ' )</font>&nbsp; &nbsp;'.
+			    '<font color="red">Nothing submitted - no attempts</font><br /><br />';
  		    } else {
 			foreach (@$string) {
 			    my ($partid,$respid) = /^resource\.(\w+)\.(\w+)\.submission/;
@@ -1418,11 +1465,9 @@ KEYWORDS
 				     '"><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>'.($responsetype =~ /^(essay|option)$/ ? 
-								  '<blockquote>' : '').
-				     &cleanRecord(&keywords_highlight($subval),$responsetype).
-				     ($responsetype =~ /^(essay|option)$/ ? '</blockquote><br />' : 
-				      '<br /><br />').$similar."\n"
+				     '<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$/));
@@ -1434,7 +1479,10 @@ KEYWORDS
 	    $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',
@@ -1466,7 +1514,6 @@ KEYWORDS
 	    $msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';
 	}
 	$msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
-#	$result.='<tr><td bgcolor="#ffffff">'."\n".
 	$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.
@@ -1513,11 +1560,11 @@ KEYWORDS
 	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="Next" '.
-	    'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self> &nbsp;'."\n".
-	    '<input type="button" value="Previous" '.
-	    'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self> &nbsp;';
-	$endform.='(Next and Previous do not save the scores.)'."\n" ;
+	$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);
@@ -1547,7 +1594,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;
 }
 
@@ -1717,7 +1764,7 @@ sub processHandGrade {
 	}
     }
     $ctr = 0;
-    my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
+    my ($partlist,$handgrade) = &response_type($ENV{'form.url'},$symb);
     @parsedlist = reverse @parsedlist if ($button eq 'Previous');
     foreach my $student (@parsedlist) {
 	my ($uname,$udom) = split(/:/,$student);
@@ -1766,14 +1813,23 @@ sub saveHandGrade {
     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 {
+	} 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.'_'.$_});
@@ -1794,7 +1850,7 @@ sub saveHandGrade {
 	    }
 	    $newrecord{'resource.'.$_.'.submitted_by'} = $submitter 
 		if ($submitter && ($record{'resource.'.$_.'.submitted_by'} ne $submitter));
-	    $newrecord{'resource.'.$_.'regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+	    $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
 	}
     }
 
@@ -1816,10 +1872,10 @@ 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");
+	    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;
@@ -1850,15 +1906,13 @@ sub viewgrades_js {
 	    }
 
 	} 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) {
@@ -1866,15 +1920,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;
 
@@ -1882,30 +1935,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;
 		}
 	    }
@@ -1913,10 +1965,10 @@ 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) || parseFloat(point) < 0) {
 	    alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
@@ -1935,19 +1987,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;
 
@@ -1956,16 +2010,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 {
@@ -1999,21 +2050,23 @@ sub viewgrades {
 	'<input type="hidden" name="command" value="editgrades" />'."\n".
 	'<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";
 
-    $result.='<h3>Assign Common Grade To ';
+    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>';
     #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">';
@@ -2049,7 +2102,8 @@ 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".
@@ -2059,21 +2113,14 @@ sub viewgrades {
 
     #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> <font color="#999999">(Username)</font></td>'."\n";
+	'<table border=0><tr bgcolor="#deffff"><td>&nbsp;<b>No.</b>&nbsp;</td>'.
+	'<td>&nbsp;<b>Fullname</b> <font color="#999999">(Username)</font></td>'."\n";
     my (@parts) = sort(&getpartlist($url));
     foreach my $part (@parts) {
 	my $display=&Apache::lonnet::metadata($url,$part.'.display');
-	next if ($display =~ /Number of Attempts/);
+	$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);
@@ -2094,13 +2141,13 @@ sub viewgrades {
 	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);
@@ -2113,11 +2160,11 @@ sub viewgrades {
 
 #--- 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> '.
 	'<font color="#999999">('.$uname.($ENV{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
@@ -2137,21 +2184,20 @@ sub viewstudentgrade {
 	    $status = 'nothing' if ($status eq '');
 	    $result.='<input type="hidden" name="'.'GD_'.$student.'_'.
 		$part.'_solved_s" value="'.$status.'" />'."\n";
-	    $result.='<td align="middle"><select name="'.
+	    $result.='<td align="middle">&nbsp;<select name="'.
 		'GD_'.$student.'_'.$part.'_solved" '.
 		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\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";
-#	} else {
-#	    $result.='<input type="hidden" name="'.
-#		'GD_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
-#		    "\n";
-#	    $result.='<td align="middle"><input type="text" name="'.
-#		'GD_'.$student.'_'.$part.'_'.$type.'" '.
-#		'value="'.$score.'" size="4" /></td>'."\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_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
+		    "\n";
+	    $result.='<td align="middle"><input type="text" name="'.
+		'GD_'.$student.'_'.$part.'_'.$type.'" '.
+		'value="'.$score.'" size="4" /></td>'."\n";
 	}
     }
     $result.='</tr>';
@@ -2168,9 +2214,10 @@ sub editgrades {
     my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
     $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";
+
     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>Domain</b></td><td rowspan=2><b>Fullname</b></td>'."\n";
+    $result.= '<table border="0"><tr bgcolor="#deffff"><td rowspan=2>&nbsp;<b>No.</b>&nbsp;</td>'.
+	'<td rowspan=2>&nbsp;<b>Fullname</b>&nbsp;<font color="#999999">(username)</font></td>'."\n";
 
     my %scoreptr = (
 		    'correct'  =>'correct_by_override',
@@ -2204,8 +2251,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;
 	}
     }
@@ -2219,6 +2267,7 @@ sub editgrades {
     $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};
@@ -2227,12 +2276,11 @@ sub editgrades {
 	my ($uname,$udom)=split(/_/,$user);
 	my %newrecord;
 	my $updateflag = 0;
-	$line .= '<tr bgcolor="#ffffde"><td>'.$uname.'&nbsp;</td><td>'.
-	    $udom.'&nbsp;</td><td>'.
-		$$fullname{$usercolon}.'&nbsp;</td>';
+	$line .= '<td>&nbsp;'.$$fullname{$usercolon}.
+	    '&nbsp<font color="#999999">('.$uname.($udom eq $ENV{'user.domain'} ? '' : '$udom').')</font></td>';
 	my $usec=$classlist->{"$uname:$udom"}[5];
 	if (!&canmodify($usec)) {
-	    my $numcols=scalar(@partid)*(scalar(@parts)-1)*2;
+	    my $numcols=scalar(@partid)*4+2;
 	    $noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>";
 	    next;
 	}
@@ -2253,8 +2301,19 @@ sub editgrades {
 	    } elsif ($partial == 0) {
 		$score = 'incorrect_by_override';
 	    }
-	    $score = 'excused' if (($ENV{'form.GD_'.$user.'_'.$_.'_solved'} eq 'excused') &&
-				   ($score ne 'excused'));
+	    my $dropMenu = $ENV{'form.GD_'.$user.'_'.$_.'_solved'};
+	    $score = 'excused' if (($dropMenu eq 'excused') && ($score ne 'excused'));
+
+	    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;
+	    }
+
 	    $line .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
 		'<td align="center">'.$awarded.
 		($score eq 'excused' ? $score : '').'&nbsp;</td>';
@@ -2275,7 +2334,7 @@ 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'}";
+		    $newrecord{'resource.'.$part.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
 		    $updateflag=1;
 		}
 		$line .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
@@ -2287,18 +2346,21 @@ sub editgrades {
 	    $count++;
 	    &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},
 				    $udom,$uname);
-	    $result.=$line;
+	    $result.='<tr bgcolor="#ffffde"><td align="right">&nbsp;'.$updateCtr.'&nbsp;</td>'.$line;
+	    $updateCtr++;
 	} else {
-	    $noupdate.=$line;
+	    $noupdate.='<tr bgcolor="#ffffde"><td align="right">&nbsp;'.$noupdateCtr.'&nbsp;</td>'.$line;
+	    $noupdateCtr++;
 	}
     }
     if ($noupdate) {
-	my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
-	$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occured For the Students Below</td></tr>'.$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 = '<b>Number of records updated = '.$rec_update.
+    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;
@@ -2404,7 +2466,7 @@ sub csvuploadmap_header {
 	$javascript=&csvupload_javascript_forward_associate();
     }
 
-    my ($result,$resptype,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'});
+    my ($result) = &showResourceInfo($url,$ENV{'form.probTitle'});
 
     $request->print(<<ENDPICK);
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
@@ -2616,7 +2678,7 @@ sub csvuploadassign {
 #
 #-------------------------------------------------------------------
 #
-#-------------- Next few routines handles grading by page/sequence
+#-------------- Next few routines handle grading by page/sequence
 #
 #--- Select a page/sequence and a student to grade
 sub pickStudentPage {
@@ -2630,9 +2692,9 @@ function checkPickOne(formname) {
 	alert("Please select the student you wish to grade.");
 	return;
     }
-    var ptr = pullDownSelection(formname.selectpage);
-    formname.page.value = eval("formname.page"+ptr+".value");
-    formname.title.value = eval("formname.title"+ptr+".value");
+    ptr = pullDownSelection(formname.selectpage);
+    formname.page.value = formname["page"+ptr].value;
+    formname.title.value = formname["title"+ptr].value;
     formname.submit();
 }
 
@@ -2675,7 +2737,7 @@ LISTJAVASCRIPT
 
     $result.='&nbsp;<b>Submission Details: </b>'.
 	'<input type="radio" name="lastSub" value="none" /> none'."\n".
-	'<input type="radio" name="lastSub" value="datesub" checked /> dates and submissions'."\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".
@@ -2686,34 +2748,33 @@ LISTJAVASCRIPT
 	'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."<br />\n";
 
     $result.='&nbsp;<input type="button" '.
-	'onClick="javascript:checkPickOne(this.form);"value="Submit" /><br />'."\n";
+	'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";
 
     $request->print($result);
 
-    my $studentTable.='&nbsp;<b>Select a student you wish to grade</b><br>'.
+    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><b>&nbsp;Fullname <font color="#999999">(username)</font></b></td>'.
-	'<td><b>&nbsp;Fullname <font color="#999999">(username)</font></b></td>'.
-	'<td><b>&nbsp;Fullname <font color="#999999">(username)</font></b></td>'.
+	'<td align="right">&nbsp;<b>No.</b></td>'.
 	'<td><b>&nbsp;Fullname <font color="#999999">(username)</font></b></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%4 == 1 ? '<tr bgcolor="#ffffe6"><td>' : '</td><td>');
-	$studentTable.='<input type="radio" name="student" value="'.$student.'" /> '.$$fullname{$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.'" /> '.$$fullname{$student}.
 	    '<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font>'."\n";
-	$studentTable.=($ptr%4 == 0 ? '</td></tr>' : '');
+	$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
 	$ptr++;
     }
-    $studentTable.='</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;' if ($ptr%4 == 2);
-    $studentTable.='</td><td>&nbsp;</td><td>&nbsp;' if ($ptr%4 == 3);
-    $studentTable.='</td><td>&nbsp;' if ($ptr%4 == 0);
+    $studentTable.='</td><td>&nbsp;</td><td>&nbsp;' if ($ptr%2 == 0);
     $studentTable.='</td></tr></table></td></tr></table>'."\n";
-    $studentTable.='<br />&nbsp;<input type="button" '.
-	'onClick="javascript:checkPickOne(this.form);"value="Submit" /></form>'."\n";
+    $studentTable.='<input type="button" '.
+	'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";
 
     $studentTable.=&show_grading_menu_form($symb,$url);
     $request->print($studentTable);
@@ -2781,11 +2842,13 @@ sub displayPage {
 
     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').
@@ -2805,7 +2868,6 @@ sub displayPage {
         if($curRes == $iterator->BEGIN_MAP) { $depth++; }
         if($curRes == $iterator->END_MAP) { $depth--; }
 
-#        if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
         if (ref($curRes) && $curRes->is_problem()) {
 	    my $parts = $curRes->parts();
             my $title = $curRes->compTitle();
@@ -2828,6 +2890,7 @@ sub displayPage {
 	    }
 
 	    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 />';
@@ -2836,7 +2899,7 @@ sub displayPage {
 		    foreach my $partid (@{$parts}) {
 			$responseType{$partid} = $curRes->responseType($partid);
 		    }
-		    $studentTable.= &displaySubByDates(\%record,$parts,\%responseType,$checkIcon);
+		    $studentTable.= &displaySubByDates(\$symbx,\%record,$parts,\%responseType,$checkIcon);
 		}
 	    } elsif ($ENV{'form.lastSub'} eq 'all') {
 		my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
@@ -2861,7 +2924,7 @@ sub displayPage {
     $navmap->untieHashes();
 
     $studentTable.='</td></tr></table></td></tr></table>'."\n".
-	'&nbsp;&nbsp;<input type="button" value="Save" '.
+	'<input type="button" value="Save" '.
 	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.
 	'</form>'."\n";
     $studentTable.=&show_grading_menu_form($symb,$url);
@@ -2871,7 +2934,7 @@ sub displayPage {
 }
 
 sub displaySubByDates {
-    my ($record,$parts,$responseType,$checkIcon) = @_;
+    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>'.
@@ -2880,6 +2943,8 @@ sub displaySubByDates {
     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>';
@@ -2887,22 +2952,21 @@ sub displaySubByDates {
 	my @displaySub = ();
 	foreach my $partid (@{$parts}) {
 	    my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;
-	    next if ($$record{"$version:resource.$partid.solved"} eq '');
+#	    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}).'<br />' : '';
+		 &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 />' : '';
-#	    $$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"} : '';
+	    $$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>';
     }
@@ -2926,7 +2990,7 @@ sub updateGradeByPage {
 	return;
     }
     my $result='<h3><font color="#339933">&nbsp;'.$ENV{'form.title'}.'</font></h3>';
-    $result.='<h3>&nbsp;Student: '.$$fullname{$ENV{'form.student'}}.
+    $result.='<h3>&nbsp;Student: '.$ENV{'form.fullname'}.
 	'<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font></h3>'."\n";
 
     $request->print($result);
@@ -2941,7 +3005,7 @@ sub updateGradeByPage {
 
     my $studentTable='<table border="0"><tr><td bgcolor="#777777">'.
 	'<table border="0"><tr bgcolor="#e6ffff">'.
-	'<td align="center"><b>&nbsp;No&nbsp;</b></td>'.
+	'<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>';
@@ -2973,31 +3037,39 @@ sub updateGradeByPage {
 		my $score;
 		if ($partial > 0) {
 		    $score = 'correct_by_override';
-		} elsif ($partial == 0) {
+		} elsif ($newpts ne '') { #empty is taken as 0
 		    $score = 'incorrect_by_override';
 		}
-		if ($ENV{'form.GD_SEL'.$question.'_'.$partid} eq 'excused') {
+		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.' = '.
-		    ($oldstatus eq 'correct_by_student' ? $oldpts :
-		     (($score eq 'excused') ? 'excused' : $newpts)).
+		     (($score eq 'excused') ? 'excused' : $newpts).
 		    '&nbsp;<br>';
 
 		$question++;
-		if (($oldstatus eq 'correct_by_student') ||
-		    ($newpts eq $oldpts && $score eq $oldstatus))
-		{
-		    next;
-		}
+		next if ($dropMenu eq 'reset status' || ($newpts == $oldpts && $score ne 'excused'));
+
 		$newrecord{'resource.'.$partid.'.awarded'}  = $partial if $partial ne '';
-		$newrecord{'resource.'.$partid.'.solved'}   = $score;
-		$newrecord{'resource.'.$partid.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+		$newrecord{'resource.'.$partid.'.solved'}   = $score if $score ne '';
+		$newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}"
+		    if (scalar(keys(%newrecord)) > 0);
 
 		$changeflag++;
 	    }
@@ -3005,6 +3077,7 @@ sub updateGradeByPage {
 		&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>';
@@ -3346,7 +3419,7 @@ SCANTRONFORM
 #--- 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".
+    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".
@@ -3412,7 +3485,7 @@ sub gradingmenu {
 GRADINGMENUJS
     &commonJSfunctions($request);
     my $result='<h3>&nbsp;<font color="#339933">Manual Grading/View Submission</font></h3>';
-    my ($table,$resptype,$hdgrade) = &showResourceInfo($url,$probTitle);
+    my ($table,undef,$hdgrade) = &showResourceInfo($url,$probTitle);
     $result.=$table;
     my (undef,$sections) = &getclasslist('all','0');
     my $savedState = &savedState();
@@ -3424,11 +3497,11 @@ GRADINGMENUJS
     $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="response"    value="'.$resptype.'" />'."\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".
@@ -3473,7 +3546,7 @@ GRADINGMENUJS
 	'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="View/Grade/Regrade" />'.
+	'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
 	'</td></tr></table>'."\n";
 
     $result.='</td><td valign="top">';