--- loncom/homework/grades.pm	2001/05/01 17:30:18	1.7
+++ loncom/homework/grades.pm	2001/08/20 23:27:27	1.15
@@ -1,5 +1,8 @@
 # The LON-CAPA Grading handler
 # 2/9,2/13 Guy Albertelli
+# 6/8 Gerd Kortemeyer
+# 7/26 H.K. Ng
+# 8/20 Gerd Kortemeyer
 
 package Apache::grades;
 use strict;
@@ -26,6 +29,37 @@ sub moreinfo {
 }
 
 
+sub listStudents {
+  my ($request) = shift;
+  my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+  my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
+  $request->print ("Found $cdom:$cnum:$chome<br />");
+  my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
+  foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+      my ($sname,$sdom) = split(/:/,$student);
+
+      my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
+		     ':environment:lastname&generation&firstname&middlename',
+		      &Apache::lonnet::homeserver($sname,$sdom));
+      #print "reply=$reply<br>";
+      my (@nameparts) = split /&/,$reply;
+#      my $sfullname = $Apache::lonnet::unescape($nameparts[0]);
+
+      if ( $Apache::grades::viewgrades eq 'F' ) {
+	  $request->print('<form action="/adm/grades" method="post">'."\n");
+	  $request->print("$sname @nameparts\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('<input type="hidden" name="student" value="'.$sname.'"></input>'."\n");
+	  $request->print('<input type="hidden" name="domain" value="'.$sdom.'"></input>'."\n");
+	  $request->print('<input type="submit" name="submit" value="View"></input>'."<br />\n");
+	  $request->print('</form>');
+      }
+  }
+
+}
+
+
 #FIXME - needs to handle multiple matches
 sub finduser {
   my ($name) = @_;
@@ -57,9 +91,10 @@ sub getclasslist {
     my ($end,$start)=split(/:/,$value);
     # still a student?
     if (($hideexpired) && ($end) && ($end < $now)) {
-      print "Skipping:$name:$end:$now<br />\n";
+      #print "Skipping:$name:$end:$now<br />\n";
       next;
     }
+    #print "record=$record<br>";
     push( @{ $classlist{'allids'} }, $name); 
   }
   return (%classlist);
@@ -80,25 +115,24 @@ sub getpartlist {
 sub viewstudentgrade {
   my ($url,$symb,$courseid,$student,@parts) = @_;
   my $result ='';
-
+  my $cellclr = '"#ffffdd"';
   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);
 
-  $result.="<tr><td>$stuname</td><td>$domain</td>\n";
+  $result.="<tr><td bgcolor=$cellclr>$stuname</td><td bgcolor=$cellclr 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";
+      $result.="<td bgcolor=$cellclr align=\"middle\"><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"
+      $result.="<td bgcolor=$cellclr 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";
+      $result.="<td bgcolor=$cellclr align=\"middle\"><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/) {
@@ -125,8 +159,8 @@ sub setstudentgrade {
 
   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,8 +196,8 @@ 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;
@@ -174,14 +208,14 @@ sub submission {
   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 ''; }
+#  if ($ENV{'form.student'} eq '') { &listStudents($request); return ''; }
   my ($uname,$udom) = &finduser($ENV{'form.student'});
   if ($uname eq '') { &moreinfo($request,"Unable to find student"); return ''; }
   my $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,
+  my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
 						      $ENV{'request.course.id'});
-  my $result="<h2> Submission Record </h2>  $uname:$udom for $url".$answer;
+  my $result="<h2> Submission Record </h2>  $uname:$udom for $url <br />".$answer;
   return $result;
 }
 
@@ -201,30 +235,34 @@ sub viewgrades {
   my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
   #print "Found $cdom:$cnum:$chome<br />";
   my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
-
+  my $headerclr = '"#ccffff"';
+  my $cellclr = '"#ffffcc"';
 
   #get list of parts for this problem
   my (@parts) = &getpartlist($url);
 
+  $request->print ("<h2><font color=\"#339966\">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>'."\n".
-	      '<tr><td>UserId</td><td>Domain</td>'."\n";
+	    '<table border=0><tr><td bgcolor="#999999">'."\n".
+	     '<table border=0>'."\n".
+	      '<tr><td bgcolor='.$headerclr.'>UserId</td><td bgcolor='.$headerclr.'>Domain</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.='<td bgcolor='.$headerclr.'>'.$display.'</td>'."\n";
    }
   $result.="</tr>";
   #get info for each student
   foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
     $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><input type="submit" name="submit" value="Submit Changes" /></form>';
 
   return $result;
 }
@@ -294,11 +332,37 @@ sub handler {
   
   &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::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
     if ($command eq 'submission') {
-      $request->print(&submission($request));
+      $request->print(&listStudents($request)) if ($ENV{'form.student'} eq '');
+      $request->print(&submission($request)) if ($ENV{'form.student'} ne '');
     } elsif ($command eq 'viewgrades') {
       $request->print(&viewgrades($request));
     } elsif ($command eq 'editgrades') {