--- loncom/interface/statistics/lonstudentassessment.pm	2002/08/05 20:53:38	1.7
+++ loncom/interface/statistics/lonstudentassessment.pm	2002/12/06 21:11:48	1.19
@@ -1,12 +1,11 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstudentassessment.pm,v 1.7 2002/08/05 20:53:38 stredwic Exp $
+# $Id: lonstudentassessment.pm,v 1.19 2002/12/06 21:11:48 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
@@ -104,35 +103,59 @@ sub BuildStudentAssessmentPage {
     my $selected=0;
     $r->print('<pre>'."\n");
     foreach (@$students) {
-        if($c->aborted()) {  return $Str; }
-        next if ($_ ne $selectedName && 
+        if($c->aborted()) { return $Str; }
+        next if ($_ ne $selectedName &&
                  $selectedName ne 'All Students');
         $selected = 1;
-        my $courseData; 
-        my $downloadTime='';
-        if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
-            $downloadTime = $cache{$_.':lastDownloadTime'};
-            untie(%cache);
-        }
-        if($downloadTime eq 'Not downloaded') {
-            $courseData = 
-                &Apache::loncoursedata::DownloadCourseInformation($_, 
-                                                                  $courseID);
-            unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) {
-                next;
-            }
-            &Apache::loncoursedata::ProcessStudentData(\%cache, 
-                                                       $courseData, $_);
-            untie(%cache);
-        }
 
+        my @who = ($_);
+        next if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'true',
+                                                             $cacheDB, 'true',
+                                                             'false', $courseID,
+                                                             $r, $c) ne 'OK');
         next if($c->aborted());
 
         if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
+            my @before=();
+            my @after=();
+            my @updateColumn=();
+            my $foundUpdate = 0;
+            foreach(@$infoKeys) {
+                if(/updateTime/) {
+                    $foundUpdate=1;
+                    push(@updateColumn, $_);
+                    next;
+                }
+                if($foundUpdate) {
+                    push(@after, $_);
+                } else {
+                    push(@before, $_);
+                }
+            }
             my $displayString = 'DISPLAYDATA'.$spacing;
             $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
                                                          \%cache, $_,
-                                                         $infoKeys,
+                                                         \@before,
+                                                         $displayString,
+                                                         'preformatted'));
+
+            if($foundUpdate) {
+                $displayString = '';
+                $displayString .= '<a href="/adm/statistics?reportSelected=';
+                $displayString .= &Apache::lonnet::escape('Student Assessment');
+                $displayString .= '&download='.$_.'">';
+                $displayString .= 'DISPLAYDATA</a>'.$spacing;
+                $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
+                                                                   \%cache, $_,
+                                                                   \@updateColumn,
+                                                                   $displayString,
+                                                                   'preformatted'));
+            }
+
+            $displayString = 'DISPLAYDATA'.$spacing;
+            $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
+                                                         \%cache, $_,
+                                                         \@after,
                                                          $displayString,
                                                          'preformatted'));
             $r->print(&StudentReport(\%cache, $_, $spacing, $sequenceKeys));
@@ -141,6 +164,15 @@ sub BuildStudentAssessmentPage {
             untie(%cache);
         }
     }
