--- loncom/homework/grades.pm	2002/07/18 21:27:57	1.39
+++ loncom/homework/grades.pm	2002/08/02 21:10:03	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.39 2002/07/18 21:27:57 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,77 +42,37 @@ use Apache::loncommon;
 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");
-    }
-#    $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
+# ----- 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);
+	}
     }
-    return '';
+    return @parts;
 }
 
-sub student_gradeStatus {
-   my ($url,$udom,$uname,$partlist) = @_;
-   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;
-   }
-   return %partstatus;
+# --- 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)));
+    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',
-						  'firstname','middlename'],
-				  $udom,$uname);
+						  'firstname','middlename'],$udom,$uname);
     my $fullname;
     my ($tmp) = keys(%name);
     if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
@@ -123,125 +83,28 @@ sub get_fullname {
     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');
-   my %seen = ();
-   my (@partlist,%handgrade);
-   foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
-      if (/^\w+response_\d{1,2}.*/) {
-	 my ($responsetype,$part) = split(/_/,$_,2);
-	 my ($partid,$respid) = split(/_/,$part);
-	 $handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no');
-	 next if ($seen{$partid} > 0);
-	 $seen{$partid}++;
-	 push @partlist,$partid;
-      }
-   }
-   return \@partlist,\%handgrade;
-}
-
-
-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'};
-  my $submitonly=$ENV{'form.submitonly'};
-
-  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>';
-  my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
-  for (sort keys(%$handgrade)) {
-      my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
-      $result.='<tr><td><b>Part id: </b>'.$_.'</td>'.
-	  '<td><b>Type: </b>'.$responsetype.'</td>'.
-	  '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
-  }
-  $result.='</table>';
-  $request->print($result);
-
-  $request->print(<<ENDTABLEST);
-<form action="/adm/grades" method="post">
-&nbsp;<b>View Problem: </b><input type="radio" name="vProb" value="no" checked> no 
-<input type="radio" name="vProb" value="yes"> yes <br />
-&nbsp;<b>Submissions: </b>
-<input type="radio" name="lastSub" value="lastonly" checked /> last sub only
-<input type="radio" name="lastSub" value="last" /> last sub & parts info
-<input type="radio" name="lastSub" value="all" /> all details
-<input type="hidden" name="section" value="$getsec" />
-<input type="hidden" name="submitonly" value="$submitonly" />
-<input type="hidden" name="response" value="$ENV{'form.response'}" />
-<input type="hidden" name="handgrade" value="$ENV{'form.handgrade'}" />
-<input type="submit" name="submit" value="View/Grade" />
-ENDTABLEST
-  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="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>';
-  foreach (sort(@$partlist)) {
-      $result.='<td><b>&nbsp;Part ID '.$_.' Status&nbsp;</b></td>';
-  }
-  $request->print($result.'</tr>'."\n");
-
-  foreach my $student (sort(@{ $$classlist{$getsec} }) ) {
-      my ($uname,$udom) = split(/:/,$student);
-      my (%status) = &student_gradeStatus($ENV{'form.url'},$udom,$uname,$partlist);
-      my $statusflg = '';
-      foreach (keys(%status)) {
-	  $statusflg = 1 if ($status{$_} ne 'nothing');
-      }
-      next if ($statusflg eq '' && $submitonly eq 'yes');
-
-      if ( $Apache::grades::viewgrades eq 'F' ) {
-	  $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 align="middle">&nbsp;'.$udom.'&nbsp;</td>'."\n";
-
-	  foreach (sort keys(%status)) {
-	      $result.='<td align="middle">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
-	  }
-	  $request->print($result.'</tr>'."\n");
-      }
-  }
-  $request->print('</table></td></tr></table>');
-  $request->print('<input type="submit" name="submit" value="View/Grade" /><form />');
-}
-
-sub processGroup {
-  my ($request)  = shift;
-  my $ctr        = 0;
-  my @stuchecked = (ref($ENV{'form.stuinfo'}) ? @{$ENV{'form.stuinfo'}}
-                           : ($ENV{'form.stuinfo'}));
-  my $total      = scalar(@stuchecked)-1;
-  if ($stuchecked[0] eq '') {
-      &userError($request,'No student was selected for viewing/grading.');
-      return;
-  }
-  foreach (@stuchecked) {
-      my ($uname,$udom,$fullname) = split(/:/);
-      $ENV{'form.student'} = $uname;
-      $ENV{'form.fullname'} = $fullname;
-      &submission($request,$ctr,$total);
-      $ctr++;
-  }
-  return '';
+    my ($url) = shift;
+    my $allkeys = &Apache::lonnet::metadata($url,'keys');
+    my %seen = ();
+    my (@partlist,%handgrade);
+    foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
+	if (/^\w+response_\d+.*/) {
+	    my ($responsetype,$part) = split(/_/,$_,2);
+	    my ($partid,$respid) = split(/_/,$part);
+	    $handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no');
+	    next if ($seen{$partid} > 0);
+	    $seen{$partid}++;
+	    push @partlist,$partid;
+	}
+    }
+    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");
@@ -251,865 +114,326 @@ sub userError {
     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; }
-    }
-    return ($name,$domain);
-  } else {
-    return ($ENV{'user.name'},$ENV{'user.domain'});
-  }
-}
-
+#--- Dumps the class list with usernames,list of sections,
+#--- section, ids and fullnames for each user.
 sub getclasslist {
-   my ($getsec,$hideexpired) = @_;
-   my %classlist=&Apache::lonnet::dump('classlist',
-				       $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-				       $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-   my $now = time;
-   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);
-}
-
-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);
+    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;
+	}
     }
-  }
-  return @parts;
-}
-
-sub viewstudentgrade {
-  my ($url,$symb,$courseid,$student,@parts) = @_;
-  my $cellclr = '"#ffffdd"';
-  my ($username,$domain) = split(/:/,$student);
-
-  my $fullname = &get_fullname($username,$domain);
-  my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$username);
-
-  my $result="<tr bgcolor=$cellclr><td>$username</td><td>$fullname</td><td align=\"middle\">$domain</td>\n";
-  foreach my $part (@parts) {
-    my ($temp,$part,$type)=split(/_/,$part);
-    my $score=$record{"resource.$part.$type"};
-    if ($type eq 'awarded' || $type eq 'tries') {
-      $result.='<td align="middle"><input type="text" name="GRADE.'.$student.'.'.$part.'.'.$type.
-	  '" value="'.$score.'" size="4" /></td>'."\n";
-    } elsif ($type eq 'solved') {
-      my ($status,$foo)=split(/_/,$score,2);
-      $result.="<td align=\"middle\"><select name=\"GRADE.$student.$part.$type\">\n";
-      my $optsel = '<option>correct</option><option>incorrect</option><option>excused</option>'.
-	  '<option>ungraded</option><option>nothing</option>'."\n";
-      $status = 'nothing' if ($status eq '');
-      $optsel =~ s/<option>$status/<option selected="on">$status/;
-      $result.=$optsel;
-      $result.="</select></td>\n";
+    my %seen = ();
+    foreach my $item (@holdsec) {
+	push (@sections, $item) unless $seen{$item}++;
     }
-  }
-  $result.='</td></tr>';
-  return $result;
+    return (\%classlist,\@sections,\%allids,\%stusec,\%fullname);
 }
 
-#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) = @_;
-  print "set student grade parts=@parts<br>";
-  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.GRADE.$student.$part.$type"};
-    print "old=$oldscore:new=$newscore:<br>";
-    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'; }
-#	if ($newscore eq 'partial')   { $newscore = 'correct_partially_by_override'; }
-      } 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";
-      }
+# 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;
     }
-  }
-  if ( scalar(keys(%newrecord)) > 0 ) {
-    $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
-#    &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);
+    my $putresult = &Apache::lonnet::put
+	('classlist',\%$classlist,
+	 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+	 $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
 
-    $result.="Stored away ".scalar(keys(%newrecord))." elements.<br />\n";
-  }
-  return $result;
+    return %$classlist;
 }
 
