--- loncom/homework/grades.pm	2001/10/05 21:51:14	1.16
+++ loncom/homework/grades.pm	2002/04/09 03:56:29	1.20
@@ -1,4 +1,30 @@
+# The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
+#
+# $Id: grades.pm,v 1.20 2002/04/09 03:56:29 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
@@ -38,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);
@@ -51,22 +79,29 @@ sub listStudents {
 #      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(
+ "\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'}.'" />'."\n");
+	    $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'}.'" />'."\n");
+	    $request->print(
+    '<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />');
 	  }
-	  $request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />'."\n");
-	  $request->print('<input type="hidden" name="student" value="'.$sname.'" />'."\n");
-	  $request->print('<input type="hidden" name="domain" value="'.$sdom.'" />'."\n");
-	  $request->print('<input type="submit" name="submit" value="View" />'."<br />\n");
-	  $request->print('</form>');
+	  $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>');
 }
 
 
@@ -231,6 +266,13 @@ sub submission {
   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;
 }
 
@@ -381,7 +423,7 @@ sub handler {
   } 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));