[LON-CAPA-cvs] cvs: loncom /homework grades.pm

ng lon-capa-cvs@mail.lon-capa.org
Fri, 02 Aug 2002 21:10:03 -0000


This is a MIME encoded message

--ng1028322603
Content-Type: text/plain

ng		Fri Aug  2 17:10:03 2002 EDT

  Modified files:              
    /loncom/homework	grades.pm 
  Log:
  Checks classlist for section number, id & fullname. If not present, will
  rewrite the classlist.
  
  Remove a few buttons for keywords highlight etc.
  
  Receipt button works - also provides a link to view the student's page if
  verified.
  
  On the whole, pretty much complete for grading by class, or individually.
  
  csv needs to be checked.
  
  
  
--ng1028322603
Content-Type: text/plain
Content-Disposition: attachment; filename="ng-20020802171003.txt"

Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.43 loncom/homework/grades.pm:1.44
--- loncom/homework/grades.pm:1.43	Tue Jul 30 15:59:58 2002
+++ loncom/homework/grades.pm	Fri Aug  2 17:10:03 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.43 2002/07/30 19:59:58 ng Exp $
+# $Id: grades.pm,v 1.44 2002/08/02 21:10:03 ng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,7 @@
 # 7/26 H.K. Ng
 # 8/20 Gerd Kortemeyer
 # Year 2002
-# June, July 2002 H.K. Ng
+# June-August H.K. Ng
 #
 
 package Apache::grades;
@@ -42,74 +42,33 @@
 use Apache::lonhomework;
 use Apache::lonmsg qw(:user_normal_msg);
 use Apache::Constants qw(:common);
-#use Time::HiRes qw( gettimeofday tv_interval );
 
