--- loncom/homework/grades.pm	2001/08/06 20:29:37	1.13
+++ loncom/homework/grades.pm	2002/04/06 21:07:08	1.19
@@ -1,7 +1,34 @@
+# The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
+#
+# $Id: grades.pm,v 1.19 2002/04/06 21:07:08 www 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
 
 package Apache::grades;
 use strict;
@@ -17,11 +44,16 @@ 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 '';
@@ -32,7 +64,9 @@ 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 />");
+  $request->print ('<h1>Show Student Submissions on Assessment</h1>'.
+ '<table border="1"><tr><th>Username</th><th>Domain</th><th>Name</th><th>&nbsp;</th></tr>'
+ );
   my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
   foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
       my ($sname,$sdom) = split(/:/,$student);
@@ -40,22 +74,34 @@ sub listStudents {
       my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
 		     ':environment:lastname&generation&firstname&middlename',
 		      &Apache::lonnet::homeserver($sname,$sdom));
-      print "reply=$reply<br>";
+      #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>');
+	  $request->print(
+ "\n".'<tr><form action="/adm/grades" method="post">'.
+ "<td>$sname</td><td>$sdom</td><td>@nameparts</td><td>");
+	  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="domain" value="'.$sdom.'" />');
+	  $request->print(
+                         '<input type="submit" name="submit" value="View" />');
+	  $request->print('</td></form></tr>');
       }
   }
-
+  $request->print('</table>');
 }
 
 
@@ -90,10 +136,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>";
+    #print "record=$record<br>";
     push( @{ $classlist{'allids'} }, $name); 
   }
   return (%classlist);
@@ -210,11 +256,23 @@ sub submission {
 #  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);
+  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 $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
 						      $ENV{'request.course.id'});
   my $result="<h2> Submission Record </h2>  $uname:$udom for $url <br />".$answer;
+  my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
+						   $ENV{'request.course.id'});
+  $result.="Student's view of the problem:<br /> $rendered <br /> Correct answer:";
+
+  my $answer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+						  $ENV{'request.course.id'});
+  $result.=$answer;
   return $result;
 }
 
@@ -244,8 +302,8 @@ sub viewgrades {
 
   #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 border=0><tr><td bgcolor="#999999">'."\n".
@@ -325,13 +383,43 @@ 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::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
     if ($command eq 'submission') {