--- loncom/homework/grades.pm	2003/02/27 22:39:11	1.69
+++ loncom/homework/grades.pm	2003/03/17 19:08:50	1.73
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.69 2003/02/27 22:39:11 albertel Exp $
+# $Id: grades.pm,v 1.73 2003/03/17 19:08:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,7 +32,7 @@
 # Year 2002
 # June-August H.K. Ng
 # Year 2003
-# February H.K. Ng
+# February, March H.K. Ng
 #
 
 package Apache::grades;
@@ -209,6 +209,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="lastCmd" value="'.$ENV{'form.lastCmd'}.'" />'."\n".
+	'<input type="hidden" name="lastSec" value="'.$ENV{'form.lastSec'}.'" />'."\n".
+	'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n".
 	'<input type="hidden" name="command" value="submission" />'."\n".
 	'<input type="hidden" name="student" value="" />'."\n".
 	'<input type="hidden" name="userdom" value="" />'."\n".
@@ -237,7 +240,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>Problem: </b>'.$ENV{'form.probTitle'}.'</font><br><br>'."\n";
 
     my ($string,$contents,$matches) = ('','',0);
     my (undef,undef,$fullname) = &getclasslist('all','0');
@@ -272,10 +275,6 @@ sub verifyreceipt {
     return $string.&show_grading_menu_form($symb,$url);
 }
 
-#
-# Pick student and page/sequence for manual grading
-
-
 #--- This is called by a number of programs.
 #--- Called from the Grading Menu - View/Grade an individual student
 #--- Also called directly when one clicks on the subm button 
@@ -283,7 +282,7 @@ 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'};
@@ -305,8 +304,8 @@ sub listStudents {
     $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;
+	    '<table border="0"><tr><td colspan=3><font size=+1>'.
+		    '<b>Problem: </b>'.$ENV{'form.probTitle'}.'</font></td></tr>'.$result;
 
     $request->print(<<LISTJAVASCRIPT);
 <script type="text/javascript" language="javascript">
@@ -356,6 +355,9 @@ LISTJAVASCRIPT
 	'<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="lastCmd"     value="'.$ENV{'form.lastCmd'}.'" />'."\n".
+	'<input type="hidden" name="lastSec"     value="'.$ENV{'form.lastSec'}.'" />'."\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".
@@ -455,91 +457,177 @@ 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 = eval("formname.GD_BOX"+id);
+	var radioButton = eval("formname.RADVAL"+id);
+	var oldpts = eval("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 = "";
+		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);
+	var stores = eval("formname.stores"+id);
+	stores.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 = eval("formname.GD_BOX"+id);
+	if (checkSolved(formname,id) == 'update') {
+	    gradeBox.value = pts;
+	} else {
+	    var oldpts = eval("formname.oldpts"+id+".value");
+	    gradeBox.value = oldpts;
+	    var radioButton = eval("formname.RADVAL"+id);
+	    for (var i=0; i<radioButton.length; i++) {
+		radioButton[i].checked=false;
+		if (i == oldpts) {
+		    radioButton[i].checked=true;
+		}
+	    }
 	}
+	var stores = eval("formname.stores"+id);
+	stores.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 = eval("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);
+	if (selectx == stores.value) { return };
+	var gradeBox = eval("formname.GD_BOX"+id);
+	gradeBox.value = "";
+	var radioButton = eval("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 (eval("formname.solved"+id+".value") == "correct_by_student") {
+	    alert("This problem has been graded correct by the computer. The score cannot be changed.");
+	    return "noupdate";
 	}
+	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) {
+	var gradeSelect = eval("formname.GD_SEL"+id);
+	gradeSelect[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 (essay grading only) ============
+    function checksubmit(formname,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("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");
+			if (points == "") {
+			    var name = eval("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()");
+				return false;
+			    }
+			}
+		    }
+		    
+		}
+	    }
+	    
+	}
+	formname.submit();
+    }
 
-//=================== 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;
-		 }
-	      }
+//======= 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 = 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");
+		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
+}
 