-sub moreinfo {
-    my ($request,$reason) = @_;
-    $request->print("Unable to process request: $reason");
-    if ( $Apache::grades::viewgrades eq 'F' ) {
-	$request->print('<form action="/adm/grades" method="post">'."\n");
-	if ($ENV{'form.url'}) {
-	    $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");
-	}
-	if ($ENV{'form.symb'}) {
-	    $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
+# ----- These first few routines are general use routines.-----
+#
+# --- Retrieve the parts that matches stores_\d+ from the metadata file.---
+sub getpartlist {
+    my ($url) = @_;
+    my @parts =();
+    my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
+    foreach my $key (@metakeys) {
+	if ( $key =~ m/stores_([0-9]+)_.*/) {
+	    push(@parts,$key);
 	}
-#    $request->print('<input type="hidden" name="command" value="submission" />'."\n");
-	$request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />'."\n");
-	$request->print("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'" />'."<br />\n");
-	$request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'" />'."<br />\n");
-	$request->print('<input type="submit" name="submit" value="ReSubmit" />'."<br />\n");
-	$request->print('</form>');
-    }
-    return '';
-}
-
-sub verifyreceipt {
-    my $request=shift;
-    my $courseid=$ENV{'request.course.id'};
-#    my $cdom=$ENV{"course.$courseid.domain"};
-#    my $cnum=$ENV{"course.$courseid.num"};
-    my $receipt=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'.
-	$ENV{'form.receipt'};
-    $receipt=~s/[^\-\d]//g;
-    my $symb=$ENV{'form.symb'};
-    unless ($symb) {
-	$symb=&Apache::lonnet::symbread($ENV{'form.url'});
     }
-    if ((&Apache::lonnet::allowed('mgr',$courseid)) && ($symb)) {
-        $request->print('<h1>Verifying Submission Receipt '.$receipt.'</h1>');
-        my $matches=0;
-        my ($classlist) = &getclasslist('all','0');
-        foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
-            my ($uname,$udom)=split(/\:/,$student);
-            if ($receipt eq 
-		&Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) {
-		$request->print('Matching '.$student.'<br>');
-		$matches++;
-	   }
-        }
-        $request->printf('<p>'.$matches." match%s</p>",$matches <= 1 ? '' : 'es');
-# needs to print who is matched
-    }
-    return '';
+    return @parts;
 }
 
-sub student_gradeStatus {
-    my ($url,$udom,$uname,$partlist) = @_;
+# --- Get the symbolic name of a problem and the url
+sub get_symb_and_url {
+    my ($request) = @_;
+    (my $url=$ENV{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
     my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
-    my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
-    my %partstatus = ();
-    foreach (@$partlist) {
-	my ($status,$foo)=split(/_/,$record{"resource.$_.solved"},2);
-	$status = 'nothing' if ($status eq '');
-	$partstatus{$_} = $status;
-	$partstatus{"resource.$_.submitted_by"} = $record{"resource.$_.submitted_by"} 
-	if ($record{"resource.$_.submitted_by"} ne '');
-    }
-    return %partstatus;
+    if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
+    return ($symb,$url);
 }
 
+# --- Retrieve the fullname for a user. Return lastname, first middle ---
+# --- Generation is attached next to the lastname if it exists. ---
 sub get_fullname {
     my ($uname,$udom) = @_;
     my %name=&Apache::lonnet::get('environment', ['lastname','generation',
@@ -124,10 +83,11 @@
     return $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 $allkeys = &Apache::lonnet::metadata($url,'keys');
-#    print "allkeys=>$allkeys<br>";
     my %seen = ();
     my (@partlist,%handgrade);
     foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
@@ -143,22 +103,219 @@
     return \@partlist,\%handgrade;
 }
 
+#--- Prints a message on screen if a user did something wrong
+#--- Operator error ---
+sub userError {
+    my ($request, $reason, $step) = @_;
+    $request->print('<h3><font color="red">LON-CAPA User Error</font></h3><br />'."\n");
+    $request->print('<b>Reason: </b>'.$reason.'<br /><br />'."\n");
+    $request->print('<b>Step: </b>'.($step ne '' ? $step : 'Use your browser back button to correct')
+		    .'<br /><br />'."\n");
+    return '';
+}
+
+#--- Dumps the class list with usernames,list of sections,
+#--- section, ids and fullnames for each user.
+sub getclasslist {
+    my ($getsec,$hideexpired) = @_;
+    my $now = time;
+    my %classlist=&Apache::lonnet::dump('classlist',
+					$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+					$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+    # codes to check for fields in the classlist
+    # should contain end:start:id:section:fullname
+    for (keys %classlist) {
+	my (@fields) = split(/:/,$classlist{$_});
+	%classlist   = &reformat_classlist(\%classlist) if (scalar(@fields) <= 2);
+	last;
+    }
+
+    my (@holdsec,@sections,%allids,%stusec,%fullname);
+    foreach (keys(%classlist)) {
+	my ($end,$start,$id,$section,$fullname)=split(/:/,$classlist{$_});
+	# still a student?
+	if (($hideexpired) && ($end) && ($end < $now)) {
+	    next;
+	}
+	$section = ($section ne '' ? $section : 'no');
+	push @holdsec,$section;
+	if ($getsec eq 'all' || $getsec eq $section) {
+	    push (@{ $classlist{$getsec} }, $_);
+	    $allids{$_}  =$id;
+	    $stusec{$_}  =$section;
+	    $fullname{$_}=$fullname;
+	}
+    }
+    my %seen = ();
+    foreach my $item (@holdsec) {
+	push (@sections, $item) unless $seen{$item}++;
+    }
+    return (\%classlist,\@sections,\%allids,\%stusec,\%fullname);
+}
+
+# add id, section and fullname to the classlist.db
+# done to maintain backward compatibility with older versions
+sub reformat_classlist {
+    my ($classlist) = shift;
+    foreach (sort keys(%$classlist)) {
+	my ($unam,$udom) = split(/:/);
+	my $section      = &Apache::lonnet::usection($udom,$unam,$ENV{'request.course.id'});
+	my $fullname     = &get_fullname ($unam,$udom);
+	my %userid       = &Apache::lonnet::idrget($udom,($unam));
+	$$classlist{$_}  = $$classlist{$_}.':'.$userid{$unam}.':'.$section.':'.$fullname;
+    }
+    my $putresult = &Apache::lonnet::put
+	('classlist',\%$classlist,
+	 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+	 $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+    return %$classlist;
+}
+
+#find user domain
+sub finduser {
+    my ($name) = @_;
+    my $domain = '';
+    if ( $Apache::grades::viewgrades eq 'F' ) {
+	my %classlist=&Apache::lonnet::dump('classlist',
+					    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+					    $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+	my (@fields) = grep /^$name:/, keys %classlist;
+	($name, $domain) = split(/:/,$fields[0]);
+	return ($name,$domain);
+    } else {
+	return ($ENV{'user.name'},$ENV{'user.domain'});
+    }
+}
+
+#--- Prompts a user to enter a username.
+sub moreinfo {
+    my ($request,$reason) = @_;
+    $request->print("Unable to process request: $reason");
+    if ( $Apache::grades::viewgrades eq 'F' ) {
+	$request->print('<form action="/adm/grades" method="post">'."\n");
+	if ($ENV{'form.url'}) {
+	    $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");
+	}
+	if ($ENV{'form.symb'}) {
+	    $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
+	}
+	$request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />'."\n");
+	$request->print("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'" />'."<br />\n");
+	$request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'" />'."<br />\n");
+	$request->print('<input type="submit" name="submit" value="ReSubmit" />'."<br />\n");
+	$request->print('</form>');
+    }
+    return '';
+}
+
+#--- Retrieve the grade status of a student for all the parts
+sub student_gradeStatus {
+    my ($url,$symb,$udom,$uname,$partlist) = @_;
+    my %record     = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+    my %partstatus = ();
+    foreach (@$partlist) {
+	my ($status,$foo)    = split(/_/,$record{"resource.$_.solved"},2);
+	$status              = 'nothing' if ($status eq '');
+	$partstatus{$_}      = $status;
+	my $subkey           = "resource.$_.submitted_by";
+	$partstatus{$subkey} = $record{$subkey} if ($record{$subkey} ne '');
+    }
+    return %partstatus;
+}
+
 
+#------------------ End of general use routines --------------------
+#-------------------------------------------------------------------
+
+#------------------------------------ Receipt Verification Routines
+#--- Check whether a receipt number is valid.---
+sub verifyreceipt {
+    my $request  = shift;
+
+    my $courseid = $ENV{'request.course.id'};
+    my $receipt  = unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'.
+	$ENV{'form.receipt'};
+    $receipt     =~ s/[^\-\d]//g;
+    my $url      = $ENV{'form.url'};
+    my $symb     = $ENV{'form.symb'};
+    unless ($symb) {
+	$symb    = &Apache::lonnet::symbread($url);
+    }
+
+    my $jscript='<script type="text/javascript" language="javascript">'."\n".
+	'    function viewOneStudent(user,domain) {'."\n".
+	'	document.onestudent.student.value = user;'."\n".
+	'	document.onestudent.userdom.value = domain;'."\n".
+	'	document.onestudent.submit();'."\n".
+	'    }'."\n".
+	'</script>'."\n";
+    $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="command" value="submission" />'."\n".
+	'<input type="hidden" name="student" value="" />'."\n".
+	'<input type="hidden" name="userdom" value="" />'."\n".
+	'</form>'."\n";
+
+    my $title.='<h2><font color="#339933">Verifying Submission Receipt '.
+	$receipt.'</h2></font>'."\n".
+	'<font size=+1><b>Resource: </b>'.$ENV{'form.url'}.'</font><br><br>'."\n";
+
+    my ($string,$contents,$matches) = ('','',0);
+    my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist('all','0');
+    
+    foreach (sort {$$fullname{$a} cmp $$fullname{$b} } keys %$fullname) {
+	my ($uname,$udom)=split(/\:/);
+	if ($receipt eq 
+	    &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) {
+	    $contents.='<tr bgcolor="#ffffe6"><td>&nbsp;'."\n".
+		'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
+		'\')"; TARGET=_self>'.$$fullname{$_}.'</a>&nbsp;</td>'."\n".
+		'<td>&nbsp;'.$uname.'&nbsp;</td>'.
+		'<td>&nbsp;'.$udom.'&nbsp;</td></tr>'."\n";
+	    
+	    $matches++;
+	}
+    }
+    if ($matches == 0) {
+	$string = $title.'No match found for the above receipt.';
+    } else {
+	$string = $jscript.$title.
+	    'The above receipt matches the following student'.
+	    ($matches <= 1 ? '.' : 's.')."\n".
+	    '<table border="0"><tr><td bgcolor="#777777">'."\n".
+	    '<table border="0"><tr bgcolor="#e6ffff">'."\n".
+	    '<td><b>&nbsp;Fullname&nbsp;</b></td>'."\n".
+	    '<td><b>&nbsp;Username&nbsp;</b></td>'."\n".
+	    '<td><b>&nbsp;Domain&nbsp;</b></td></tr>'."\n".
+	    $contents.
+	    '</table></td></tr></table>'."\n";
+    }
+    return $string.&show_grading_menu_form ($symb,$url);
+}
+
+#--- 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 
+#    on the problem page.
 sub listStudents {
     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 $submitonly=$ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'};
+    my $cdom      = $ENV{"course.$ENV{'request.course.id'}.domain"};
+    my $cnum      = $ENV{"course.$ENV{'request.course.id'}.num"};
+    my $getsec    = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
+    my $submitonly= $ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'};
 
-    my $result='<h2><font color="#339933">&nbsp;View Submissions for a Student or a Group of Students</font></h2>';
+    my $result='<h2><font color="#339933">&nbsp;'.
+	'View Submissions for a Student or a Group of Students</font></h2>';
     $result.='<table border="0">';
-    $result.='<tr><td colspan=3><font size=+1><b>Resource: </b>'.$ENV{'form.url'}.'</font></td></tr>';
+    $result.='<tr><td colspan=3><font size=+1>'.
+	'<b>Resource: </b>'.$ENV{'form.url'}.'</font></td></tr>';
     my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
     for (sort keys(%$handgrade)) {
 	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
 	$ENV{'form.handgrade'} = 'yes' if ($handgrade eq 'yes');
-	$result.='<tr><td><b>Part id: </b>'.(split(/_/))[0].'</td>'.
+	$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
 	    '<td><b>Type: </b>'.$responsetype.'</td>'.
 	    '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
     }
@@ -188,21 +345,22 @@
 	$request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
     }
     $request->print('<input type="hidden" name="command" value="processGroup" />'."\n");
-    
+
     my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($getsec,'0');
     
     $result='<table border="0"><tr><td bgcolor="#777777">'.
 	'<table border="0"><tr bgcolor="#e6ffff">'.
-	'<td><b>&nbsp;Select&nbsp;</b></td><td><b>&nbsp;Username&nbsp;</b></td>'.
-	'<td><b>&nbsp;Fullname&nbsp;</b></td><td><b>&nbsp;Domain&nbsp;</b></td>';
+	'<td><b>&nbsp;Select&nbsp;</b></td><td><b>&nbsp;Fullname&nbsp;</b></td>'.
+	'<td><b>&nbsp;Username&nbsp;</b></td><td><b>&nbsp;Domain&nbsp;</b></td>';
     foreach (sort(@$partlist)) {
-	$result.='<td><b>&nbsp;Part ID '.(split(/_/))[0].' Status&nbsp;</b></td>';
+	$result.='<td><b>&nbsp;Part '.(split(/_/))[0].' Status&nbsp;</b></td>';
     }
     $request->print($result.'</tr>'."\n");
 
-    foreach my $student (sort(@{ $$classlist{$getsec} }) ) {
+    foreach my $student (sort {$$fullname{$a} cmp $$fullname{$b} } keys %$fullname) {
 	my ($uname,$udom) = split(/:/,$student);
-	my (%status) = &student_gradeStatus($ENV{'form.url'},$udom,$uname,$partlist);
+	my (%status) = &student_gradeStatus($ENV{'form.url'},
+					    $ENV{'form.symb'},$udom,$uname,$partlist);
 	my $statusflg = '';
 	foreach (keys(%status)) {
 	    $statusflg = 1 if ($status{$_} ne 'nothing');
@@ -220,8 +378,8 @@
 	    $result='<tr bgcolor="#ffffe6">'.
 		'<td align="center"><input type=checkbox name="stuinfo" value="'.
 		$student.':'.$$fullname{$student}.'"></td>'."\n".
-		'<td>&nbsp;'.$uname.'&nbsp;</td>'."\n".
 		'<td>&nbsp;'.$$fullname{$student}.'&nbsp;</td>'."\n".
+		'<td>&nbsp;'.$uname.'&nbsp;</td>'."\n".
 		'<td align="middle">&nbsp;'.$udom.'&nbsp;</td>'."\n";
 	    
 	    foreach (sort keys(%status)) {
@@ -233,8 +391,11 @@
     }
     $request->print('</table></td></tr></table>');
     $request->print('<input type="submit" name="submit" value="View/Grade" /><form />');
+    return '';
 }
 
+#---- Called from the listStudents routine
+#     Displays the submissions for one student or a group of students
 sub processGroup {
     my ($request)  = shift;
     my $ctr        = 0;
@@ -247,102 +408,358 @@
     }
     foreach (@stuchecked) {
 	my ($uname,$udom,$fullname) = split(/:/);
-	$ENV{'form.student'} = $uname;
-	$ENV{'form.fullname'} = $fullname;
+	$ENV{'form.student'}        = $uname;
+	$ENV{'form.userdom'}        = $udom;
+	$ENV{'form.fullname'}       = $fullname;
 	&submission($request,$ctr,$total);
 	$ctr++;
     }
     return '';
 }
 
-sub userError {
-    my ($request, $reason, $step) = @_;
-    $request->print('<h3><font color="red">LON-CAPA User Error</font></h3><br />'."\n");
-    $request->print('<b>Reason: </b>'.$reason.'<br /><br />'."\n");
-    $request->print('<b>Step: </b>'.($step ne '' ? $step : 'Use your browser back button to correct')
-		    .'<br /><br />'."\n");
-    return '';
-}
-
-#FIXME - needs to handle multiple matches
-sub finduser {
-    my ($name) = @_;
-    my $domain = '';
-    if ( $Apache::grades::viewgrades eq 'F' ) {
-	my ($classlist) = &getclasslist('all','0');
-	foreach ( sort(@{ $$classlist{'all'} }) ) {
-	    my ($posname,$posdomain) = split(/:/);
-	    if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; }
+#------------------------------------------------------------------------------------
+#
+#-------------------------- Next few routines handles grading by student, essentially
+#                           handles essay response type problem/part
+#
+#--- Javascript to handle the submission page functionality ---
+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;
+	   }
 	}
-	return ($name,$domain);
-    } else {
-	return ($ENV{'user.name'},$ENV{'user.domain'});
+	if (!resetbox) {
+	   formtextbox.value = "";
+	}
+	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;
+       }
     }
-}
 
-sub getclasslist {
-    my ($getsec,$hideexpired) = @_;
-    my $now = time;
-    my %classlist=&Apache::lonnet::dump('classlist',
-					$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-					$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-    my (@holdsec,@sections,%allids,%stusec,%fullname);
-    foreach (keys(%classlist)) {
-	my ($end,$start,$id,$section,$fullname)=split(/:/,$classlist{$_});
-       # still a student?
-	if (($hideexpired) && ($end) && ($end < $now)) {
-	    next;
-	}
-	$section = ($section ne '' ? $section : 'no');
-	push @holdsec,$section;
-	if ($getsec eq 'all' || $getsec eq $section) {
-	    push (@{ $classlist{$getsec} }, $_);
-	    $allids{$_}=$id;
-	    $stusec{$_}=$section;
-	    $fullname{$_}=$fullname;
+    for (var i=0; i<radioButton.length; i++) {
+	radioButton[i].checked=false;
+	if (pts == i) {
+	   radioButton[i].checked=true;
 	}
     }
-    my %seen = ();
-    foreach my $item (@holdsec) {
-	push (@sections, $item) unless $seen{$item}++;
-    }
-    return (\%classlist,\@sections,\%allids,\%stusec,\%fullname);
-}
+    updateSelect(formsel);
+    scores.value = "0";
+  }
 
-sub getpartlist {
-    my ($url) = @_;
-    my @parts =();
-    my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
-    foreach my $key (@metakeys) {
-	if ( $key =~ m/stores_([0-9]+)_.*/) {
-	    push(@parts,$key);
+  function writeBox(formrad,formsel,pts,scores) {
+    formrad.value = pts;
+    scores.value = "0";
+    updateSelect(formsel,pts);
+    return;
+  }
+
+  function clearRadBox(radioButton,formbox,formsel,scores) {
+    for (var i=0; i<formsel.length; i++) {
+	if (formsel[i].selected) {
+	    var selectx=i;
 	}
     }
-    return @parts;
-}
-
-sub print_hash {
-    my ($request, $hash) = @_;
-    $request->print('<table border=1><tr><td>Key</td><td>Value</td></tr>');
-    for (sort keys (%$hash)) {
-	$request->print('<tr><td>'.$_.'</td><td>'.$$hash{$_}.'&nbsp;</td></tr>');
+    if (selectx == scores.value) { return };
+    formbox.value = "";
+    for (var i=0; i<radioButton.length; i++) {
+	radioButton[i].checked=false;
     }
-    $request->print('</table>');
-    return '';
-}
-#
-# --------------------------- show submissions of a student, option to grade --------
-sub submission {
-    my ($request,$counter,$total) = @_;
+    scores.value = selectx;
+  }
 
-    (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) = &finduser($ENV{'form.student'});
-    if ($uname eq '') { &moreinfo($request,'Unable to find student'); return ''; }
+  function updateSelect(formsel) {
+    formsel[0].selected = true;
+    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' : '');
+//===================== Show list of keywords ====================
+  function keywords(keyform) {
+    var keywds = keyform.value;
+    var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keywds);
+    if (nret==null) return;
+    keyform.value = nret;
+
+    document.SCORE.refresh.value = "on";
+    if (document.SCORE.keywords.value != "") {
+	document.SCORE.submit();
+    }
+    return;
+  }
+
+//===================== Script to view submitted by ==================
+  function viewSubmitter(submitter) {
+    document.SCORE.refresh.value = "on";
+    document.SCORE.NCT.value = "1";
+    document.SCORE.unamedom0.value = submitter;
+    document.SCORE.submit();
+    return;
+  }
+
+//===================== Script to add keyword(s) ==================
+  function getSel() {
+    if (document.getSelection) txt = document.getSelection();
+    else if (document.selection) txt = document.selection.createRange().text;
+    else return;
+    var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
+    if (cleantxt=="") {
+	alert("Select a word or group of words from document and then click this link.");
+	return;
+    }
+    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";
+    if (document.SCORE.keywords.value != "") {
+	document.SCORE.submit();
+    }
+    return;
+  }
+
+//====================== Script for composing message ==============
+  function msgCenter(msgform,usrctr,fullname) {
+    var Nmsg  = msgform.savemsgN.value;
+    savedMsgHeader(Nmsg,usrctr,fullname);
+    var subject = msgform.msgsub.value;
+    var rtrchk  = eval("document.SCORE.includemsg"+usrctr);
+    var msgchk = rtrchk.value;
+    re = /msgsub/;
+    var shwsel = "";
+    if (re.test(msgchk)) { shwsel = "checked" }
+    displaySubject(subject,shwsel);
+    for (var i=1; i<=Nmsg; i++) {
+	var testpt = "savemsg"+i+",";
+	re = /testpt/;
+	shwsel = "";
+	if (re.test(msgchk)) { shwsel = "checked" }
+	var message = eval("document.SCORE.savemsg"+i+".value");
+	displaySavedMsg(i,message,shwsel);
+    }
+    newmsg = eval("document.SCORE.newmsg"+usrctr+".value");
+    shwsel = "";
+    re = /newmsg/;
+    if (re.test(msgchk)) { shwsel = "checked" }
+    newMsg(newmsg,shwsel);
+    msgTail(); 
+    return;
+  }
+
+  function savedMsgHeader(Nmsg,usrctr,fullname) {
+    var height = 30*Nmsg+250;
+    var scrollbar = "no";
+    if (height > 600) {
+	height = 600;
+	scrollbar = "yes";
+    }
+/*    if (window.pWin)
+	window.pWin.close(); */
+    pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx=70,screeny=75,width=600,height='+height);
+    pWin.document.write("<html><head>");
+    pWin.document.write("<title>Message Central</title>");
+
+    pWin.document.write("<script language=javascript>");
+    pWin.document.write("function checkInput() {");
+    pWin.document.write("  opener.document.SCORE.msgsub.value = document.msgcenter.msgsub.value;");
+    pWin.document.write("  var nmsg   = opener.document.SCORE.savemsgN.value;");
+    pWin.document.write("  var usrctr = document.msgcenter.usrctr.value;");
+    pWin.document.write("  var newval = eval(\\"opener.document.SCORE.newmsg\\"+usrctr);");
+    pWin.document.write("  newval.value = document.msgcenter.newmsg.value;");
+
+    pWin.document.write("  var msgchk = \\"\\";");
+    pWin.document.write("  if (document.msgcenter.subchk.checked) {");
+    pWin.document.write("     msgchk = \\"msgsub,\\";");
+    pWin.document.write("  }");
+    pWin.document.write(   "for (var i=1; i<=nmsg; i++) {");
+    pWin.document.write("      var opnmsg = eval(\\"opener.document.SCORE.savemsg\\"+i);");
+    pWin.document.write("      var frmmsg = eval(\\"document.msgcenter.msg\\"+i);");
+    pWin.document.write("      opnmsg.value = frmmsg.value;");
+    pWin.document.write("      var chkbox = eval(\\"document.msgcenter.msgn\\"+i);");
+    pWin.document.write("      if (chkbox.checked) {");
+    pWin.document.write("         msgchk += \\"savemsg\\"+i+\\",\\";");
+    pWin.document.write("      }");
+    pWin.document.write("  }");
+    pWin.document.write("  if (document.msgcenter.newmsgchk.checked) {");
+    pWin.document.write("     msgchk += \\"newmsg\\"+usrctr;");
+    pWin.document.write("  }");
+    pWin.document.write("  var includemsg = eval(\\"opener.document.SCORE.includemsg\\"+usrctr);");
+    pWin.document.write("  includemsg.value = msgchk;");
+
+    pWin.document.write("  self.close()");
+
+    pWin.document.write("}");
+
+    pWin.document.write("<");
+    pWin.document.write("/script>");
+
+    pWin.document.write("</head><body bgcolor=white>");
+
+    pWin.document.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
+    pWin.document.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
+    pWin.document.write("<font color=\\"green\\" size=+1>&nbsp;Compose Message for \"+fullname+\"</font><br><br>");
+
+    pWin.document.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
+    pWin.document.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
+    pWin.document.write("<td><b>Type</b></td><td><b>Include</b></td><td><b>Message</td></tr>");
+}
+    function displaySubject(msg,shwsel) {
+    pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
+    pWin.document.write("<td>Subject</td>");
+    pWin.document.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
+    pWin.document.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+" \\"size=\\"60\\" maxlength=\\"80\\"></td></tr>");
+}
+
+function displaySavedMsg(ctr,msg,shwsel) {
+    pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
+    pWin.document.write("<td align=\\"center\\">"+ctr+"</td>");
+    pWin.document.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"></td>");
+    pWin.document.write("<td><input name=\\"msg"+ctr+"\\" type=\\"text\\" value=\\""+msg+" \\" size=\\"60\\" maxlength=\\"80\\"></td></tr>");
+}
+
+  function 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>");
+}
+
+  function msgTail() {
+    pWin.document.write("</table>");
+    pWin.document.write("</td></tr></table>&nbsp;");
+    pWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
+    pWin.document.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+    pWin.document.write("</form>");
+    pWin.document.write("</body></html>");
+}
+
+//====================== Script for keyword highlight options ==============
+  function kwhighlight() {
+    var kwclr    = document.SCORE.kwclr.value;
+    var kwsize   = document.SCORE.kwsize.value;
+    var kwstyle  = document.SCORE.kwstyle.value;
+    var redsel = "";
+    var grnsel = "";
+    var blusel = "";
+    if (kwclr=="red")   {var redsel="checked"};
+    if (kwclr=="green") {var grnsel="checked"};
+    if (kwclr=="blue")  {var blusel="checked"};
+    var sznsel = "";
+    var sz1sel = "";
+    var sz2sel = "";
+    if (kwsize=="0")  {var sznsel="checked"};
+    if (kwsize=="+1") {var sz1sel="checked"};
+    if (kwsize=="+2") {var sz2sel="checked"};
+    var synsel = "";
+    var syisel = "";
+    var sybsel = "";
+    if (kwstyle=="")    {var synsel="checked"};
+    if (kwstyle=="<i>") {var syisel="checked"};
+    if (kwstyle=="<b>") {var sybsel="checked"};
+    highlightCentral();
+    highlightbody('red','red',redsel,'0','normal',sznsel,'','normal',synsel);
+    highlightbody('green','green',grnsel,'+1','+1',sz1sel,'<i>','italic',syisel);
+    highlightbody('blue','blue',blusel,'+2','+2',sz2sel,'<b>','bold',sybsel);
+    highlightend();
+    return;
+  }
+
+
+  function highlightCentral() {
+    hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx=100,screeny=75');
+    hwdWin.document.write("<html><head>");
+    hwdWin.document.write("<title>Highlight Central</title>");
+
+    hwdWin.document.write("<script language=javascript>");
+    hwdWin.document.write("function updateChoice(flag) {");
+    hwdWin.document.write("  opener.document.SCORE.kwclr.value = radioSelection(document.hlCenter.kwdclr);");
+    hwdWin.document.write("  opener.document.SCORE.kwsize.value = radioSelection(document.hlCenter.kwdsize);");
+    hwdWin.document.write("  opener.document.SCORE.kwstyle.value = radioSelection(document.hlCenter.kwdstyle);");
+    hwdWin.document.write("  opener.document.SCORE.refresh.value = \\"on\\";");
+    hwdWin.document.write("  if (opener.document.SCORE.keywords.value!=\\"\\"){");
+    hwdWin.document.write("     opener.document.SCORE.submit();");
+    hwdWin.document.write("  }");
+    hwdWin.document.write("  self.close()");
+    hwdWin.document.write("}");
+
+    hwdWin.document.write("function radioSelection(radioButton) {");
+    hwdWin.document.write("    var selection=null;");
+    hwdWin.document.write("    for (var i=0; i<radioButton.length; i++) {");
+    hwdWin.document.write("        if (radioButton[i].checked) {");
+    hwdWin.document.write("            selection=radioButton[i].value;");
+    hwdWin.document.write("            return selection;");
+    hwdWin.document.write("        }");
+    hwdWin.document.write("    }");
+    hwdWin.document.write("}");
+
+    hwdWin.document.write("<");
+    hwdWin.document.write("/script>");
+
+    hwdWin.document.write("</head><body bgcolor=white>");
+
+    hwdWin.document.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
+    hwdWin.document.write("<font color=\\"green\\" size=+1>&nbsp;Keyword Highlight Options</font><br><br>");
+
+    hwdWin.document.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
+    hwdWin.document.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
+    hwdWin.document.write("<td><b>Text Color</b></td><td><b>Font Size</b></td><td><b>Font Style</td></tr>");
+  }
+
+  function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) { 
+    hwdWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
+    hwdWin.document.write("<td align=\\"left\\">");
+    hwdWin.document.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+">&nbsp;"+clrtxt+"</td>");
+    hwdWin.document.write("<td align=\\"left\\">");
+    hwdWin.document.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+">&nbsp;"+sztxt+"</td>");
+    hwdWin.document.write("<td align=\\"left\\">");
+    hwdWin.document.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+">&nbsp;"+sytxt+"</td>");
+    hwdWin.document.write("</tr>");
+  }
+
+  function highlightend() { 
+    hwdWin.document.write("</table>");
+    hwdWin.document.write("</td></tr></table>&nbsp;");
+//    hwdWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(0)\\">&nbsp;&nbsp;");
+    hwdWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
+    hwdWin.document.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+    hwdWin.document.write("</form>");
+    hwdWin.document.write("</body></html>");
+  }
+
+</script>
+SUBJAVASCRIPT
+}
+
+
+# --------------------------- show submissions of a student, option to grade 
+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';
     my ($classlist,$seclist,$ids,$stusec,$fullname);
 
@@ -352,8 +769,8 @@
 	$request->print('<h2>&nbsp;<font color="#339933">Submission Record</font></h2>'.
 			'<font size=+1>&nbsp;<b>Resource: </b>'.$url.'</font>');
 
-	# option to display problem, only once else it cause problems with the form later 
-	# since the problem has a form.
+	# 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') {
 	    my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
 							      $ENV{'request.course.id'});
@@ -361,14 +778,16 @@
 								   $ENV{'request.course.id'});
 	    my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
 	    $result.='<table border="0" width="100%"><tr><td bgcolor="#e6ffff">';
-	    $result.='<b>Student\'s view of the problem</b></td></tr><tr><td bgcolor="#ffffff">'.$rendered.'<br />';
+	    $result.='<b> View of the problem for '.$ENV{'form.fullname'}.
+		'</b></td></tr><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);
 	}
 	
-	# kwclr is the only variable that is guaranteed to be non blank if this subroutine has been called once.
+	# kwclr is the only variable that is guaranteed to be non blank 
+        # if this subroutine has been called once.
 	my %keyhash = ();
 	if ($ENV{'form.kwclr'} eq '') {
 	    %keyhash = &Apache::lonnet::dump('nohist_handgrade',
@@ -385,6 +804,7 @@
 	    $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="refresh"    value="off" />'."\n".
@@ -425,32 +845,36 @@
 KEYWORDS
         }
     }
+
     my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
     my ($partlist,$handgrade) = &response_type($url);
-#    &print_hash($request,\%record);
 
-    # Student info
+    # Display student info
     $request->print(($counter == 0 ? '' : '<br />'));
-#    my $fullname = ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom));
     my $result='<table border="0" width=100%><tr><td bgcolor="#777777">'.
-	'<table border="0" width=100%><tr bgcolor="#ffffff"><td>';
+	'<table border="0" width=100%><tr bgcolor="#edffff"><td>';
+
+#    $result.='<table border="0"><tr bgcolor="#ffffff"><td><b>Fullname: </b>'.$ENV{'form.fullname'}.
+    $result.='<b>Fullname: </b>'.$ENV{'form.fullname'}.
+	'<font color="#999999">&nbsp; &nbsp;Username: '.$uname.'</font>'.
+	'<font color="#999999">&nbsp; &nbsp;Domain: '.$udom.'</font><br />';
 
-    $result.='<table border="0"><tr bgcolor="#ffffff"><td><b>Fullname: </b>'.$ENV{'form.fullname'}.
-#    $result.='<table border="0"><tr bgcolor="#ffffff"><td><b>Fullname: </b>'.$fullname.
-	'</td><td>&nbsp; &nbsp;<b>Username: </b>'.$uname.
-	'</td><td>&nbsp; &nbsp;<b>Domain: </b>'.$udom.'</td></tr>';
+    # If this is handgraded, then check for collaborators
+    my $col_flag = 0;
     if ($ENV{'form.handgrade'} eq 'yes') {
 	my @col_list;
 	($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist('all','0');
 	for (keys (%$handgrade)) {
-	    my $ncol = &Apache::lonnet::EXT('resource.'.$_.'.maxcollaborators',$symb,$udom,$uname);
+	    my $ncol = &Apache::lonnet::EXT('resource.'.$_.
+					    '.maxcollaborators',$symb,$udom,$uname);
 	    if ($ncol > 0) {
 		s/\_/\./g;
 		if ($record{'resource.'.$_.'.collaborators'} ne '') {
-		    my (@collaborators) = split(/,?\s+/,$record{'resource.'.$_.'.collaborators'});
+		    my (@collaborators) = split(/,?\s+/,
+						$record{'resource.'.$_.'.collaborators'});
 		    my (@badcollaborators);
 		    if (scalar(@collaborators) != 0) {
-			$result.='<tr bgcolor="#ffffff"><td colspan=3><b>Collaborators: </b>';
+			$result.='<b>Collaborators: </b>';
 			foreach my $collaborator (@collaborators) {
 			    $collaborator = $collaborator =~ /\@|:/ ? 
 				(split(/@|:/,$collaborator))[0] : $collaborator;
@@ -459,19 +883,21 @@
 				push @badcollaborators,$collaborator;
 				next;
 			    }
+			    $col_flag++;
 			    push @col_list, $collaborator;
-			    $result.=$$fullname{$collaborator.':'.$udom}.' ('.$collaborator.') &nbsp; &nbsp;';
+			    $result.=$$fullname{$collaborator.':'.$udom}.'&nbsp; &nbsp; &nbsp;';
 			}
-			$result.='</td></tr>'."\n";
-			$result.='<tr bgcolor="#ffbbbb"><td colspan=2>'.
-			    'This student has submitted '.(scalar (@badcollaborators) > 1 ? '' : 'an').
+			$result.='<br />'."\n";
+			$result.='<table border="0"><tr bgcolor="#ffbbbb"><td>'.
+			    'This student has submitted '.
+			    (scalar (@badcollaborators) > 1 ? '' : 'an').
 			    ' invalid collaborator'.(scalar (@badcollaborators) > 1 ? 's. ' : '. ').
-			    (join ', ',@badcollaborators).'</td></tr>' 
+			    (join ', ',@badcollaborators).'</td></tr></table>' 
 			    if (scalar(@badcollaborators) > 0);
 
-			$result.='<tr bgcolor="#ffbbbb"><td colspan=2>'.
+			$result.='<table border="0"><tr bgcolor="#ffbbbb"><td>'.
 			    'This student has submitted too many collaborators. Maximum is '.
-			    $ncol.'.</td></tr>' if (scalar(@collaborators) > $ncol);
+			    $ncol.'.</td></tr></table>' if (scalar(@collaborators) > $ncol);
 			$result.='<input type="hidden" name="collaborator'.$counter.
 			    '" value="'.(join ':',@col_list).'" />'."\n";
 		    }
@@ -479,22 +905,29 @@
 	    }
 	}
     }
-    $request->print($result.'</table>'."\n");
+    $request->print($result."\n");
 
-    # print student answer
+    # print student answer/submission
+    # Options are (1) Handgaded submission only
+    #             (2) Last submission, includes submission that is not handgraded 
+    #                  (for multi-response type part)
+    #             (3) Last submission plus the parts info
+    #             (4) The whole record for this student
     if ($ENV{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
 	if ($ENV{'form.'.$uname.':'.$udom.':submitted_by'}) {
-	    my $submitby='</td></tr><tr><td bgcolor="#e6ffff">'.
+	    my $submitby=''.
 		'<b>Collaborative submission by: </b>'.
-		'<a href="javascript:viewSubmitter(\''.$ENV{'form.'.$uname.':'.$udom.':submitted_by'}.
+		'<a href="javascript:viewSubmitter(\''.
+		$ENV{'form.'.$uname.':'.$udom.':submitted_by'}.
 		'\')"; TARGET=_self>'.
 		$$fullname{$ENV{'form.'.$uname.':'.$udom.':submitted_by'}}.'</a>';
-	    $submitby.='</td></tr><tr><td bgcolor="#ffffff">'."\n";
 	    $request->print($submitby);
 	} else {
-	    my ($string,$timestamp)=&get_last_submission ($symb,$uname,$udom,$ENV{'request.course.id'});
-	    my $lastsubonly.='</td></tr><tr><td bgcolor="#e6ffff"><b>Last Submission Only</b>'.
-		($$timestamp eq '' ? '' : '&nbsp; &nbsp; <b>Date Submitted:</b> '.$$timestamp).'</td></tr>';
+	    my ($string,$timestamp)=
+		&get_last_submission ($symb,$uname,$udom,$ENV{'request.course.id'});
+	    my $lastsubonly.=''.
+		($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
+		 $$timestamp).'';
 	    if ($$timestamp eq '') {
 		$lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0].'</td></tr>';
 	    } else {
@@ -503,11 +936,13 @@
 			my ($partid,$respid) = /^resource\.(\d+)\.(\d+)\.submission/;
 			if ($part eq ($partid.'_'.$respid)) {
 			    my ($ressub,$subval) = split(/:/,$_,2);
-			    $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part ID</b> '.
-				$partid.' <b>Response ID</b> '.$respid.
-				' <b>Submission</b> '.&keywords_highlight($subval).'</td></tr>'
+			    $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
+				$partid.'</b> <font color="#999999">( ID '.$respid.
+				' )</font>&nbsp; &nbsp;<b>Answer: </b>'.
+				&keywords_highlight($subval).'</td></tr>'
 				if ($ENV{'form.lastSub'} eq 'lastonly' || 
-				    ($ENV{'form.lastSub'} eq 'hdgrade' && $$handgrade{$part} =~ /:yes$/));
+				    ($ENV{'form.lastSub'} eq 'hdgrade' && 
+				     $$handgrade{$part} =~ /:yes$/));
 			}
 		    }
 		}
@@ -517,21 +952,26 @@
 	}
     } else {
 	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
-								 $ENV{'request.course.id'},$last,
-								 '.submission','Apache::grades::keywords_highlight'));
+								 $ENV{'request.course.id'},
+								 $last,'.submission',
+								 'Apache::grades::keywords_highlight'));
     }
     