+
+
+#    $r->print("AverageTtal");
+#    $r->print(&StudentAverageTotal(\%cache, $spacing, $sequenceKeys));
+#    $r->print("\n");
+#    $r->rflush();
+    untie(%cache);
+
+
     $r->print('</pre>'."\n");
     if($selected == 0) {
 	$Str .= '<h3><font color=blue>WARNING: ';
@@ -162,7 +194,7 @@ sub CreateInterface {
     $Str .= '<input type="submit" name="PreviousStudent" ';
     $Str .= 'value="Previous Student" />'."\n";
     $Str .= '&nbsp&nbsp&nbsp'."\n";
-    $Str .= &Apache::lonhtmlcommon::StudentOptions($cache, $students, 
+    $Str .= &Apache::lonhtmlcommon::StudentOptions($cache, $students,
                                                    $selectedName, 
                                                    'StudentAssessment', 
                                                    $formName);
@@ -187,6 +219,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;
@@ -208,13 +251,13 @@ sub CreateTableHeadings {
     my $displayString = '<td align="left"><pre><a href="/adm/statistics?';
     $displayString .= 'sort=LINKDATA">DISPLAYDATA</a>FORMATTING';
     $displayString .= $spacing.'</pre></td>'."\n";
-    $Str .= &Apache::lonhtmlcommon::CreateHeadings($cache, 
+    $Str .= &Apache::lonhtmlcommon::CreateHeadings($cache,
                                                    $infoKeys,
                                                    $infoHeadings,
                                                    $displayString,
                                                    'preformatted');
 
-    $displayString  = '<td align="left"><pre>DISPLAYDATA'.$spacing;
+    $displayString  = '<td align="left"><pre>DISPLAYDATAFORMATTING'.$spacing;
     $displayString .= '</pre></td>'."\n";
     $Str .= &Apache::lonhtmlcommon::CreateHeadings($cache,
                                                    $sequenceKeys,
@@ -233,7 +276,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.
@@ -265,137 +308,183 @@ sub StudentReport {
     my ($username,$domain)=split(':',$name);
 
     my $Str = '';
+    if(defined($cache->{$name.':error'})) {
+        return $Str;
+    }
     if($cache->{$name.':error'} =~ /course/) {
         $Str .= '<b><font color="blue">No course data for student </font>';
         $Str .= '<font color="red">'.$username.'.</font></b><br>';
         return $Str;
     }
 
-    my $Version;
-    my $problemsCorrect = 0;
-    my $totalProblems   = 0;
-    my $problemsSolved  = 0;
-    my $numberOfParts   = 0;
-#    foreach my $sequence (split(':', $cache->{'orderedSequences'})) {
+    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'};
-            my $LatestVersion = $cache->{$name.':version:'.$problem};
-
-            # Output dashes for all the parts of this problem if there
-            # is no version information about the current problem.
-            if(!$LatestVersion) {
-                foreach my $part (split(/\:/,$cache->{$sequence.':'.
-                                                      $problemID.
-                                                      ':parts'})) {
+            # 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 .= ' ';
-                    $totalProblems++;
                     $characterCount++;
+                    next;
+                }
+                $hasVersion = 'true';
+                $hasData = 'true';
+                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;
+                if (lc($ENV{'form.displaymode'}) ne 'display without links') {
+                    $Str .= '</a>';
                 }
-                next;
+                $characterCount++;
             }
+        }
 
-            my %partData=undef;
-            # Initialize part data, display skips correctly
-            # Skip refers to when a student made no submissions on that
-            # part/problem.
-            foreach my $part (split(/\:/,$cache->{$sequence.':'.
-                                                  $problemID.
-                                                  ':parts'})) {
-                $partData{$part.':tries'}=0;
-                $partData{$part.':code'}=' ';
-            }
+        # 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);
 
-            # Looping through all the versions of each part, starting with the
-            # oldest version.  Basically, it gets the most recent 
-            # set of grade data for each part.
-	    for(my $Version=1; $Version<=$LatestVersion; $Version++) {
-                foreach my $part (split(/\:/,$cache->{$sequence.':'.
-                                                      $problemID.
-                                                      ':parts'})) {
-
-                    if(!defined($cache->{$name.":$Version:$problem".
-                                               ":resource.$part.solved"})) {
-                        # No grade for this submission, so skip
-                        next;
-                    }
-
-                    my $tries=0;
-                    my $code=' ';
-
-                    $tries = $cache->{$name.':'.$Version.':'.$problem.
-                                      ':resource.'.$part.'.tries'};
-                    $partData{$part.':tries'}=($tries) ? $tries : 0;
-
-                    my $val = $cache->{$name.':'.$Version.':'.$problem.
-                                       ':resource.'.$part.'.solved'};
-                    if    ($val eq 'correct_by_student')   {$code = '*';} 
-                    elsif ($val eq 'correct_by_override')  {$code = '+';}
-                    elsif ($val eq 'incorrect_attempted')  {$code = '.';} 
-                    elsif ($val eq 'incorrect_by_override'){$code = '-';}
-                    elsif ($val eq 'excused')              {$code = 'x';}
-                    elsif ($val eq 'ungraded_attempted')   {$code = '#';}
-                    else                                   {$code = ' ';}
-                    $partData{$part.':code'}=$code;
-                }
-            }
+#        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>';
+    }
+
+    if($hasVersion eq 'false') {
+        $Str = '<b><font color="blue">No course data.</font></b>';
+    }
+
+    return $Str;
+}
 
+
+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
-            $Str .= '<a href="/adm/grades?symb=';
-            $Str .= &Apache::lonnet::escape($problem);
-            $Str .= '&student='.$username.'&domain='.$domain;
-            $Str .= '&command=submission">'; 
             foreach(split(/\:/,$cache->{$sequence.':'.$problemID.
                                         ':parts'})) {
-                if($partData{$_.':code'} eq '*') {
-                    $problemsCorrect++;
-                    if (($partData{$_.':tries'}<10) &&
-                        ($partData{$_.':tries'} ne '')) {
-                        $partData{$_.':code'}=$partData{$_.':tries'};
-                    }
-                } elsif($partData{$_.':code'} eq '+') {
-                    $problemsCorrect++;
+                if($cache->{$name.':'.$problemID.':NoVersion'} eq 'true' ||
+                   $cache->{$name.':'.$problemID.':'.$_.':code'} eq ' ' ||
+                   $cache->{$name.':'.$problemID.':'.$_.':code'} eq '') {
+                    $Str .= ' ';
+                    $characterCount++;
+                    next;
                 }
-
-                $Str .= $partData{$_.':code'};
-                $characterCount++;
-
-                if($partData{$_.':code'} ne 'x') {
-                    $totalProblems++;
+                $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.='</a>';
         }
 
         # Output the number of correct answers for the current sequence.
-        # This part takes up 6 character slots, but is formated right 
+        # 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", $problemsCorrect );
-	$Str .= '<font color="#007700">'.$outputProblemsCorrect.'</font>';
-	$problemsSolved += $problemsCorrect;
-	$problemsCorrect=0;
+#        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", $problemsSolved );
-    my $outputTotalProblems  = sprintf( "%4d", $totalProblems );
-    $Str .= '<font color="#000088">'.$outputProblemsSolved.
+    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>';
+    }
 
     return $Str;
 }
 
+
+
 =pod
 
 =item &CreateLegend()
@@ -408,15 +497,16 @@ 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".
-              "</pre><p>"; 
+              "   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;
 }
 
@@ -425,7 +515,7 @@ sub CreateLegend {
 =item &CreateColumnSelectionBox()
 
 If there are columns not being displayed then this selection box is created
-with a list of those columns.  When selections are made and the page 
+with a list of those columns.  When selections are made and the page
 refreshed, the columns will be removed from this box and the column is
 put back in the chart.  If there is no columns to select, no row is added
 to the interface table.
@@ -436,13 +526,13 @@ Input: $CacheData, $headings
 
 $CacheData: A pointer to a hash tied to the cached data
 
-$headings:  An array of the names of the columns for the student information.  
+$headings:  An array of the names of the columns for the student information.
 They are used for displaying which columns are missing.
 
 Output: $notThere
 
-$notThere: The string contains one row of a table.  The first column has the 
-name of the selection box.  The second contains the selection box 
+$notThere: The string contains one row of a table.  The first column has the
+name of the selection box.  The second contains the selection box
 which has a size of four.
 
 =back
@@ -472,7 +562,7 @@ sub CreateColumnSelectionBox {
 
 =item &CreateColumnSelectors()
 
-This function generates the checkboxes above the column headings.  The 
+This function generates the checkboxes above the column headings.  The
 column will be removed if the checkbox is unchecked.
 
 =over 4
@@ -522,7 +612,7 @@ sub CreateColumnSelectors {
 sub FindSelectedStudent {
     my($cache, $selectedName, $students)=@_;
 
-    if($selectedName eq 'All Students' || 
+    if($selectedName eq 'All Students' ||
        $selectedName eq 'No Student Selected') {
         return $selectedName;
     }