-     }
-     document.SCORE.submit();
- }
+#--- javascript for essay type problem --
+sub sub_page_kw_js {
+    my $request = shift;
+    $request->print(<<SUBJAVASCRIPT);
+<script type="text/javascript" language="javascript">
 
 //===================== Show list of keywords ====================
   function keywords(keyform) {
@@ -614,7 +702,7 @@ sub sub_page_js {
   }
 
   function savedMsgHeader(Nmsg,usrctr,fullname) {
-    var height = 30*Nmsg+250;
+    var height = 50*Nmsg+250;
     var scrollbar = "no";
     if (height > 600) {
 	height = 600;
@@ -677,18 +765,18 @@ sub sub_page_js {
     pWin.document.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"></td></tr>");
 }
 
-function displaySavedMsg(ctr,msg,shwsel) {
+  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>");
+    pWin.document.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>");
+    pWin.document.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"</textarea></td></tr>");
 }
 
   function msgTail() {
@@ -786,7 +874,6 @@ function displaySavedMsg(ctr,msg,shwsel)
   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>");
@@ -797,9 +884,65 @@ function displaySavedMsg(ctr,msg,shwsel)
 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></select>'."\n";
+    } else {
+	$result.='<option selected="on"> </option>'.
+	    '<option>excused</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 ($request,$symb,$uname,$udom,$removeform,$viewon) = @_;
     my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
 						      $ENV{'request.course.id'});
     if ($removeform) {
@@ -815,13 +958,14 @@ sub show_problem {
 	$rendered=~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.='<table border="0" width="100%">';
+    $result.='<tr><td bgcolor="#e6ffff"><b> View of the problem - '.$ENV{'form.fullname'}.
+	'</b></td></tr>' if ($viewon);
+    $result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';
     $result.='<b>Correct answer:</b><br />'.$companswer;
     $result.='</td></tr></table>';
     $result.='</td></tr></table><br />';
-    $request->print($result);
+    return $result;
 }
 
 # --------------------------- show submissions of a student, option to grade 
@@ -829,27 +973,25 @@ 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 '';
     $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 ''; }
     my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
-#    $ENV{'form.vProb'} = $ENV{'form.vProb'} ne '' ? $ENV{'form.vProb'} : 'yes';
 
     # header info
     if ($counter == 0) {
 	&sub_page_js($request);
+	&sub_page_kw_js($request);
 	$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>Problem: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
 
 	# 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' or !$ENV{'form.vProb'}) {
-	    &show_problem($request,$symb,$uname,$udom,0);
+	    $request->print(&show_problem($request,$symb,$uname,$udom,0,1));
 	}
 	
 	# kwclr is the only variable that is guaranteed to be non blank 
@@ -866,13 +1008,16 @@ 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';
 
 	}
 
 	$request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".
 			'<input type="hidden" name="command"    value="handgrade" />'."\n".
+			'<input type="hidden" name="lastCmd"    value="'.$ENV{'form.lastCmd'}.'" />'."\n".
+			'<input type="hidden" name="lastSec"    value="'.$ENV{'form.lastSec'}.'" />'."\n".
+			'<input type="hidden" name="probTitle"  value="'.$ENV{'form.probTitle'}.'" />'."\n".
 			'<input type="hidden" name="refresh"    value="off" />'."\n".
 			'<input type="hidden" name="symb"       value="'.$symb.'" />'."\n".
 			'<input type="hidden" name="url"        value="'.$url.'" />'."\n".
@@ -913,8 +1058,8 @@ KEYWORDS
     }
 
     if ($ENV{'form.vProb'} eq 'all') {
-	$request->print('<br /><br /><br />');
-	&show_problem($request,$symb,$uname,$udom,1);
+	$request->print('<br /><br /><br />') if ($counter > 0);
+	$request->print(&show_problem($request,$symb,$uname,$udom,1,1));
     }
 
     my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
@@ -1010,7 +1155,7 @@ KEYWORDS
 	} else {
 	    my ($string,$timestamp)=
 		&get_last_submission (%record);
-	    my $lastsubonly.=''.
+	    my $lastsubonly=''.
 		($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
 		 $$timestamp).'';
 	    if ($$timestamp eq '') {
@@ -1050,6 +1195,9 @@ KEYWORDS
     # return if view submission with no grading option
     if ($ENV{'form.showgrading'} eq '') {
 	$request->print('</td></tr></table></td></tr></table></form>'."\n");
+	$request->print(&show_grading_menu_form($symb,$url)) 
+	    if (($ENV{'form.command'} eq 'submission') || 
+		($ENV{'form.command'} eq 'processGroup' && $counter == $total));
 	return;
     }
 
@@ -1080,54 +1228,8 @@ KEYWORDS
 	$seen{$partid}++;
 	next if ($$handgrade{$_} =~ /:no$/);
 	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>';
-
-	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";
@@ -1145,7 +1247,7 @@ KEYWORDS
 	    '<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\','.
+		'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>'.
@@ -1158,9 +1260,9 @@ KEYWORDS
 	    $endform.='<input type="hidden" name="NTSTU" value="1" />'."\n";
 	}
 	$endform.='<input type="button" value="Next" '.
-	    'onClick="javascript:checksubmit(\'Next\');" TARGET=_self> &nbsp;'."\n".
+	    'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self> &nbsp;'."\n".
 	    '<input type="button" value="Previous" '.
-	    'onClick="javascript:checksubmit(\'Previous\');" TARGET=_self> &nbsp;';
+	    'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self> &nbsp;';
 	$endform.='(Next and Previous do not save the scores.)'."\n" 
 	    if ($ENV{'form.handgrade'} eq 'yes');
 	$endform.='</td><tr></table></form>';
@@ -1180,9 +1282,7 @@ sub get_last_submission {
 	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'}));
-#	       } 
 	    }
 	}
 	foreach ((keys %lasthash)) {
@@ -1230,6 +1330,10 @@ sub processHandGrade {
 	while ($ctr < $ngrade) {
 	    my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
 	    my ($errorflag) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
+	    if ($errorflag eq 'no_score') {
+		$ctr++;
+		next;
+	    }
 
 	    my $includemsg = $ENV{'form.includemsg'.$ctr};
 	    my ($subject,$message,$msgstatus) = ('','','');
@@ -1239,7 +1343,7 @@ sub processHandGrade {
 		foreach (@msgnum) {
 		    $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
 		}
-		$message =~ s/\s+/ /g;
+		#$message =~ s/\s+/ /g;
 		$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,
 							       $ENV{'form.msgsub'},$message);
 	    }
@@ -1361,8 +1465,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++;
     }
@@ -1393,6 +1495,7 @@ sub saveHandGrade {
 	    my $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 '');
 	    my $wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 : 
 		$ENV{'form.WGT'.$newflg.'_'.$_};
 	    my $partial= $pts/$wgt;
@@ -1408,11 +1511,11 @@ 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);
     }