-    # view submission with no grading option
+    # return if view submission with no grading option
     if ($ENV{'form.showgrading'} eq '') {
 	$request->print('</td></tr></table></td></tr></table></form>');
 	return;
     }
 
+    # Grading options
     $result='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".
 	'<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
 	'<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'.$udom.'" />'."\n";
     $result.='&nbsp;<a href="javascript:msgCenter(document.SCORE,'.$counter.
-	',\''.$fullname.'\')"; TARGET=_self>Compose Message</a><br />'."\n" if ($ENV{'form.handgrade'} eq 'yes');
+	',\''.$ENV{'form.fullname'}.'\')"; TARGET=_self>'.
+	'Compose Message to student'.($col_flag > 1 ? 's' : '').'</a>'.
+	'<br />&nbsp;(Message will be sent when you click on Save & Next below.)'."\n" 
+	if ($ENV{'form.handgrade'} eq 'yes');
     $request->print($result);
 
     my %seen = ();
@@ -543,14 +983,13 @@
 	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>');
+	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);
-
-	# display grading options
 	$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>';
+	$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
@@ -571,7 +1010,8 @@
 	    '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.')" /></td>'."\n";
+	    ',this.form.stores'.$counter.'_'.$partid.
+	    ','.$wgt.')" /></td>'."\n";
 	$result.='<td>/'.$wgt.' '.$wgtmsg.' </td><td>';
 
 	$result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
