--- loncom/interface/statistics/lonstudentassessment.pm	2002/07/26 16:22:09	1.3
+++ loncom/interface/statistics/lonstudentassessment.pm	2002/08/31 19:25:39	1.10
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstudentassessment.pm,v 1.3 2002/07/26 16:22:09 stredwic Exp $
+# $Id: lonstudentassessment.pm,v 1.10 2002/08/31 19:25:39 stredwic Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,13 +42,15 @@ use Apache::lonhtmlcommon;
 use Apache::loncoursedata;
 use GDBM_File;
 
+#my $jr;
+
 sub BuildStudentAssessmentPage {
     my ($cacheDB,$students,$courseID,$formName,$headings,$spacing,
         $studentInformation,$r,$c)=@_;
-
+#    $jr = $r;
     my %cache;
-    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
-        $r->print('<html><body>Unable to tie database.</body></html>');
+    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
+[5~        $r->print('<html><body>Unable to tie database.</body></html>');
         return;
     }
 
@@ -75,75 +77,99 @@ sub BuildStudentAssessmentPage {
             splice(@$students, $studentIndex, 1);
         }
     }
+    my ($infoHeadings, $infoKeys, $sequenceHeadings, $sequenceKeys,
+        $doNotShow) = 
+        &ShouldShowColumns(\%cache, $headings, $studentInformation);
 
     my $selectedName = &FindSelectedStudent(\%cache, 
                                             $cache{'StudentAssessmentStudent'},
                                             $students);
-    $r->print(&CreateInterface(\%cache, $selectedName, $students, $formName));
+    $r->print(&CreateInterface(\%cache, $selectedName, $students, $formName,
+                               $doNotShow));
+    $r->rflush();
 
-    my $Ptr = '';
+    my $Str = '';
     if($selectedName eq 'No Student Selected') {
-	$Ptr .= '<h3><font color=blue>WARNING: ';
-        $Ptr .= 'Please select a student</font></h3>';
-        $r->print($Ptr);
+	$Str .= '<h3><font color=blue>WARNING: ';
+        $Str .= 'Please select a student</font></h3>';
+        $r->print($Str);
         return;
     }
 
-    my ($infoHeadings, $infoKeys, $sequenceHeadings, $sequenceKeys) = 
-        &ShouldShowColumns(\%cache, $headings, $studentInformation);
-
     $r->print(&CreateTableHeadings(\%cache, $spacing, $infoKeys, $infoHeadings,
                                    $sequenceKeys, $sequenceHeadings));
     untie(%cache);
+    if($c->aborted()) {  return $Str; }
 
     my $selected=0;
     $r->print('<pre>'."\n");
     foreach (@$students) {
+        if($c->aborted()) { return $Str; }
         next if ($_ ne $selectedName && 
                  $selectedName ne 'All Students');
         $selected = 1;
-        my $courseData; 
-        if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
-            if($cache{$_.':lastDownloadTime'} eq 'Not downloaded') {
-                untie(%cache);
-                $courseData = 
-                    &Apache::loncoursedata::DownloadCourseInformation($_, 
-                                                                    $courseID);
-                if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT,0640)) {
-                    &Apache::loncoursedata::ProcessStudentData(\%cache, 
-                                                             $courseData, $_);
-                    untie(%cache);
-                } else {
-                    last if($c->aborted());
+
+        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;
                 }
-            } else {
-                untie(%cache);
+                if($foundUpdate) {
+                    push(@after, $_);
+                } else {
+                    push(@before, $_);
+                }
             }
-        } else {
-            last if($c->aborted());
-            next;
-        }
+            my $displayString = 'DISPLAYDATA'.$spacing;
+            $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
+                                                         \%cache, $_,
+                                                         \@before,
+                                                         $displayString,
+                                                         'preformatted'));
 
-        last if ($c->aborted());
+            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'));
+            }
 
-        if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
-            my $displayString = 'DISPLAYDATA'.$spacing;
+            $displayString = 'DISPLAYDATA'.$spacing;
             $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
                                                          \%cache, $_,
-                                                         $infoKeys,
+                                                         \@after,
                                                          $displayString,
                                                          'preformatted'));
             $r->print(&StudentReport(\%cache, $_, $spacing, $sequenceKeys));
             $r->print("\n");
+            $r->rflush();
             untie(%cache);
         }
     }
     $r->print('</pre>'."\n");
     if($selected == 0) {
-	$Ptr .= '<h3><font color=blue>WARNING: ';
-        $Ptr .= 'Please select a student</font></h3>';
-        $r->print($Ptr);
+	$Str .= '<h3><font color=blue>WARNING: ';
+        $Str .= 'Please select a student</font></h3>';
+        $r->print($Str);
     }
 
     return;
