--- loncom/homework/grades.pm	2001/08/06 20:29:37	1.13
+++ loncom/homework/grades.pm	2002/05/16 00:01:09	1.25
@@ -1,7 +1,34 @@
+# The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
+#
+# $Id: grades.pm,v 1.25 2002/05/16 00:01:09 albertel 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,45 +44,113 @@ 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->print('<p>'.$matches.' match(es)</p>');
+    }
+    return '';
+}
 
 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');
+  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);
+<h1>Verify a Submission Receipt Issued by this Server</h1>
+<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);
+</form>
+<h1>Show Student Submissions on Assessment</h1>
+<table border="1">
+<tr><th>Username</th><th>Domain</th><th>Name</th><th>&nbsp;</th></tr>
+ENDTABLEST
+  my (%classlist) = &getclasslist($cdom,$cnum,'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]);
-
+      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('<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>'."<td>$sname</td><td>$sdom</td><td>$fullname</td><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="domain" value="'.$sdom.'" />');
+	  $request->print(
+                         '<input type="submit" name="submit" value="View" />');
+	  $request->print('</form></td></tr>');
       }
   }
-
+  $request->print('</table>');
 }
 
 
@@ -67,9 +162,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; }
@@ -81,20 +175,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;
     }
-    print "record=$record<br>";
-    push( @{ $classlist{'allids'} }, $name); 
+    #print "record=$record<br>";
+    push( @{ $classlist{'allids'} }, $student);
   }
   return (%classlist);
 }
@@ -210,11 +302,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:<br />";
+
+  $answer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+						  $ENV{'request.course.id'});
+  $result.=$answer;
   return $result;
 }
 
@@ -231,9 +335,8 @@ sub viewgrades {
 
   #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"';
 
@@ -244,8 +347,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".
@@ -275,9 +378,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);
@@ -325,24 +427,56 @@ 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') {
-      $request->print(&listStudents($request)) if ($ENV{'form.student'} eq '');
+      &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') {
       $request->print(&editgrades($request));
+    } elsif ($command eq 'verify') {
+      $request->print(&verifyreceipt($request));
     } else {
-      $request->print("Unknown action:$command:");
+      $request->print("Unknown action: $command:");
     }
   }
   &send_footer($request);