@@ -607,6 +1047,7 @@
     return '';
 }
 
+#--- Retrieve the last submission for all the parts
 sub get_last_submission {
     my ($symb,$username,$domain,$course)=@_;
     if ($symb) {
@@ -621,7 +1062,12 @@
 		}
 	    }
 	    foreach ((keys %lasthash)) {
-		if ($_ =~ /\.submission$/) {push @string, (join(':',$_,$lasthash{$_}))}
+		if ($_ =~ /\.submission$/) {
+		    my ($partid,$foo) = split(/submission$/,$_);
+		    my $draft  = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
+			'<font color="red">Draft Copy</font> ' : '';
+		    push @string, (join(':',$_,$draft.$lasthash{$_}));
+		}
 		if ($_ =~ /timestamp/) {$timestamp = scalar(localtime($lasthash{$_}))};
 	    }
 	}
@@ -630,18 +1076,20 @@
     }
 }
 
+#--- High light keywords, with style choosen by user.
 sub keywords_highlight {
-    my $string  = shift;
-    my $size    = $ENV{'form.kwsize'} eq '0' ? '' : 'size='.$ENV{'form.kwsize'};
-    my $styleon = $ENV{'form.kwstyle'} eq ''  ? '' : $ENV{'form.kwstyle'};
+    my $string    = shift;
+    my $size      = $ENV{'form.kwsize'} eq '0' ? '' : 'size='.$ENV{'form.kwsize'};
+    my $styleon   = $ENV{'form.kwstyle'} eq ''  ? '' : $ENV{'form.kwstyle'};
     (my $styleoff = $styleon) =~ s/\</\<\//;
-    my @keylist = split(/[,\s+]/,$ENV{'form.keywords'});
+    my @keylist   = split(/[,\s+]/,$ENV{'form.keywords'});
     foreach (@keylist) {
 	$string =~ s/\b$_(\b|\.)/\<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff\<\/font\>/gi;
     }
     return $string;
 }
 
+#--- Called from submission routine
 sub processHandGrade {
     my ($request) = shift;
     my $url    = $ENV{'form.url'};
@@ -650,16 +1098,57 @@
     my $ngrade = $ENV{'form.NCT'};
     my $ntstu  = $ENV{'form.NTSTU'};
 
+    if ($button eq 'Save & Next') {
+	my $ctr = 0;
+	while ($ctr < $ngrade) {
+	    my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
+	    my ($errorflg) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
+	    return '' if ($errorflg eq 'error');
+
+	    my $includemsg = $ENV{'form.includemsg'.$ctr};
+	    my ($subject,$message,$msgstatus) = ('','','');
+	    if ($includemsg =~ /savemsg|new$ctr/) {
+		$subject = $ENV{'form.msgsub'} if ($includemsg =~ /^msgsub/);
+		my (@msgnum) = split(/,/,$includemsg);
+		foreach (@msgnum) {
+		    $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
+		}
+		$message =~ s/\s+/ /g;
+		$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,
+							       $ENV{'form.msgsub'},$message);
+	    }
+	    if ($ENV{'form.collaborator'.$ctr}) {
+		my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
+		foreach (@collaborators) {
+		    &saveHandGrade($request,$url,$symb,$_,$udom,$ctr,
+				   $ENV{'form.unamedom'.$ctr});
+		    if ($message ne '') {
+			$msgstatus = &Apache::lonmsg::user_normal_msg ($_,$udom,
+								       $ENV{'form.msgsub'},
+								       $message);
+		    }
+		}
+	    }
+	    $ctr++;
+	}
+    }
+
+    # Keywords sorted in alphabatical order
     my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
     my %keyhash = ();
     $ENV{'form.keywords'}           =~ s/,\s{0,}|\s+/ /g;
     $ENV{'form.keywords'}           =~ s/^\s+|\s+$//;
+    my (@keywords) = sort(split(/\s+/,$ENV{'form.keywords'}));
+    $ENV{'form.keywords'} = join(' ',@keywords);
     $keyhash{$symb.'_keywords'}     = $ENV{'form.keywords'};
     $keyhash{$symb.'_subject'}      = $ENV{'form.msgsub'};
     $keyhash{$loginuser.'_kwclr'}   = $ENV{'form.kwclr'};
     $keyhash{$loginuser.'_kwsize'}  = $ENV{'form.kwsize'};
     $keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
 
