[BACK]Return to lonstudentassessment.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface / statistics

Diff for /loncom/interface/statistics/lonstudentassessment.pm between versions 1.19 and 1.28

version 1.19, 2002/12/06 21:11:48 version 1.28, 2003/02/21 18:41:56
Line 25 Line 25
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # (Navigate problems for statistical reports  # (Navigate problems for statistical reports
 # YEAR=2001  
 # 5/5,7/9,7/25/1,8/11,9/13,9/26,10/5,10/9,10/22,10/26 Behrouz Minaei  
 # 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  
 #  #
 ###  #######################################################
   #######################################################
   
 package Apache::lonstudentassessment;   =pod
   
   =head1 NAME
   
   lonstudentassessment
   
   =head1 SYNOPSIS
   
   Presents assessment data about a student or a group of students.
   
   =head1 Subroutines
   
   =over 4 
   
   =cut
   
   #######################################################
   #######################################################
   
   package Apache::lonstudentassessment;
   
 use strict;  use strict;
   use Apache::lonstatistics;
 use Apache::lonhtmlcommon;  use Apache::lonhtmlcommon;
 use Apache::loncoursedata;  use Apache::loncoursedata;
   use Apache::lonnet; # for logging porpoises
 use GDBM_File;  use GDBM_File;
   
 #my $jr;  #######################################################
   #######################################################
   
   =pod
   
   =item &BuildStudentAssessmentPage()
   
   Inputs: 
   
   =over 4
   
   =item $cacheDB The name of the cache file used to store student data
   
   =item $students Array ref containing the name(s) of the students 
   selected for display
   
   =item $courseID The ID of the course
   
   =item $formName The name of the html form - 'Statistics'
   
   =item $headings Array ref of headings to show
   
   =item $spacing A string of spaces
   
   =item $studentInformation Array ref of possible headings for student info
   ('fullname','section',...)
   
   =item $r Apache Request
   
   =item $c Apache Connection 
   
   =back
   
   =cut
   
   #######################################################
   #######################################################
 sub BuildStudentAssessmentPage {  sub BuildStudentAssessmentPage {
     my ($cacheDB,$students,$courseID,$formName,$headings,$spacing,      my ($cacheDB,$students,$courseID,$formName,$headings,$spacing,
         $studentInformation,$r,$c)=@_;          $studentInformation,$r,$c)=@_;
 #    $jr = $r;  
     my %cache;      my %cache;
     unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {      unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
         $r->print('<html><body>Unable to tie database.</body></html>');          $r->print('<html><body>Unable to tie database.</body></html>');
Line 77  sub BuildStudentAssessmentPage { Line 127  sub BuildStudentAssessmentPage {
         }          }
     }      }
     my ($infoHeadings, $infoKeys, $sequenceHeadings, $sequenceKeys,      my ($infoHeadings, $infoKeys, $sequenceHeadings, $sequenceKeys,
         $doNotShow) =           $doNotShow) =
         &ShouldShowColumns(\%cache, $headings, $studentInformation);          &ShouldShowColumns(\%cache, $headings, $studentInformation);
   
     my $selectedName = &FindSelectedStudent(\%cache,       my $selectedName = &FindSelectedStudent(\%cache,
                                             $cache{'StudentAssessmentStudent'},                                              $cache{'StudentAssessmentStudent'},
                                             $students);                                              $students);
     $r->print(&CreateInterface(\%cache, $selectedName, $students, $formName,      $r->print(&CreateInterface(\%cache, $selectedName, $students, $formName,
Line 101  sub BuildStudentAssessmentPage { Line 151  sub BuildStudentAssessmentPage {
     if($c->aborted()) {  return $Str; }      if($c->aborted()) {  return $Str; }
   
     my $selected=0;      my $selected=0;
       my $Count = 0;
     $r->print('<pre>'."\n");      $r->print('<pre>'."\n");
     foreach (@$students) {      foreach (@$students) {
         if($c->aborted()) { return $Str; }          if($c->aborted()) { return $Str; }
Line 132  sub BuildStudentAssessmentPage { Line 183  sub BuildStudentAssessmentPage {
                     push(@before, $_);                      push(@before, $_);
                 }                  }
             }              }
             my $displayString = 'DISPLAYDATA'.$spacing;              $Count++;
             $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(      my $out = '';
       $out .= sprintf("%3d) ", $Count);
               if($Count % 2) {
                   $out .= '<bgcolor="#FFFFFF">';
               } else {
                   $out .= '<bgcolor="#505050">';
               }
       my $displayString = $out.'DISPLAYDATA'.$spacing;
       $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
                                                          \%cache, $_,                                                           \%cache, $_,
                                                          \@before,                                                           \@before,
                                                          $displayString,                                                           $displayString,
Line 164  sub BuildStudentAssessmentPage { Line 223  sub BuildStudentAssessmentPage {
             untie(%cache);              untie(%cache);
         }          }
     }      }
       $r->print('</pre>'."\n"); 
   
 #    $r->print("AverageTtal");  
 #    $r->print(&StudentAverageTotal(\%cache, $spacing, $sequenceKeys));  
 #    $r->print("\n");  
 #    $r->rflush();  
     untie(%cache);  
   
   
     $r->print('</pre>'."\n");  
     if($selected == 0) {      if($selected == 0) {
  $Str .= '<h3><font color=blue>WARNING: ';   $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);          $r->print($Str);
       } else {
    if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
       $r->print(&StudentAverageTotal(\%cache, $students, $sequenceKeys));
       untie(%cache);
    }
     }      }
   
     return;      return;
 }  }
   #######################################################
   #######################################################
   
   =pod
   
   =item &CreateInterface()
   
 #---- Student Assessment Web Page --------------------------------------------  Called by &BuildStudentAssessmentPage to create the top part of the
   page which displays the chart.
   
   Inputs:
   
   =over 4
   
   =item $cache The ubiquitous cache
   
   =item $selectedName The name of the currently selected student, or
   'All Students' or 'No Student Selected'.
   
   =item $students Array ref containing the name(s) of the students selected
   for display.
   
   =item $formName The name of the HTML form to use, 'Statistics'
   
   =item $doNotShow Array ref containing the names of columns to not show
   
   =back
   
   Returns:  A string containing the HTML for the headers and top table for 
   the chart page.
   
   =cut
   
   #######################################################
   #######################################################
 sub CreateInterface {  sub CreateInterface {
     my($cache,$selectedName,$students,$formName,$doNotShow)=@_;      my($cache,$selectedName,$students,$formName,$doNotShow)=@_;
   
Line 195  sub CreateInterface { Line 281  sub CreateInterface {
     $Str .= 'value="Previous Student" />'."\n";      $Str .= 'value="Previous Student" />'."\n";
     $Str .= '&nbsp&nbsp&nbsp'."\n";      $Str .= '&nbsp&nbsp&nbsp'."\n";
     $Str .= &Apache::lonhtmlcommon::StudentOptions($cache, $students,      $Str .= &Apache::lonhtmlcommon::StudentOptions($cache, $students,
                                                    $selectedName,                                                      $selectedName,
                                                    'StudentAssessment',                                                      'StudentAssessment',
                                                    $formName);                                                     $formName);
     $Str .= "\n".'&nbsp&nbsp&nbsp'."\n";      $Str .= "\n".'&nbsp&nbsp&nbsp'."\n";
     $Str .= '<input type="submit" name="NextStudent" ';      $Str .= '<input type="submit" name="NextStudent" ';
Line 225  sub CreateInterface { Line 311  sub CreateInterface {
         lc($ENV{'form.displaymode'}) eq 'display with links') {          lc($ENV{'form.displaymode'}) eq 'display with links') {
         $Str .= 'value="Display without links" />';          $Str .= 'value="Display without links" />';
         # Set the current value, in case it is undefined          # Set the current value, in case it is undefined
         $ENV{'form.displaymode'} = 'Display with links';           $ENV{'form.displaymode'} = 'Display with links';
     } else {      } else {
         $Str .= 'value="Display with links" />';          $Str .= 'value="Display with links" />';
     }      }
Line 234  sub CreateInterface { Line 320  sub CreateInterface {
   
     return $Str;      return $Str;
 }  }
   #######################################################
   #######################################################
   
   =pod
   
   =item &CreateTableHeadings()
   
   Create HTML for the columns of student data to show.
   Called by &BuildStudentAssessmentPage().  Calls
   &Apache::lonhtmlcommon::CreateHeadings().
   
   Inputs:
   
   =over 4
   
   =item $cache The ubiquitous cache
   
   =item $spacing A string of spaces
   
   =item $infoKeys Array ref to names of keys to display from the cache 
   which describe students
   
   =item $infoHeadings Array ref to headings of columns for student info
   
   =item $sequenceKeys Array ref of names of keys to use to retrieve sequence
   data from the cache
   
   =item $sequenceHeadings Array ref of names of sequences used for output.
   
   =back
   
   Returns: A string containing the HTML of the table headings.
   
   =cut
   
   #######################################################
   #######################################################
 sub CreateTableHeadings {  sub CreateTableHeadings {
     my($cache,$spacing,$infoKeys,$infoHeadings,$sequenceKeys,      my($cache,$spacing,$infoKeys,$infoHeadings,$sequenceKeys,
        $sequenceHeadings)=@_;         $sequenceHeadings)=@_;
   
   #    my $Str = '&nbsp&nbsp&nbsp&nbsp&nbsp';
     my $Str = '';      my $Str = '';
     $Str .= '<table border="0" cellpadding="0" cellspacing="0">'."\n";      $Str .= '<table border="0" cellpadding="0" cellspacing="0">'."\n";
   
     $Str .= '<tr>'."\n";      $Str .= '<tr>'."\n";
       $Str .= '<td><pre>     </pre></td>'."\n";
     $Str .= &CreateColumnSelectors($infoHeadings, $sequenceHeadings,      $Str .= &CreateColumnSelectors($infoHeadings, $sequenceHeadings,
                                    $sequenceKeys);                                     $sequenceKeys);
     $Str .= '<td></td></tr>'."\n";      $Str .= '<td></td></tr>'."\n";
   
     $Str .= '<tr>'."\n";      $Str .= '<tr>'."\n";
     my $displayString = '<td align="left"><pre><a href="/adm/statistics?';      my $displayString = '';
       $displayString .= '<td><pre>     </pre></td>'."\n";
       $displayString .= '<td align="left"><pre><a href="/adm/statistics?';
     $displayString .= 'sort=LINKDATA">DISPLAYDATA</a>FORMATTING';      $displayString .= 'sort=LINKDATA">DISPLAYDATA</a>FORMATTING';
     $displayString .= $spacing.'</pre></td>'."\n";      $displayString .= $spacing.'</pre></td>'."\n";
     $Str .= &Apache::lonhtmlcommon::CreateHeadings($cache,      $Str .= &Apache::lonhtmlcommon::CreateHeadings($cache,
Line 271  sub CreateTableHeadings { Line 396  sub CreateTableHeadings {
     return $Str;      return $Str;
 }  }
   
   #######################################################
   #######################################################
   
 =pod  =pod
   
 =item &FormatStudentData()  =item &StudentReport()
   
 First, FormatStudentInformation is called and prefixes the course information.  This is the workhorse subroutine - it handles formatting and display of a
 This function produces a formatted string of the student\'s course information.  students performance data.  It processes one row of the chart.
 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  Input: 
 for that problem.  
   
 =over 4  =over 4
   
 Input: $name, $studentInformation, $ChartDB  =item $cache The ubiquitous cache
   
   =item $name The name and domain of the current student in name:domain format
   
 $name: The name and domain of the current student in name:domain format  =item $spacing A string containing spaces.
   
 $studentInformation: A pointer to an array holding the names used to   =item $showSequences Array ref containing the sequences to display
 remove data from the hash.  They represent   
 the name of the data to be removed.  
   
 $ChartDB: The name of the cached data database which will be tied to that   =back
 database.  
   
 Output: $Str  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.  concatenation of student information and student course information.
   
 =back  
   
 =cut  =cut
   
   #######################################################
   #######################################################
 sub StudentReport {  sub StudentReport {
     my ($cache,$name,$spacing,$showSequences)=@_;      my ($cache,$name,$spacing,$showSequences)=@_;
     my ($username,$domain)=split(':',$name);      my ($username,$domain)=split(':',$name);
Line 342  sub StudentReport { Line 468  sub StudentReport {
                     $Str .= '<a href="/adm/grades?symb=';                      $Str .= '<a href="/adm/grades?symb=';
                     $Str .= &Apache::lonnet::escape($problem);                      $Str .= &Apache::lonnet::escape($problem);
                     $Str .= '&student='.$username.'&domain='.$domain;                      $Str .= '&student='.$username.'&domain='.$domain;
                     $Str .= '&command=submission">';                       $Str .= '&command=submission">';
                 }                  }
                 my $code = $cache->{$name.':'.$problemID.':'.$_.':code'};                  my $code = $cache->{$name.':'.$problemID.':'.$_.':code'};
                 my $tries = $cache->{$name.':'.$problemID.':'.$_.':tries'};                  my $tries = $cache->{$name.':'.$problemID.':'.$_.':tries'};
Line 398  sub StudentReport { Line 524  sub StudentReport {
     return $Str;      return $Str;
 }  }
   
   #######################################################
   #######################################################
   
   #######################################################
   #######################################################
 sub StudentAverageTotal {  sub StudentAverageTotal {
           my ($cache, $students, $sequenceKeys)=@_;
     return "";      my $Str = "\n<b>Summary Tables:</b>\n";
       my %Correct = ();
     my ($cache,$name,$spacing,$showSequences)=@_;      my $ProblemsSolved = 0;
     my $username = $name;      my $TotalProblems = 0;
     my $Str = '';      my $StudentCount = 0;
     my $hasVersion = 'false';  
     my $hasFinalData = 'false';      foreach my $name (@$students) {
     foreach my $sequence (@$showSequences) {          $StudentCount++;
         my $hasData = 'false';          foreach my $sequence (@$sequenceKeys) {
         my $characterCount=0;              $Correct{$sequence} +=
         foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {         $cache->{$name.':'.$sequence.':problemsCorrect'};
             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++;  
             }  
         }          }
    $ProblemsSolved += $cache->{$name.':problemsSolved'};
         # Output the number of correct answers for the current sequence.          $TotalProblems += $cache->{$name.':totalProblems'};
         # 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;  
     }      }
       if ($StudentCount) { 
     # Output the total correct problems over the total number of problems.          $ProblemsSolved = sprintf( "%.2f", 
     # I don't like this type of formatting, but it is a solution.  Need                               $ProblemsSolved/$StudentCount);
     # a way to dynamically determine the space requirements.          $TotalProblems /= $StudentCount;
     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 {      } else {
         $Str .= '<font color="#000088">           </font>';          $ProblemsSolved = 0;
           $TotalProblems  = 0;
     }      }
   
     if($hasVersion eq 'false') {      $Str .= '<table border=2 cellspacing="1">'."\n";
         $Str = '<b><font color="blue">No course data.</font></b>';      $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;      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  =pod
   
Line 495  problems. Line 626  problems.
   
 =cut  =cut
   
   #######################################################
   #######################################################
 sub CreateLegend {  sub CreateLegend {
     my $Str = "<p><pre>".      my $Str = "<p><pre>".
               "   1  correct by student in 1 try\n".                "   1  correct by student in 1 try\n".
               "   7  correct by student in 7 tries\n".                "   7  correct by student in 7 tries\n".
               "   *  correct by student in more than 9 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 by override\n".
       "   .  incorrect attempted\n".        "   .  incorrect attempted\n".
       "   #  ungraded attempted\n".        "   #  ungraded attempted\n".
Line 510  sub CreateLegend { Line 643  sub CreateLegend {
     return $Str;      return $Str;
 }  }
   
   #######################################################
   #######################################################
   
 =pod  =pod
   
 =item &CreateColumnSelectionBox()  =item &CreateColumnSelectionBox()
Line 523  to the interface table. Line 659  to the interface table.
 =over 4  =over 4
 Input: $CacheData, $headings  Input: $CacheData, $headings
   
   
 $CacheData: A pointer to a hash tied to the cached data  $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.
Line 539  which has a size of four. Line 674  which has a size of four.
   
 =cut  =cut
   
   #######################################################
   #######################################################
 sub CreateColumnSelectionBox {  sub CreateColumnSelectionBox {
     my ($doNotShow)=@_;      my ($doNotShow)=@_;
   
Line 558  sub CreateColumnSelectionBox { Line 695  sub CreateColumnSelectionBox {
     return $notThere;      return $notThere;
 }  }
   
   #######################################################
   #######################################################
   
 =pod  =pod
   
 =item &CreateColumnSelectors()  =item &CreateColumnSelectors()
Line 584  for consistency of location over the col Line 724  for consistency of location over the col
   
 =cut  =cut
   
   #######################################################
   #######################################################
 sub CreateColumnSelectors {  sub CreateColumnSelectors {
     my ($infoHeadings, $sequenceHeadings, $sequenceKeys)=@_;      my ($infoHeadings, $sequenceHeadings, $sequenceKeys)=@_;
   
Line 605  sub CreateColumnSelectors { Line 747  sub CreateColumnSelectors {
     return $present;      return $present;
 }  }
   
 #---- END Student Assessment Web Page ----------------------------------------  #######################################################
   #######################################################
   
 #---- Student Assessment Worker Functions ------------------------------------  =pod
   
   =back
   
   =head1 HELPER FUNCTIONS
   
   =over 4
   
   =cut 
   
   #######################################################
   #######################################################
 sub FindSelectedStudent {  sub FindSelectedStudent {
     my($cache, $selectedName, $students)=@_;      my($cache, $selectedName, $students)=@_;
   
Line 646  sub FindSelectedStudent { Line 799  sub FindSelectedStudent {
   
     return 'No Student Selected';      return 'No Student Selected';
 }  }
   #######################################################
   #######################################################
   
 =pod  =pod
   
Line 662  $cache: A pointer to the hash tied to th Line 817  $cache: A pointer to the hash tied to th
 $test: The form name of the column (heading.$headingIndex) or   $test: The form name of the column (heading.$headingIndex) or 
 (sequence.$sequenceIndex)  (sequence.$sequenceIndex)
   
 Output: 0 (false), 1 (true)  
   
 =back  =back
   
 =cut  =cut
   
   #######################################################
   #######################################################
 sub ShouldShowColumns {  sub ShouldShowColumns {
     my ($cache,$headings,$cacheKey)=@_;      my ($cache,$headings,$cacheKey)=@_;
   
Line 696  sub ShouldShowColumns { Line 851  sub ShouldShowColumns {
   
     foreach my $sequence (split(/\:/,$cache->{'orderedSequences'})) {      foreach my $sequence (split(/\:/,$cache->{'orderedSequences'})) {
         $check = 'SequenceColumn'.$sequence;          $check = 'SequenceColumn'.$sequence;
         if($cache->{'SequencesFound'} eq 'All Sequences' ||           if($cache->{'SequencesFound'} eq 'All Sequences' ||
            $cache->{'SequencesFound'} =~ /$check/) {             $cache->{'SequencesFound'} =~ /$check/) {
             push(@sequenceHeadings, $cache->{$sequence.':title'});              push(@sequenceHeadings, $cache->{$sequence.':title'});
             push(@sequenceKeys, $sequence);              push(@sequenceKeys, $sequence);
Line 709  sub ShouldShowColumns { Line 864  sub ShouldShowColumns {
   
     $doNotShow{'count'} = $count;      $doNotShow{'count'} = $count;
   
     return (\@infoHeadings, \@infoKeys, \@sequenceHeadings,       return (\@infoHeadings, \@infoKeys, \@sequenceHeadings,
             \@sequenceKeys, \%doNotShow);              \@sequenceKeys, \%doNotShow);
 }  }
   1;
   
 #---- END Student Assessment Worker Functions --------------------------------  #######################################################
   #######################################################
   
   =pod 
   
   =back
   
   =cut
   
   #######################################################
   #######################################################
   
 1;  
 __END__  __END__
Removed from v.1.19  
changed lines
  Added in v.1.28

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>