--- loncom/interface/statistics/lonstudentassessment.pm	2002/09/22 18:24:45	1.12
+++ loncom/interface/statistics/lonstudentassessment.pm	2002/10/23 21:04:26	1.16
@@ -1,12 +1,11 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstudentassessment.pm,v 1.12 2002/09/22 18:24:45 minaeibi Exp $
+# $Id: lonstudentassessment.pm,v 1.16 2002/10/23 21:04:26 minaeibi 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
@@ -165,6 +164,14 @@ sub BuildStudentAssessmentPage {
             untie(%cache);
         }
     }
+
+
+    $r->print(&StudentReport(\%cache, "AvgTotal", $spacing, $sequenceKeys));
+    $r->print("\n");
+    $r->rflush();
+    untie(%cache);
+
+
     $r->print('</pre>'."\n");
     if($selected == 0) {
 	$Str .= '<h3><font color=blue>WARNING: ';
@@ -341,13 +348,17 @@ sub StudentReport {
         $spacesNeeded -= 3;
         $Str .= (' 'x$spacesNeeded);
 
-	my $outputProblemsCorrect = sprintf("%3d", $cache->{$name.':'.$sequence.
-                                                            ':problemsCorrect'});
+#        my $outputProblemsCorrect = sprintf("%3d", $cache->{$name.':'.$sequence.
+#							    ':problemsCorrect'});
+
+	my $outputProblemsCorrect = sprintf("%2d/%2d", $cache->{$name.':'.$sequence.
+                                            ':problemsCorrect'}, 
+                                            $characterCount);
         if($hasData eq 'true') {
             $Str .= '<font color="#007700">'.$outputProblemsCorrect.'</font>';
             $hasFinalData = 'true';
         } else {
-            $Str .= '<font color="#007700">   </font>';
+            $Str .= '<font color="#007700">     </font>';
         }
         $Str .= $spacing;
     }
@@ -383,13 +394,14 @@ problems.
 
 sub CreateLegend {
     my $Str = "<p><pre>".
-              "1..9  correct by student in 1..9 tries\n".
+              "   1  correct by student in 1 try\n".
+              "   7  correct by student in 7 tries\n".
               "   *  correct by student in more than 9 tries\n".
 	      "   +  correct by override\n".
               "   -  incorrect by override\n".
 	      "   .  incorrect attempted\n".
 	      "   #  ungraded attempted\n".
-              "      not attempted\n".
+              "      not attempted (blank field)\n".
 	      "   x  excused".
               "</pre><p>"; 
     return $Str;