@@ -152,33 +178,42 @@ sub BuildStudentAssessmentPage {
 #---- Student Assessment Web Page --------------------------------------------
 
 sub CreateInterface {
-    my($cache,$selectedName,$students,$formName)=@_;
-    my $Ptr = '';
-    $Ptr .= &CreateLegend();
-    $Ptr .= '<table><tr><td>'."\n";
-    $Ptr .= '<input type="submit" name="PreviousStudent" ';
-    $Ptr .= 'value="Previous Student" />'."\n";
-    $Ptr .= '&nbsp&nbsp&nbsp'."\n";
-    $Ptr .= &Apache::lonhtmlcommon::StudentOptions($cache, $students, 
+    my($cache,$selectedName,$students,$formName,$doNotShow)=@_;
+
+    my $Str = '';
+    $Str .= &CreateLegend();
+    $Str .= '<table><tr><td>'."\n";
+    $Str .= '<input type="submit" name="PreviousStudent" ';
+    $Str .= 'value="Previous Student" />'."\n";
+    $Str .= '&nbsp&nbsp&nbsp'."\n";
+    $Str .= &Apache::lonhtmlcommon::StudentOptions($cache, $students, 
                                                    $selectedName, 
                                                    'StudentAssessment', 
                                                    $formName);
-    $Ptr .= "\n".'&nbsp&nbsp&nbsp'."\n";
-    $Ptr .= '<input type="submit" name="NextStudent" ';
-    $Ptr .= 'value="Next Student" />'."\n";
-    $Ptr .= '</td></tr></table>'."\n";
-    $Ptr .= '<table><tr><td align="center"><b>Select Sections</b>';
-    $Ptr .= '</td></tr>'."\n";
+    $Str .= "\n".'&nbsp&nbsp&nbsp'."\n";
+    $Str .= '<input type="submit" name="NextStudent" ';
+    $Str .= 'value="Next Student" />'."\n";
+    $Str .= '</td></tr></table>'."\n";
+    $Str .= '<table cellspacing="5"><tr>'."\n";
+    $Str .= '<td align="center"><b>Select Sections</b>'."\n";
+    $Str .= '</td>'."\n";
+    $Str .= '<td align="center"><b>Select column to view:</b></td>'."\n";
+    $Str .= '<td></td></tr>'."\n";
 
-    $Ptr .= '<tr><td align="center">'."\n";
+    $Str .= '<tr><td align="center">'."\n";
     my @sections = split(':',$cache->{'sectionList'});
     my @selectedSections = split(':',$cache->{'sectionsSelected'});
-    $Ptr .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections,
+    $Str .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections,
                                                           \@selectedSections,
                                                           'Statistics');
-    $Ptr .= '</td></tr></table>'."\n";
+    $Str .= '</td><td align="center">';
+    $Str .= &CreateColumnSelectionBox($doNotShow);
+    $Str .= '</td><td>'."\n";
+    $Str .= '<input type="submit" name="DefaultColumns" ';
+    $Str .= 'value="Default Column Display" />'."\n";
+    $Str .= '</td></tr></table>'."\n";
 
-    return $Ptr;
+    return $Str;
 }
 
 sub CreateTableHeadings {
@@ -186,8 +221,14 @@ sub CreateTableHeadings {
        $sequenceHeadings)=@_;
 
     my $Str = '';
-    $Str .= '<table border="0" cellpadding="0" cellspacing="0"><tr>'."\n";
+    $Str .= '<table border="0" cellpadding="0" cellspacing="0">'."\n";
+
+    $Str .= '<tr>'."\n";
+    $Str .= &CreateColumnSelectors($infoHeadings, $sequenceHeadings,
+                                   $sequenceKeys);
+    $Str .= '<td></td></tr>'."\n";
 
+    $Str .= '<tr>'."\n";
     my $displayString = '<td align="left"><pre><a href="/adm/statistics?';
     $displayString .= 'sort=LINKDATA">DISPLAYDATA</a>FORMATTING';
     $displayString .= $spacing.'</pre></td>'."\n";
@@ -197,7 +238,7 @@ sub CreateTableHeadings {
                                                    $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,
@@ -248,109 +289,49 @@ 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'})) {
-                    $Str .= ' ';
-                    $totalProblems++;
-                    $characterCount++;
-                }
-                next;
-            }
-
-            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'}=' ';
-            }
-
-            # 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;
-                }
-            }
-
             # 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='.$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>';
+                $characterCount++;
             }
-            $Str.='</a>';
         }
 
         # Output the number of correct answers for the current sequence.
@@ -360,21 +341,32 @@ sub StudentReport {
         $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'});
+        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;
 }