-#
-# --------------------------- 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) = &finduser($ENV{'form.student'});
-  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' : '');
-
-  # header info
-  if ($counter == 0) {
-      &sub_page_js($request);
-      $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.
-      if ($ENV{'form.vProb'} eq 'yes') {
-	  my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
-							    $ENV{'request.course.id'});
-	  my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
-								 $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>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.
-      my %keyhash = ();
-      if ($ENV{'form.kwclr'} eq '') {
-	  %keyhash = &Apache::lonnet::dump('nohist_handgrade',
-					      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-					      $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
-	  my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
-	  $ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
-	  $ENV{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
-	  $ENV{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
-	  $ENV{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
-	  $ENV{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ? 
-	      $keyhash{$symb.'_subject'} : &Apache::lonnet::metadata($url,'title');
-	  $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".
-		      '<input type="hidden" name="symb"       value="'.$symb.'" />'."\n".
-		      '<input type="hidden" name="url"        value="'.$url.'" />'."\n".
-		      '<input type="hidden" name="vProb"      value="'.$ENV{'form.vProb'}.'" />'."\n".
-		      '<input type="hidden" name="lastSub"    value="'.$ENV{'form.lastSub'}.'" />'."\n".
-		      '<input type="hidden" name="section"    value="'.$ENV{'form.section'}.'">'."\n".
-		      '<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
-		      '<input type="hidden" name="response"   value="'.$ENV{'form.response'}.'">'."\n".
-		      '<input type="hidden" name="handgrade"  value="'.$ENV{'form.handgrade'}.'">'."\n".
-		      '<input type="hidden" name="keywords"   value="'.$ENV{'form.keywords'}.'" />'."\n".
-		      '<input type="hidden" name="kwclr"      value="'.$ENV{'form.kwclr'}.'" />'."\n".
-		      '<input type="hidden" name="kwsize"     value="'.$ENV{'form.kwsize'}.'" />'."\n".
-		      '<input type="hidden" name="kwstyle"    value="'.$ENV{'form.kwstyle'}.'" />'."\n".
-		      '<input type="hidden" name="msgsub"     value="'.$ENV{'form.msgsub'}.'" />'."\n".
-		      '<input type="hidden" name="savemsgN"   value="'.$ENV{'form.savemsgN'}.'" />'."\n".
-		      '<input type="hidden" name="NCT"'.
-		      ' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : $total+1).'" />'."\n");
-
-      my ($cts,$prnmsg) = (1,'');
-      while ($cts <= $ENV{'form.savemsgN'}) {
-	  $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
-	      ($keyhash{$symb.'_savemsg'.$cts} eq '' ? $ENV{'form.savemsg'.$cts} : $keyhash{$symb.'_savemsg'.$cts}).
-	      '" />'."\n";
-	  $cts++;
-      }
-      $request->print($prnmsg);
-
-      if ($ENV{'form.handgrade'} eq 'yes') {
-	  $request->print(<<KEYWORDS);
-&nbsp;<b>Keyword Options:</b>&nbsp;
-<a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>List</a>&nbsp; &nbsp;
-<a href="#" onMouseDown="javascript:getSel(); return false"
- CLASS="page">Paste Selection to List</a>&nbsp; &nbsp;
-<a href="javascript:kwhighlight()"; TARGET=_self>Highlight Attribute</a><br /><br />
-KEYWORDS
-      }
-  }
-
-  # 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>';
-  $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 ($ENV{'form.handgrade'} eq 'yes') {
-#      my $subonly = &get_last_submission($symb,$uname,$udom,$ENV{'request.course.id'});
-      my ($classlist) = &getclasslist('all','0');
-      my @collaborators;
-#      foreach ( sort(@{ $$classlist{'all'} }) ) {
-#	  my ($uname,$udom) = split(/:/);
-#	  push @collaborators,$uname if (grep /\b$uname(\b|\.)/i,$subonly);
-#      }
-#      push @collaborators,'leede','carlandmm','freyniks'; # as a test to display collaborators.
-      if (scalar(@collaborators) != 0) {
-	  $result.='<tr bgcolor="#ffffff"><td colspan=3><b>Collaborators: </b>';
-	  foreach (@collaborators) {
-	      $result.=$_.' ('.&get_fullname($_,$udom).') &nbsp; &nbsp;';
-	  }
-	  $result.='</td></tr>'."\n";
-	  $result.='<input type="hidden" name="collaborator'.$counter.
-	      '" value="'.(join ':',@collaborators).'" />'."\n";
-      }
-  }
-  $result.='</table>'."\n";
-  $request->print($result);
-
-  my ($partlist,$handgrade) = &response_type($url);
-
- # print student answer
-  if ($ENV{'form.lastSub'} eq 'lastonly') {
-      my ($string,$timestamp)=&get_last_submission ($symb,$uname,$udom,$ENV{'request.course.id'});
-      my $lastsubonly='<table border="0" width=100%><tr><td bgcolor="#777777">';
-      $lastsubonly.='<table border="0" width=100%><tr bgcolor="#ddffff">';
-      $lastsubonly.='<td><b>Last Submission Only</b>'.
-	  ($$timestamp eq '' ? '' : '&nbsp; &nbsp; <b>Date Submitted:</b> '.$$timestamp).'</td></tr>';
-      if ($$timestamp eq '') {
-	  $lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0].'</td></tr>';
-      } else {
-	  for my $part (sort keys(%$handgrade)) {
-	      foreach (@$string) {
-		  my ($partid,$respid) = /^resource\.(\d{1,2})\.(\d{1,2})\.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.='</td></tr></table></td></tr></table>'."\n";
-      $request->print($lastsubonly);
-  } else {
-      $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
-							       $ENV{'request.course.id'},$last,
-							       '.submission','Apache::grades::keywords_highlight'));
-  }
-
-  $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');
-  $request->print($result);
-
-  my %seen = ();
-  my @partlist;
-  for (sort keys(%$handgrade)) {
-      my ($partid,$respid) = split(/_/);
-      next if ($seen{$partid} > 0);
-      $seen{$partid}++;
-      next if ($$handgrade{$_} =~ /:no$/);
-      push @partlist,$partid;
-      my $wgt    = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
-      my $wgtmsg = ($wgt > 0 ? '(problem weight)' : '<font color="red">problem weight assigned by computer</font>');
-      $wgt       = ($wgt > 0 ? $wgt : '1');
-      my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
-      my $score  = ($record{'resource.0.awarded'} eq '' ? '' : $record{'resource.0.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>';
-
-      my $ctr = 0;
-      $result.='<table border="0"><tr>';  # display radio buttons in a nice table 10 across
-      while ($ctr<=$wgt) {
-	  $result.= '<td><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
-	      'onclick="javascript:writeBox(this.form.GRADE_BOX'.$counter.'_'.$partid.
-	      ',this.form.GRADE_SEL'.$counter.'_'.$partid.','.$ctr.
-	      ',this.form.stores'.$counter.'_'.$partid.')" '.
-	      ($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
-	  $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
-	  $ctr++;
-      }
-      $result.='</tr></table>';
-
-      $result.='</td><td>&nbsp;<b>or</b>&nbsp;</td>';
-      $result.='<td><input type="text" name="GRADE_BOX'.$counter.'_'.$partid.'"'.
-	  ($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
-	  'onChange="javascript:updateRadio(this.form.RADVAL'.$counter.'_'.$partid.
-	  ',this.form.GRADE_BOX'.$counter.'_'.$partid.
-	  ',this.form.GRADE_SEL'.$counter.'_'.$partid.
-	  ',this.form.stores'.$counter.'_'.$partid.')" /></td>'."\n";
-      $result.='<td>/'.$wgt.' '.$wgtmsg.' </td><td>';
-
-      $result.='<select name="GRADE_SEL'.$counter.'_'.$partid.'" '.
-	  'onChange="javascript:clearRadBox(this.form.RADVAL'.$counter.'_'.$partid.
-	  ',this.form.GRADE_BOX'.$counter.'_'.$partid.
-	  ',this.form.GRADE_SEL'.$counter.'_'.$partid.
-	  ',this.form.stores'.$counter.'_'.$partid.')" />'."\n".
-	  '<option selected="on"> </option>'.
-	  '<option>excused</option></select>'."&nbsp&nbsp\n";
-      $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="0" />';
-      $result.='</td></tr></table>';
-      $request->print($result);
-  }
-  $request->print('<input type="hidden" name="partlist'.$counter.'" value="'.(join ":",@partlist).'" />'."\n");
-  $request->print('</td></tr></table></td></tr></table>'."\n");
-
-  # print end of form
-  if ($counter == $total) {
-      my $endform.='<table border="0"><tr><td><input type="submit" name="gradeOpt" value="Save & Next" />';
-      my $ntstu ='<select name="NTSTU">'.
-	  '<option>1</option><option>2</option>'.
-	      '<option>3</option><option>5</option>'.
-		  '<option>7</option><option>10</option></select>'."\n";
-      my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
-      $ntstu =~ s/<option>$nsel/<option selected="on">$nsel/;
-      $endform.=$ntstu.'student(s) &nbsp;&nbsp;';
-      $endform.='<input type="submit" name="gradeOpt" value="Next" />&nbsp';
-      $endform.='<input type="submit" name="gradeOpt" value="Previous" />&nbsp';
-      $endform.='(Next and Previous do not save the scores.)';
-      $endform.='</td><tr></table></form>';
-      $request->print($endform);
-  }
-
-  return '';
-}
-
-sub get_last_submission {
-  my ($symb,$username,$domain,$course)=@_;
-  if ($symb) {
-      my (@string,$timestamp);
-      my (%returnhash)=&Apache::lonnet::restore($symb,$course,$domain,$username);
-      if ($returnhash{'version'}) {
-	  my %lasthash=();
-	  my ($version);
-	  for ($version=1;$version<=$returnhash{'version'};$version++) {
-	      foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
-		  $lasthash{$_}=$returnhash{$version.':'.$_};
-	      }
-	  }
-	  foreach ((keys %lasthash)) {
-	      if ($_ =~ /\.submission$/) {push @string, (join(':',$_,$lasthash{$_}))}
-	      if ($_ =~ /timestamp/) {$timestamp = scalar(localtime($lasthash{$_}))};
-	  }
-      }
-      @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string;
-      return \@string,\$timestamp;
-  }
-}
-
-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 $styleoff = $styleon) =~ s/\</\<\//;
-  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;
-}
-
-sub processHandGrade {
-  my ($request) = shift;
-  my $url    = $ENV{'form.url'};
-  my $symb   = $ENV{'form.symb'};
-  my $button = $ENV{'form.gradeOpt'};
-  my $ngrade = $ENV{'form.NCT'};
-  my $ntstu  = $ENV{'form.NTSTU'};
-
-  my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
-  my %keyhash = ();
-  $ENV{'form.keywords'} =~ s/,\s{0,}|\s+/ /g;
-  $ENV{'form.keywords'} =~ s/^\s+|\s+$//;
-  $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'};
-
-  my ($ctr,$idx) = (1,1);
-  while ($ctr <= $ENV{'form.savemsgN'}) {
-      if ($ENV{'form.savemsg'.$ctr} ne '') {
-	  $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
-	  $idx++;
-      }
-      $ctr++;
-  }
-  $ctr = 0;
-  while ($ctr < $ngrade) {
-      if ($ENV{'form.newmsg'.$ctr} ne '') {
-	  $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
-	  $ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
-	  $idx++;
-      }
-      $ctr++;
-  }
-  $ENV{'form.savemsgN'} = --$idx;
-  $keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
-  my $putresult = &Apache::lonnet::put
-      ('nohist_handgrade',\%keyhash,
-       $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-       $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
-  if ($ENV{'form.refresh'} eq 'on') {
-      my $ctr = 0;
-      while ($ctr < $ntstu) {
-	  ($ENV{'form.student'},my $udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
-	  &submission($request,$ctr,$ntstu-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);
-		  if ($message ne '') {
-		      $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,$ENV{'form.msgsub'},$message);
-		  }
-	      }
-	  }
-	  $ctr++;
-      }
-  }
-  my $firststu = $ENV{'form.unamedom0'};
-  my $laststu  = $ENV{'form.unamedom'.($ngrade-1)};
-
-  my ($classlist) = &getclasslist($ENV{'form.section'},'0');
-  my (@nextlist,@prevlist);
-  my ($nextflg,$ctr,$ctprev) = (0,0,0);
-  my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
-  foreach my $student ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) {
-      my ($uname,$udom) = split(/:/,$student);
-      my (%status) = &student_gradeStatus($ENV{'form.url'},$udom,$uname,$partlist);
-      my $statusflg = '';
-      foreach (keys(%status)) {
-	  $statusflg = 1 if ($status{$_} ne 'nothing');
-      }
-      next if ($statusflg eq '' && $ENV{'form.submitonly'} eq 'yes');
-
-      if ($nextflg == 1 && $button =~ /Next$/) {
-	  push @nextlist,$uname if ($ctr < $ntstu);
-	  $ctr++;
-	  last if ($ctr == $ntstu);
-      }
-      $nextflg = 1 if ($student eq $laststu);
-      if ($button eq 'Previous') {
-	  last if ($student eq $firststu);
-	  push @prevlist,$uname;
-	  $ctprev++;
-      }
-  }
-
-  if ($button eq 'Previous') {
-      if ($ctprev <= $ntstu) {
-	  @nextlist = @prevlist;
-      } else {
-	  my $idx = 0;
-	  my $start = $ctprev - $ntstu;
-	  while ($idx < $ntstu) {
-	      $nextlist[$idx] = $prevlist[$start+$idx];
-	      $idx++;
-	  }
-      }
-  }
-
-  $ctr = 0;
-  my $total = scalar(@nextlist)-1;
-  foreach my $student (@nextlist) {
-      $ENV{'form.student'} = $student;
-      &submission($request,$ctr,$total);
-      $ctr++;
-  }
-  if ($total < 0) {
-      my $the_end = '<h3><font color="red">LON-CAPA User Message</font></h3><br />'."\n";
-      $the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";
-      $the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";
-      $the_end.=&show_grading_menu_form ($symb,$url);
-      $request->print($the_end);
-  }
-  return '';
-}
-
-sub saveHandGrade {
-  my ($request,$url,$symb,$stuname,$domain,$newflg) = @_;
-#  my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
-  my %newrecord;
-  foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
-      if ($ENV{'form.GRADE_SEL'.$newflg.'_'.$_} eq 'excused') {
-	  $newrecord{'resource.'.$_.'.solved'} = 'excused';
-      } else {
-	  my $pts    = ($ENV{'form.GRADE_BOX'.$newflg.'_'.$_} ne '' ? 
-		       $ENV{'form.GRADE_BOX'.$newflg.'_'.$_} : $ENV{'form.RADVAL'.$newflg.'_'.$_});
-	  if ($pts eq '') {
-	      &userError($request,'No point was assigned for part id '.$_.' and for username '.$stuname.'.');
-	      return 'error';
-	  }
-	  my $wgt    = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 : $ENV{'form.WGT'.$newflg.'_'.$_};
-	  my $partial= $pts/$wgt;
-	  $newrecord{'resource.'.$_.'.awarded'}  = $partial;
-	  if ($partial == 0) {
-	      $newrecord{'resource.'.$_.'.solved'} = 'incorrect_by_override';
-	  } else {
-	      $newrecord{'resource.'.$_.'.solved'} = 'correct_by_override';
-	  }
-      }
-  }
-
-  if ( scalar(keys(%newrecord)) > 0 ) {
-      $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
-      while (my ($k,$v) = each %newrecord) {
-	 print "k=$k:v=$v:<br>\n";
-      }
-#     &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname);
-  }
-  return '';
+#find user domain
+sub finduser {
+    my ($name) = @_;
+    my $domain = '';
+    if ( $Apache::grades::viewgrades eq 'F' ) {
+	my %classlist=&Apache::lonnet::dump('classlist',
+					    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+					    $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+	my (@fields) = grep /^$name:/, keys %classlist;
+	($name, $domain) = split(/:/,$fields[0]);
+	return ($name,$domain);
+    } else {
+	return ($ENV{'user.name'},$ENV{'user.domain'});
+    }
 }
 
-sub 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);
+#--- 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 '';
 }
 
-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;
+#--- 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;
 }
 
-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>'.$_.'</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).'<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 '';
-}
+#------------------ End of general use routines --------------------
+#-------------------------------------------------------------------
 