+    # message center - Order of message gets changed. Blank line is eliminated.
+    # New messages are saved in ENV for the next student.
+    # All messages are saved in nohist_handgrade.db
     my ($ctr,$idx) = (1,1);
     while ($ctr <= $ENV{'form.savemsgN'}) {
 	if ($ENV{'form.savemsg'.$ctr} ne '') {
@@ -684,51 +1173,19 @@
 	 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 	 $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
 
+    # Called by Save & Refresh from Highlight Attribute Window
     if ($ENV{'form.refresh'} eq 'on') {
 	my $ctr = 0;
 	$ENV{'form.NTSTU'}=$ngrade;
 	while ($ctr < $ngrade) {
-	    ($ENV{'form.student'},my $udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
+	    ($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$ENV{'form.unamedom'.$ctr});
 	    &submission($request,$ctr,$ngrade-1);
 	    $ctr++;
 	}
 	return '';
     }
 
-    if ($button eq 'Save & Next') {
-	my $ctr = 0;
-	while ($ctr < $ngrade) {
-	    my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
-	    my ($errorflg) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
-	    return '' if ($errorflg eq 'error');
-
-	    my $includemsg = $ENV{'form.includemsg'.$ctr};
-	    my ($subject,$message,$msgstatus) = ('','','');
-	    if ($includemsg =~ /savemsg|new$ctr/) {
-		$subject = $ENV{'form.msgsub'} if ($includemsg =~ /^msgsub/);
-		my (@msgnum) = split(/,/,$includemsg);
-		foreach (@msgnum) {
-		    $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
-		}
-		$message =~ s/\s+/ /g;
-		$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,
-							       $ENV{'form.msgsub'},$message);
-	    }
-	    if ($ENV{'form.collaborator'.$ctr}) {
-		my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
-		foreach (@collaborators) {
-		    &saveHandGrade($request,$url,$symb,$_,$udom,$ctr,
-				   $ENV{'form.unamedom'.$ctr});
-		    if ($message ne '') {
-			$msgstatus = &Apache::lonmsg::user_normal_msg ($_,$udom,
-								       $ENV{'form.msgsub'},
-								       $message);
-		    }
-		}
-	    }
-	    $ctr++;
-	}
-    }
+    # Get the next/previous one or group of students
     my $firststu = $ENV{'form.unamedom0'};
     my $laststu = $ENV{'form.unamedom'.($ngrade-1)};
     $ctr = 2;
@@ -737,11 +1194,11 @@
 	$ctr++;
 	$laststu = $firststu if ($ctr > $ngrade);
     }
-    my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($ENV{'form.section'},'0');
 
+    my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($ENV{'form.section'},'0');
     my (@parsedlist,@nextlist);
     my ($nextflg) = 0;
-    foreach ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) {
+    foreach (sort {$$fullname{$a} cmp $$fullname{$b} } keys %$fullname) {
 	if ($nextflg == 1 && $button =~ /Next$/) {
 	    push @parsedlist,$_;
 	}
@@ -757,11 +1214,11 @@
     foreach my $student (@parsedlist) {
 	my ($uname,$udom) = split(/:/,$student);
 	if ($ENV{'form.submitonly'} eq 'yes') {
-	    my (%status) = &student_gradeStatus($ENV{'form.url'},$udom,$uname,$partlist) ;
+	    my (%status) = &student_gradeStatus($ENV{'form.url'},$symb,$udom,$uname,$partlist) ;
 	    my $statusflg = '';
 	    foreach (keys(%status)) {
 		$statusflg = 1 if ($status{$_} ne 'nothing');
-		my ($foo,$partid,$foo1) = split(/\./,$_);
+		my ($foo,$partid,$foo1) = split(/\./);
 		$statusflg = '' if ($status{'resource.'.$partid.'.submitted_by'} ne '');
 	    }
 	    next if ($statusflg eq '');
@@ -775,7 +1232,8 @@
 
     foreach (sort @nextlist) {
 	my ($uname,$udom,$submitter) = split(/:/);
-	$ENV{'form.student'} = $uname;
+	$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>";
@@ -792,237 +1250,63 @@
     return '';
 }
 
+#---- Save the score and award for each student, if changed
 sub saveHandGrade {
     my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter) = @_;
-#   my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
+    my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
     my %newrecord;
     foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
 	if ($ENV{'form.GD_SEL'.$newflg.'_'.$_} eq 'excused') {
-	    $newrecord{'resource.'.$_.'.solved'} = 'excused';
+	    $newrecord{'resource.'.$_.'.solved'} = 'excused' 
+		if ($record{'resource.'.$_.'.solved'} ne 'excused');
 	} else {
-	    my $pts    = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ? 
-			  $ENV{'form.GD_BOX'.$newflg.'_'.$_} : $ENV{'form.RADVAL'.$newflg.'_'.$_});
+	    my $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ? 
+		       $ENV{'form.GD_BOX'.$newflg.'_'.$_} : 
+		       $ENV{'form.RADVAL'.$newflg.'_'.$_});
 	    if ($pts eq '') {
-		&userError($request,'No point was assigned for part id '.$_.' and for username '.$stuname.'.');
+		&userError($request,'No point was assigned for part '.$_.
+			   ' and for username '.$stuname.'.');
 		return 'error';
 	    }
-	    my $wgt    = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 : $ENV{'form.WGT'.$newflg.'_'.$_};
+	    my $wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 : 
+		$ENV{'form.WGT'.$newflg.'_'.$_};
 	    my $partial= $pts/$wgt;
-	    $newrecord{'resource.'.$_.'.awarded'}  = $partial;
+	    $newrecord{'resource.'.$_.'.awarded'}  = $partial 
+		if ($record{'resource.'.$_.'.awarded'} ne $partial);
+	    my $reckey = 'resource.'.$_.'.solved';
 	    if ($partial == 0) {
-		$newrecord{'resource.'.$_.'.solved'} = 'incorrect_by_override';
+		$newrecord{$reckey} = 'incorrect_by_override' 
+		    if ($record{$reckey} ne 'incorrect_by_override');
 	    } else {
-		$newrecord{'resource.'.$_.'.solved'} = 'correct_by_override';
+		$newrecord{$reckey} = 'correct_by_override' 
+		    if ($record{$reckey} ne 'correct_by_override');
 	    }
-	    $newrecord{'resource.'.$_.'.submitted_by'} = $submitter if ($submitter);
+	    $newrecord{'resource.'.$_.'.submitted_by'} = $submitter 
+		if ($submitter && ($record{'resource.'.$_.'.submitted_by'} ne $submitter));
 	}
     }
-    
-    if ( scalar(keys(%newrecord)) > 0 ) {
-	$newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
-#	&print_hash($request,\%newrecord);
-	&Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname);
-    }
-    return '';
-}
-
-sub get_symb_and_url {
-    my ($request) = @_;
-    (my $url=$ENV{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
-    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 ''; }
-    return ($symb,$url);
-}
-
-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;
-}
 
-sub gradingmenu {
-    my ($request) = @_;
-    my ($symb,$url)=&get_symb_and_url($request);
-    if (!$symb) {return '';}
-    my $result='<h2>&nbsp;<font color="#339933">Select a Grading Method</font></h2>';
-    $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 ID: </b>'.(split(/_/))[0].'</td>'.
-	    '<td><b>Type: </b>'.$responsetype.'</td>'.
-	    '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
+    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);
     }
-    $result.='</table>';
-    $result.=&view_edit_entire_class_form($symb,$url).'<br />';
-    $result.=&upcsvScores_form($symb,$url).'<br />';
-    $result.=&viewGradeaStu_form($symb,$url,$resptype,$hdgrade).'<br />';
-    $result.=&verifyReceipt_form($symb,$url).'<br />';
-    $result.=&view_classlist_form($symb,$url);
-
-    return $result;
-}
-
-sub view_classlist_form {
-    my ($symb,$url)=@_;
-    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>View Class List</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="viewclasslist" />'."\n";
-    $result.='&nbsp;<input type="submit" name="submit" value="View Class" /></form>'."\n";
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
-    return $result;
-}
-
-sub viewclasslist {
-    my ($request) = shift;
-    my ($coursedomain,$coursenum) = split(/_/,$ENV{'request.course.id'});
-    my %classlist=&Apache::lonnet::dump('classlist',$coursedomain,$coursenum);
-    $request->print('<table border=1>');
-    foreach (sort keys(%classlist)) {
-#    my ($unam,$udom) = split(/:/,$_,2);
-#    my $section = &Apache::lonnet::usection($udom,$unam,$ENV{'request.course.id'});
-#    my $fullname = &get_fullname ($unam,$udom);
-#    my @uname;
-#    $uname[0]=$unam;
-#    my %userid=&Apache::lonnet::idrget($udom,@uname);
-#    my $value=$classlist{$_}.':'.$userid{$unam}.':'.$section.':'.$fullname;
-#    $classlist{$_}=$value;
-	$request->print('<tr><td>'.$_.' </td><td><pre> '.$classlist{$_}.'</pre></td></tr>');
-    }
-    $request->print('</table>');
-#  my $putresult = &Apache::lonnet::put
-#      ('classlist',\%classlist,
-#       $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-#       $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
     return '';
 }
 
-sub view_edit_entire_class_form {
-    my ($symb,$url)=@_;
-    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>View/Grade Entire Section/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";
-    foreach (sort (@$sections)) {
-	$result.= '<option>'.$_.'</option>'."\n";
-    }
-    $result.='<option selected="on">all</select>'."<br />\n";
-    $result.='&nbsp;<input type="submit" name="submit" value="View/Grade" /></form>'."\n";
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
-    return $result;
-}
-
-sub upcsvScores_form {
-    my ($symb,$url) = @_;
-    if (!$symb) {return '';}
-    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>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="submit" name="submit" value="Upload Grades" />
-</form>
-ENDUPFORM
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
-    return $result;
-}
-
-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>View/Grade 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";
-    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 />';
-    $result.='&nbsp;(Section "no" implies the students were not assigned a section.)<br />' 
-	if (grep /no/,@$sections);
-    
-    $result.='<br />&nbsp;<input type="submit" name="submit" value="View/Grade" />'."\n".
-	'</form>'."\n";
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
-    return $result;
-}
-
-sub verifyReceipt_form {
-    my ($symb,$url) = @_;
-    my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
-    my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
-    my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});
-
-    my $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">'."\n";
-    $result.='&nbsp;<tt>'.$hostver.'-<input type="text" name="receipt" size="4"></tt><br />'."\n";
-    $result.='&nbsp;<input type="submit" name="submit" 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'}.'" />';
-    }
-    if ($ENV{'form.symb'}) {
-	$result.='<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />';
-    }
-    $result.='</form>';
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
-    return $result;
-}
-
+#--------------------------------------------------------------------------------------
+#
+#-------------------------- Next few routines handles grading by section or whole class
+#
+#--- Javascript to handle grading by section or whole class
 sub viewgrades_js {
     my ($request) = shift;
 
     $request->print(<<VIEWJAVASCRIPT);
 <script type="text/javascript" language="javascript">
-    function viewOneStudent(user) {
+    function viewOneStudent(user,domain) {
 	document.onestudent.student.value = user;
+	document.onestudent.userdom.value = domain;
 	document.onestudent.submit();
     }
 
@@ -1045,6 +1329,14 @@
 		}
 		return;
 	    }
