--- loncom/interface/statistics/lonstudentassessment.pm	2002/10/24 20:58:06	1.17
+++ loncom/interface/statistics/lonstudentassessment.pm	2002/12/24 21:00:21	1.23
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstudentassessment.pm,v 1.17 2002/10/24 20:58:06 minaeibi Exp $
+# $Id: lonstudentassessment.pm,v 1.23 2002/12/24 21:00:21 minaeibi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,11 +30,11 @@
 # 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
 #
 ###
 
-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" ';
@@ -219,6 +218,17 @@ sub CreateInterface {
     $Str .= '</td><td>'."\n";
     $Str .= '<input type="submit" name="DefaultColumns" ';
     $Str .= 'value="Default Column Display" />'."\n";
+    $Str .= '</td><td>'."\n";
+    $Str .= '<input type="submit" name="displaymode" ';
+    if (! exists($ENV{'form.displaymode'}) ||
+        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';
+    } else {
+        $Str .= 'value="Display with links" />';
+    }
+    $Str .= "\n";
     $Str .= '</td></tr></table>'."\n";
 
     return $Str;
@@ -265,7 +275,7 @@ sub CreateTableHeadings {
 =item &FormatStudentData()
 
 First, FormatStudentInformation is called and prefixes the course information.
-This function produces a formatted string of the student's course information.
+This function produces a formatted string of the student\'s course information.
 Each column of data represents all the problems for a given sequence.  For
 valid grade data, a link is created for that problem to a submission record
 for that problem.
@@ -285,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
@@ -327,17 +337,21 @@ sub StudentReport {
                 }
                 $hasVersion = 'true';
                 $hasData = 'true';
-                $Str .= '<a href="/adm/grades?symb=';
-                $Str .= &Apache::lonnet::escape($problem);
-                $Str .= '&student='.$username.'&domain='.$domain;
-                $Str .= '&command=submission">'; 
+                if (lc($ENV{'form.displaymode'}) ne 'display without links') {
+                    $Str .= '<a href="/adm/grades?symb=';
+                    $Str .= &Apache::lonnet::escape($problem);
+                    $Str .= '&student='.$username.'&domain='.$domain;
+                    $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>';
+                if (lc($ENV{'form.displaymode'}) ne 'display without links') {
+                    $Str .= '</a>';
+                }
                 $characterCount++;
             }
         }
@@ -385,88 +399,76 @@ sub StudentReport {
 
 
 sub StudentAverageTotal {
+    my ($cache, $students, $sequenceKeys)=@_;
+    my $Str = "\n<b>Summary Tables:</b>\n";
+    my %Correct = ();
+    my $ProblemsSolved = 0;
+    my $TotalProblems = 0;
+    my $StudentCount = 0;
+
+    foreach my $name (@$students) {
+        $StudentCount++;
+        foreach my $sequence (@$sequenceKeys) {
+            $Correct{$sequence} +=
+	       $cache->{$name.':'.$sequence.':problemsCorrect'};
+        }
+	$ProblemsSolved += $cache->{$name.':problemsSolved'};
+        $TotalProblems += $cache->{$name.':totalProblems'};
+    }
+    $ProblemsSolved /= $StudentCount;
+    $TotalProblems /= $StudentCount;
     
-    return "";
+    $Str .= '<table border=2 cellspacing="5">'."\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="5">'."\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=sprintf( "%.2f", $Correct{$S}/$StudentCount );
+        $Str .= '<tr><td>'.$title.
+                '</td><td align=center>'.$pCount.
+                '</td><td align=center>'.$crr.
+                '</td></tr>'."\n";
+    }
 
-    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++;
-            }
-        }
+    $Str .= '</table>'."\n";
 
-        # 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);
+    return $Str;
+}
 
-#        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;
-    }
 
-    # 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>';
+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;
+}
 
-    if($hasVersion eq 'false') {
-        $Str = '<b><font color="blue">No course data.</font></b>';
-    }
 
-    return $Str;
-}
 
 
 
@@ -485,7 +487,7 @@ sub CreateLegend {
               "   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".
+	      "   +  correct by hand grading or override\n".
               "   -  incorrect by override\n".
 	      "   .  incorrect attempted\n".
 	      "   #  ungraded attempted\n".
@@ -681,7 +683,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);
@@ -694,7 +696,7 @@ sub ShouldShowColumns {
 
     $doNotShow{'count'} = $count;
 
-    return (\@infoHeadings, \@infoKeys, \@sequenceHeadings, 
+    return (\@infoHeadings, \@infoKeys, \@sequenceHeadings,
             \@sequenceKeys, \%doNotShow);
 }