--- loncom/homework/grades.pm	2001/05/01 17:30:18	1.7
+++ loncom/homework/grades.pm	2002/06/25 21:07:56	1.31
@@ -1,5 +1,37 @@
+# The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
+#
+# $Id: grades.pm,v 1.31 2002/06/25 21:07:56 ng Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 2/9,2/13 Guy Albertelli
+# 6/8 Gerd Kortemeyer
+# 7/26 H.K. Ng
+# 8/20 Gerd Kortemeyer
+# Year 2002
+# June 2002 H.K. Ng
+#
 
 package Apache::grades;
 use strict;
@@ -15,16 +47,137 @@ sub moreinfo {
   $request->print("Unable to process request: $reason");
   if ( $Apache::grades::viewgrades eq 'F' ) {
     $request->print('<form action="/adm/grades" method="post">'."\n");
-    $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'"></input>'."\n");
-    $request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'"></input>'."\n");
-    $request->print("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'"></input>'."<br />\n");
-    $request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'"></input>'."<br />\n");
-    $request->print('<input type="submit" name="submit" value="ReSubmit"></input>'."<br />\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 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($cdom,$cnum,'0');
+        foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+            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');
+    }
+    return '';
+}
+
+sub receiptInput {
+  my ($request) = shift;
+  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'});
+  $request->print(<<ENDHEADER);
+<h2><font color="#339933">Verify a Submission Receipt Issued by this Server</font></h2>
+<form action="/adm/grades" method="post">
+<tt>$hostver-<input type="text" name="receipt" size="4"></tt>
+<input type="submit" name="submit" value="Verify">
+<input type="hidden" name="command" value="verify">
+ENDHEADER
+	  if ($ENV{'form.url'}) {
+	    $request->print(
+    '<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />');
+	  }
+	  if ($ENV{'form.symb'}) {
+	    $request->print(
+    '<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />');
+	  }
+#  $request->print(<<ENDTABLEST);
+  $request->print('</form>');
+    return '';
+}
+
+sub listStudents {
+  my ($request) = shift;
+  my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
+  my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
+
+  $request->print(<<ENDTABLEST);
+<h2><font color="#339933">Show Student Submissions on Assessment</font></h2>
+
+<table border="0"><tr><td bgcolor="#000000">
+<table border="0">
+<tr bgcolor="#e6ffff"><td colspan="6"><b>Resource: </b> $ENV{'form.url'}</td></tr>
+<tr bgcolor="#e6ffff"><td><b>Username</b></td><td><b>Name</b></td><td><b>Domain</b></td>
+<td><b>View Problem</b></td><td><b>Submissions</b></td><td><b>Action</b></td></tr>
+ENDTABLEST
+  my (%classlist) = &getclasslist($cdom,$cnum,'0');
+  foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+      my ($sname,$sdom) = split(/:/,$student);
+
+      my %name=&Apache::lonnet::get('environment', ['lastname','generation',
+						    'firstname','middlename'],
+				    $sdom,$sname);
+      my $fullname;
+      my ($tmp) = keys(%name);
+      if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
+	$fullname=$name{'lastname'}.$name{'generation'};
+	if ($fullname =~ /[^\s]+/) { $fullname.=', '; }
+	$fullname.=$name{'firstname'}.' '.$name{'middlename'};
+      }
+      if ( $Apache::grades::viewgrades eq 'F' ) {
+	  $request->print("\n".'<tr bgcolor=#ffffe6>'."<td>$sname</td><td>$fullname</td><td>$sdom</td>".
+			  '<form action="/adm/grades" method="post">');
+	  if ($ENV{'form.url'}) {
+	    $request->print(
+			    '<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />');
+	  }
+	  if ($ENV{'form.symb'}) {
+	    $request->print(
+			    '<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />');
+	  }
+	  $request->print(
+			  '<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />');
+	  $request->print(
+			  '<input type="hidden" name="student" value="'.$sname.'" />');
+	  $request->print(
+			  '<input type="hidden" name="fullname" value="'.$fullname.'" />');
+	  $request->print(
+			  '<input type="hidden" name="domain" value="'.$sdom.'" />');
+	  $request->print('<td>'.
+			  '<input type="radio" name="vProb" value="no" checked> no '.
+			  '<input type="radio" name="vProb" value="yes"> yes </td>');
+	  $request->print('<td>'.
+			  '<input type="radio" name="submission" value="last" checked> last '.
+			  '<input type="radio" name="submission" value="all"> all </td>');
+	  $request->print(
+                         '<td><input type="submit" name="submit" value="View/Grade" />');
+	  $request->print('</td></tr></form>');
+#	  $request->print('</form></td></tr>');
+      }
+  }
+  $request->print('</table></td></tr></table>');
+}
+
 
 #FIXME - needs to handle multiple matches
 sub finduser {
@@ -34,9 +187,8 @@ sub finduser {
   if ( $Apache::grades::viewgrades eq 'F' ) {
     #get classlist
     my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
-    my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
-    #print "Found $cdom:$cnum:$chome<br />";
-    my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
+    #print "Found $cdom:$cnum<br />";
+    my (%classlist) = &getclasslist($cdom,$cnum,'0');
     foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
       my ($posname,$posdomain) = split(/:/,$student);
       if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; }
@@ -48,19 +200,18 @@ sub finduser {
 }
 
 sub getclasslist {
-  my ($coursedomain,$coursenum,$coursehome,$hideexpired) = @_;
-  my $classlist=&Apache::lonnet::reply("dump:$coursedomain:$coursenum:classlist",$coursehome);
-  my %classlist=();
+  my ($coursedomain,$coursenum,$hideexpired) = @_;
+  my %classlist=&Apache::lonnet::dump('classlist',$coursedomain,$coursenum);
   my $now = time;
-  foreach my $record (split /&/, $classlist) {
-    my ($name,$value)=split(/=/,&Apache::lonnet::unescape($record));
-    my ($end,$start)=split(/:/,$value);
+  foreach my $student (keys(%classlist)) {
+    my ($end,$start)=split(/:/,$classlist{$student});
     # still a student?
     if (($hideexpired) && ($end) && ($end < $now)) {
-      print "Skipping:$name:$end:$now<br />\n";
+      #print "Skipping:$name:$end:$now<br />\n";
       next;
     }
-    push( @{ $classlist{'allids'} }, $name); 
+    #print "record=$record<br>";
+    push( @{ $classlist{'allids'} }, $student);
   }
   return (%classlist);
 }
@@ -70,7 +221,7 @@ sub getpartlist {
   my @parts =();
   my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
   foreach my $key (@metakeys) {
-    if ( $key =~ m/stores_([0-9]+)_.*/ ) {
+    if ( $key =~ m/stores_([0-9]+)_.*/) {
       push(@parts,$key);
     }
   }
@@ -80,53 +231,46 @@ sub getpartlist {
 sub viewstudentgrade {
   my ($url,$symb,$courseid,$student,@parts) = @_;
   my $result ='';
+  my $cellclr = '"#ffffdd"';
+  my ($username,$domain) = split(/:/,$student);
 
-  my ($stuname,$domain) = split(/:/,$student);
-
-  my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname,
-				      &Apache::lonnet::homeserver($stuname,$domain));
+  my (@requests) = ('lastname','firstname','middlename','generation');
+  my (%name) = &Apache::lonnet::get('environment',\@requests,$domain,$username);
+  my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$username);
+  my $fullname=$name{'lastname'}.$name{'generation'};
+  if ($fullname =~ /[^\s]+/) { $fullname.=', '; }
+  $fullname.=$name{'firstname'}.' '.$name{'middlename'};
 
-  $result.="<tr><td>$stuname</td><td>$domain</td>\n";
+  $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);
-    #print "resource.$part.$type = ".$record{"resource.$part.$type"}." <br />\n";
-    if ($type eq 'awarded') {
-      my $score=$record{"resource.$part.$type"};
-      $result.="<td><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n";
-    } elsif ($type eq 'tries') {
-      my $score=$record{"resource.$part.$type"};
-      $result.="<td><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n"
+    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 $score=$record{"resource.$part.$type"};
-      $result.="<td><select name=\"GRADE.$student.$part.$type\">\n";
-      if ($score =~ /^correct/) {
-	$result.="<option selected=\"on\">correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";
-      } elsif ($score =~ /^incorrect/) {
-	$result.="<option>correct</option>\n<option selected=\"on\">incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";
-      } elsif ($score eq '') {
-	$result.="<option>correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option selected=\"on\">nothing</option>\n";
-      } elsif ($score =~ /^excused/) {
-	$result.="<option>correct</option>\n<option>incorrect</option>\n<option selected=\"on\">excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";
-      } elsif ($score =~ /^ungraded/) {
-	$result.="<option>correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option selected=\"on\">ungraded</option>\n<option>nothing</option>\n";
-      }
+      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>handgraded</option><option>nothing</option>'."\n";
+      $status = 'nothing' if ($status eq '');
+      $optsel =~ s/<option>$status/<option selected="on">$status/;
+      $result.=$optsel;
       $result.="</select></td>\n";
     }
   }
-  $result.='</tr>';
+  $result.='<td></td></tr>';
   return $result;
 }
-#FIXME need to look at the meatdata <stores> spec on what type of data to accept and provide an
+
+#FIXME need to look at the metadata <stores> spec on what type of data to accept and provide an
 #interface based on that, also do that to above function.
 sub setstudentgrade {
   my ($url,$symb,$courseid,$student,@parts) = @_;
 
   my $result ='';
-
   my ($stuname,$domain) = split(/:/,$student);
-
-  my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname,
-				      &Apache::lonnet::homeserver($stuname,$domain));
+  my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);
   my %newrecord;
 
   foreach my $part (@parts) {
@@ -162,70 +306,212 @@ sub setstudentgrade {
   }
   if ( scalar(keys(%newrecord)) > 0 ) {
     $newrecord{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
-    &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname,
-			    &Apache::lonnet::homeserver($stuname,$domain));
+    &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);
+
     $result.="Stored away ".scalar(keys(%newrecord))." elements.<br />\n";
   }
   return $result;
 }
 