+	    if (point > weight) {
+		var resp = confirm("You entered a value ("+point+
+				   ") greater than the weight for the part. Accept?");
+		if (resp == false) {
+		    textbox.value = "";
+		    return;
+		}
+	    }
 	    for (var i=0; i<radioButton.length; i++) {
 		radioButton[i].checked=false;
 		if (point == i) {
@@ -1117,6 +1409,23 @@
 
     function changeSelect(partid,user) {
 	var selval = eval("document.classgrade.GD_"+user+'_'+partid+"_sv");
+	var textbox = eval("document.classgrade.GD_"+user+'_'+partid+"_aw");
+	var point  = textbox.value;
+	var weight = eval("document.classgrade.weight_"+partid+".value");
+
+	if (isNaN(point) || point < 0) {
+	    alert("A number equal or greater than 0 is expected. Entered value = "+point);
+	    textbox.value = "";
+	    return;
+	}
+	if (point > weight) {
+	    var resp = confirm("You entered a value ("+point+
+			       ") greater than the weight of the part. Accept?");
+	    if (resp == false) {
+		textbox.value = "";
+		return;
+	    }
+	}
 	selval[0].selected = true;
     }
 
@@ -1161,14 +1470,11 @@
 	}
     }
 
-    function submitForm() {
-	document.classgrade.submit();
-    }
-
 </script>
 VIEWJAVASCRIPT
 }
 
+#--- show scores for a section or whole class w/ option to change/update a score
 sub viewgrades {
     my ($request) = shift;
     &viewgrades_js($request);
@@ -1184,9 +1490,10 @@
 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
 	'<input type="hidden" name="command" value="submission" />'."\n".
 	'<input type="hidden" name="student" value="" />'."\n".
+	'<input type="hidden" name="userdom" value="" />'."\n".
 	'</form>'."\n";
 
-    #start the form
+    #beginning of class grading form
     $result.= '<form action="/adm/grades" method="post" name="classgrade">'."\n".
 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
@@ -1195,10 +1502,12 @@
 
     $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 score that has already '.
+	'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>';
 
+    #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 %weight = ();
     my $ctsparts = 0;
@@ -1209,8 +1518,11 @@
 	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
 	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
 
-	$result.='<input type="hidden" name="partid_'.$ctsparts.'" value="'.$partid.'" />'."\n";
-	$result.='<tr><td><b>Part ID:</b> '.$partid.'&nbsp; &nbsp;</td><td>';
+	$result.='<input type="hidden" name="partid_'.
+	    $ctsparts.'" value="'.$partid.'" />'."\n";
+	$result.='<input type="hidden" name="weight_'.
+	    $partid.'" value="'.$weight{$partid}.'" />'."\n";
+	$result.='<tr><td><b>Part  '.$partid.'&nbsp; &nbsp;Point:</b> </td><td>';
 	$result.='<table border="0"><tr>';  
 	my $ctr = 0;
 	while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across
@@ -1221,8 +1533,10 @@
 	    $ctr++;
 	}
 	$result.='</tr></table>';
-	$result.= '</td><td><b> or </b><input type="text" name="TEXTVAL_'.$partid.'" size="4" '.
-	    'onChange="javascript:writePoint('.$partid.','.$weight{$partid}.',\'textval\')" /> /'.
+	$result.= '</td><td><b> or </b><input type="text" name="TEXTVAL_'.
+	    $partid.'" size="4" '.
+	    'onChange="javascript:writePoint('.$partid.','.$weight{$partid}.
+	    ',\'textval\')" /> /'.
 	    $weight{$partid}.' (problem weight)</td>'."\n";
 	$result.= '</td><td><select name="SELVAL_'.$partid.'"'.
 	    'onChange="javascript:writeRadText('.$partid.','.$weight{$partid}.')" /> '.
@@ -1234,13 +1548,14 @@
     $result.='<input type="button" value="Reset" '.
 	'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self> &nbsp; &nbsp;';
 #    $result.='<input type="button" value="Submit Changes" '.
-#	'onClick="document.classgrade.submit();" TARGET=_self />'."\n";
+#	'onClick="submit();" TARGET=_self />'."\n";
     $result.= '<input type="submit" name="submit"  value="Submit Changes" />'."\n";
 
+    #table listing all the students in a section/class
+    #header of table
     $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
 	'<table border=0><tr bgcolor="#deffff">'.
-	'<td><b>Username</b></td><td><b>Fullname</b></td><td><b>Domain</b></td>'."\n";
-    #get list of parts for this problem
+	'<td><b>Fullname</b></td><td><b>Username</b></td><td><b>Domain</b></td>'."\n";
     my (@parts) = sort(&getpartlist($url));
     foreach my $part (@parts) {
 	my $display=&Apache::lonnet::metadata($url,$part.'.display');
@@ -1257,12 +1572,14 @@
 	$result.='<td><b>'.$display.'</b></td>'."\n";
     }
     $result.='</tr>';
+
     #get info for each student
+    #list all the students - with points and grade status
     my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($ENV{'form.section'},'0');
     my $ctr = 0;
-    foreach ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) {
-	(my $username = $_) = split(/:/);
-	$result.='<input type="hidden" name="ctr'.$ctr.'" value="'.$username.'" />'."\n";
+    foreach (sort {$$fullname{$a} cmp $$fullname{$b} } keys %$fullname) {
+	my ($uname,$udom) = split(/:/);
+	$result.='<input type="hidden" name="ctr'.$ctr.'" value="'.$uname.'" />'."\n";
 	$result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
 				   $_,$$fullname{$_},\@parts,\%weight);
 	$ctr++;
@@ -1274,13 +1591,15 @@
     return $result;
 }
 
+#--- call by previous routine to display each student
 sub viewstudentgrade {
     my ($url,$symb,$courseid,$student,$fullname,$parts,$weight) = @_;
-    my ($username,$domain) = split(/:/,$student);
-    my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$username);
+    my ($uname,$udom) = split(/:/,$student);
+    my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
     my $result='<tr bgcolor="#ffffdd"><td>'.