@@ -1601,7 +1704,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>Problem: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";
 
     #view individual student submission form - called using Javascript viewOneStudent
     $result.=&jscriptNform($url,$symb);
@@ -1611,7 +1714,11 @@ 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";
+	'<input type="hidden" name="section" value="'.$ENV{'form.section'}.'" />'."\n".
+	'<input type="hidden" name="lastCmd" value="'.$ENV{'form.lastCmd'}.'" />'."\n".
+	'<input type="hidden" name="lastSec" value="'.$ENV{'form.lastSec'}.'" />'."\n".
+	'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n";
+
     $result.='<h3>Assign Common Grade To ';
     if ($ENV{'form.section'} eq 'all') {
 	$result.='Class </h3>';
@@ -1622,12 +1729,6 @@ sub viewgrades {
     }
     $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'});
@@ -1777,9 +1878,8 @@ 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>Problem: </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";
@@ -1879,6 +1979,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'}";
 		    $updateflag=1;
 		}
 		$result .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
@@ -1888,12 +1989,12 @@ sub editgrades {
 	$result .= '</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);
 	}
     }
-    $result .= '</table></td></tr></table>'."\n";
+    $result .= '</table></td></tr></table>'."\n".
+	&show_grading_menu_form ($symb,$url);
     my $msg = '<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 />';
@@ -1917,6 +2018,48 @@ sub split_part_type {
 #
 #-------------------------- Next few routines handles grading by csv upload
 #
+#--- Menu to upload a csv scores ---
+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();
+	if (navigator.appName !="Netscape") {self.close()}; //if netscape if appears to close before submit!!!
+	    // any suggestion how to get around this??
+    }
+    </script>
+CSVFORMJS
+    $ENV{'form.probTitle'} = &Apache::lonnet::metadata($url,'title');
+    $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 problem - '.$ENV{'form.probTitle'}.
+	'.</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" target="LONcatInfo">
+<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'}" />
+$upfile_select
+<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scores" />&nbsp;
+<input type="button" value="Cancel" onClick="self.close()">
+
+</form>
+ENDUPFORM
+    $result.='</td></tr></table>'."\n";
+    $result.='</td></tr></table>'."\n";
+    return $result;
+}
+
 #--- Javascript to handle csv upload
 sub csvupload_javascript_reverse_associate {
   return(<<ENDPICK);
@@ -2001,7 +2144,7 @@ sub csvuploadmap_header {
     }
 
     my $result='<table border="0">';
-    $result.='<tr><td colspan=3><font size=+1><b>Resource: </b>'.$url.'</font></td></tr>';
+    $result.='<tr><td colspan=3><font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font></td></tr>';
     my ($partlist,$handgrade) = &response_type($url);
     my ($resptype,$hdgrade)=('','no');
     for (sort keys(%$handgrade)) {
@@ -2032,6 +2175,9 @@ 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="lastCmd"    value="$ENV{'form.lastCmd'}" />
+<input type="hidden" name="lastSec"    value="$ENV{'form.lastSec'}" />
+<input type="hidden" name="probTitle"  value="$ENV{'form.probTitle'}" />
 <input type="hidden" name="command"    value="csvuploadassign" />
 <hr />
 <script type="text/javascript" language="Javascript">
@@ -2072,6 +2218,7 @@ 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);
@@ -2100,6 +2247,8 @@ sub csvuploadmap {
 	}
     }
     &csvuploadmap_footer($request,$i,$keyfields);
+    $request->print(&show_grading_menu_form($symb,$url));
+
     return '';
 }
 
