--- loncom/interface/statistics/lonstudentassessment.pm	2002/12/11 18:41:00	1.20
+++ loncom/interface/statistics/lonstudentassessment.pm	2002/12/16 23:35:46	1.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstudentassessment.pm,v 1.20 2002/12/11 18:41:00 minaeibi Exp $
+# $Id: lonstudentassessment.pm,v 1.21 2002/12/16 23:35:46 minaeibi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,7 +34,7 @@
 #
 ###
 
-package Apache::lonstudentassessment; 
+package Apache::lonstudentassessment;
 
 use strict;
 use Apache::lonhtmlcommon;
@@ -77,10 +77,10 @@ sub BuildStudentAssessmentPage {
         }
     }
     my ($infoHeadings, $infoKeys, $sequenceHeadings, $sequenceKeys,
-        $doNotShow) = 
+        $doNotShow) =
         &ShouldShowColumns(\%cache, $headings, $studentInformation);
 
-    my $selectedName = &FindSelectedStudent(\%cache, 
+    my $selectedName = &FindSelectedStudent(\%cache,
                                             $cache{'StudentAssessmentStudent'},
                                             $students);
     $r->print(&CreateInterface(\%cache, $selectedName, $students, $formName,
@@ -165,14 +165,10 @@ sub BuildStudentAssessmentPage {
         }
     }
 
-
-#    $r->print("AverageTtal");
-#    $r->print(&StudentAverageTotal(\%cache, $spacing, $sequenceKeys));
-#    $r->print("\n");
-#    $r->rflush();
-    untie(%cache);
-
-
+    if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
+        $r->print(&StudentAverageTotal(\%cache, $students, $sequenceKeys));
+        untie(%cache);
+    }
     $r->print('</pre>'."\n");
     if($selected == 0) {
 	$Str .= '<h3><font color=blue>WARNING: ';
@@ -183,6 +179,9 @@ sub BuildStudentAssessmentPage {
     return;
 }
 
+
+
+
 #---- Student Assessment Web Page --------------------------------------------
 
 sub CreateInterface {
@@ -195,8 +194,8 @@ sub CreateInterface {
     $Str .= 'value="Previous Student" />'."\n";
     $Str .= '&nbsp&nbsp&nbsp'."\n";
     $Str .= &Apache::lonhtmlcommon::StudentOptions($cache, $students,
-                                                   $selectedName, 
-                                                   'StudentAssessment', 
+                                                   $selectedName,
+                                                   'StudentAssessment',
                                                    $formName);
     $Str .= "\n".'&nbsp&nbsp&nbsp'."\n";
     $Str .= '<input type="submit" name="NextStudent" ';
@@ -225,7 +224,7 @@ sub CreateInterface {
         lc($ENV{'form.displaymode'}) eq 'display with links') {
         $Str .= 'value="Display without links" />';
         # Set the current value, in case it is undefined
-        $ENV{'form.displaymode'} = 'Display with links'; 
+        $ENV{'form.displaymode'} = 'Display with links';
     } else {
         $Str .= 'value="Display with links" />';
     }
@@ -296,7 +295,7 @@ database.
 
 Output: $Str
 
-$Str: Formatted string that is an entire row of the chart.  It is a 
+$Str: Formatted string that is an entire row of the chart.  It is a
 concatenation of student information and student course information.
 
 =back
@@ -342,7 +341,7 @@ sub StudentReport {
                     $Str .= '<a href="/adm/grades?symb=';
                     $Str .= &Apache::lonnet::escape($problem);
                     $Str .= '&student='.$username.'&domain='.$domain;
-                    $Str .= '&command=submission">'; 
+                    $Str .= '&command=submission">';
                 }
                 my $code = $cache->{$name.':'.$problemID.':'.$_.':code'};
                 my $tries = $cache->{$name.':'.$problemID.':'.$_.':tries'};
@@ -400,84 +399,28 @@ sub StudentReport {
 
 
 sub StudentAverageTotal {
-    
-    return "";
-
-    my ($cache,$name,$spacing,$showSequences)=@_;
-    my $username = $name;
-    my $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'};
-            # All grades (except for versionless parts) are displayed as links
-            # to their submission record.  Loop through all the parts for the
-            # current problem in the correct order and prepare the output links
-            foreach(split(/\:/,$cache->{$sequence.':'.$problemID.
-                                        ':parts'})) {
-                if($cache->{$name.':'.$problemID.':NoVersion'} eq 'true' ||
-                   $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= Average &domain= Total';
-                $Str .= '&command=submission">';
-                my $code = $cache->{$name.':'.$problemID.':'.$_.':code'};
-                my $tries = $cache->{$name.':'.$problemID.':'.$_.':tries'};
-                if($code eq '*' && $tries < 10 && $tries ne '') {
-                    $code = $tries;
-                }
-                $Str .= $code;
-                $Str .= '</a>';
-                $characterCount++;
-            }
+    my ($cache, $students, $sequenceKeys)=@_;
+    my $Str = "\nAverageTotal\n";
+    my %Correct = ();
+    my $ProblemsSolved = 0;
+    my $TotalProblems = 0;
+    my $StudentCount = 0;
+
+    foreach my $name (@$students) {
+        $StudentCount++;
+        foreach my $sequence (@$sequenceKeys) {
+            $Correct{$cache->{$sequence.':title'}} +=
+	        $cache->{$name.':'.$sequence.':problemsCorrect'};
         }
-
-        # Output the number of correct answers for the current sequence.
-        # This part takes up 6 character slots, but is formated right
-        # justified.
-        my $spacesNeeded=$cache->{$sequence.':columnWidth'}-$characterCount;
-        $spacesNeeded -= 3;
-        $Str .= (' 'x$spacesNeeded);
-
-#        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;
+	$ProblemsSolved += $cache->{$name.':problemsSolved'};
+        $TotalProblems += $cache->{$name.':totalProblems'};
     }
-
-    # Output the total correct problems over the total number of problems.
-    # I don't like this type of formatting, but it is a solution.  Need
-    # a way to dynamically determine the space requirements.
-    my $outputProblemsSolved = sprintf("%4d", $cache->{$name.':problemsSolved'});
-    my $outputTotalProblems  = sprintf("%4d", $cache->{$name.':totalProblems'});
-    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>';
+    $ProblemsSolved /= $StudentCount;
+    $TotalProblems /= $StudentCount;
+    $Str .= "AvgSlvd:$ProblemsSolved  AvgTotal: $TotalProblems\n";
+    
+    foreach (%Correct) {
+        $Str .= "$_  : $Correct{$_}\n";
     }
 
     return $Str;
@@ -696,7 +639,7 @@ sub ShouldShowColumns {
 
     foreach my $sequence (split(/\:/,$cache->{'orderedSequences'})) {
         $check = 'SequenceColumn'.$sequence;
-        if($cache->{'SequencesFound'} eq 'All Sequences' || 
+        if($cache->{'SequencesFound'} eq 'All Sequences' ||
            $cache->{'SequencesFound'} =~ /$check/) {
             push(@sequenceHeadings, $cache->{$sequence.':title'});
             push(@sequenceKeys, $sequence);
@@ -709,7 +652,7 @@ sub ShouldShowColumns {
 
     $doNotShow{'count'} = $count;
 
-    return (\@infoHeadings, \@infoKeys, \@sequenceHeadings, 
+    return (\@infoHeadings, \@infoKeys, \@sequenceHeadings,
             \@sequenceKeys, \%doNotShow);
 }