-	'<a href="javascript:viewOneStudent(\''.$username.'\')"; TARGET=_self>'.$username.'</a>'.
-	'</td><td>'.$fullname.'</td><td align="middle">'.$domain.'</td>'."\n";
+	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
+	'\')"; TARGET=_self>'.$fullname.'</a>'.
+	'</td><td>'.$uname.'</td><td align="middle">'.$udom.'</td>'."\n";
     foreach my $part (@$parts) {
 	my ($temp,$part,$type)=split(/_/,$part);
 	my $score=$record{"resource.$part.$type"};
@@ -1288,19 +1607,19 @@
 	if ($type eq 'awarded') {
 	    my $pts = $score eq '' ? '' : $score*$$weight{$part};
 	    $result.='<input type="hidden" name="'.
-		'GD_'.$username.'_'.$part.'_aw_s" value="'.$pts.'" />'."\n";
+		'GD_'.$uname.'_'.$part.'_aw_s" value="'.$pts.'" />'."\n";
 	    $result.='<td align="middle"><input type="text" name="'.
-		'GD_'.$username.'_'.$part.'_aw"'.
-		'onChange="javascript:changeSelect('.$part.',\''.$username.'\')" value="'.
-		$pts.'" size="4" /></td>'."\n";
+		'GD_'.$uname.'_'.$part.'_aw" '.
+		'onChange="javascript:changeSelect('.$part.',\''.$uname.
+		'\')" value="'.$pts.'" size="4" /></td>'."\n";
 	} elsif ($type eq 'solved') {
 	    my ($status,$foo)=split(/_/,$score,2);
 	    $status = 'nothing' if ($status eq '');
 	    $result.='<input type="hidden" name="'.
-		'GD_'.$username.'_'.$part.'_sv_s" value="'.$status.'" />'."\n";
+		'GD_'.$uname.'_'.$part.'_sv_s" value="'.$status.'" />'."\n";
 	    $result.='<td align="middle"><select name="'.
-		'GD_'.$username.'_'.$part.'_sv" '.
-		'onChange="javascript:changeOneScore('.$part.',\''.$username.'\')" >'."\n";
+		'GD_'.$uname.'_'.$part.'_sv" '.
+		'onChange="javascript:changeOneScore('.$part.',\''.$uname.'\')" >'."\n";
 	    my $optsel = '<option selected="on"> </option><option>excused</option>'."\n";
 	    $optsel = '<option> </option><option selected="on">excused</option>'."\n"
 		if ($status eq 'excused');
@@ -1312,460 +1631,110 @@
     return $result;
 }
 
-
+#--- change scores for all the students in a section/class
+#    record does not get update if unchanged
 sub editgrades {
     my ($request) = @_;
 
     my $symb=$ENV{'form.symb'};
     my $url =$ENV{'form.url'};
-    my $result='<h2><font color="#339933">Current Grade Status</font></h2>';
-    $result.='<font size=+1><b>Resource: </b>'.$ENV{'form.url'}.'</font><br />'."\n";
-    $result.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\n";
-    $result.= &show_grading_menu_form ($symb,$url);
-    $result.= '<table border="0"><tr><td bgcolor="#777777">'."\n";
+    my $title='<h2><font color="#339933">Current Grade Status</font></h2>';
+    $title.='<font size=+1><b>Resource: </b>'.$ENV{'form.url'}.'</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";
 
     my %scoreptr = (
 		    'correct'  =>'correct_by_override',
 		    'incorrect'=>'incorrect_by_override',
-		    'excused'  =>'excused',
-		    'ungraded' =>'ungraded_attempted',
-		    'nothing'  => '',
-		    );
-    my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($ENV{'form.section'},'0');
-
-    my (@partid);
-    my %weight = ();
-    my ($i,$ctr) = (0,0);
-    while ($ctr < $ENV{'form.totalparts'}) {
-	my $partid = $ENV{'form.partid_'.$ctr};
-	push @partid,$partid;
-	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
-	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
-	$ctr++;
-	$result .= '<td colspan = 2 align="center"><b>Part ID '.$partid.
-	    '</b> (Weight = '.$weight{$partid}.')</td>';
-    }
-    $result .= '</tr><tr bgcolor="#deffff">';
-    foreach (@partid) {
-	$result .= '<td align="center">&nbsp;<b>Old Score</b>&nbsp;</td>'.
-	    '<td align="center">&nbsp;<b>New Score</b>&nbsp;</td>';
-    }
-    $result .= '</tr>'."\n";
-
-    for ($i=0; $i<$ENV{'form.total'}; $i++) {
-	my $user = $ENV{'form.ctr'.$i};
-	my %newrecord;
-	my $updateflag = 0;
-	my @userdom = grep /^$user:/,keys %$classlist;
-	my ($foo,$udom) = split(/:/,$userdom[0]);
-
-	$result .= '<tr bgcolor="#ffffde"><td>'.$user.'&nbsp;</td><td>'.
-	    $$fullname{$userdom[0]}.'&nbsp;</td>';
-
-	foreach (@partid) {
-	    my $old_aw    = $ENV{'form.GD_'.$user.'_'.$_.'_aw_s'};
-	    my $old_part  = $old_aw eq '' ? '' : $old_aw/$weight{$_};
-	    my $old_score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_sv_s'}};
-
-	    my $awarded   = $ENV{'form.GD_'.$user.'_'.$_.'_aw'};
-	    my $partial   = $awarded eq '' ? '' : $awarded/$weight{$_};
-	    my $score;
-	    if ($partial eq '') {
-		$score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_sv_s'}};
-	    } elsif ($partial > 0) {
-		$score = 'correct_by_override';
-	    } elsif ($partial == 0) {
-		$score = 'incorrect_by_override';
-	    }
-	    $score = 'excused' if (($ENV{'form.GD_'.$user.'_'.$_.'_sv'} eq 'excused') &&
-				   ($score ne 'excused'));
-	    $result .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
-		'<td align="center">'.$awarded.
-		($score eq 'excused' ? $score : '').'&nbsp;</td>';
-
-	    next if ($old_part eq $partial && $old_score eq $score);
-
-	    $updateflag = 1;
-	    $newrecord{'resource.'.$_.'.awarded'}  = $partial if $partial ne '';
-	    $newrecord{'resource.'.$_.'.solved'} = $score;
-
-	}
-	$result .= '</tr>'."\n";
-	if ($updateflag) {
-	    $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";
-    return $result;
-}
-
-
-#FIXME need to look at the metadata <stores> spec on what type of data to accept and provide an
-#interface based on that, also do that to above function.
-sub setstudentgrade {
-    my ($url,$symb,$courseid,$student,@parts) = @_;
-    my $result ='';
-    my ($stuname,$domain) = split(/:/,$student);
-    my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);
-    my %newrecord;
-
-    foreach my $part (@parts) {
-	my ($temp,$part,$type)=split(/_/,$part);
-	my $oldscore=$record{"resource.$part.$type"};
-	my $newscore=$ENV{"form.GD.$student.$part.$type"};
-	if ($type eq 'solved') {
-	    my $update=0;
-	    if ($newscore eq 'nothing' ) {
-		if ($oldscore ne '') {
-		    $update=1;
-		    $newscore = '';
-		}
-	    } elsif ($oldscore !~ m/^$newscore/) {
-		$update=1;
-		$result.="Updating $stuname to $newscore<br />\n";
-		if ($newscore eq 'correct')   { $newscore = 'correct_by_override'; }
-		if ($newscore eq 'incorrect') { $newscore = 'incorrect_by_override'; }
-		if ($newscore eq 'excused')   { $newscore = 'excused'; }
-		if ($newscore eq 'ungraded')  { $newscore = 'ungraded_attempted'; }
-	    } else {
-		#$result.="$stuname:$part:$type:unchanged  $oldscore to $newscore:<br />\n";
-	    }
-	    if ($update) { $newrecord{"resource.$part.$type"}=$newscore; }
-	} else {
-	    if ($oldscore ne $newscore) {
-		$newrecord{"resource.$part.$type"}=$newscore;
-		$result.="Updating $student"."'s status for $part.$type to $newscore<br />\n";
-	    } else {
-		#$result.="$stuname:$part:$type:unchanged  $oldscore to $newscore:<br />\n";
-	    }
-	}
-    }
-    if ( scalar(keys(%newrecord)) > 0 ) {
-	$newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
-#       &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);
-
-	$result.="Stored away ".scalar(keys(%newrecord))." elements.<br />\n";
-    }
-    return $result;
-}
-
-
-sub sub_page_js {
-    my $request = shift;
-    $request->print(<<SUBJAVASCRIPT);
-<script type="text/javascript" language="javascript">
-  function updateRadio(radioButton,formtextbox,formsel,scores) {
-     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;
-	   }
-	}
-	if (!resetbox) {
-	   formtextbox.value = "";
-	}
-	return;
-    }
-
-    for (var i=0; i<radioButton.length; i++) {
-	radioButton[i].checked=false;
-	if (pts == i) {
-	   radioButton[i].checked=true;
-	}
-    }
-    updateSelect(formsel);
-    scores.value = "0";
-  }
-
-  function writeBox(formrad,formsel,pts,scores) {
-    formrad.value = pts;
-    scores.value = "0";
-    updateSelect(formsel,pts);
-    return;
-  }
-
-  function clearRadBox(radioButton,formbox,formsel,scores) {
-    for (var i=0; i<formsel.length; i++) {
-	if (formsel[i].selected) {
-	    var selectx=i;
-	}
-    }
-    if (selectx == scores.value) { return };
-    formbox.value = "";
-    for (var i=0; i<radioButton.length; i++) {
-	radioButton[i].checked=false;
-    }
-    scores.value = selectx;
-  }
-
-  function updateSelect(formsel) {
-    formsel[0].selected = true;
-    return;
-  }
-
-//===================== Show list of keywords ====================
-  function keywords(keyform) {
-    var keywds = keyform.value;
-    var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keywds);
-    if (nret==null) return;
-    keyform.value = nret;
-    return;
-  }
-
-//===================== Script to view submitted by ==================
-  function viewSubmitter(submitter) {
-    document.SCORE.refresh.value = "on";
-    document.SCORE.NCT.value = "1";
-    document.SCORE.unamedom0.value = submitter;
-    document.SCORE.submit();
-    return;
-  }
-
-//===================== Script to add keyword(s) ==================
-  function getSel() {
-    if (document.getSelection) txt = document.getSelection();
-    else if (document.selection) txt = document.selection.createRange().text;
-    else return;
-    var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
-    if (cleantxt=="") {
-	alert("Select a word or group of words from document and then click this link.");
-	return;
-    }
-    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;
-    return;
-  }
-
-//====================== Script for composing message ==============
-  function msgCenter(msgform,usrctr,fullname) {
-    var Nmsg  = msgform.savemsgN.value;
-    savedMsgHeader(Nmsg,usrctr,fullname);
-    var subject = msgform.msgsub.value;
-    var rtrchk  = eval("document.SCORE.includemsg"+usrctr);
-    var msgchk = rtrchk.value;
-//    alert("checked=>"+msgchk);
-    re = /msgsub/;
-    var shwsel = "";
-    if (re.test(msgchk)) { shwsel = "checked" }
-    displaySubject(subject,shwsel);
-    for (var i=1; i<=Nmsg; i++) {
-	var testpt = "savemsg"+i+",";
-	re = /testpt/;
-	shwsel = "";
-	if (re.test(msgchk)) { shwsel = "checked" }
-	var message = eval("document.SCORE.savemsg"+i+".value");
-	displaySavedMsg(i,message,shwsel);
-    }
-    newmsg = eval("document.SCORE.newmsg"+usrctr+".value");
-    shwsel = "";
-    re = /newmsg/;
-    if (re.test(msgchk)) { shwsel = "checked" }
-    newMsg(newmsg,shwsel);
-    msgTail(); 
-    return;
-  }
-
-  function savedMsgHeader(Nmsg,usrctr,fullname) {
-    var height = 30*Nmsg+250;
-    var scrollbar = "no";
-    if (height > 600) {
-	height = 600;
-	scrollbar = "yes";
-    }
-/*    if (window.pWin)
-	window.pWin.close(); */
-    pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx=70,screeny=75,width=600,height='+height);
-    pWin.document.write("<html><head>");
-    pWin.document.write("<title>Message Central</title>");
-
-    pWin.document.write("<script language=javascript>");
-    pWin.document.write("function checkInput() {");
-    pWin.document.write("  opener.document.SCORE.msgsub.value = document.msgcenter.msgsub.value;");
-    pWin.document.write("  var nmsg   = opener.document.SCORE.savemsgN.value;");
-    pWin.document.write("  var usrctr = document.msgcenter.usrctr.value;");
-    pWin.document.write("  var newval = eval(\\"opener.document.SCORE.newmsg\\"+usrctr);");
-    pWin.document.write("  newval.value = document.msgcenter.newmsg.value;");
-
-    pWin.document.write("  var msgchk = \\"\\";");
-    pWin.document.write("  if (document.msgcenter.subchk.checked) {");
-    pWin.document.write("     msgchk = \\"msgsub,\\";");
-    pWin.document.write("  }");
-    pWin.document.write(   "for (var i=1; i<=nmsg; i++) {");
-    pWin.document.write("      var opnmsg = eval(\\"opener.document.SCORE.savemsg\\"+i);");
-    pWin.document.write("      var frmmsg = eval(\\"document.msgcenter.msg\\"+i);");
-    pWin.document.write("      opnmsg.value = frmmsg.value;");
-    pWin.document.write("      var chkbox = eval(\\"document.msgcenter.msgn\\"+i);");
-    pWin.document.write("      if (chkbox.checked) {");
-    pWin.document.write("         msgchk += \\"savemsg\\"+i+\\",\\";");
-    pWin.document.write("      }");
-    pWin.document.write("  }");
-    pWin.document.write("  if (document.msgcenter.newmsgchk.checked) {");
-    pWin.document.write("     msgchk += \\"newmsg\\"+usrctr;");
-    pWin.document.write("  }");
-    pWin.document.write("  var includemsg = eval(\\"opener.document.SCORE.includemsg\\"+usrctr);");
-    pWin.document.write("  includemsg.value = msgchk;");
-
-//    pWin.document.write("  alert(\\"slected=\\"+msgchk)");
-    pWin.document.write("  self.close()");
-
-    pWin.document.write("}");
-
-    pWin.document.write("<");
-    pWin.document.write("/script>");
-
-    pWin.document.write("</head><body bgcolor=white>");
-
-    pWin.document.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
-    pWin.document.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
-    pWin.document.write("<font color=\\"green\\" size=+1>&nbsp;Compose Message for \"+fullname+\"</font><br><br>");
-
-    pWin.document.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
-    pWin.document.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
-    pWin.document.write("<td><b>Type</b></td><td><b>Include</b></td><td><b>Message</td></tr>");
-}
-    function displaySubject(msg,shwsel) {
-    pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
-    pWin.document.write("<td>Subject</td>");
-    pWin.document.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
-    pWin.document.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+" \\"size=\\"60\\" maxlength=\\"80\\"></td></tr>");
-}
-
-function displaySavedMsg(ctr,msg,shwsel) {
-    pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
-    pWin.document.write("<td align=\\"center\\">"+ctr+"</td>");
-    pWin.document.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"></td>");
-    pWin.document.write("<td><input name=\\"msg"+ctr+"\\" type=\\"text\\" value=\\""+msg+" \\" size=\\"60\\" maxlength=\\"80\\"></td></tr>");
-}
-
-  function 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>");
-}
-
-  function msgTail() {
-    pWin.document.write("</table>");
-    pWin.document.write("</td></tr></table>&nbsp;");
-    pWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
-    pWin.document.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
-    pWin.document.write("</form>");
-    pWin.document.write("</body></html>");
-}
-
-//====================== Script for keyword highlight options ==============
-  function kwhighlight() {
-    var kwclr    = document.SCORE.kwclr.value;
-    var kwsize   = document.SCORE.kwsize.value;
-    var kwstyle  = document.SCORE.kwstyle.value;
-    var redsel = "";
-    var grnsel = "";
-    var blusel = "";
-    if (kwclr=="red")   {var redsel="checked"};
-    if (kwclr=="green") {var grnsel="checked"};
-    if (kwclr=="blue")  {var blusel="checked"};
-    var sznsel = "";
-    var sz1sel = "";
-    var sz2sel = "";
-    if (kwsize=="0")  {var sznsel="checked"};
-    if (kwsize=="+1") {var sz1sel="checked"};
-    if (kwsize=="+2") {var sz2sel="checked"};
-    var synsel = "";
-    var syisel = "";
-    var sybsel = "";
-    if (kwstyle=="")    {var synsel="checked"};
-    if (kwstyle=="<i>") {var syisel="checked"};
-    if (kwstyle=="<b>") {var sybsel="checked"};
-    highlightCentral();
-    highlightbody('red','red',redsel,'0','normal',sznsel,'','normal',synsel);
-    highlightbody('green','green',grnsel,'+1','+1',sz1sel,'<i>','italic',syisel);
-    highlightbody('blue','blue',blusel,'+2','+2',sz2sel,'<b>','bold',sybsel);
-    highlightend();
-    return;
-  }
-
-
-  function highlightCentral() {
-    hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx=100,screeny=75');
-    hwdWin.document.write("<html><head>");
-    hwdWin.document.write("<title>Highlight Central</title>");
-
-    hwdWin.document.write("<script language=javascript>");
-    hwdWin.document.write("function updateChoice(flag) {");
-    hwdWin.document.write("  opener.document.SCORE.kwclr.value = radioSelection(document.hlCenter.kwdclr);");
-    hwdWin.document.write("  opener.document.SCORE.kwsize.value = radioSelection(document.hlCenter.kwdsize);");
-    hwdWin.document.write("  opener.document.SCORE.kwstyle.value = radioSelection(document.hlCenter.kwdstyle);");
-//    hwdWin.document.write("     var kwords=opener.document.SCORE.keywords.value;");
-//    hwdWin.document.write("     alert(\\"keywords=\\"+opener.document.SCORE.keywords.value);");
-//    hwdWin.document.write("     return;");
-
-    hwdWin.document.write("  if (flag==1){");
-    hwdWin.document.write("     opener.document.SCORE.refresh.value = \\"on\\";");
-    hwdWin.document.write("     if (opener.document.SCORE.keywords.value!=\\"\\"){");
-    hwdWin.document.write("        opener.document.SCORE.submit();");
-    hwdWin.document.write("     }");
-    hwdWin.document.write("   }");
-    hwdWin.document.write("  self.close()");
-    hwdWin.document.write("}");
-
-    hwdWin.document.write("function radioSelection(radioButton) {");
-    hwdWin.document.write("    var selection=null;");
-    hwdWin.document.write("    for (var i=0; i<radioButton.length; i++) {");
-    hwdWin.document.write("        if (radioButton[i].checked) {");
-    hwdWin.document.write("            selection=radioButton[i].value;");
-    hwdWin.document.write("            return selection;");
-    hwdWin.document.write("        }");
-    hwdWin.document.write("    }");
-    hwdWin.document.write("}");
+		    'excused'  =>'excused',
+		    'ungraded' =>'ungraded_attempted',
+		    'nothing'  => '',
+		    );
+    my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($ENV{'form.section'},'0');
 
