--- loncom/interface/statistics/lonstudentassessment.pm	2002/12/18 20:02:34	1.22
+++ loncom/interface/statistics/lonstudentassessment.pm	2003/01/09 16:37:48	1.26
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstudentassessment.pm,v 1.22 2002/12/18 20:02:34 minaeibi Exp $
+# $Id: lonstudentassessment.pm,v 1.26 2003/01/09 16:37:48 minaeibi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,7 @@
 # 11/1,11/4,11/16,12/14,12/16,12/18,12/20,12/31 Behrouz Minaei
 # YEAR=2002
 # 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6 Behrouz Minaei
-# 5/12,5/14,5/15,5/19,5/26,7/16  Behrouz Minaei
+# 5/12,5/14,5/15,5/19,5/26,7/16,12/24  Behrouz Minaei
 #
 ###
 
@@ -101,6 +101,7 @@ sub BuildStudentAssessmentPage {
     if($c->aborted()) {  return $Str; }
 
     my $selected=0;
+    my $Count = 0;
     $r->print('<pre>'."\n");
     foreach (@$students) {
         if($c->aborted()) { return $Str; }
@@ -132,8 +133,16 @@ sub BuildStudentAssessmentPage {
                     push(@before, $_);
                 }
             }
-            my $displayString = 'DISPLAYDATA'.$spacing;
-            $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
+            $Count++;
+	    my $out = '';
+#	    $out .= sprintf("%3d", $Count);
+            if($Count % 2) {
+                $out .= '<bgcolor="#FFFFFF">';
+            } else {
+                $out .= '<bgcolor="#F0F0F0">';
+            }
+	    my $displayString = $out.'DISPLAYDATA'.$spacing;
+	    $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
                                                          \%cache, $_,
                                                          \@before,
                                                          $displayString,
@@ -164,18 +173,17 @@ sub BuildStudentAssessmentPage {
             untie(%cache);
         }
     }
-
-#    if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
-#        $r->print(&StudentAverageTotal(\%cache, $students, $sequenceKeys));
-#        untie(%cache);
-#    }
-    $r->print('</pre>'."\n");
+    $r->print('</pre>'."\n"); 
     if($selected == 0) {
 	$Str .= '<h3><font color=blue>WARNING: ';
-        $Str .= 'Please select a student</font></h3>';
+        $Str .= 'No Students enrolled OR Please select a student</font></h3>';
         $r->print($Str);
+    } else {
+	if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
+	    $r->print(&StudentAverageTotal(\%cache, $students, $sequenceKeys));
+	    untie(%cache);
+	}
     }
-
     return;
 }
 
@@ -238,6 +246,7 @@ sub CreateTableHeadings {
     my($cache,$spacing,$infoKeys,$infoHeadings,$sequenceKeys,
        $sequenceHeadings)=@_;
 
+#    my $Str = '&nbsp&nbsp&nbsp&nbsp&nbsp';
     my $Str = '';
     $Str .= '<table border="0" cellpadding="0" cellspacing="0">'."\n";
 
@@ -400,7 +409,7 @@ sub StudentReport {
 
 sub StudentAverageTotal {
     my ($cache, $students, $sequenceKeys)=@_;
-    my $Str = "\nAverageTotal\n";
+    my $Str = "\n<b>Summary Tables:</b>\n";
     my %Correct = ();
     my $ProblemsSolved = 0;
     my $TotalProblems = 0;
@@ -409,25 +418,78 @@ sub StudentAverageTotal {
     foreach my $name (@$students) {
         $StudentCount++;
         foreach my $sequence (@$sequenceKeys) {
-            $Correct{$cache->{$sequence.':title'}} +=
-	        $cache->{$name.':'.$sequence.':problemsCorrect'};
+            $Correct{$sequence} +=
+	       $cache->{$name.':'.$sequence.':problemsCorrect'};
         }
 	$ProblemsSolved += $cache->{$name.':problemsSolved'};
         $TotalProblems += $cache->{$name.':totalProblems'};
     }
-    $ProblemsSolved /= $StudentCount;
-    $TotalProblems /= $StudentCount;
-    $Str .= "AvgSlvd:$ProblemsSolved  AvgTotal: $TotalProblems\n";
-    
-    foreach (%Correct) {
-        $Str .= "$_  : $Correct{$_}\n";
+    if ($StudentCount) { 
+        $ProblemsSolved /= $StudentCount;
+        $TotalProblems /= $StudentCount;
+    } else {
+        $ProblemsSolved = 0;
+        $TotalProblems  = 0;
+    }
+    $Str .= '<table border=2 cellspacing="1">'."\n";
+    $Str .= '<tr><td><b>Students Count</b></td><td><b>'.
+            $StudentCount.'</b></td></tr>'."\n";
+    $Str .= '<tr><td><b>Total Problems</b></td><td><b>'.
+            $TotalProblems.'</b></td></tr>'."\n";
+    $Str .= '<tr><td><b>Average Correct</b></td><td><b>'.
+            $ProblemsSolved.'</b></td></tr>'."\n";
+    $Str .= '</table>'."\n";
+
+    $Str .= '<table border=2 cellspacing="1">'."\n";
+    $Str .= '<tr><th>Title</th><th>Total Problems</th>'.
+            '<th>Average Correct</th></tr>'."\n";
+    foreach my $S(@$sequenceKeys) {
+        my $title=$cache->{$S.':title'};
+	#$Str .= $cache->{$S.':problems'};
+	#my @problems=split(':', $cache->{$S.':problems'});
+	#my $pCount=scalar @problems;
+	my $pCount=MaxSeqPr($cache,@$students[0],$S);
+        my $crr;
+	if ($StudentCount) {
+            $crr=sprintf( "%.2f", $Correct{$S}/$StudentCount );
+        } else {
+            $crr="0.00";
+        }
+        $Str .= '<tr><td>'.$title.
+                '</td><td align=center>'.$pCount.
+                '</td><td align=center>'.$crr.
+                '</td></tr>'."\n";
     }
 
+    $Str .= '</table>'."\n";
+
     return $Str;
 }
 
 
 
+sub MaxSeqPr {
+    my ($cache, $name, $sequence)=@_;
+    my $prCount=0;
+    foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
+        my $problem = $cache->{$problemID.':problem'};
+        foreach(split(/\:/,$cache->{$sequence.':'.$problemID.':parts'})) {
+            if($cache->{$name.':'.$problemID.':NoVersion'} eq 'true' ||
+               $cache->{$name.':'.$problemID.':'.$_.':code'} eq ' ' ||
+               $cache->{$name.':'.$problemID.':'.$_.':code'} eq '') {
+                 $prCount++;
+                 next;
+            }
+            $prCount++;
+        }
+    }
+    return $prCount;
+}
+
+
+
+
+
 =pod
 
 =item &CreateLegend()