-sub view_edit_entire_class_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/Grade Entire 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>Display students who has: </b>'.
-      '<input type="radio" name="submitonly" value="yes" checked> submitted'.
-	  '<input type="radio" name="submitonly" value="all"> everybody <br /><br />';
-  $result.='&nbsp;<input type="submit" name="submit" value="View/Grade" /></form>'."\n";
-  $result.='</td></tr></table>'."\n";
-  $result.='</td></tr></table>'."\n";
-  return $result;
-}
+#------------------------------------ Receipt Verification Routines
+#--- Check whether a receipt number is valid.---
+sub verifyreceipt {
+    my $request  = shift;
 
-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;
-}
+    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);
+    }
 
-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="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;
-}
+    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 $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>';
+    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 </b>'.(split(/_/))[0].'</td>'.
+	    '<td><b>Type: </b>'.$responsetype.'</td>'.
+	    '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
+    }
+    $result.='</table>';
+    $request->print($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;
-}
+    $request->print(<<ENDTABLEST);
+<form action="/adm/grades" method="post">
+&nbsp;<b>View Problem: </b><input type="radio" name="vProb" value="no" checked> no 
+<input type="radio" name="vProb" value="yes"> yes <br />
+&nbsp;<b>Submissions: </b>
+<input type="radio" name="lastSub" value="hdgrade" checked /> handgrade only
+<input type="radio" name="lastSub" value="lastonly" /> last sub only
+<input type="radio" name="lastSub" value="last" /> last sub & parts info
+<input type="radio" name="lastSub" value="all" /> all details
+<input type="hidden" name="section" value="$getsec" />
+<input type="hidden" name="submitonly" value="$submitonly" />
+<input type="hidden" name="response" value="$ENV{'form.response'}" />
+<input type="hidden" name="handgrade" value="$ENV{'form.handgrade'}" /><br />
+<input type="hidden" name="showgrading" value="$ENV{'form.showgrading'}" /><br />
+<input type="submit" name="submit" value="View/Grade" />
+ENDTABLEST
+    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="processGroup" />'."\n");
 
-sub viewgrades {
-  my ($request) = @_;
-  my $result='';
+    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;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 '.(split(/_/))[0].' Status&nbsp;</b></td>';
+    }
+    $request->print($result.'</tr>'."\n");
+
+    foreach my $student (sort {$$fullname{$a} cmp $$fullname{$b} } keys %$fullname) {
+	my ($uname,$udom) = split(/:/,$student);
+	my (%status) = &student_gradeStatus($ENV{'form.url'},
+					    $ENV{'form.symb'},$udom,$uname,$partlist);
+	my $statusflg = '';
+	foreach (keys(%status)) {
+	    $statusflg = 1 if ($status{$_} ne 'nothing');
+	    my ($foo,$partid,$foo1) = split(/\./,$_);
+	    if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
+		$statusflg = '';
+		$request->print('<input type="hidden" name="'.
+				$student.':submitted_by" value="'.
+				$status{'resource.'.$partid.'.submitted_by'}.'" />');
+	    }
+	}
+	next if ($statusflg eq '' && $submitonly eq 'yes');
 