-    hwdWin.document.write("<");
-    hwdWin.document.write("/script>");
+    my (@partid);
+    my %weight = ();
+    my ($i,$ctr,$count,$rec_update) = (0,0,0,0);
+    while ($ctr < $ENV{'form.totalparts'}) {
+	my $partid = $ENV{'form.partid_'.$ctr};
+	push @partid,$partid;
+	$weight{$partid} = $ENV{'form.weight_'.$partid};
+	$ctr++;
+	$result .= '<td colspan = 2 align="center"><b>Part '.$partid.
+	    '</b> (Weight = '.$weight{$partid}.')</td>';
+    }
+    $result .= '</tr><tr bgcolor="#deffff">';
+    foreach (@partid) {
+	$result .= '<td align="center">&nbsp;<b>Old Score</b>&nbsp;</td>'.
+	    '<td align="center">&nbsp;<b>New Score</b>&nbsp;</td>';
+    }
+    $result .= '</tr>'."\n";
 
-    hwdWin.document.write("</head><body bgcolor=white>");
+    for ($i=0; $i<$ENV{'form.total'}; $i++) {
+	my $user = $ENV{'form.ctr'.$i};
+	my %newrecord;
+	my $updateflag = 0;
+	my @userdom = grep /^$user:/,keys %$classlist;
+	my ($foo,$udom) = split(/:/,$userdom[0]);
 
-    hwdWin.document.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
-    hwdWin.document.write("<font color=\\"green\\" size=+1>&nbsp;Keyword Highlight Options</font><br><br>");
+	$result .= '<tr bgcolor="#ffffde"><td>'.$user.'&nbsp;</td><td>'.
+	    $$fullname{$userdom[0]}.'&nbsp;</td>';
 
-    hwdWin.document.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
-    hwdWin.document.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
-    hwdWin.document.write("<td><b>Text Color</b></td><td><b>Font Size</b></td><td><b>Font Style</td></tr>");
-  }
+	foreach (@partid) {
+	    my $old_aw    = $ENV{'form.GD_'.$user.'_'.$_.'_aw_s'};
+	    my $old_part  = $old_aw eq '' ? '' : $old_aw/$weight{$_};
+	    my $old_score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_sv_s'}};
 
-  function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) { 
-    hwdWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
-    hwdWin.document.write("<td align=\\"left\\">");
-    hwdWin.document.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+">&nbsp;"+clrtxt+"</td>");
-    hwdWin.document.write("<td align=\\"left\\">");
-    hwdWin.document.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+">&nbsp;"+sztxt+"</td>");
-    hwdWin.document.write("<td align=\\"left\\">");
-    hwdWin.document.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+">&nbsp;"+sytxt+"</td>");
-    hwdWin.document.write("</tr>");
-  }
+	    my $awarded   = $ENV{'form.GD_'.$user.'_'.$_.'_aw'};
+	    my $partial   = $awarded eq '' ? '' : $awarded/$weight{$_};
+	    my $score;
+	    if ($partial eq '') {
+		$score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_sv_s'}};
+	    } elsif ($partial > 0) {
+		$score = 'correct_by_override';
+	    } elsif ($partial == 0) {
+		$score = 'incorrect_by_override';
+	    }
+	    $score = 'excused' if (($ENV{'form.GD_'.$user.'_'.$_.'_sv'} eq 'excused') &&
+				   ($score ne 'excused'));
+	    $result .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
+		'<td align="center">'.$awarded.
+		($score eq 'excused' ? $score : '').'&nbsp;</td>';
 
-  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 & Refresh\\" onClick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
-    hwdWin.document.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
-    hwdWin.document.write("</form>");
-    hwdWin.document.write("</body></html>");
-  }
+	    next if ($old_part eq $partial && $old_score eq $score);
 
-</script>
-SUBJAVASCRIPT
+	    $updateflag = 1;
+	    $newrecord{'resource.'.$_.'.awarded'}  = $partial if $partial ne '';
+	    $newrecord{'resource.'.$_.'.solved'}   = $score;
+	    $rec_update++;
+	}
+	$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";
+    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 />';
+    return $title.$msg.$result;
 }
+#------------- end of section for handling grading by section/class ---------
+#
+#----------------------------------------------------------------------------
+
 
+#----------------------------------------------------------------------------
+#
+#-------------------------- Next few routines handles grading by csv upload
+#
+#--- Javascript to handle csv upload
 sub csvupload_javascript_reverse_associate {
   return(<<ENDPICK);
   function verify(vf) {
@@ -1941,7 +1910,7 @@
     my ($symb,$url)=&get_symb_and_url($request);
     if (!$symb) {return '';}
     &Apache::loncommon::load_tmp_file($request);
-    my @gradedata=&Apache::loncommon::upfile_record_sep();
+    my @gradedata = &Apache::loncommon::upfile_record_sep();
     my @keyfields = split(/\,/,$ENV{'form.keyfields'});
     my %fields=();
     for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) {
@@ -1995,22 +1964,157 @@
     $request->print(&show_grading_menu_form($symb,$url));
     return '';
 }
+#------------- end of section for handling csv file upload ---------
+#
+#-------------------------------------------------------------------
 
-sub send_header {
-    my ($request)= @_;
-    $request->print(&Apache::lontexconvert::header());
-#  $request->print("
-#<script>
-#remotewindow=open('','homeworkremote');
-#remotewindow.close();
-#</script>"); 
-    $request->print('<body bgcolor="#FFFFFF">');
+#-------------------------- 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;
 }
 
-sub send_footer {
-    my ($request)= @_;
-    $request->print('</body>');
-    $request->print(&Apache::lontexconvert::footer());
+#--- Displays the main menu page -------
+sub gradingmenu {
+    my ($request) = @_;
+    my ($symb,$url)=&get_symb_and_url($request);
+    if (!$symb) {return '';}
+    my $result='<h2>&nbsp;<font color="#339933">Select a Grading Method</font></h2>';
+    $result.='<table border="0">';
+    $result.='<tr><td colspan=3><font size=+1><b>Resource: </b>'.$url.'</font></td></tr>';
+    my ($partlist,$handgrade) = &response_type($url);
+    my ($resptype,$hdgrade)=('','no');
+    for (sort keys(%$handgrade)) {
+	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
+	$resptype = $responsetype;
+	$hdgrade = $handgrade if ($handgrade eq 'yes');
+	$result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
+	    '<td><b>Type: </b>'.$responsetype.'</td>'.
+	    '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
+    }
+    $result.='</table>';
+    $result.=&view_edit_entire_class_form($symb,$url).'<br />';
+    $result.=&upcsvScores_form($symb,$url).'<br />';
+    $result.=&viewGradeaStu_form($symb,$url,$resptype,$hdgrade).'<br />';
+    $result.=&verifyReceipt_form($symb,$url) 
+	if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb));
+ 
+    return $result;
+}
+
+#--- Menu for grading a section or the whole class ---
+sub view_edit_entire_class_form {
+    my ($symb,$url)=@_;
+    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>View/Grade Entire Section/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";
+    foreach (sort (@$sections)) {
+	$result.= '<option>'.$_.'</option>'."\n";
+    }
+    $result.='<option selected="on">all</select>'."<br />\n";
+    $result.='&nbsp;<input type="submit" name="submit" value="View/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.='<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="submit" name="submit" 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>View/Grade 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";
+    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 />';
+    $result.='&nbsp;(Section "no" implies the students were not assigned a section.)<br />' 
+	if (grep /no/,@$sections);
+    
+    $result.='<br />&nbsp;<input type="submit" name="submit" value="View/Grade" />'."\n".
+	'</form>'."\n";
+    $result.='</td></tr></table>'."\n";
+    $result.='</td></tr></table>'."\n";
+    return $result;
+}
+
+#--- Form to input a receipt number ---
+sub verifyReceipt_form {
+    my ($symb,$url) = @_;
+    my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
+    my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
+    my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});
+
+    my $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">'."\n";
+    $result.='&nbsp;<tt>'.$hostver.'-<input type="text" name="receipt" size="4"></tt><br />'."\n";
+    $result.='&nbsp;<input type="submit" name="submit" 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'}.'" />';
+    }
+    if ($ENV{'form.symb'}) {
+	$result.='<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />';
+    }
+    $result.='</form>';
+    $result.='</td></tr></table>'."\n";
+    $result.='</td></tr></table>'."\n";
+    return $result;
 }
 
 sub handler {
@@ -2022,7 +2126,7 @@
 	$request->content_type('text/html');
     }
     $request->send_http_header;
-    return OK if $request->header_only;
+    return '' if $request->header_only;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
     my $url=$ENV{'form.url'};
     my $symb=$ENV{'form.symb'};
@@ -2051,10 +2155,10 @@
 							      'grade_courseid' => $tcrsid,
 							      'grade_symb' => $tsymb)));
 		    } else {
-			$request->print('<h1>Not authorized: '.$token.'</h1>');
+			$request->print('<h2>Not authorized: '.$token.'</h2>');
 		    }           
 		} else {
-		    $request->print('<h1>Not a valid DocID: '.$token.'</h1>');
+		    $request->print('<h2>Not a valid DocID: '.$token.'</h2>');
 		}
 	    } else {
 		$request->print(&Apache::lonxml::tokeninputfield());
@@ -2084,8 +2188,6 @@
 	    $request->print(&viewclasslist($request));
 	} elsif ($command eq 'csvuploadmap') {
 	    $request->print(&csvuploadmap($request));
-#    } elsif ($command eq 'receiptInput') {
-#      &receiptInput($request);
 	} elsif ($command eq 'csvuploadassign') {
 	    if ($ENV{'form.associate'} ne 'Reverse Association') {
 		$request->print(&csvuploadassign($request));
@@ -2102,7 +2204,24 @@
 	}
     }
     &send_footer($request);
-    return OK;
+    return '';
+}
+
+sub send_header {
+    my ($request)= @_;
+    $request->print(&Apache::lontexconvert::header());
+#  $request->print("
+#<script>
+#remotewindow=open('','homeworkremote');
+#remotewindow.close();
+#</script>"); 
+    $request->print('<body bgcolor="#FFFFFF">');
+}
+
+sub send_footer {
+    my ($request)= @_;
+    $request->print('</body>');
+    $request->print(&Apache::lontexconvert::footer());
 }
 
 1;

--ng1028322603--