@@ -2163,182 +2312,10 @@ sub csvuploadassign {
 #------------- end of section for handling csv file upload ---------
 #
 #-------------------------------------------------------------------
-
-#-------------------------- 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".
-	'</form>'."\n";
-    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.=&gradeByPage_form($symb,$url,$resptype,$hdgrade).'<br />';
-    $result.=&verifyReceipt_form($symb,$url) 
-	if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb));
- 
-    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";
-	}
-    }
-    $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";
-    return $result;
-}
-
-#--- Menu to upload a csv scores ---
-sub upcsvScores_form {
-    my ($symb,$url) = @_;
-    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" />
-</form>
-ENDUPFORM
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
-    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>';
-    $result.=($handgrade eq 'yes' ? 'View/Grade' : 'View').' 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";
-
-    $result.='&nbsp;<b>Select section:</b> <select name="section">'."\n";
-    if (ref($sections)) {
-	foreach (sort (@$sections)) {$result.='<option>'.$_.'</option>'."\n";}
-    }
-    $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);
-    }
-
-
-    $result.='<br />&nbsp;<input type="button" onClick="submit();" value="';
-    if ($handgrade eq 'yes') {
-	$result.="View/Grade";
-    } else {
-	$result.="View";
-    }
-    $result.='" />'."\n".'</form>'."\n";
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
-    return $result;
-}
-
-#--- Handgrading problems by page/sequence for each student ---
-sub gradeByPage_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>';
-    $result.='Handgrade an Individual Student\'s by Page/Sequence</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="pickStudentPage" />'."\n";
-
-    $result.='&nbsp;<b>Select section:</b> <select name="section">'."\n";
-    if (ref($sections)) {
-	foreach (sort (@$sections)) {$result.='<option>'.$_.'</option>'."\n";}
-    }
-    $result.= '<option selected="on">all</select>'."\n";
-
-    $result.='<br />&nbsp;<input type="button" onClick="submit();" value="';
-    $result.='View/Grade'.'" />'."\n".'</form>'."\n";
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
-    return $result;
-}
-
-
+#-------------- Next few routines handles grading by page/sequence
+#
+#--- Select a page/sequence and a student to grade
 sub pickStudentPage {
     my ($request) = shift;
 
@@ -2346,11 +2323,14 @@ sub pickStudentPage {
 <script type="text/javascript" language="javascript">
 
 function checkPickOne(formname) {
-    var user = radioSelection(formname.pickOne);
+    var user = radioSelection(formname.student);
     if (user == null) {
 	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");
     formname.submit();
 }
 
@@ -2358,16 +2338,24 @@ function radioSelection(radioButton) {
     var selection=null;
     for (var i=0; i<radioButton.length; i++) {
         if (radioButton[i].checked) {
-            selection=radioButton[i].value;
-            return selection;
+            return radioButton[i].value;
         }
     }
     return selection;
 }
+
+function pullDownSelection(selectOne) {
+    var selection=null;
+    for (var i=0; i<selectOne.length; i++) {
+        if (selectOne[i].selected) {
+            return selectOne[i].value;
+        }
+    }
+}
 </script>
 LISTJAVASCRIPT
 
-    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'};
@@ -2375,29 +2363,47 @@ LISTJAVASCRIPT
     my $result='<h3><font color="#339933">&nbsp;'.
 	'Manual Grading by Page or Sequence</font></h3>';
 
-    my ($pagepath,$pagename,$type,$mapId) = ($symb =~ /(.*\/)(.*?\.(page|sequence))___(\d+)___/); 
-    my $curtitle = &Apache::lonnet::metadata($pagepath.$pagename,'title');
-
     $result.='<form action="/adm/grades" method="post" name="displayPage">'."<br>\n";
-    $result.='&nbsp;<b>Problems from:</b> <select name="page">'."\n";
+    $result.='&nbsp;<b>Problems from:</b> <select name="selectpage">'."\n";
     my ($titles,$symbx) = &getSymbMap();
-#    shift @$titles; # skip the top level sequence
+    my ($curpage,$type,$mapId) = ($symb =~ /(.*?\.(page|sequence))___(\d+)___/); 
+    my $ctr=0;
     foreach (@$titles) {
 	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
-	my $check_select = ($showtitle eq $curtitle ? 'selected="on"' : '');
-	$result.='<option value="'.$_.'" '.$check_select.'>'.$showtitle.'</option>'."\n";
+	$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: </b><input type="radio" name="vProb" value="no" checked /> 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 /> dates and submissions'."\n".
+	'<input type="radio" name="lastSub" value="all" /> all details'."\n";
 
-#    $result.='&nbsp;<b>View Problems: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
-#	'<input type="radio" name="vProb" value="yes" /> yes '."<br>\n";
-#    $result.='&nbsp;<b>Submission Details: </b>'.
-#	'<input type="radio" name="lastSub" value="last" checked /> last sub only'."\n".
-#	'<input type="radio" name="lastSub" value="all" /> all details'."\n";
     $result.='<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
-	'<input type="hidden" name="command"  value="displayPage" />'."\n".
-	'<input type="hidden" name="url"  value="'.$url.'" />'."\n".
-	'<input type="hidden" name="symb" value="'.$symb.'" />'."<br><br>\n";
+	'<input type="hidden" name="command" value="displayPage" />'."\n".
+	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
+	'<input type="hidden" name="symb"    value="'.$symb.'" />'."<br><br>\n".
+	'<input type="hidden" name="lastCmd" value="'.$ENV{'form.lastCmd'}.'" />'."\n".
+	'<input type="hidden" name="lastSec" value="'.$ENV{'form.lastSec'}.'" />'."\n";
+
+    $result.='<br />&nbsp;<input type="button" '.
+	'onClick="javascript:checkPickOne(this.form);"value="Submit" /><br />'."\n";
+
     $request->print($result);
 
     my $studentTable.='&nbsp;<b>Select a Student you wish to grade</b><br>'.
@@ -2413,7 +2419,7 @@ LISTJAVASCRIPT
     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="pickOne" value="'.$student.'" /> '.$$fullname{$student}.
+	$studentTable.='<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>' : '');
 	$ptr++;
@@ -2422,7 +2428,8 @@ LISTJAVASCRIPT
     $studentTable.='</td><td>&nbsp;</td><td>&nbsp;' if ($ptr%4 == 3);
     $studentTable.='</td><td>&nbsp;' if ($ptr%4 == 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.='<br />&nbsp;<input type="button" '.
+	'onClick="javascript:checkPickOne(this.form);"value="Submit" /></form>'."\n";
 
     $studentTable.=&show_grading_menu_form($symb,$url);
     $request->print($studentTable);
@@ -2453,10 +2460,32 @@ sub getSymbMap {
         if ($curRes == $iterator->END_MAP()) { $depth--; }
 
         if (ref($curRes) && $curRes->is_map()) {
-            my $title = $curRes->compTitle();
-	    push @titles,$minder.'.'.$title; # minder, just in case two titles are identical
-	    $symbx{$minder.'.'.$title} = $curRes->symb();
-	    $minder++;
+	    my ($mapUrl, $id, $resUrl) = split(/___/, $curRes->symb()); # check map contains at least one problem
+	    my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
+
+	    my $mapiterator = $navmap->getIterator($map->map_start(),
+						   $map->map_finish());
+
+	    my $mapdepth = 1;
+	    my $countProblems = 0;
+	    $mapiterator->next(); # skip the first BEGIN_MAP
+	    my $mapcurRes = $mapiterator->next(); # for "current resource"
+	    my $ctr=0;
+	    while ($mapdepth > 0 && $ctr < 100) {
+		if($mapcurRes == $mapiterator->BEGIN_MAP) { $mapdepth++; }
+		if($mapcurRes == $mapiterator->END_MAP) { $mapdepth++; }
+
+		if (ref($mapcurRes) && $mapcurRes->is_problem() && !$mapcurRes->randomout) {
+		    $countProblems++;
+		}
+		$ctr++;
+	    }
+	    if ($countProblems > 0) {
+		my $title = $curRes->compTitle();
+		push @titles,$minder.'.'.$title; # minder, just in case two titles are identical
+		$symbx{$minder.'.'.$title} = $curRes->symb();
+		$minder++;
+	    }
        }
         $curRes = $iterator->next();
     }
@@ -2465,145 +2494,450 @@ sub getSymbMap {
     return \@titles,\%symbx;
 }
 
+#
+#--- 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 (undef,undef,$fullname) = &getclasslist($getsec,'0');
-    my ($uname,$udom) = split(/:/,$ENV{'form.pickOne'});
-    my ($idx,$showtitle) = ($pageTitle =~ /(\d+)\.(.*)/);
+    my ($uname,$udom) = split(/:/,$ENV{'form.student'});
 
-    my $result='<h3><font color="#339933">&nbsp;'.$showtitle.'</font></h3>';
-    $result.='<h3>&nbsp;Student: '.$$fullname{$ENV{'form.pickOne'}}.
+    my $result='<h3><font color="#339933">&nbsp;'.$ENV{'form.title'}.'</font></h3>';
+    $result.='<h3>&nbsp;Student: '.$$fullname{$ENV{'form.student'}}.
 	'<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font></h3>'."\n";
 
-    my ($pg_titles,$pg_symbx) = &getSymbMap();
+    &sub_page_js($request);
+    $request->print($result);
 
     my $navmap = Apache::lonnavmaps::navmap-> new(
 						  $ENV{'request.course.fn'}.'.db',
 						  $ENV{'request.course.fn'}.'_parms.db',1, 1);
-
-    my ($mapUrl, $id, $resUrl) = split(/___/, $$pg_symbx{$ENV{'form.page'}});
+    my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
 
     my $iterator = $navmap->getIterator($map->map_start(),
 					$map->map_finish());
 
-    my $depth = 1;
+    my $studentTable='<form action="/adm/grades" method="post" name="gradePage">'."\n".
+	'<input type="hidden" name="command" value="gradeByPage" />'."\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="lastCmd" value="'.$ENV{'form.lastCmd'}.'" />'."\n".
+	'<input type="hidden" name="lastSec" value="'.$ENV{'form.lastSec'}.'" />'."\n";
+
+    my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+	'/check.gif" height="16" border="0" />';
+
+    $studentTable.='&nbsp;<b>Note:</b> A problem graded correct ('.$checkIcon.
+	') by the computer cannot be changed.'."\n".
+	'<table border="0"><tr><td bgcolor="#777777">'.
+	'<table border="0"><tr bgcolor="#e6ffff">'.
+	'<td align="center"><b>&nbsp;No&nbsp;</b></td>'.
+	'<td><b>&nbsp;'.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem View').'/Grade</b></td></tr>';
+
+    my ($depth,$ctr,$question) = (1,0,1);
     $iterator->next(); # skip the first BEGIN_MAP
     my $curRes = $iterator->next(); # for "current resource"
-    my %symbx = ();
-    my @titles = ();
-    my %parts = ();
-    my $ctr=0;
-    my $minder=0;
     while ($depth > 0 && $ctr < 100) { # ctr, just in case it never gets out of loop
         if($curRes == $iterator->BEGIN_MAP) { $depth++; }
         if($curRes == $iterator->END_MAP) { $depth++; }
 
         if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
 	    my $parts = $curRes->parts();
+	    $parts = &temp_parts_fix($parts); # remove line when lonnavmap is fixed
             my $title = $curRes->compTitle();
-	    push @titles,$minder.'.'.$title; # minder, just in case two titles are identical
-	    if (scalar(@{$parts}) > 1) { shift @{$parts}; }
-	    for my $part (@$parts) {
-		$result.='title='.$title.'part='.$part.':<br>';
+	    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);
+	    } 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>
+#		    $request->print('match='.$1.'<br>');
+#		    $companswer =~ s/$1/ /s;
+#		}
+#		$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 {
+		    $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);
+		    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;
+			    $displaySub[0].=(exists $record{$version.':'.$matchKey[0]}) ? 
+				'<b>Part:</b> '.$partid.'&nbsp;<b>Submission:</b>&nbsp;'
+				.$record{$version.':'.$matchKey[0]}.'<br />' : '';
+			    $displaySub[1].=(exists $record{"$version:resource.$partid.award"}) ?
+				'<b>Part:</b> '.$partid.'&nbsp;'.
+				$record{"$version:resource.$partid.award"}.'/'.
+				$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"} : '';
+			$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>';
+		}
+	    } 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');
+ 
 	    }