-  #get resource reference
-  my ($symb,$url)=&get_symb_and_url($request);
-  if (!$symb) {return '';}
-  #get classlist
-  my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
-  #print "Found $cdom:$cnum<br />";
-  my ($classlist) = &getclasslist('all','0');
-  my $headerclr = '"#ddffff"';
-  my $cellclr = '"#ffffdd"';
-
-  #get list of parts for this problem
-  my (@parts) = sort(&getpartlist($url));
-
-  $request->print ("<h2><font color=\"#339933\">Manual Grading</font></h2>");
-
-  #start the form
-  $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="editgrades" />'."\n".
-	  '<input type="submit" name="submit" value="Submit Changes" />'."\n".
-	    '<table border=0><tr><td bgcolor="#777777">'."\n".
-	     '<table border=0>'."\n".
-	      '<tr bgcolor='.$headerclr.'><td><b>Username</b></td><td><b>Fullname</b></td><td><b>Domain</b></td>'."\n";
-  foreach my $part (@parts) {
-     my $display=&Apache::lonnet::metadata($url,$part.'.display');
-     if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
-     $result.='<td><b>'.$display.'</b></td>'."\n";
-  }
-  $result.='</tr>';
-  #get info for each student
-  foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
-#    my $display=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
-#      print "ID=$ENV{'request.course.id'}:STU=$student:DIS=$display:<br>\n";
-    $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
-  }
-  $result.='</table></td></tr></table>';
-  $result.='<input type="submit" name="submit" value="Submit Changes" /></form>';
-  $result.=&show_grading_menu_form($symb,$url);
-  return $result;
+	if ( $Apache::grades::viewgrades eq 'F' ) {
+	    $result='<tr bgcolor="#ffffe6">'.
+		'<td align="center"><input type=checkbox name="stuinfo" value="'.
+		$student.':'.$$fullname{$student}.'"></td>'."\n".
+		'<td>&nbsp;'.$$fullname{$student}.'&nbsp;</td>'."\n".
+		'<td>&nbsp;'.$uname.'&nbsp;</td>'."\n".
+		'<td align="middle">&nbsp;'.$udom.'&nbsp;</td>'."\n";
+	    
+	    foreach (sort keys(%status)) {
+		next if (/^resource.*?submitted_by$/);
+		$result.='<td align="middle">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
+	    }
+	    $request->print($result.'</tr>'."\n");
+	}
+    }
+    $request->print('</table></td></tr></table>');
+    $request->print('<input type="submit" name="submit" value="View/Grade" /><form />');
+    return '';
 }
 
-sub editgrades {
-  my ($request) = @_;
-  my $result='';
-
-  my $symb=$ENV{'form.symb'};
-  if ($symb eq '') { $request->print("Unable to handle ambiguous references:$symb:$ENV{'form.url'}"); return ''; }
-  my $url=$ENV{'form.url'};
-  #get classlist
-#  my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
-  #print "Found $cdom:$cnum<br />";
-  my ($classlist) = &getclasslist('all','0');
-
-  #get list of parts for this problem
-  my (@parts) = &getpartlist($url);
-
-  $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".
-	  '<input type="submit" name="submit" value="See Grades" /> <br />'."\n";
-
-  foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
-    $result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
-  }
-
-  $result.='<input type="submit" name="submit" value="See Grades" /></table></form>';
-  return $result;
+#---- Called from the listStudents routine
+#     Displays the submissions for one student or a group of students
+sub processGroup {
+    my ($request)  = shift;
+    my $ctr        = 0;
+    my @stuchecked = (ref($ENV{'form.stuinfo'}) ? @{$ENV{'form.stuinfo'}}
+		      : ($ENV{'form.stuinfo'}));
+    my $total      = scalar(@stuchecked)-1;
+    if ($stuchecked[0] eq '') {
+	&userError($request,'No student was selected for viewing/grading.');
+	return;
+    }
+    foreach (@stuchecked) {
+	my ($uname,$udom,$fullname) = split(/:/);
+	$ENV{'form.student'}        = $uname;
+	$ENV{'form.userdom'}        = $udom;
+	$ENV{'form.fullname'}       = $fullname;
+	&submission($request,$ctr,$total);
+	$ctr++;
+    }
+    return '';
 }
 
+#------------------------------------------------------------------------------------
+#
+#-------------------------- 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);
+    my $request = shift;
+    $request->print(<<SUBJAVASCRIPT);
 <script type="text/javascript" language="javascript">
-  function updateRadio(radioButton,formtextbox,formsel,scores) {
+  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) {
+        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;
 	   }