@@ -433,41 +425,22 @@ which has a size of four.
 =cut
 
 sub CreateColumnSelectionBox {
-    my ($CacheData,$headings)=@_;
+    my ($doNotShow)=@_;
 
-    my $missing=0;
-    my $notThere='<tr><td align="right"><b>Select column to view:</b>';
-    my $name;
-    $notThere .= '<td align="left">';
-    $notThere .= '<select name="ChartReselect" size="4" multiple="true">'."\n";
-
-    for(my $index=0; $index<(scalar @$headings); $index++) {
-        if(&ShouldShowColumn($CacheData, 'ChartHeading'.$index)) {
-            next;
-        }
-        $name = $headings->[$index];
-        $notThere .= '<option value="ChartHeading'.$index.'">';
+    my $notThere = '';
+    $notThere .= '<select name="ReselectColumns" size="4" ';
+    $notThere .= 'multiple="true">'."\n";
+
+    for(my $index=0; $index<$doNotShow->{'count'}; $index++) {
+        my $name = $doNotShow->{$index.':name'};
+        $notThere .= '<option value="';
+        $notThere .= $doNotShow->{$index.':id'}.'">';
         $notThere .= $name.'</option>'."\n";
-        $missing++;
     }
 
-    foreach my $sequence (split(/\:/,$CacheData->{'orderedSequences'})) {
-        if(&ShouldShowColumn($CacheData, 'ChartSequence'.$sequence)) {
-            next;
-        }
-        $name = $CacheData->{$sequence.':title'};
-        $notThere .= '<option value="ChartSequence'.$sequence.'">';
-        $notThere .= $name.'</option>'."\n";
-        $missing++;
-    }
+    $notThere .= '</select>';
 
-    if($missing) {
-        $notThere .= '</select>';
-    } else {
-        $notThere='<tr><td>';
-    }
-
-    return $notThere.'</td></tr>';
+    return $notThere;
 }
 
 =pod
@@ -497,37 +470,24 @@ for consistency of location over the col
 =cut
 
 sub CreateColumnSelectors {
-    my ($headings)=@_;
-=pod
-    my $found=0;
-    my ($name, $length, $position);
+    my ($infoHeadings, $sequenceHeadings, $sequenceKeys)=@_;
 
-    my $present = '<tr>';
-    for(my $index=0; $index<(scalar @$headings); $index++) {
+    my $present = '';
+    for(my $index=0; $index<(scalar @$infoHeadings); $index++) {
         $present .= '<td align="left">';
         $present .= '<input type="checkbox" checked="on" ';
-        $present .= 'name="ChartHeading'.$index.'" />';
-        $present .= '</td>';
-        $found++;
+        $present .= 'name="HeadingColumn'.$infoHeadings->[$index].'" />';
+        $present .= '</td>'."\n";
     }
 
-    foreach my $sequence (split(/\:/,$CacheData->{'orderedSequences'})) {
-        if(!&ShouldShowColumn($CacheData, 'ChartSequence'.$sequence)) {
-            next;
-        }
+    for(my $index=0; $index<(scalar @$sequenceHeadings); $index++) {
         $present .= '<td align="left">';
         $present .= '<input type="checkbox" checked="on" ';
-        $present .= 'name="ChartSequence'.$sequence.'" />';
-        $present .= '</td>';
-        $found++;
+        $present .= 'name="SequenceColumn'.$sequenceKeys->[$index].'" />';
+        $present .= '</td>'."\n";
     }
 
-    if(!$found) {
-        $present = '';
-    }
-
-    return $present.'<td></td></tr></form>'."\n";;
-=cut
+    return $present;
 }
 
 #---- END Student Assessment Web Page ----------------------------------------
@@ -602,26 +562,40 @@ sub ShouldShowColumns {
     my @sequenceKeys=();
     my @sequenceHeadings=();
 
+    my %doNotShow;
+
     my $index;
+    my $count = 0;
+    my $check = '';
     for($index=0; $index < scalar @$headings; $index++) {
-        push(@infoHeadings, $headings->[$index]);
-        push(@infoKeys, $cacheKey->[$index]);
+        $check = 'HeadingColumn'.$headings->[$index];
+        if($cache->{'HeadingsFound'} =~ /$check/) {
+            push(@infoHeadings, $headings->[$index]);
+            push(@infoKeys, $cacheKey->[$index]);
+        } else {
+            $doNotShow{$count.':name'} = $headings->[$index];
+            $doNotShow{$count.':id'} = 'HeadingColumn'.$headings->[$index];
+            $count++;
+        }
     }
 
     foreach my $sequence (split(/\:/,$cache->{'orderedSequences'})) {
-        push(@sequenceHeadings, $cache->{$sequence.':title'});
-        push(@sequenceKeys, $sequence);
+        $check = 'SequenceColumn'.$sequence;
+        if($cache->{'SequencesFound'} eq 'All Sequences' || 
+           $cache->{'SequencesFound'} =~ /$check/) {
+            push(@sequenceHeadings, $cache->{$sequence.':title'});
+            push(@sequenceKeys, $sequence);
+        } else {
+            $doNotShow{$count.':name'} = $cache->{$sequence.':title'};
+            $doNotShow{$count.':id'} = 'SequenceColumn'.$sequence;
+            $count++;
+        }
     }
 
-#    my $headings=$cache->{'form.ChartHeadings'};
-#    my $sequences=$cache->{'form.ChartSequences'};
-#    if($headings eq 'ALLHEADINGS' || $sequences eq 'ALLSEQUENCES' ||
-#       $headings=~/$test/ || $sequences=~/$test/) {
-#        return 1;
-#    }
+    $doNotShow{'count'} = $count;
 
     return (\@infoHeadings, \@infoKeys, \@sequenceHeadings, 
-            \@sequenceKeys);
+            \@sequenceKeys, \%doNotShow);
 }
 
 #---- END Student Assessment Worker Functions --------------------------------