-	    $parts{$minder.'.'.$title} = join '::',@$parts;
 
-            $symbx{$minder.'.'.$title} = $curRes->symb();
-	    $minder++;
+	    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();
 	$ctr++;
     }
 
-    $navmap->init();
+    $studentTable.='</td></tr></table></td></tr></table>'."\n".
+	'&nbsp;&nbsp;<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 temp_parts_fix { #remove sub once lonnavmap is fixed
+    my $parts = shift;
+    my %seen = ();
+    my @correctParts = ();
+    foreach (@{$parts}) {
+	next if ($seen{$_} > 0);
+	$seen{$_}++;
+	push @correctParts,$_;
+    }
+    return \@correctParts;
+}
+
+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 (undef,undef,$fullname) = &getclasslist($getsec,'0');
+    my ($uname,$udom) = split(/:/,$ENV{'form.student'});
+
+    my $result='<h3><font color="#339933">&nbsp;'.$ENV{'form.title'}.'</font></h3>';
+    $result.='<h3>&nbsp;Student: '.$$fullname{$ENV{'form.student'}}.
+	'<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font></h3>'."\n";
+
     $request->print($result);
 
-    my $studentTable.=
-	'<table border="0"><tr><td bgcolor="#777777">'.
+    my $navmap = Apache::lonnavmaps::navmap-> new(
+						  $ENV{'request.course.fn'}.'.db',
+						  $ENV{'request.course.fn'}.'_parms.db',1, 1);
+    my ($mapUrl, $id, $resUrl) = split(/___/, $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><b>&nbsp;No&nbsp;</b></td>'.
-	'<td><b>&nbsp;Title</b></td>'.
-	'<td><b>&nbsp;Answer</b></td>'.
-	'<td><b>&nbsp;Grade</b></td></tr>';
-    my $question=1;
-    foreach (@titles) {
-	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
-	$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.'</td>';
-	$studentTable.='<td valign="top">&nbsp;'.$showtitle.'&nbsp;</td>';
-	$studentTable.='<td>&nbsp;'.
-	    &Apache::loncommon::get_student_answers($symbx{$_},$uname,$udom,$ENV{'request.course.id'}).'</td>';
-
-	my (undef,undef,$requesturl)=split(/___/,$symbx{$_});
-	$requesturl=&Apache::lonnet::clutter($requesturl);
-	my $subresult=&Apache::lonnet::ssi($requesturl,
-					   ('grade_target' => 'analyze'),
-					   ('grade_domain' => $udom),
-					   ('grade_user' => $uname),
-					   ('grade_symb' => $symbx{$_}),
-					   ('grade_courseid' => $ENV{'request.course.id'}));
-	(undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
-	my %analyze=&Apache::lonnet::str2hash($subresult);
-
-	$studentTable.='<td>&nbsp;';
-	while (my($key,$value) = each (%analyze)){
-	    $studentTable.='key='.$key.'->value='.$value.'<br>';
-	}
-	$studentTable.='</td></tr>';
-	$question++;
+	'<td align="center"><b>&nbsp;No&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,$ctr,$question,$changeflag)= (1,0,1,0);
+    while ($depth > 0 && $ctr < 100) { # ctr, just in case it never gets out of loop
+        if($curRes == $iterator->BEGIN_MAP) { $depth++; }
+        if($curRes == $iterator->END_MAP) { $depth++; }
 
-    $studentTable.='</table></td></tr></table>';
-#    $result.='<form action="/adm/grades" method="post" name="displayPage">'."<br>\n";
-#    $result.='</form>'."\n";
+        if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
+	    my $parts = $curRes->parts();
+	    $parts = &temp_parts_fix($parts); # remove line when lonnavmap is fixed
+            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 ($partial == 0) {
+		    $score = 'incorrect_by_override';
+		}
+		if ($ENV{'form.GD_SEL'.$question.'_'.$partid} eq 'excused') {
+		    $partial = '';
+		    $score = 'excused';
+		}
+		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)).
+		    '&nbsp;<br>';
+
+		$question++;
+		if (($oldstatus eq 'correct_by_student') ||
+		    ($newpts eq $oldpts && $score eq $oldstatus))
+		{
+		    next;
+		}
+		$newrecord{'resource.'.$partid.'.awarded'}  = $partial if $partial ne '';
+		$newrecord{'resource.'.$partid.'.solved'}   = $score;
+		$newrecord{'resource.'.$partid.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+
+		$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>';
 
-    $request->print($studentTable);
+	}
+        $curRes = $iterator->next();
+	$ctr++;
+    }
 
+    $studentTable.='</td></tr></table></td></tr></table>';
+    $studentTable.=($changeflag == 0 ? 'No score was changed or updated.' :
+		    'The scores were changed for '.
+		    $changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));
+    $studentTable.=&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'});
+    $request->print($studentTable);
 
     return '';
 }
 