+# -- show submissions of a student, option to grade
+#
 sub submission {
   my ($request) = @_;
+  $request->print(<<JAVASCRIPT);
+<script type="text/javascript">
+    function changeRadio(title,url) {
+    }
+</script>
+JAVASCRIPT
   my $url=$ENV{'form.url'};
   $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=&Apache::lonnet::symbread($url);
+  my $symb;
+  if ($ENV{'form.symb'}) {
+    $symb=$ENV{'form.symb'};
+  } else {
+    $symb=&Apache::lonnet::symbread($url);
+  }
   if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
-  my $home=&Apache::lonnet::homeserver($uname,$udom);
-  my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,$home,
-						      $ENV{'request.course.id'});
-  my $result="<h2> Submission Record </h2>  $uname:$udom for $url".$answer;
+#
+# header info
+  my $result='<h2><font color="#339933">Submission Record</font></h2>';
+  $result.='<table border="0"><tr><td><b>Username: </b>'.$uname.'</td><td><b>Fullname: </b>'.$ENV{'form.fullname'}.'</td><td><b>Domain: </b>'.$udom.'</td></tr>';
+  $result.='<tr><td colspan=3><b>Resource: </b>'.$url.'</td></tr></table>';
+#
+# option to display problem
+  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'});
+      $result.='<table border="0"><tr><td bgcolor="#000000">';
+      $result.='<table border="0"><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 />';
+  }
+  my $last = '';
+  $last = 'last' if ($ENV{'form.submission'} eq 'last');
+  my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
+						      $ENV{'request.course.id'},$last);
+  $result.=$answer;
+
+  my $maxpt = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname);
+  my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+  my $score = $record{'resource.0.awarded'}*$maxpt;
+
+  $result.= '<form action="/adm/grades" method="post" name="SCORE">'."\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".
+         '<table border="0"><tr><td><b>Points</b></td><td>';
+  my $ctr = 0;
+  while ($ctr<=$maxpt) {
+      $result.= '<input type="radio" name="radval" '.
+	  'onclick="javascript:SCORE.GRADE_'.$ENV{'form.student'}.'.value='.$ctr.'" value="'.$ctr.'" '.
+	  ($score == $ctr? 'checked':'').' /> '.$ctr."\n";
+      $ctr++;
+  }
+  $result.='</td><td>&nbsp;<b>or</b>&nbsp;</td>';
+  $result.='<td><input type="text" name="GRADE_'.$ENV{'form.student'}.'"'.
+      ($score ne ''? ' value = "'.$score.'"':'').' size="4" /></td>'."\n";  
+  $result.='<td>/'.$maxpt.' (max pts)</td><td>';
+
+  foreach my $part (&getpartlist($url)) {
+    my ($temp,$part,$type)=split(/_/,$part);
+    if ($type eq 'solved') {
+      my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2);
+      $result.="<select name=\"GRADE.$uname:$udom.$part.$type\">\n";
+      my $optsel = '<option>correct</option><option>incorrect</option>'.
+	  '<option>excused</option><option>ungraded</option>'.
+	      '<option>handgraded</option><option>nothing</option>'."\n";
+      $status = 'nothing' if ($status eq '');
+      $optsel =~ s/<option>$status/<option selected="on">$status/;
+      $result.=$optsel;
+      $result.="</select></td></tr>\n";
+    }
+  }
+  $result.='<tr><td colspan="5">The buttons do not work yet.<input type="submit" name="gradeOpt" value="Save N Next" />&nbsp;';
+  $result.='<input type="submit" name="gradeOpt" value="Next" />&nbsp';
+  $result.='<input type="submit" name="gradeOpt" value="Previous" />&nbsp';
+  $result.='</td><tr></table></form>';
   return $result;
 }
 
