--- loncom/interface/statistics/lonstudentassessment.pm	2002/08/31 18:31:15	1.9
+++ 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.9 2002/08/31 18:31:15 stredwic 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: ';
@@ -290,8 +297,7 @@ sub StudentReport {
 
     my $Str = '';
     if(defined($cache->{$name.':error'})) {
-        return '<br><br><br>';
-#        return 'ERROR in student report for '.$name.'<br>';
+        return $Str;
     }
     if($cache->{$name.':error'} =~ /course/) {
         $Str .= '<b><font color="blue">No course data for student </font>';
@@ -299,7 +305,10 @@ sub StudentReport {
         return $Str;
     }
 
+    my $hasVersion = 'false';
+    my $hasFinalData = 'false';
     foreach my $sequence (@$showSequences) {
+        my $hasData = 'false';
         my $characterCount=0;
         foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
             my $problem = $cache->{$problemID.':problem'};
@@ -308,12 +317,15 @@ sub StudentReport {
             # current problem in the correct order and prepare the output links
             foreach(split(/\:/,$cache->{$sequence.':'.$problemID.
                                         ':parts'})) {
-                $characterCount++;
                 if($cache->{$name.':'.$problemID.':NoVersion'} eq 'true' ||
-                   $cache->{$name.':'.$problemID.':'.$_.':code'} eq ' ') {
+                   $cache->{$name.':'.$problemID.':'.$_.':code'} eq ' ' ||
+                   $cache->{$name.':'.$problemID.':'.$_.':code'} eq '') {
                     $Str .= ' ';
+                    $characterCount++;
                     next;
                 }
+                $hasVersion = 'true';
+                $hasData = 'true';
                 $Str .= '<a href="/adm/grades?symb=';
                 $Str .= &Apache::lonnet::escape($problem);
                 $Str .= '&student='.$username.'&domain='.$domain;
@@ -324,7 +336,8 @@ sub StudentReport {
                     $code = $tries;
                 }
                 $Str .= $code;
-                $Str.='</a>';
+                $Str .= '</a>';
+                $characterCount++;
             }
         }
 
@@ -335,9 +348,18 @@ sub StudentReport {
         $spacesNeeded -= 3;
         $Str .= (' 'x$spacesNeeded);
 
-	my $outputProblemsCorrect = sprintf("%3d", $cache->{$name.':'.$sequence.
-                                                            ':problemsCorrect'});
-	$Str .= '<font color="#007700">'.$outputProblemsCorrect.'</font>';
+#        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 .= $spacing;
     }
 
@@ -346,8 +368,16 @@ sub StudentReport {
     # a way to dynamically determine the space requirements.
     my $outputProblemsSolved = sprintf("%4d", $cache->{$name.':problemsSolved'});
     my $outputTotalProblems  = sprintf("%4d", $cache->{$name.':totalProblems'});
-    $Str .= '<font color="#000088">'.$outputProblemsSolved.
+    if($hasFinalData eq 'true') {
+        $Str .= '<font color="#000088">'.$outputProblemsSolved.
 	    ' / '.$outputTotalProblems.'</font>';
+    } else {
+        $Str .= '<font color="#000088">           </font>';
+    }
+
+    if($hasVersion eq 'false') {
+        $Str = '<b><font color="blue">No course data.</font></b>';
+    }
 
     return $Str;
 }
@@ -364,14 +394,15 @@ problems.
 
 sub CreateLegend {
     my $Str = "<p><pre>".
-              "1..9: correct by student in 1..9 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".
-	      "   x: excused".
+              "   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 (blank field)\n".
+	      "   x  excused".
               "</pre><p>"; 
     return $Str;
 }