@@ -1118,6 +442,15 @@ sub sub_page_js {
 	   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;
+       }
     }
 
     for (var i=0; i<radioButton.length; i++) {
@@ -1162,6 +495,20 @@ sub sub_page_js {
     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;
   }
 
@@ -1179,6 +526,10 @@ sub sub_page_js {
     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;
   }
 
@@ -1189,7 +540,6 @@ sub sub_page_js {
     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" }
@@ -1251,7 +601,6 @@ sub sub_page_js {
     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("}");
@@ -1341,10 +690,10 @@ function displaySavedMsg(ctr,msg,shwsel)
     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("  if (flag==1){");
-    hwdWin.document.write("     opener.document.SCORE.refresh.value = \\"on\\";");
+    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("}");
 
@@ -1385,8 +734,8 @@ function displaySavedMsg(ctr,msg,shwsel)
   function highlightend() { 
     hwdWin.document.write("</table>");
     hwdWin.document.write("</td></tr></table>&nbsp;");
-    hwdWin.document.write("<input type=\\"button\\" value=\\"Refresh\\" onClick=\\"javascript:updateChoice(1)\\">&nbsp;&nbsp;");
-    hwdWin.document.write("<input type=\\"button\\" value=\\"Set Options\\" onClick=\\"javascript:updateChoice(0)\\">&nbsp;&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>");
@@ -1396,6 +745,996 @@ function displaySavedMsg(ctr,msg,shwsel)
 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);
+
+    # header info
+    if ($counter == 0) {
+	&sub_page_js($request);
+	$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.
+	if ($ENV{'form.vProb'} eq 'yes') {
+	    my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
+							      $ENV{'request.course.id'});
+	    my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+								   $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> 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.
+	my %keyhash = ();
+	if ($ENV{'form.kwclr'} eq '') {
+	    %keyhash = &Apache::lonnet::dump('nohist_handgrade',
+					     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+					     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+	    my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+	    $ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
+	    $ENV{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
+	    $ENV{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
+	    $ENV{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
+	    $ENV{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ? 
+		$keyhash{$symb.'_subject'} : &Apache::lonnet::metadata($url,'title');
+	    $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".
+			'<input type="hidden" name="symb"       value="'.$symb.'" />'."\n".
+			'<input type="hidden" name="url"        value="'.$url.'" />'."\n".
+			'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" />'."\n".
+			'<input type="hidden" name="vProb"      value="'.$ENV{'form.vProb'}.'" />'."\n".
+			'<input type="hidden" name="lastSub"    value="'.$ENV{'form.lastSub'}.'" />'."\n".
+			'<input type="hidden" name="section"    value="'.$ENV{'form.section'}.'">'."\n".
+			'<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
+			'<input type="hidden" name="response"   value="'.$ENV{'form.response'}.'">'."\n".
+			'<input type="hidden" name="handgrade"  value="'.$ENV{'form.handgrade'}.'">'."\n".
+			'<input type="hidden" name="keywords"   value="'.$ENV{'form.keywords'}.'" />'."\n".
+			'<input type="hidden" name="kwclr"      value="'.$ENV{'form.kwclr'}.'" />'."\n".
+			'<input type="hidden" name="kwsize"     value="'.$ENV{'form.kwsize'}.'" />'."\n".
+			'<input type="hidden" name="kwstyle"    value="'.$ENV{'form.kwstyle'}.'" />'."\n".
+			'<input type="hidden" name="msgsub"     value="'.$ENV{'form.msgsub'}.'" />'."\n".
+			'<input type="hidden" name="savemsgN"   value="'.$ENV{'form.savemsgN'}.'" />'."\n".
+			'<input type="hidden" name="NCT"'.
+			' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : $total+1).'" />'."\n");
+	
+	my ($cts,$prnmsg) = (1,'');
+	while ($cts <= $ENV{'form.savemsgN'}) {
+	    $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
+		($keyhash{$symb.'_savemsg'.$cts} eq '' ? $ENV{'form.savemsg'.$cts} : $keyhash{$symb.'_savemsg'.$cts}).
+		'" />'."\n";
+	    $cts++;
+	}
+	$request->print($prnmsg);
+
+	if ($ENV{'form.handgrade'} eq 'yes' && $ENV{'form.showgrading'} eq 'yes') {
+	    $request->print(<<KEYWORDS);
+&nbsp;<b>Keyword Options:</b>&nbsp;
+<a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>List</a>&nbsp; &nbsp;
+<a href="#" onMouseDown="javascript:getSel(); return false"
+ CLASS="page">Paste Selection to List</a>&nbsp; &nbsp;
+<a href="javascript:kwhighlight()"; TARGET=_self>Highlight Attribute</a><br /><br />
+KEYWORDS
+        }
+    }
+
+    my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+    my ($partlist,$handgrade) = &response_type($url);
+
+    # Display student info
+    $request->print(($counter == 0 ? '' : '<br />'));
+    my $result='<table border="0" width=100%><tr><td bgcolor="#777777">'.
+	'<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 />';
+
+    # 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);
+	    if ($ncol > 0) {
+		s/\_/\./g;
+		if ($record{'resource.'.$_.'.collaborators'} ne '') {
+		    my (@collaborators) = split(/,?\s+/,
+						$record{'resource.'.$_.'.collaborators'});
+		    my (@badcollaborators);
+		    if (scalar(@collaborators) != 0) {
+			$result.='<b>Collaborators: </b>';
+			foreach my $collaborator (@collaborators) {
+			    $collaborator = $collaborator =~ /\@|:/ ? 
+				(split(/@|:/,$collaborator))[0] : $collaborator;
+			    next if ($collaborator eq $uname);
+			    if (!grep /^$collaborator:/i,keys %$classlist) {
+				push @badcollaborators,$collaborator;
+				next;
+			    }
+			    $col_flag++;
+			    push @col_list, $collaborator;
+			    $result.=$$fullname{$collaborator.':'.$udom}.'&nbsp; &nbsp; &nbsp;';
+			}
+			$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></table>' 
+			    if (scalar(@badcollaborators) > 0);
+
+			$result.='<table border="0"><tr bgcolor="#ffbbbb"><td>'.
+			    'This student has submitted too many collaborators. Maximum is '.
+			    $ncol.'.</td></tr></table>' if (scalar(@collaborators) > $ncol);
+			$result.='<input type="hidden" name="collaborator'.$counter.
+			    '" value="'.(join ':',@col_list).'" />'."\n";
+		    }
+		}
+	    }
+	}
+    }
+    $request->print($result."\n");
+
+    # 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=''.
+		'<b>Collaborative submission by: </b>'.
+		'<a href="javascript:viewSubmitter(\''.
+		$ENV{'form.'.$uname.':'.$udom.':submitted_by'}.
+		'\')"; TARGET=_self>'.
+		$$fullname{$ENV{'form.'.$uname.':'.$udom.':submitted_by'}}.'</a>';
+	    $request->print($submitby);
+	} else {
+	    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 {
+		for my $part (sort keys(%$handgrade)) {
+		    foreach (@$string) {
+			my ($partid,$respid) = /^resource\.(\d+)\.(\d+)\.submission/;
+			if ($part eq ($partid.'_'.$respid)) {
+			    my ($ressub,$subval) = split(/:/,$_,2);
+			    $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
+				$partid.'</b> <font color="#999999">( ID '.$respid.
+				' )</font>&nbsp; &nbsp;<b>Answer: </b>'.
+				&keywords_highlight($subval).'</td></tr>'
+				if ($ENV{'form.lastSub'} eq 'lastonly' || 
+				    ($ENV{'form.lastSub'} eq 'hdgrade' && 
+				     $$handgrade{$part} =~ /:yes$/));
+			}
+		    }
+		}
+	    }
+	    $lastsubonly.='</td></tr><tr><td bgcolor="#ffffff">'."\n";
+	    $request->print($lastsubonly);
+	}
+    } else {
+	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
+								 $ENV{'request.course.id'},
+								 $last,'.submission',
+								 'Apache::grades::keywords_highlight'));
+    }
+    
+    # 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.
+	',\''.$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 = ();
+    my @partlist;
+    for (sort keys(%$handgrade)) {
+	my ($partid,$respid) = split(/_/);
+	next if ($seen{$partid} > 0);
+	$seen{$partid}++;
+	next if ($$handgrade{$_} =~ /:no$/);
+	push @partlist,$partid;
+	my $wgt    = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
+	my $wgtmsg = ($wgt > 0 ? '(problem weight)' : 
+		      '<font color="red">problem weight assigned by computer</font>');
+	$wgt       = ($wgt > 0 ? $wgt : '1');
+	my $score  = ($record{'resource.'.$partid.'.awarded'} eq '' ?
+		      '' : $record{'resource.'.$partid.'.awarded'}*$wgt);
+	$result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />';
+	$result.='<table border="0"><tr><td><b>Part </b>'.$partid.' <b>Points: </b></td><td>';
+
+	my $ctr = 0;
+	$result.='<table border="0"><tr>';  # display radio buttons in a nice table 10 across
+	while ($ctr<=$wgt) {
+	    $result.= '<td><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+		'onclick="javascript:writeBox(this.form.GD_BOX'.$counter.'_'.$partid.
+		',this.form.GD_SEL'.$counter.'_'.$partid.','.$ctr.
+		',this.form.stores'.$counter.'_'.$partid.')" '.
+		($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
+	    $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+	    $ctr++;
+	}
+	$result.='</tr></table>';
+
+	$result.='</td><td>&nbsp;<b>or</b>&nbsp;</td>';
+	$result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
+	    ($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
+	    'onChange="javascript:updateRadio(this.form.RADVAL'.$counter.'_'.$partid.
+	    ',this.form.GD_BOX'.$counter.'_'.$partid.
+	    ',this.form.GD_SEL'.$counter.'_'.$partid.
+	    ',this.form.stores'.$counter.'_'.$partid.
+	    ','.$wgt.')" /></td>'."\n";
+	$result.='<td>/'.$wgt.' '.$wgtmsg.' </td><td>';
+
+	$result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
+	    'onChange="javascript:clearRadBox(this.form.RADVAL'.$counter.'_'.$partid.
+	    ',this.form.GD_BOX'.$counter.'_'.$partid.
+	    ',this.form.GD_SEL'.$counter.'_'.$partid.
+	    ',this.form.stores'.$counter.'_'.$partid.')" />'."\n".
+	    '<option selected="on"> </option>'.
+	    '<option>excused</option></select>'."&nbsp&nbsp\n";
+	$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="0" />';
+	$result.='</td></tr></table>';
+	$request->print($result);
+    }
+    $request->print('<input type="hidden" name="partlist'.$counter.'" value="'.(join ":",@partlist).'" />'."\n");
+    $request->print('</td></tr></table></td></tr></table>'."\n");
+
+    # print end of form
+    if ($counter == $total) {
+	my $endform.='<table border="0"><tr><td><input type="submit" name="gradeOpt" value="Save & Next" />';
+	my $ntstu ='<select name="NTSTU">'.
+	    '<option>1</option><option>2</option>'.
+	    '<option>3</option><option>5</option>'.
+	    '<option>7</option><option>10</option></select>'."\n";
+	my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
+	$ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;
+	$endform.=$ntstu.'student(s) &nbsp;&nbsp;'.
+	    '<input type="submit" name="gradeOpt" value="Next" />&nbsp'.
+	    '<input type="submit" name="gradeOpt" value="Previous" />&nbsp'.
+	    '(Next and Previous do not save the scores.)'.
+	    '</td><tr></table></form>';
+	$request->print($endform);
+    }
+    return '';
+}
+
+#--- Retrieve the last submission for all the parts
+sub get_last_submission {
+    my ($symb,$username,$domain,$course)=@_;
+    if ($symb) {
+	my (@string,$timestamp);
+	my (%returnhash)=&Apache::lonnet::restore($symb,$course,$domain,$username);
+	if ($returnhash{'version'}) {
+	    my %lasthash=();
+	    my ($version);
+	    for ($version=1;$version<=$returnhash{'version'};$version++) {
+		foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
+		    $lasthash{$_}=$returnhash{$version.':'.$_};
+		}
+	    }
+	    foreach ((keys %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{$_}))};
+	    }
+	}
+	@string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string;
+	return \@string,\$timestamp;
+    }
+}
+
+#--- 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 $styleoff = $styleon) =~ s/\</\<\//;
+    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'};
+    my $symb   = $ENV{'form.symb'};
+    my $button = $ENV{'form.gradeOpt'};
+    my $ngrade = $ENV{'form.NCT'};
+    my $ntstu  = $ENV{'form.NTSTU'};
+
+    if ($button eq 'Save & Next') {
+	my $ctr = 0;
+	while ($ctr < $ngrade) {
+	    my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
+	    my ($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 '') {
+	    $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
+	    $idx++;
+	}
+	$ctr++;
+    }
+    $ctr = 0;
+    while ($ctr < $ngrade) {
+	if ($ENV{'form.newmsg'.$ctr} ne '') {
+	    $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+	    $ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+	    $idx++;
+	}
+	$ctr++;
+    }
+    $ENV{'form.savemsgN'} = --$idx;
+    $keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
+    my $putresult = &Apache::lonnet::put
+	('nohist_handgrade',\%keyhash,
+	 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+	 $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+    # Called by Save & Refresh from Highlight Attribute Window
+    if ($ENV{'form.refresh'} eq 'on') {
+	my $ctr = 0;
+	$ENV{'form.NTSTU'}=$ngrade;
+	while ($ctr < $ngrade) {
+	    ($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$ENV{'form.unamedom'.$ctr});
+	    &submission($request,$ctr,$ngrade-1);
+	    $ctr++;
+	}
+	return '';
+    }
+
+    # Get the next/previous one or group of students
+    my $firststu = $ENV{'form.unamedom0'};
+    my $laststu = $ENV{'form.unamedom'.($ngrade-1)};
+    $ctr = 2;
+    while ($laststu eq '') {
+	$laststu  = $ENV{'form.unamedom'.($ngrade-$ctr)};
+	$ctr++;
+	$laststu = $firststu if ($ctr > $ngrade);
+    }
+
+    my ($classlist,$seclist,$ids,$stusec,$fullname) = &getclasslist($ENV{'form.section'},'0');
+    my (@parsedlist,@nextlist);
+    my ($nextflg) = 0;
+    foreach (sort {$$fullname{$a} cmp $$fullname{$b} } keys %$fullname) {
+	if ($nextflg == 1 && $button =~ /Next$/) {
+	    push @parsedlist,$_;
+	}
+	$nextflg = 1 if ($_ eq $laststu);
+	if ($button eq 'Previous') {
+	    last if ($_ eq $firststu);
+	    push @parsedlist,$_;
+	}
+    }
+    $ctr = 0;
+    my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
+    @parsedlist = reverse @parsedlist if ($button eq 'Previous');
+    foreach my $student (@parsedlist) {
+	my ($uname,$udom) = split(/:/,$student);
+	if ($ENV{'form.submitonly'} eq 'yes') {
+	    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(/\./);
+		$statusflg = '' if ($status{'resource.'.$partid.'.submitted_by'} ne '');
+	    }
+	    next if ($statusflg eq '');
+	}
+	push @nextlist,$student if ($ctr < $ntstu);
+	$ctr++;
+    }
+
+    $ctr = 0;
+    my $total = scalar(@nextlist)-1;
+
+    foreach (sort @nextlist) {
+	my ($uname,$udom,$submitter) = split(/:/);
+	$ENV{'form.student'}  = $uname;
+	$ENV{'form.userdom'}  = $udom;
+	$ENV{'form.fullname'} = $$fullname{$_};
+#	$ENV{'form.'.$_.':submitted_by'} = $submitter;
+#	print "submitter=$ENV{'form.'.$_.':submitted_by'}= $submitter:<br>";
+	&submission($request,$ctr,$total);
+	$ctr++;
+    }
+    if ($total < 0) {
+	my $the_end = '<h3><font color="red">LON-CAPA User Message</font></h3><br />'."\n";
+	$the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";
+	$the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";
+	$the_end.=&show_grading_menu_form ($symb,$url);
+	$request->print($the_end);
+    }
+    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 %newrecord;
+    foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
+	if ($ENV{'form.GD_SEL'.$newflg.'_'.$_} eq '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.'_'.$_});
+	    if ($pts eq '') {
+		&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 $partial= $pts/$wgt;
+	    $newrecord{'resource.'.$_.'.awarded'}  = $partial 
+		if ($record{'resource.'.$_.'.awarded'} ne $partial);
+	    my $reckey = 'resource.'.$_.'.solved';
+	    if ($partial == 0) {
+		$newrecord{$reckey} = 'incorrect_by_override' 
+		    if ($record{$reckey} ne 'incorrect_by_override');
+	    } else {
+		$newrecord{$reckey} = 'correct_by_override' 
+		    if ($record{$reckey} ne 'correct_by_override');
+	    }
+	    $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'}";
+	&Apache::lonnet::cstore(\%newrecord,$symb,
+				$ENV{'request.course.id'},$domain,$stuname);
+    }
+    return '';
+}
+
+#--------------------------------------------------------------------------------------
+#
+#-------------------------- 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,domain) {
+	document.onestudent.student.value = user;
+	document.onestudent.userdom.value = domain;
+	document.onestudent.submit();
+    }
+
+    function writePoint(partid,weight,point) {
+	var radioButton = eval("document.classgrade.RADVAL_"+partid);
+	var textbox = eval("document.classgrade.TEXTVAL_"+partid);
+	if (point == "textval") {
+	    var point = eval("document.classgrade.TEXTVAL_"+partid+".value");
+	    if (isNaN(point) || point < 0) {
+		alert("A number equal or greater than 0 is expected. Entered value = "+point);
+		var resetbox = false;
+		for (var i=0; i<radioButton.length; i++) {
+		    if (radioButton[i].checked) {
+			textbox.value = i;
+			resetbox = true;
+		    }
+		}
+		if (!resetbox) {
+		    textbox.value = "";
+		}
+		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) {
+		    radioButton[i].checked=true;
+		}
+	    }
+
+	} else {
+	    textbox.value = point;
+	}
+	for (i=0;i<document.classgrade.total.value;i++) {
+	    var user = eval("document.classgrade.ctr"+i+".value");
+	    var scorename = eval("document.classgrade.GD_"+user+
+				 "_"+partid+"_aw");
+	    var saveval   = eval("document.classgrade.GD_"+user+
+				 "_"+partid+"_sv_s.value");
+	    var selname   = eval("document.classgrade.GD_"+user+"_"+partid+"_sv");
+	    if (saveval != "correct") {
+		scorename.value = point;
+		if (selname[0].selected != true) {
+		    selname[0].selected = true;
+		}
+	    }
+	}
+	var selval   = eval("document.classgrade.SELVAL_"+partid);
+	selval[0].selected = true;
+    }
+
+    function writeRadText(partid,weight) {
+	var selval   = eval("document.classgrade.SELVAL_"+partid);
+	var radioButton = eval("document.classgrade.RADVAL_"+partid);
+	var textbox = eval("document.classgrade.TEXTVAL_"+partid);
+	if (selval[1].selected) {
+	    for (var i=0; i<radioButton.length; i++) {
+		radioButton[i].checked=false;
+
+	    }
+	    textbox.value = "";
+
+	    for (i=0;i<document.classgrade.total.value;i++) {
+		var user = eval("document.classgrade.ctr"+i+".value");
+		var scorename = eval("document.classgrade.GD_"+user+
+				     "_"+partid+"_aw");
+		var saveval   = eval("document.classgrade.GD_"+user+
+				     "_"+partid+"_sv_s.value");
+		var selname   = eval("document.classgrade.GD_"+user+
+				     "_"+partid+"_sv");
+		if (saveval != "correct") {
+		    scorename.value = "";
+		    selname[1].selected = true;
+		}
+	    }
+	} else {
+	    for (i=0;i<document.classgrade.total.value;i++) {
+		var user = eval("document.classgrade.ctr"+i+".value");
+		var scorename = eval("document.classgrade.GD_"+user+
+				     "_"+partid+"_aw");
+		var saveval   = eval("document.classgrade.GD_"+user+
+				     "_"+partid+"_sv_s.value");
+		var selname   = eval("document.classgrade.GD_"+user+
+				     "_"+partid+"_sv");
+		if (saveval != "correct") {
+		    scorename.value = eval("document.classgrade.GD_"+user+
+				     "_"+partid+"_aw_s.value");;
+		    selname[0].selected = true;
+		}
+	    }
+	}	    
+    }
+
+    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;
+    }
+
+    function changeOneScore(partid,user) {
+	var selval = eval("document.classgrade.GD_"+user+'_'+partid+"_sv");
+	if (selval[1].selected) {
+	    var boxval = eval("document.classgrade.GD_"+user+'_'+partid+"_aw");
+	    boxval.value = "";
+	}
+    }
+
+    function resetEntry(numpart) {
+	for (ctpart=0;ctpart<numpart;ctpart++) {
+	    var partid = eval("document.classgrade.partid_"+ctpart+".value");
+	    var radioButton = eval("document.classgrade.RADVAL_"+partid);
+	    var textbox = eval("document.classgrade.TEXTVAL_"+partid);
+	    var selval  = eval("document.classgrade.SELVAL_"+partid);
+	    for (var i=0; i<radioButton.length; i++) {
+		radioButton[i].checked=false;
+
+	    }
+	    textbox.value = "";
+	    selval[0].selected = true;
+
+	    for (i=0;i<document.classgrade.total.value;i++) {
+		var user = eval("document.classgrade.ctr"+i+".value");
+		var resetscore = eval("document.classgrade.GD_"+user+
+				      "_"+partid+"_aw");
+		resetscore.value = eval("document.classgrade.GD_"+user+
+					"_"+partid+"_aw_s.value");
+
+		var saveselval   = eval("document.classgrade.GD_"+user+
+				     "_"+partid+"_sv_s.value");
+
+		var selname   = eval("document.classgrade.GD_"+user+"_"+partid+"_sv");
+		if (saveselval == "excused") {
+		    if (selname[1].selected == false) { selname[1].selected = true;}
+		} else {
+		    if (selname[0].selected == false) {selname[0].selected = true};
+		}
+	    }
+	}
+    }
+
+</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);
+
+    my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'}); 
+    my $result='<h2><font color="#339933">Manual Grading</font></h2>';
+
+    $result.='<font size=+1><b>Resource: </b>'.$ENV{'form.url'}.'</font>'."\n";
+
+    #view individual student submission form - called using Javascript viewOneStudent
+    $result.= '<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";
+
+    #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".
+	'<input type="hidden" name="command" value="editgrades" />'."\n".
+	'<input type="hidden" name="section" value="'.$ENV{'form.section'}.'" />'."\n";
+
+    $result.='To assign the same score for all the students use the radio buttons or '.
+	'text box below. To assign scores individually fill in the score boxes for '.
+	'each student in the table below. <font color="red">A part that has already '.
+	'been graded does not get changed using the radio buttons or text box. '.
+	'If needed, it has to be changed individually.</font>';
+
+    #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;
+    $result.='<table border="0">';
+    for (sort keys(%$handgrade)) {
+	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
+	my ($partid,$respid) = split (/_/);
+	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.='<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
+	    $result.= '<td><input type="radio" name="RADVAL_'.$partid.'" '.
+		'onclick="javascript:writePoint('.$partid.','.$weight{$partid}.
+		','.$ctr.')" />'.$ctr."</td>\n";
+	    $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+	    $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\')" /> /'.
+	    $weight{$partid}.' (problem weight)</td>'."\n";
+	$result.= '</td><td><select name="SELVAL_'.$partid.'"'.
+	    'onChange="javascript:writeRadText('.$partid.','.$weight{$partid}.')" /> '.
+	    '<option selected="on"> </option>'.
+	    '<option>excused</option></select></td></tr>'."\n";
+	$ctsparts++;
+    }
+    $result.='</table><input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
+    $result.='<input type="button" value="Reset" '.
+	'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self> &nbsp; &nbsp;';
+#    $result.='<input type="button" value="Submit Changes" '.
+#	'onClick="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>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');
+	next if ($display =~ /^Number of Attempts/);
+	if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
+	if ($display =~ /^Partial Credit Factor/) {
+	    $_ = $display;
+	    my ($partid) = /.*?(\d+).*/;
+	    $result.='<td><b>Score Part '.$partid.'<br>(weight = '.
+		$weight{$partid}.')</b></td>'."\n";
+	    next;
+	}
+	$display =~ s/Problem Status/Grade Status<br>/;
+	$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 {$$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++;
+    }
+    $result.='</table></td></tr></table>';
+    $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
+    $result.='<input type="submit" name="submit" value="Submit Changes" /></form>';
+    $result.=&show_grading_menu_form($symb,$url);
+    return $result;
+}
+
+#--- call by previous routine to display each student
+sub viewstudentgrade {
+    my ($url,$symb,$courseid,$student,$fullname,$parts,$weight) = @_;
+    my ($uname,$udom) = split(/:/,$student);
+    my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
+    my $result='<tr bgcolor="#ffffdd"><td>'.
+	'<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"};
+	next if $type eq 'tries';
+	if ($type eq 'awarded') {
+	    my $pts = $score eq '' ? '' : $score*$$weight{$part};
+	    $result.='<input type="hidden" name="'.
+		'GD_'.$uname.'_'.$part.'_aw_s" value="'.$pts.'" />'."\n";
+	    $result.='<td align="middle"><input type="text" name="'.
+		'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_'.$uname.'_'.$part.'_sv_s" value="'.$status.'" />'."\n";
+	    $result.='<td align="middle"><select name="'.
+		'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');
+	    $result.=$optsel;
+	    $result.="</select></td>\n";
+	}
+    }
+    $result.='</tr>';
+    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 $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,$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";
+
+    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;
+	    $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) {
@@ -1470,15 +1809,15 @@ ENDPICK
 }
 
 sub csvuploadmap_header {
-  my ($request,$symb,$url,$datatoken,$distotal)= @_;
-  my $result;
-  my $javascript;
-  if ($ENV{'form.upfile_associate'} eq 'reverse') {
-    $javascript=&csvupload_javascript_reverse_associate();
-  } else {
-    $javascript=&csvupload_javascript_forward_associate();
-  }
-  $request->print(<<ENDPICK);
+    my ($request,$symb,$url,$datatoken,$distotal)= @_;
+    my $result;
+    my $javascript;
+    if ($ENV{'form.upfile_associate'} eq 'reverse') {
+	$javascript=&csvupload_javascript_reverse_associate();
+    } else {
+	$javascript=&csvupload_javascript_forward_associate();
+    }
+    $request->print(<<ENDPICK);
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
 <h3>Uploading Class Grades for resource $url</h3>
 <hr>
@@ -1502,28 +1841,28 @@ to this page if the data selected is ins
 $javascript
 </script>
 ENDPICK
-  return '';
+return '';
 
 }
 
 sub csvupload_fields {
-  my ($url) = @_;
-  my (@parts) = &getpartlist($url);
-  my @fields=(['username','Student Username'],['domain','Student Domain']);
-  foreach my $part (sort(@parts)) {
-    my @datum;
-    my $display=&Apache::lonnet::metadata($url,$part.'.display');
-    my $name=$part;
-    if  (!$display) { $display = $name; }
-    @datum=($name,$display);
-    push(@fields,\@datum);
-  }
-  return (@fields);
+    my ($url) = @_;
+    my (@parts) = &getpartlist($url);
+    my @fields=(['username','Student Username'],['domain','Student Domain']);
+    foreach my $part (sort(@parts)) {
+	my @datum;
+	my $display=&Apache::lonnet::metadata($url,$part.'.display');
+	my $name=$part;
+	if  (!$display) { $display = $name; }
+	@datum=($name,$display);
+	push(@fields,\@datum);
+    }
+    return (@fields);
 }
 
 sub csvuploadmap_footer {
-  my ($request,$i,$keyfields) =@_;
-  $request->print(<<ENDPICK);
+    my ($request,$i,$keyfields) =@_;
+    $request->print(<<ENDPICK);
 </table>
 <input type="hidden" name="nfields" value="$i" />
 <input type="hidden" name="keyfields" value="$keyfields" />
@@ -1533,207 +1872,356 @@ ENDPICK
 }
 
 sub csvuploadmap {
-  my ($request)= @_;
-  my ($symb,$url)=&get_symb_and_url($request);
-  if (!$symb) {return '';}
-  my $datatoken;
-  if (!$ENV{'form.datatoken'}) {
-    $datatoken=&Apache::loncommon::upfile_store($request);
-  } else {
-    $datatoken=$ENV{'form.datatoken'};
-    &Apache::loncommon::load_tmp_file($request);
-  }
-  my @records=&Apache::loncommon::upfile_record_sep();
-  &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
-  my $i;
-  my $keyfields;
-  if (@records) {
-    my @fields=&csvupload_fields($url);
-    if ($ENV{'form.upfile_associate'} eq 'reverse') {	
-      &Apache::loncommon::csv_print_samples($request,\@records);
-      $i=&Apache::loncommon::csv_print_select_table($request,\@records,
-						    \@fields);
-      foreach (@fields) { $keyfields.=$_->[0].','; }
-      chop($keyfields);
+    my ($request)= @_;
+    my ($symb,$url)=&get_symb_and_url($request);
+    if (!$symb) {return '';}
+    my $datatoken;
+    if (!$ENV{'form.datatoken'}) {
+	$datatoken=&Apache::loncommon::upfile_store($request);
     } else {
-      unshift(@fields,['none','']);
-      $i=&Apache::loncommon::csv_samples_select_table($request,\@records,
-						      \@fields);
-      my %sone=&Apache::loncommon::record_sep($records[0]);
-      $keyfields=join(',',sort(keys(%sone)));
+	$datatoken=$ENV{'form.datatoken'};
+	&Apache::loncommon::load_tmp_file($request);
     }
-  }
-  &csvuploadmap_footer($request,$i,$keyfields);
-  return '';
+    my @records=&Apache::loncommon::upfile_record_sep();
+    &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
+    my ($i,$keyfields);
+    if (@records) {
+	my @fields=&csvupload_fields($url);
+	if ($ENV{'form.upfile_associate'} eq 'reverse') {	
+	    &Apache::loncommon::csv_print_samples($request,\@records);
+	    $i=&Apache::loncommon::csv_print_select_table($request,\@records,
+							  \@fields);
+	    foreach (@fields) { $keyfields.=$_->[0].','; }
+	    chop($keyfields);
+	} else {
+	    unshift(@fields,['none','']);
+	    $i=&Apache::loncommon::csv_samples_select_table($request,\@records,
+							    \@fields);
+	    my %sone=&Apache::loncommon::record_sep($records[0]);
+	    $keyfields=join(',',sort(keys(%sone)));
+	}
+    }
+    &csvuploadmap_footer($request,$i,$keyfields);
+    return '';
 }
 
 sub csvuploadassign {
-  my ($request)= @_;
-  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 @keyfields = split(/\,/,$ENV{'form.keyfields'});
-  my %fields=();
-  for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) {
-    if ($ENV{'form.upfile_associate'} eq 'reverse') {
-      if ($ENV{'form.f'.$i} ne 'none') {
-	$fields{$keyfields[$i]}=$ENV{'form.f'.$i};
-      }
-    } else {
-      if ($ENV{'form.f'.$i} ne 'none') {
-	$fields{$ENV{'form.f'.$i}}=$keyfields[$i];
-      }
+    my ($request)= @_;
+    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 @keyfields = split(/\,/,$ENV{'form.keyfields'});
+    my %fields=();
+    for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) {
+	if ($ENV{'form.upfile_associate'} eq 'reverse') {
+	    if ($ENV{'form.f'.$i} ne 'none') {
+		$fields{$keyfields[$i]}=$ENV{'form.f'.$i};
+	    }
+	} else {
+	    if ($ENV{'form.f'.$i} ne 'none') {
+		$fields{$ENV{'form.f'.$i}}=$keyfields[$i];
+	    }
+	}
     }
-  }
-  $request->print('<h3>Assigning Grades</h3>');
-  my $courseid=$ENV{'request.course.id'};
+    $request->print('<h3>Assigning Grades</h3>');
+    my $courseid=$ENV{'request.course.id'};
 #  my $cdom=$ENV{"course.$courseid.domain"};
 #  my $cnum=$ENV{"course.$courseid.num"};
-  my ($classlist) = &getclasslist('all','1');
-  my @skipped;
-  my $countdone=0;
-  foreach my $grade (@gradedata) {
-    my %entries=&Apache::loncommon::record_sep($grade);
-    my $username=$entries{$fields{'username'}};
-    my $domain=$entries{$fields{'domain'}};
-    if (!exists($$classlist{"$username:$domain"})) {
-      push(@skipped,"$username:$domain");
-      next;
-    }
-    my %grades;
-    foreach my $dest (keys(%fields)) {
-      if ($dest eq 'username' || $dest eq 'domain') { next; }
-      if ($entries{$fields{$dest}} eq '') { next; }
-      my $store_key=$dest;
-      $store_key=~s/^stores/resource/;
-      $store_key=~s/_/\./g;
-      $grades{$store_key}=$entries{$fields{$dest}};
-    }
-    $grades{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
-    &Apache::lonnet::cstore(\%grades,$symb,$ENV{'request.course.id'},
-			    $domain,$username);
-    $request->print('.');
-    $request->rflush();
-    $countdone++;
-  }
-  $request->print("<br />Stored $countdone students\n");
-  if (@skipped) {
-    $request->print('<br /><font size="+1"><b>Skipped Students</b></font><br />');
-    foreach my $student (@skipped) { $request->print("<br />$student"); }
-  }
-  $request->print(&view_edit_entire_class_form($symb,$url));
-  $request->print(&show_grading_menu_form($symb,$url));
-  return '';
+    my ($classlist) = &getclasslist('all','1');
+    my @skipped;
+    my $countdone=0;
+    foreach my $grade (@gradedata) {
+	my %entries=&Apache::loncommon::record_sep($grade);
+	my $username=$entries{$fields{'username'}};
+	my $domain=$entries{$fields{'domain'}};
+	if (!exists($$classlist{"$username:$domain"})) {
+	    push(@skipped,"$username:$domain");
+	    next;
+	}
+	my %grades;
+	foreach my $dest (keys(%fields)) {
+	    if ($dest eq 'username' || $dest eq 'domain') { next; }
+	    if ($entries{$fields{$dest}} eq '') { next; }
+	    my $store_key=$dest;
+	    $store_key=~s/^stores/resource/;
+	    $store_key=~s/_/\./g;
+	    $grades{$store_key}=$entries{$fields{$dest}};
+	}
+	$grades{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
+	&Apache::lonnet::cstore(\%grades,$symb,$ENV{'request.course.id'},
+				$domain,$username);
+	$request->print('.');
+	$request->rflush();
+	$countdone++;
+    }
+    $request->print("<br />Stored $countdone students\n");
+    if (@skipped) {
+	$request->print('<br /><font size="+1"><b>Skipped Students</b></font><br />');
+	foreach my $student (@skipped) { $request->print("<br />$student"); }
+    }
+    $request->print(&view_edit_entire_class_form($symb,$url));
+    $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;
 }
 
-sub handler {
-  my $request=$_[0];
+#--- 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;
+}
 
-  if ($ENV{'browser.mathml'}) {
-    $request->content_type('text/xml');
-  } else {
-    $request->content_type('text/html');
-  }
-  $request->send_http_header;
-  return OK if $request->header_only;
-  &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
-  my $url=$ENV{'form.url'};
-  my $symb=$ENV{'form.symb'};
-  my $command=$ENV{'form.command'};
-  if (!$url) {
-    my ($temp1,$temp2);
-    ($temp1,$temp2,$ENV{'form.url'})=split(/___/,$symb);
-    $url = $ENV{'form.url'};
-  }
-  &send_header($request);
-  if ($url eq '' && $symb eq '') {
-     if ($ENV{'user.adv'}) {
-         if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) &&
-             ($ENV{'form.codethree'})) {
-             my $token=$ENV{'form.codeone'}.'*'.$ENV{'form.codetwo'}.'*'.
-		        $ENV{'form.codethree'};
-             my ($tsymb,$tuname,$tudom,$tcrsid)=
-		 &Apache::lonnet::checkin($token);
-             if ($tsymb) {
-                my ($map,$id,$url)=split(/\_\_\_/,$tsymb);
-                if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
-                   $request->print(
-                     &Apache::lonnet::ssi('/res/'.$url,
-                        ('grade_username' => $tuname,
-                         'grade_domain' => $tudom,
-                         'grade_courseid' => $tcrsid,
-                         'grade_symb' => $tsymb)));
-                } else {
-                   $request->print('<h1>Not authorized: '.$token.'</h1>');
-                }           
+#--- 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 {
+    my $request=$_[0];
+    
+    if ($ENV{'browser.mathml'}) {
+	$request->content_type('text/xml');
+    } else {
+	$request->content_type('text/html');
+    }
+    $request->send_http_header;
+    return '' if $request->header_only;
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+    my $url=$ENV{'form.url'};
+    my $symb=$ENV{'form.symb'};
+    my $command=$ENV{'form.command'};
+    if (!$url) {
+	my ($temp1,$temp2);
+	($temp1,$temp2,$ENV{'form.url'})=split(/___/,$symb);
+	$url = $ENV{'form.url'};
+    }
+    &send_header($request);
+    if ($url eq '' && $symb eq '') {
+	if ($ENV{'user.adv'}) {
+	    if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) &&
+		($ENV{'form.codethree'})) {
+		my $token=$ENV{'form.codeone'}.'*'.$ENV{'form.codetwo'}.'*'.
+		    $ENV{'form.codethree'};
+		my ($tsymb,$tuname,$tudom,$tcrsid)=
+		    &Apache::lonnet::checkin($token);
+		if ($tsymb) {
+		    my ($map,$id,$url)=split(/\_\_\_/,$tsymb);
+		    if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
+			$request->print(
+					&Apache::lonnet::ssi('/res/'.$url,
+							     ('grade_username' => $tuname,
+							      'grade_domain' => $tudom,
+							      'grade_courseid' => $tcrsid,
+							      'grade_symb' => $tsymb)));
+		    } else {
+			$request->print('<h2>Not authorized: '.$token.'</h2>');
+		    }           
+		} else {
+		    $request->print('<h2>Not a valid DocID: '.$token.'</h2>');
+		}
 	    } else {
-                $request->print('<h1>Not a valid DocID: '.$token.'</h1>');
-            }
-	 } else {
-             $request->print(&Apache::lonxml::tokeninputfield());
-         }
-     }
-  } else {
-    #&Apache::lonhomework::showhashsubset(\%ENV,'^form');
-    $Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
-    if ($command eq 'submission') {
-      &listStudents($request) if ($ENV{'form.student'} eq '');
-      &submission($request,0,0) if ($ENV{'form.student'} ne '');
-    } elsif ($command eq 'processGroup') {
-      &processGroup($request);
-    } elsif ($command eq 'gradingmenu') {
-      $request->print(&gradingmenu($request));
-    } elsif ($command eq 'viewgrades') {
-      $request->print(&viewgrades($request));
-    } elsif ($command eq 'handgrade') {
-      $request->print(&processHandGrade($request));
-    } elsif ($command eq 'editgrades') {
-      $request->print(&editgrades($request));
-    } elsif ($command eq 'verify') {
-      $request->print(&verifyreceipt($request));
-    } elsif ($command eq 'csvupload') {
-      $request->print(&csvupload($request));
-    } elsif ($command eq 'viewclasslist') {
-      $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));
-      } else {
-	if ( $ENV{'form.upfile_associate'} ne 'reverse' ) {
-	  $ENV{'form.upfile_associate'} = 'reverse';
-	} else {
-	  $ENV{'form.upfile_associate'} = 'forward';
+		$request->print(&Apache::lonxml::tokeninputfield());
+	    }
 	}