-sub viewgrades {
-  my ($request) = @_;
-  my $result='';
-
-  #get resource reference
+sub get_symb_and_url {
+ my ($request) = @_;
   my $url=$ENV{'form.url'};
   $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
   my $symb=$ENV{'form.symb'};
   if (!$symb) { $symb=&Apache::lonnet::symbread($url); }
   if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
+ return ($symb,$url);
+}
+
+sub view_edit_entire_class_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="viewgrades" />'."\n".
+	  '<input type="submit" name="submit" value="View/Grade Entire Class" />'."\n".
+	    '</form>'."\n";
+  return $result;
+}
+
+sub show_grading_menu_form {
+  my ($symb,$url)=@_;
+  my $result.='<form action="/adm/grades" method="post">'."\n".
+    '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+      '<input type="hidden" name="url" value="'.$url.'" />'."\n".
+	'<input type="hidden" name="command" value="gradingmenu" />'."\n".
+	  '<input type="submit" name="submit" value="Grading Menu" />'."\n".
+	    '</form>'."\n";
+  return $result;
+}
 
+sub gradingmenu {
+  my ($request) = @_;
+  my ($symb,$url)=&get_symb_and_url($request);
+  if (!$symb) {return '';}
+
+  my $result='<h2>&nbsp;<font color="#339933">Select a Grading Method</font></h2><br />';
+  $result.='<table width=100% border=0><tr><td bgcolor=#000000>'."\n";
+  $result.='<table width=100% border=0><tr><td bgcolor=#e6ffff>'."\n";
+  $result.='&nbsp;<b>Resource :</b> '.$url.'</td></tr>'."\n";
+  $result.='<tr bgcolor=#ffffe6><td>'."\n";
+  $result.=&view_edit_entire_class_form($symb,$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="csvupload" />'."\n".
+	  '<input type="submit" name="submit" value="Upload Scores" />'."\n".
+	    '</form>'."\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="submission" />'."\n".
+	  '<input type="submit" name="submit" value="View/Grade A Student" />'."\n".
+	    '</form>'."\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="receiptInput" />'."\n".
+	  '<input type="submit" name="submit" value="Verify Receipt" />'."\n".
+	    '</form>'."\n";
+  $result.='</td></tr></table>'."\n";
+  $result.='</td></tr></table>'."\n";
+  return $result;
+}
+
+sub viewgrades {
+  my ($request) = @_;
+  my $result='';
+
+  #get resource reference
+  my ($symb,$url)=&get_symb_and_url($request);
+  if (!$symb) {return '';}
   #get classlist
   my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
-  my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
-  #print "Found $cdom:$cnum:$chome<br />";
-  my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
-
+  #print "Found $cdom:$cnum<br />";
+  my (%classlist) = &getclasslist($cdom,$cnum,'0');
+  my $headerclr = '"#ccffff"';
+  my $cellclr = '"#ffffcc"';
 
   #get list of parts for this problem
-  my (@parts) = &getpartlist($url);
+  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="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>'."\n".
-	      '<tr><td>UserId</td><td>Domain</td>'."\n";
+	    '<table border=0><tr><td bgcolor="#000000">'."\n".
+	     '<table border=0>'."\n".
+	      '<tr bgcolor='.$headerclr.'><td><b>Username</b></td><td><b>Name</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>$display</td>\n";
-   }
-  $result.="</tr>";
+      print "Manual grading:$url:$part:$display:<br>";
+     $result.='<td><b>'.$display.'</b></td>'."\n";
+  }
+  $result.='</tr>';
   #get info for each student
   foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+    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><input type="submit" name="submit" value="Submit Changes" /></form>';