-#--- 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";
+#-------- end of section for handling grading by page/sequence ---------
+#
+#-------------------------------------------------------------------
 
-    my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});
+#-------------------------- 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="lastCmd" value="'.$ENV{'form.lastCmd'}.'" />'."\n".
+	'<input type="hidden" name="lastSec" value="'.$ENV{'form.lastSec'}.'" />'."\n".
+	'<input type="hidden" name="command" value="gradingmenu" />'."\n".
+	'<input type="submit" name="submit" value="Grading Menu" />'."\n".
+	'</form>'."\n";
+    return $result;
+}
 
-    $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'}.'" />';
+#--- Displays the main menu page -------
+sub gradingmenu {
+    my ($request) = @_;
+    my ($symb,$url)=&get_symb_and_url($request);
+    if (!$symb) {return '';}
+
+    $request->print(<<GRADINGMENUJS);
+<script type="text/javascript" language="javascript">
+    function checkChoice(formname) {
+	var cmd = formname.command;
+	formname.lastCmd.value = radioSelection(formname.command);
+	formname.lastSec.value = pullDownSelection(formname.section);
+	if (cmd[0].checked || cmd[1].checked || cmd[2].checked) {
+	    formname.submit();
+	}
+
+	if (cmd[3].checked) {
+	    var url = "/adm/grades?command=csvform&symb="+formname.symb.value+"&url="+formname.url.value;
+	    var options = "width=620,height=340,screenx=70,screeny=75,";
+	    options += "resizable=no,scrollbars=no,status=no,";
+	    options += "menubar=no,toolbar=no,location=no,directories=no";
+	    var newWin = window.open(url, "CSVFile", options);
+	    newWin.focus();
+	}
+
+	if (cmd[4].checked) {
+	    if (!checkReceiptNo(formname,'notOK')) { return false;}
+	    formname.submit();
+	}
+    }
+
+    function checkReceiptNo(formname,nospace) {
+	var receiptNo = formname.receipt.value;
+	var checkOpt = false;
+	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
+	if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
+	if (checkOpt) {
+	    alert("Please enter a receipt number given by a student in the receipt box.");
+	    formname.receipt.value = "";
+	    formname.receipt.focus();
+	    return false;
+	}
+	formname.command[4].checked = true;
+	return true;
     }
-    if ($ENV{'form.symb'}) {
-	$result.='<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />';
+
+    function radioSelection(radioButton) {
+	var selection=null;
+	for (var i=0; i<radioButton.length; i++) {
+	    if (radioButton[i].checked) {
+		return radioButton[i].value;
+	    }
+	}
+	return selection;
     }
-    $result.='</form>';
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
+
+    function pullDownSelection(selectOne) {
+	var selection="";
+	for (var i=0; i<selectOne.length; i++) {
+	    if (selectOne[i].selected) {
+		return selectOne[i].value;
+	    }
+	}
+    }
+</script>
+GRADINGMENUJS
+
+    my $probTitle = &Apache::lonnet::metadata($ENV{'form.url'},'title');
+    my $result='<h3>&nbsp;<font color="#339933">Manual Grading/View Submission</font></h3>'.
+	'<table border="0">'.
+	'<tr><td colspan=3><font size=+1><b>Problem: </b>'.$probTitle.'</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 ($classlist,$sections) = &getclasslist('all','0');
+    my $lastCmd = ($ENV{'form.lastCmd'} eq '' ? 'pickStudentPage' : $ENV{'form.lastCmd'});
+    my $lastSec = ($ENV{'form.lastSec'} eq '' ? 'all' : $ENV{'form.lastSec'});
+
+    $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="lastCmd"     value="" />'."\n".
+	'<input type="hidden" name="lastSec"     value="" />'."\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>'."\n".
+	'&nbsp;<b>Select a Grading/Viewing Option</b></td></tr>'."\n".
+	'<tr bgcolor=#ffffe6><td>'."\n";
+
+    $result.='<table width=100% border=0>'.
+	'<tr bgcolor="#ffffe6" valign="top"><td colspan="2">'.
+	'<input type="radio" name="command" value="pickStudentPage" '.
+	($lastCmd eq 'pickStudentPage' ? 'checked' : '').'> '.
+	'Handgrade/View Submission for a student by page/sequence</td></tr>'."\n".
+
+	'<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+	'<input type="radio" name="command" value="viewgrades" '.
+	($lastCmd eq 'viewgrades' ? 'checked' : '').'> '.
+	'Grade by section or class</td></tr>'."\n".
+
+	'<tr bgcolor="#ffffe6"valign="top"><td><input type="radio" name="command" value="submission" '.
+	($lastCmd eq 'submission' ? 'checked' : '').'> '.
+	($hdgrade eq 'yes' ? 'View/Grade essay response of' : 'View').
+	' an individual student </td>'."\n".
+	'<td>-->&nbsp;For students who has: '.
+	'<input type="radio" name="submitonly" value="yes" checked> submitted'.
+	'<input type="radio" name="submitonly" value="all"> everybody</td></tr>'."\n".
+
+	'<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+	'<input type="radio" name="command" value="csvupload" '.
+	($lastCmd eq 'csvupload' ? 'checked' : '').'> '.
+	'Upload scores from file</td></tr>'."\n";
+
+    if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb)) {
+	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+	    '<input type="radio" name="command" value="verify" onSelect="javascript:this.form.receipt.focus()" '.
+	    ($lastCmd eq 'verify' ? 'checked' : '').'> '.
+	    'Verify a submission receipt issued by this server</td>'.
+	    '<td>-->&nbsp;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.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2"><br />'."\n".
+	'&nbsp;Select section:</b> <select name="section">'."\n";
+    if (ref($sections)) {
+	foreach (sort (@$sections)) {$result.='<option value="'.$_.'" '.
+					 ($lastSec eq $_ ? 'selected="on"' : '').'>'.$_.'</option>'."\n";}
+    }
+    $result.= '<option value="all" '.($lastSec eq 'all' ? 'selected="on"' : ''). '>all</select> &nbsp; '.
+	'<font color="red">(Applies to the first three options only.)</font>'."\n";
+    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"><td colspan="2"><br />'.
+	'<input type="button" onClick="javascript:checkChoice(this.form);" value="View/Grade" />'."\n".
+	'</form></td></tr></table>'."\n".
+	'</td></tr></table>'."\n".
+	'</td></tr></table>'."\n";
     return $result;
 }
 
@@ -2658,13 +2992,12 @@ sub handler {
 	$Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
 	if ($command eq 'submission') {
 	    ($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
-#	if ($command eq 'submission') {
-#	    &listStudents($request) if ($ENV{'form.student'} eq '');
-#	    &submission($request,0,0) if ($ENV{'form.student'} ne '');
 	} elsif ($command eq 'pickStudentPage') {
 	    &pickStudentPage($request);
 	} elsif ($command eq 'displayPage') {
 	    &displayPage($request);
+	} elsif ($command eq 'gradeByPage') {
+	    &updateGradeByPage($request);
 	} elsif ($command eq 'processGroup') {
 	    &processGroup($request);
 	} elsif ($command eq 'gradingmenu') {
@@ -2677,6 +3010,8 @@ sub handler {
 	    $request->print(&editgrades($request));
 	} elsif ($command eq 'verify') {
 	    $request->print(&verifyreceipt($request));
+	} elsif ($command eq 'csvform') {
+	    $request->print(&upcsvScores_form($request));
 	} elsif ($command eq 'csvupload') {
 	    $request->print(&csvupload($request));
 	} elsif ($command eq 'viewclasslist') {