-	$request->print(&csvuploadmap($request));
-      }
     } else {
-      $request->print("Unknown action: $command:");
+	#&Apache::lonhomework::showhashsubset(\%ENV,'^form');
+	$Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+	if ($command eq 'submission') {
+	    &listStudents($request) if ($ENV{'form.student'} eq '');
+	    &submission($request,0,0) if ($ENV{'form.student'} ne '');
+	} elsif ($command eq 'processGroup') {
+	    &processGroup($request);
+	} elsif ($command eq 'gradingmenu') {
+	    $request->print(&gradingmenu($request));
+	} elsif ($command eq 'viewgrades') {
+	    $request->print(&viewgrades($request));
+	} elsif ($command eq 'handgrade') {
+	    $request->print(&processHandGrade($request));
+	} elsif ($command eq 'editgrades') {
+	    $request->print(&editgrades($request));
+	} elsif ($command eq 'verify') {
+	    $request->print(&verifyreceipt($request));
+	} elsif ($command eq 'csvupload') {
+	    $request->print(&csvupload($request));
+	} elsif ($command eq 'viewclasslist') {
+	    $request->print(&viewclasslist($request));
+	} elsif ($command eq 'csvuploadmap') {
+	    $request->print(&csvuploadmap($request));
+	} elsif ($command eq 'csvuploadassign') {
+	    if ($ENV{'form.associate'} ne 'Reverse Association') {
+		$request->print(&csvuploadassign($request));
+	    } else {
+		if ( $ENV{'form.upfile_associate'} ne 'reverse' ) {
+		    $ENV{'form.upfile_associate'} = 'reverse';
+		} else {
+		    $ENV{'form.upfile_associate'} = 'forward';
+		}
+		$request->print(&csvuploadmap($request));
+	    }
+	} else {
+	    $request->print("Unknown action: $command:");
+	}
     }
-  }
-  &send_footer($request);
-  return OK;
+    &send_footer($request);
+    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;