-
+  $result.='</table></td></tr></table>';
+  $result.='<input type="submit" name="submit" value="Submit Changes" /></form>';
+  $result.=&show_grading_menu_form($symb,$url);
   return $result;
 }
 
@@ -238,9 +524,8 @@ sub editgrades {
   my $url=$ENV{'form.url'};
   #get classlist
   my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
-  my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
-  #print "Found $cdom:$cnum:$chome<br />";
-  my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
+  #print "Found $cdom:$cnum<br />";
+  my (%classlist) = &getclasslist($cdom,$cnum,'0');
 
   #get list of parts for this problem
   my (@parts) = &getpartlist($url);
@@ -259,6 +544,256 @@ sub editgrades {
   return $result;
 }
 
+sub csvupload {
+  my ($request)= @_;
+  my $result;
+  my ($symb,$url)=&get_symb_and_url($request);
+  if (!$symb) {return '';}
+  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" />
+<hr />
+<h3>Specify a file containing the class grades for resource $url</h3>
+$upfile_select
+<p><input type="submit" name="submit" value="Upload Grades" />
+ENDUPFORM
+  return $result;
+}
+
+sub csvupload_javascript_reverse_associate {
+  return(<<ENDPICK);
+  function verify(vf) {
+    var foundsomething=0;
+    var founduname=0;
+    var founddomain=0;
+    for (i=0;i<=vf.nfields.value;i++) {
+      tw=eval('vf.f'+i+'.selectedIndex');
+      if (i==0 && tw!=0) { founduname=1; }
+      if (i==1 && tw!=0) { founddomain=1; }
+      if (i!=0 && i!=1 && tw!=0) { foundsomething=1; }
+    }
+    if (founduname==0 || founddomain==0) {
+      alert('You need to specify at both the username and domain');
+      return;
+    }
+    if (foundsomething==0) {
+      alert('You need to specify at least one grading field');
+      return;
+    }
+    vf.submit();
+  }
+  function flip(vf,tf) {
+    var nw=eval('vf.f'+tf+'.selectedIndex');
+    var i;
+    for (i=0;i<=vf.nfields.value;i++) {
+      //can not pick the same destination field for both name and domain
+      if (((i ==0)||(i ==1)) && 
+          ((tf==0)||(tf==1)) && 
+          (i!=tf) &&
+          (eval('vf.f'+i+'.selectedIndex')==nw)) {
+        eval('vf.f'+i+'.selectedIndex=0;')
+      }
+    }
+  }
+ENDPICK
+}
+
+sub csvupload_javascript_forward_associate {
+  return(<<ENDPICK);
+  function verify(vf) {
+    var foundsomething=0;
+    var founduname=0;
+    var founddomain=0;
+    for (i=0;i<=vf.nfields.value;i++) {
+      tw=eval('vf.f'+i+'.selectedIndex');
+      if (tw==1) { founduname=1; }
+      if (tw==2) { founddomain=1; }
+      if (tw>2) { foundsomething=1; }
+    }
+    if (founduname==0 || founddomain==0) {
+      alert('You need to specify at both the username and domain');
+      return;
+    }
+    if (foundsomething==0) {
+      alert('You need to specify at least one grading field');
+      return;
+    }
+    vf.submit();
+  }
+  function flip(vf,tf) {
+    var nw=eval('vf.f'+tf+'.selectedIndex');
+    var i;
+    //can not pick the same destination field twice
+    for (i=0;i<=vf.nfields.value;i++) {
+      if ((i!=tf) && (eval('vf.f'+i+'.selectedIndex')==nw)) {
+        eval('vf.f'+i+'.selectedIndex=0;')
+      }
+    }
+  }
+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);
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
+<h3>Uploading Class Grades for resource $url</h3>
+<hr>
+<h3>Identify fields</h3>
+Total number of records found in file: $distotal <hr />
+Enter as many fields as you can. The system will inform you and bring you back
+to this page if the data selected is insufficient to run your class.<hr />
+<input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
+<input type="hidden" name="associate"  value="" />
+<input type="hidden" name="phase"      value="three" />
+<input type="hidden" name="datatoken"  value="$datatoken" />
+<input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />
+<input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" />
+<input type="hidden" name="upfile_associate" 
+                                       value="$ENV{'form.upfile_associate'}" />
+<input type="hidden" name="symb"       value="$symb" />
+<input type="hidden" name="url"        value="$url" />
+<input type="hidden" name="command"    value="csvuploadassign" />
+<hr />
+<script type="text/javascript" language="Javascript">
+$javascript
+</script>
+ENDPICK
+  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);
+}
+
+sub csvuploadmap_footer {
+  my ($request,$i,$keyfields) =@_;
+  $request->print(<<ENDPICK);
+</table>
+<input type="hidden" name="nfields" value="$i" />
+<input type="hidden" name="keyfields" value="$keyfields" />
+<input type="button" onClick="javascript:verify(this.form)" value="Assign Grades" /><br />
+</form>
+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);
+    } 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];
+      }
+    }
+  }
+  $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($cdom,$cnum,'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 '';
+}
+
 sub send_header {
   my ($request)= @_;
   $request->print(&Apache::lontexconvert::header());
@@ -279,8 +814,6 @@ sub send_footer {
 sub handler {
   my $request=$_[0];
 
-  if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} else {$Apache::lonxml::debug=0;}
-  
   if ($ENV{'browser.mathml'}) {
     $request->content_type('text/xml');
   } else {
@@ -288,23 +821,76 @@ sub handler {
   }
   $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 '') {
-    $request->print("Non-Contextual Access Unsupported:$command:$url:");
+     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>');
+                }           
+	    } 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') {
-      $request->print(&submission($request));
+      &listStudents($request) if ($ENV{'form.student'} eq '');
+      $request->print(&submission($request)) if ($ENV{'form.student'} ne '');
+    } elsif ($command eq 'gradingmenu') {
+      $request->print(&gradingmenu($request));
     } elsif ($command eq 'viewgrades') {
       $request->print(&viewgrades($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 '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(&csvuploadmap($request));
+      }
     } else {
-      $request->print("Unknown action:$command:");
+      $request->print("Unknown action: $command:");
     }
   }
   &send_footer($request);