Diff for /loncom/interface/Attic/lonchart.pm between versions 1.45 and 1.55

version 1.45, 2002/06/28 19:34:12 version 1.55, 2002/07/08 13:38:52
Line 46 Line 46
 #  #
 ###  ###
   
   =pod
   
   =head1 NAME
   
   lonchart
   
   =head1 SYNOPSIS
   
   Quick display of students grades for a course in a compressed table format.
   
   =head1 DESCRIPTION
   
   This module process all student grades for a course and turns them into a 
   table like structure.
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org
   
   lonchart presents the user with a condensed view all a course's data.  The
   class title, the number of students, and the date for the last update of the
   displayed data.  There is also a legend that describes the chart values.  
   
   For each valid grade for a student is linked with a submission record for that
   problem.  The ability to add and remove columns of data from the chart was
   added for reducing the burden of having to scroll through large quantities
   of data.  The interface also allows for sorting of students by username,
   last name, and section number of class.  Active and expired students are
   also available.
   
   The interface is controlled by three primary buttons: Recalculate Chart, 
   Refresh Chart, and Reset Selections.  Recalculate Chart will update 
   the chart to the most recent data and keep the display settings for the chart
   the same.  Refresh Chart is used to redisplay the chart after selecting
   different output formatting.  Reset Selections is used to set the chart
   display options back to default values.
   
   =head1 CODE LAYOUT DESCRIPTION
   
   The code is broken down into five components: formatting data for printing,
   downloading data from servers, processing data, helper functions,
   and the central processing functions.  The module is broken into chunks
   for each component.
   
   =head1 PACKAGES USED
   
    Apache::Constants qw(:common :http)
    Apache::lonnet()
    Apache::loncommon()
    HTML::TokeParser
    GDBM_File
   
   =cut
   
 package Apache::lonchart;  package Apache::lonchart;
   
 use strict;  use strict;
Line 56  use HTML::TokeParser; Line 109  use HTML::TokeParser;
 use GDBM_File;  use GDBM_File;
   
 #my $jr;   #my $jr; 
   
   =pod
   
   =head1 FORMAT DATA FOR PRINTING
   
   =cut
   
 # ----- FORMAT PRINT DATA ----------------------------------------------  # ----- FORMAT PRINT DATA ----------------------------------------------
   
   =pod
   
   =item &FormatStudentInformation()
   
   This function produces a formatted string of the student's information:
   username, domain, section, full name, and PID.
   
   =over 4
   
   Input: $cache, $name, $studentInformation, $spacePadding
   
   $cache: This is a pointer to a hash that is tied to the cached data
   
   $name:  The name and domain of the current student in name:domain format
   
   $studentInformation: A pointer to an array holding the names used to
   
   remove data from the hash.  They represent the name of the data to be removed.
   
   $spacePadding: Extra spaces that represent the space between columns
   
   Output: $Str
   
   $Str: Formatted string.
   
   =back
   
   =cut
   
 sub FormatStudentInformation {  sub FormatStudentInformation {
     my ($cache,$name,$studentInformation,$spacePadding)=@_;      my ($cache,$name,$studentInformation,$spacePadding)=@_;
     my $Str='<pre>';      my $Str='';
   
     foreach (@$studentInformation) {      for(my $index=0; $index<(scalar @$studentInformation); $index++) {
  my $data=$cache->{$name.':'.$_};          if(!&ShouldShowColumn($cache, 'heading'.$index)) {
               next;
           }
    my $data=$cache->{$name.':'.$studentInformation->[$index]};
  $Str .= $data;   $Str .= $data;
   
  my @dataLength=split(//,$data);   my @dataLength=split(//,$data);
  my $length=scalar @dataLength;   my $length=scalar @dataLength;
  $Str .= (' 'x($cache->{$_.'Length'}-$length));   $Str .= (' 'x($cache->{$studentInformation->[$index].'Length'}-
                         $length));
  $Str .= $spacePadding;   $Str .= $spacePadding;
     }      }
   
     return $Str;      return $Str;
 }  }
   
   =pod
   
   =item &FormatStudentData()
   
   First, FormatStudentInformation is called and prefixes the 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.
   
   =over 4
   
   Input: $name, $studentInformation, $spacePadding, $ChartDB
   
   $name: The name and domain of the current student in name:domain format
   
   $studentInformation: A pointer to an array holding the names used to 
   remove data from the hash.  They represent 
   the name of the data to be removed.
   
   $spacePadding: Extra spaces that represent the space between columns
   
   $ChartDB: The name of the cached data database which will be tied to that 
   database.
   
   Output: $Str
   
   $Str: Formatted string that is an entire row of the chart.  It is a 
   concatenation of student information and student course information.
   
   =back
   
   =cut
   
 sub FormatStudentData {  sub FormatStudentData {
     my ($name,$coid,$studentInformation,$spacePadding,$ChartDB)=@_;      my ($name,$studentInformation,$spacePadding,$ChartDB)=@_;
     my ($sname,$sdom) = split(/\:/,$name);      my ($sname,$sdom) = split(/\:/,$name);
     my $Str;      my $Str;
     my %CacheData;      my %CacheData;
Line 91  sub FormatStudentData { Line 218  sub FormatStudentData {
   
     # Handle errors      # Handle errors
     if($CacheData{$name.':error'} =~ /environment/) {      if($CacheData{$name.':error'} =~ /environment/) {
           $Str .= '<br>';
         untie(%CacheData);          untie(%CacheData);
         $Str .= '</pre>';  
         return $Str;          return $Str;
 # my $errorMessage = $CacheData{$name.':error'};  
 # return '<td>'.$sname.'</td><td>'.$sdom.  
 #    '</td><td><font color="#000088">'.$errorMessage.'</font></td>';  
     }      }
   
     if($CacheData{$name.':error'} =~ /course/) {      if($CacheData{$name.':error'} =~ /course/) {
           $Str .= '<br>';
         untie(%CacheData);          untie(%CacheData);
         $Str .= '</pre>';          return $Str;
  return $Str;  
 # my $errorMessage = 'May have no course data or '.  
 #                   $CacheData{$name.':error'};  
 # return '<td>'.$sname.'</td><td>'.$sdom.  
 #    '</td><td><font color="#000088">'.$errorMessage.'</font></td>';  
     }      }
   
     # Handle problem data ------------------------------------------------      # Handle problem data ------------------------------------------------
Line 116  sub FormatStudentData { Line 236  sub FormatStudentData {
     my $problemsSolved  = 0;      my $problemsSolved  = 0;
     my $numberOfParts   = 0;      my $numberOfParts   = 0;
     foreach my $sequence (split(/\:/,$CacheData{'orderedSequences'})) {      foreach my $sequence (split(/\:/,$CacheData{'orderedSequences'})) {
           if(!&ShouldShowColumn(\%CacheData, 'sequence'.$sequence)) {
               next;
           }
   
  my $characterCount=0;   my $characterCount=0;
  foreach my $problemID (split(/\:/,$CacheData{$sequence.':problems'})) {   foreach my $problemID (split(/\:/,$CacheData{$sequence.':problems'})) {
     my $problem = $CacheData{$problemID.':problem'};      my $problem = $CacheData{$problemID.':problem'};
Line 207  sub FormatStudentData { Line 331  sub FormatStudentData {
         $Str .= $spacePadding;          $Str .= $spacePadding;
     }      }
   
     $Str .= '<font color="#000088">'.$problemsSolved.      my $outputProblemsSolved = sprintf( "%4d", $problemsSolved );
     ' / '.$totalProblems.'</font></pre>';      my $outputTotalProblems  = sprintf( "%4d", $totalProblems );
       $Str .= '<font color="#000088">'.$outputProblemsSolved.
       ' / '.$outputTotalProblems.'</font><br>';
   
     untie(%CacheData);      untie(%CacheData);
     return $Str;      return $Str;
 }  }
   
   =pod
   
   =item &CreateTableHeadings()
   
   This function generates the column headings for the chart.
   
   =over 4
   
   Inputs: $CacheData, $studentInformation, $headings, $spacePadding
   
   $CacheData: pointer to a hash tied to the cached data database
   
   $studentInformation: a pointer to an array containing the names of the data 
   held in a column and is used as part of a key into $CacheData
   
   $headings: The names of the headings for the student information
   
   $spacePadding: The spaces to go between columns
   
   Output: $Str
   
   $Str: A formatted string of the table column headings.
   
   =back
   
   =cut
   
 sub CreateTableHeadings {  sub CreateTableHeadings {
     my ($CacheData,$studentInformation,$headings,$spacePadding)=@_;      my ($CacheData,$studentInformation,$headings,$spacePadding)=@_;
     my $Str='<pre>';      my $Str='<tr>';
   
     for(my $index=0; $index<(scalar @$headings); $index++) {      for(my $index=0; $index<(scalar @$headings); $index++) {
           if(!&ShouldShowColumn($CacheData, 'heading'.$index)) {
               next;
           }
   
           $Str .= '<td align="left"><pre>';
  my $data=$$headings[$index];   my $data=$$headings[$index];
  $Str .= $data;   $Str .= $data;
   
Line 227  sub CreateTableHeadings { Line 385  sub CreateTableHeadings {
  $Str .= (' 'x($CacheData->{$$studentInformation[$index].'Length'}-   $Str .= (' 'x($CacheData->{$$studentInformation[$index].'Length'}-
                       $length));                        $length));
  $Str .= $spacePadding;   $Str .= $spacePadding;
           $Str .= '</pre></td>';
     }      }
   
     foreach my $sequence (split(/\:/,$CacheData->{'orderedSequences'})) {      foreach my $sequence (split(/\:/,$CacheData->{'orderedSequences'})) {
  $Str .= $CacheData->{$sequence.':title'};          if(!&ShouldShowColumn($CacheData, 'sequence'.$sequence)) {
               next;
           }
   
           $Str .= '<td align="left"><pre>';
           my $name = $CacheData->{$sequence.':title'};
    $Str .= $name;
  my @titleLength=split(//,$CacheData->{$sequence.':title'});   my @titleLength=split(//,$CacheData->{$sequence.':title'});
  my $leftover=$CacheData->{$sequence.':columnWidth'}-   my $leftover=$CacheData->{$sequence.':columnWidth'}-
                      (scalar @titleLength);                       (scalar @titleLength);
  $Str .= (' 'x$leftover);   $Str .= (' 'x$leftover);
  $Str .= $spacePadding;   $Str .= $spacePadding;
           $Str .= '</pre></td>';
     }      }
   
     $Str .= 'Total Solved/Total Problems';      $Str .= '<td><pre>Total Solved/Total Problems</pre></td>';
     $Str .= '</pre>';      $Str .= '</tr>';
   
     return $Str;      return $Str;
 }  }
   
   =pod
   
   =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 
   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.
   
   =over 4
   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.  
   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 
   which has a size of four.
   
   =back
   
   =cut
   
   sub CreateColumnSelectionBox {
       my ($CacheData,$headings)=@_;
   
       my $missing=0;
       my $notThere='<tr><td align="right"><b>Select column to view:</b>';
       my $name;
       $notThere .= '<td align="left">';
       $notThere .= '<select name="reselect" size="4" multiple="true">'."\n";
   
       for(my $index=0; $index<(scalar @$headings); $index++) {
           if(&ShouldShowColumn($CacheData, 'heading'.$index)) {
               next;
           }
           $name = $headings->[$index];
           $notThere .= '<option value="heading'.$index.'">';
           $notThere .= $name.'</option>'."\n";
           $missing++;
       }
   
       foreach my $sequence (split(/\:/,$CacheData->{'orderedSequences'})) {
           if(&ShouldShowColumn($CacheData, 'sequence'.$sequence)) {
               next;
           }
           $name = $CacheData->{$sequence.':title'};
           $notThere .= '<option value="sequence'.$sequence.'">';
           $notThere .= $name.'</option>'."\n";
           $missing++;
       }
   
       if($missing) {
           $notThere .= '</select>';
       } else {
           $notThere='<tr><td>';
       }
   
       return $notThere.'</td></tr>';
   }
   
   =pod
   
   =item &CreateColumnSelectors()
   
   This function generates the checkboxes above the column headings.  The 
   column will be removed if the checkbox is unchecked.
   
   =over 4
   
   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.  They are used to know what are the student information columns
   
   Output: $present
   
   $present: The string contains the first row of a table.  Each column contains
   a checkbox which is left justified.  Currently left justification is used
   for consistency of location over the column in which it presides.
   
   =back
   
   =cut
   
   sub CreateColumnSelectors {
       my ($CacheData,$headings)=@_;
   
       my $found=0;
       my ($name, $length, $position);
   
       my $present = '<tr>';
       for(my $index=0; $index<(scalar @$headings); $index++) {
           if(!&ShouldShowColumn($CacheData, 'heading'.$index)) {
               next;
           }
           $present .= '<td align="left">';
           $present .= '<input type="checkbox" checked="on" ';
           $present .= 'name="heading'.$index.'" />';
           $present .= '</td>';
           $found++;
       }
   
       foreach my $sequence (split(/\:/,$CacheData->{'orderedSequences'})) {
           if(!&ShouldShowColumn($CacheData, 'sequence'.$sequence)) {
               next;
           }
           $present .= '<td align="left">';
           $present .= '<input type="checkbox" checked="on" ';
           $present .= 'name="sequence'.$sequence.'" />';
           $present .= '</td>';
           $found++;
       }
   
       if(!$found) {
           $present = '';
       }
   
       return $present.'<td></td></tr></form>'."\n";;
   }
   
   =pod
   
   =item &CreateForm()
   
   The interface for this module consists primarily of the controls in this
   function.  The student status selection (active, expired, any) is set here.
   The sort buttons: username, last name, and section are set here.  The
   other buttons are Recalculate Chart, Refresh Chart, and Reset Selections.
   These controls are in a table to clean up the interface.
   
   =over 4
   
   Input: $CacheData
   
   $CacheData is a hash pointer to tied database for cached data.
   
   Output: $Ptr
   
   $Ptr is a string containing all the html for the above mentioned buttons.
   
   =back
   
   =cut
   
 sub CreateForm {  sub CreateForm {
       my ($CacheData)=@_;
     my $OpSel1='';      my $OpSel1='';
     my $OpSel2='';      my $OpSel2='';
     my $OpSel3='';      my $OpSel3='';
     my $Status = $ENV{'form.status'};      my $Status = $CacheData->{'form.status'};
     if ( $Status eq 'Any' ) { $OpSel3='selected'; }      if ( $Status eq 'Any' ) { $OpSel3='selected'; }
     elsif ($Status eq 'Expired' ) { $OpSel2 = 'selected'; }      elsif ($Status eq 'Expired' ) { $OpSel2 = 'selected'; }
     else { $OpSel1 = 'selected'; }      else { $OpSel1 = 'selected'; }
   
     my $Ptr = '<form name="stat" method="post" action="/adm/chart" >'."\n";      my $Ptr .= '<form name="stat" method="post" action="/adm/chart" >'."\n";
     $Ptr .= '<b> Sort by: &nbsp; </b>'."\n";      $Ptr .= '<tr><td align="right">';
       $Ptr .= '</td><td align="left">';
       $Ptr .= '<input type="submit" name="recalculate" ';
       $Ptr .= 'value="Recalculate Chart"/>'."\n";
     $Ptr .= '&nbsp;&nbsp;&nbsp;';      $Ptr .= '&nbsp;&nbsp;&nbsp;';
       $Ptr .= '<input type="submit" name="refresh" ';
       $Ptr .= 'value="Refresh Chart"/>'."\n";
       $Ptr .= '&nbsp;&nbsp;&nbsp;';
       $Ptr .= '<input type="submit" name="reset" ';
       $Ptr .= 'value="Reset Selections"/></td>'."\n";
       $Ptr .= '</tr><tr><td align="right">';
       $Ptr .= '<b> Sort by: </b>'."\n";
       $Ptr .= '</td><td align="left">';
     $Ptr .= '<input type="submit" name="sort" value="User Name" />'."\n";      $Ptr .= '<input type="submit" name="sort" value="User Name" />'."\n";
     $Ptr .= '&nbsp;&nbsp;&nbsp;';      $Ptr .= '&nbsp;&nbsp;&nbsp;';
     $Ptr .= '<input type="submit" name="sort" value="Last Name" />'."\n";      $Ptr .= '<input type="submit" name="sort" value="Last Name" />'."\n";
     $Ptr .= '&nbsp;&nbsp;&nbsp;';      $Ptr .= '&nbsp;&nbsp;&nbsp;';
     $Ptr .= '<input type="submit" name="sort" value="Section"/>'."\n";      $Ptr .= '<input type="submit" name="sort" value="Section"/>'."\n";
     $Ptr .= '<br><br>';      $Ptr .= '</td></tr><tr><td align="right">';
     $Ptr .= '<b> Student Status: &nbsp; </b>'."\n".      $Ptr .= '<b> Student Status: &nbsp; </b>'."\n".
               '</td><td align="left">'.
             '<select name="status">'.               '<select name="status">'. 
             '<option '.$OpSel1.' >Active</option>'."\n".              '<option '.$OpSel1.' >Active</option>'."\n".
             '<option '.$OpSel2.' >Expired</option>'."\n".              '<option '.$OpSel2.' >Expired</option>'."\n".
     '<option '.$OpSel3.' >Any</option> </select> '."\n";      '<option '.$OpSel3.' >Any</option> </select> '."\n";
     $Ptr .= '<br><br>';      $Ptr .= '</td></tr>';
     $Ptr .= '<input type="submit" name="sort" value="Recalculate Chart"/>';  
     $Ptr .= "\n";  
     $Ptr .= '&nbsp;&nbsp;&nbsp;';  
     $Ptr .= '<input type="submit" name="sort" value="Refresh Chart"/>';  
     $Ptr .= "\n";  
     $Ptr .= '</form>'."\n";  
   
     return $Ptr;      return $Ptr;
 }  }
   
   =pod
   
   =item &CreateLegend()
   
   This function returns a formatted string containing the legend for the
   chart.  The legend describes the symbols used to represent grades for
   problems.
   
   =cut
   
 sub CreateLegend {  sub CreateLegend {
     my $Str = '<h1>'.$ENV{'course.'.$ENV{'request.course.id'}.'.description'}.      my $Str = "<p><pre>".
               '</h1><h3>'.localtime().                "1..9: correct by student in 1..9 tries\n".
               "</h3><p><pre>1..9: correct by student in 1..9 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 override\n".
               "   -: incorrect by override\n".                "   -: incorrect by override\n".
       "   .: incorrect attempted\n".        "   .: incorrect attempted\n".
       "   #: ungraded attempted\n".        "   #: ungraded attempted\n".
               "    : not attempted\n".                "    : not attempted\n".
       "   x: excused</pre><p>";         "   x: excused".
                 "</pre><p>"; 
     return $Str;      return $Str;
 }  }
   
   =pod
   
   =item &StartDocument()
   
   Returns a string containing the header information for the chart: title,
   logo, and course title.
   
   =cut
   
 sub StartDocument {  sub StartDocument {
     my $Str = '';      my $Str = '';
     $Str .= '<html>';      $Str .= '<html>';
Line 301  sub StartDocument { Line 646  sub StartDocument {
     $Str .= '<script>window.focus();</script>';      $Str .= '<script>window.focus();</script>';
     $Str .= '<img align=right src=/adm/lonIcons/lonlogos.gif>';      $Str .= '<img align=right src=/adm/lonIcons/lonlogos.gif>';
     $Str .= '<h1>Assessment Chart</h1>';      $Str .= '<h1>Assessment Chart</h1>';
       $Str .= '<h1>'.$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
       $Str .= '</h1>';
   
     return $Str;      return $Str;
 }  }
   
 # ----- END FORMAT PRINT DATA ------------------------------------------  # ----- END FORMAT PRINT DATA ------------------------------------------
   
   =pod
   
   =head1 DOWNLOAD INFORMATION
   
   This section contains all the files that get data from other servers 
   and/or itself.  There is one function that has a call to get remote
   information but isn't included here which is ProcessTopLevelMap.  The
   usage was small enough to be ignored, but that portion may be moved
   here in the future.
   
   =cut
   
 # ----- DOWNLOAD INFORMATION -------------------------------------------  # ----- DOWNLOAD INFORMATION -------------------------------------------
   
   =pod
   
   =item &DownloadPrerequisiteData()
   
   Collects lastname, generation, middlename, firstname PID, and section for each
   student from their environment database.  The list of students is built from
   collecting a classlist for the course that is to be displayed.
   
   =over 4
   
   Input: $courseID, $c
   
   $courseID:  The id of the course
   
   $c: The connection class that can determine if the browser has aborted.  It
   is used to short circuit this function so that it doesn't continue to 
   get information when there is no need.
   
   Output: \%classlist
   
   \%classlist: A pointer to a hash containing the following data:
   
   -A list of student name:domain (as keys) (known below as $name)
   
   -A hash pointer for each student containing lastname, generation, firstname,
   middlename, and PID : Key is $name.'studentInformation'
   
   -A hash pointer to each students section data : Key is $name.section
   
   =back
   
   =cut
   
 sub DownloadPrerequisiteData {  sub DownloadPrerequisiteData {
     my ($courseID, $c)=@_;      my ($courseID, $c)=@_;
     my ($courseDomain,$courseNumber)=split(/\_/,$courseID);      my ($courseDomain,$courseNumber)=split(/\_/,$courseID);
Line 349  sub DownloadPrerequisiteData { Line 741  sub DownloadPrerequisiteData {
     return \%classlist;      return \%classlist;
 }  }
   
   =pod
   
   =item &DownloadStudentCourseInformation()
   
   Dump of all the course information for a single student.  There is no
   pruning of data, it is all stored in a hash and returned.
   
   =over 4
   
   Input: $name, $courseID
   
   $name: student name:domain
   
   $courseID:  The id of the course
   
   Output: \%courseData
   
   \%courseData:  A hash pointer to the raw data from the student's course
   database.
   
   =back
   
   =cut
   
 sub DownloadStudentCourseInformation {  sub DownloadStudentCourseInformation {
     my ($name,$courseID)=@_;      my ($name,$courseID)=@_;
     my ($studentName,$studentDomain) = split(/\:/,$name);      my ($studentName,$studentDomain) = split(/\:/,$name);
Line 361  sub DownloadStudentCourseInformation { Line 777  sub DownloadStudentCourseInformation {
   
 # ----- END DOWNLOAD INFORMATION ---------------------------------------  # ----- END DOWNLOAD INFORMATION ---------------------------------------
   
 # ----- END PROCESSING FUNCTIONS ---------------------------------------  =pod
   
   =head1 PROCESSING FUNCTIONS
   
   These functions process all the data for all the students.  Also, they
   are the only functions that access the cache database for writing.  Thus
   they are the only functions that cache data.  The downloading and caching
   were separated to reduce problems with stopping downloading then can't
   tie hash to database later.
   
   =cut
   
   # ----- PROCESSING FUNCTIONS ---------------------------------------
   
   =pod
   
   =cut
   
 sub ProcessTopResourceMap {  sub ProcessTopResourceMap {
     my ($ChartDB,$c)=@_;      my ($ChartDB,$c)=@_;
Line 393  sub ProcessTopResourceMap { Line 825  sub ProcessTopResourceMap {
     my ($currentSequence, $currentResourceID, $lastResourceID);      my ($currentSequence, $currentResourceID, $lastResourceID);
   
     $currentResourceID=$hash{'ids_/res/'.$ENV{'request.course.uri'}};      $currentResourceID=$hash{'ids_/res/'.$ENV{'request.course.uri'}};
       push(@currentResource, $currentResourceID);
     $lastResourceID=-1;      $lastResourceID=-1;
     $currentSequence=-1;      $currentSequence=-1;
     my $topLevelSequenceNumber = $currentSequence;      my $topLevelSequenceNumber = $currentSequence;
Line 409  sub ProcessTopResourceMap { Line 842  sub ProcessTopResourceMap {
     push(@finishResource, $lastResourceID);      push(@finishResource, $lastResourceID);
   
     $currentSequence=$hash{'map_pc_'.$hash{'src_'.$currentResourceID}};      $currentSequence=$hash{'map_pc_'.$hash{'src_'.$currentResourceID}};
   
               # Mark sequence as containing problems.  If it doesn't, then
               # it will be removed when processing for this sequence is
               # complete.  This allows the problems in a sequence
               # to be outputed before problems in the subsequences
               if(!defined($CacheData{'orderedSequences'})) {
                   $CacheData{'orderedSequences'}=$currentSequence;
               } else {
                   $CacheData{'orderedSequences'}.=':'.$currentSequence;
               }
   
     $lastResourceID=$hash{'map_finish_'.      $lastResourceID=$hash{'map_finish_'.
   $hash{'src_'.$currentResourceID}};    $hash{'src_'.$currentResourceID}};
     $currentResourceID=$hash{'map_start_'.      $currentResourceID=$hash{'map_start_'.
Line 466  sub ProcessTopResourceMap { Line 910  sub ProcessTopResourceMap {
  if($currentResourceID eq $lastResourceID) {   if($currentResourceID eq $lastResourceID) {
     #pop off last resource of sequence      #pop off last resource of sequence
     $currentResourceID=pop(@currentResource);      $currentResourceID=pop(@currentResource);
     #pop to get last resource in previous sequence  
     $currentResourceID=pop(@currentResource);  
     $lastResourceID=pop(@finishResource);      $lastResourceID=pop(@finishResource);
   
     if(defined($CacheData{$currentSequence.':problems'})) {      if(defined($CacheData{$currentSequence.':problems'})) {
  # Capture sequence information here   # Capture sequence information here
  if(!defined($CacheData{'orderedSequences'})) {  
     $CacheData{'orderedSequences'}=$currentSequence;  
  } else {  
     $CacheData{'orderedSequences'}.=':'.$currentSequence;  
  }  
   
  $CacheData{$currentSequence.':title'}=   $CacheData{$currentSequence.':title'}=
     $hash{'title_'.$currentResourceID};      $hash{'title_'.$currentResourceID};
   
                 my $totalProblems=0;                  my $totalProblems=0;
                 foreach (split(/\:/,$CacheData{$currentSequence.                  foreach my $currentProblem (split(/\:/,
                                                  $CacheData{$currentSequence.
                                                ':problems'})) {                                                 ':problems'})) {
                     foreach ($CacheData{$currentSequence.':'.$_.':parts'}) {                      foreach (split(/\:/,$CacheData{$currentSequence.':'.
                                                      $currentProblem.
                                                      ':parts'})) {
                         $totalProblems++;                          $totalProblems++;
                     }                      }
                 }                  }
Line 500  sub ProcessTopResourceMap { Line 939  sub ProcessTopResourceMap {
     $CacheData{$currentSequence.':columnWidth'}=      $CacheData{$currentSequence.':columnWidth'}=
                         (scalar @titleLength);                          (scalar @titleLength);
  }   }
     }      } else {
                   $CacheData{'orderedSequences'}=~s/$currentSequence//;
                   $CacheData{'orderedSequences'}=~s/::/:/g;
                   $CacheData{'orderedSequences'}=~s/^:|:$//g;
               }
   
     $currentSequence=pop(@sequences);      $currentSequence=pop(@sequences);
     if($currentSequence eq $topLevelSequenceNumber) {      if($currentSequence eq $topLevelSequenceNumber) {
  last;   last;
     }      }
  #else  
  }   }
   
  # MOVE!!!   # MOVE!!!
Line 519  sub ProcessTopResourceMap { Line 961  sub ProcessTopResourceMap {
  foreach (split(/\,/,$hash{'to_'.$currentResourceID})) {   foreach (split(/\,/,$hash{'to_'.$currentResourceID})) {
     push(@nextResources, $hash{'goesto_'.$_});      push(@nextResources, $hash{'goesto_'.$_});
  }   }
  pop(@currentResource);  
  push(@currentResource, @nextResources);   push(@currentResource, @nextResources);
  # Set the next resource to be popped(processed)   # Set the next resource to be processed
  $currentResourceID=$currentResource[-1];   $currentResourceID=pop(@currentResource);
     }      }
   
     unless (untie(%hash)) {      unless (untie(%hash)) {
Line 618  sub ProcessStudentInformation { Line 1059  sub ProcessStudentInformation {
     }      }
   
     # Get student's section number      # Get student's section number
     my $sec=&ProcessSection($section, $courseID, $ENV{'form.status'});      my $sec=&ProcessSection($section, $courseID, $CacheData->{'form.status'});
     if($sec != -1) {      if($sec != -1) {
  $CacheData->{$name.':section'}=$sec;   $CacheData->{$name.':section'}=$sec;
     } else {      } else {
Line 635  sub ProcessClassList { Line 1076  sub ProcessClassList {
     my %CacheData;      my %CacheData;
     if(tie(%CacheData,'GDBM_File',$ChartDB,&GDBM_WRCREAT,0640)) {      if(tie(%CacheData,'GDBM_File',$ChartDB,&GDBM_WRCREAT,0640)) {
         foreach my $name (keys(%$classlist)) {          foreach my $name (keys(%$classlist)) {
             if($name =~ /\:section/ || $name =~ /\:studentInformation/) {              if($name =~ /\:section/ || $name =~ /\:studentInformation/ ||
                  $name eq '') {
                 next;                  next;
             }              }
             if($c->aborted()) {              if($c->aborted()) {
Line 650  sub ProcessClassList { Line 1092  sub ProcessClassList {
                                     $name,$courseID,$c);                                      $name,$courseID,$c);
         }          }
   
         $CacheData{'NamesOfStudents'}=join(":::",@names);          # Time of download
 #        $CacheData{'NamesOfStudents'}=&Apache::lonnet::arrayref2str(\@names);          $CacheData{'time'}=localtime();
  untie(%CacheData);   untie(%CacheData);
     }      }
   
     return @names;      return @names;
 }  }
   
 # ----- END PROCESSING FUNCTIONS ---------------------------------------  sub ProcessStudentData {
       my ($courseData, $name, $ChartDB)=@_;
   
 # ----- HELPER FUNCTIONS -----------------------------------------------      my %CacheData;
       if(tie(%CacheData,'GDBM_File',$ChartDB,&GDBM_WRCREAT,0640)) {
           my ($checkForError) = keys(%$courseData);
           if($checkForError =~ /^(con_lost|error|no_such_host)/i) {
               $CacheData{$name.':error'}='Could not download course data.';
           } else {
               foreach my $key (keys (%$courseData)) {
                   $CacheData{$name.':'.$key}=$courseData->{$key};
               }
               if(defined($CacheData{'NamesOfStudents'})) {
                   $CacheData{'NamesOfStudents'}.=':::'.$name;
               } else {
                   $CacheData{'NamesOfStudents'}=$name;
               }
           }
           untie(%CacheData);
       }
   
       return;
   }
   
   =pod
   
   =item &ProcessFormData()
   
   Cache form data and set default form data (sort, status, heading.$number,
   sequence.$number, reselect, reset, recalculate, and refresh)
   
   =over 4
   
   Input: $ChartDB, $isCached
   
   $ChartDB: The name of the database for cached data
   
   $isCached: Is there already data for this course cached.  This is used in 
   conjunction with the absence of all form data to know to display all selection 
   types.
   
   Output: None
   
   =back
   
   =cut
   
   sub ProcessFormData {
       my ($ChartDB, $isCached)=@_;
       my %CacheData;
   
       if(tie(%CacheData,'GDBM_File',$ChartDB,&GDBM_WRCREAT,0640)) {
           if(defined($ENV{'form.sort'})) {
               $CacheData{'form.sort'}=$ENV{'form.sort'};
           } elsif(!defined($CacheData{'form.sort'})) {
               $CacheData{'form.sort'}='username';
           }
   
           # Ignore $ENV{'form.refresh'}
           # Ignore $ENV{'form.recalculate'}
   
           if(defined($ENV{'form.status'})) {
               $CacheData{'form.status'}=$ENV{'form.status'};
           } elsif(!defined($CacheData{'form.status'})) {
               $CacheData{'form.status'}='Active';
           }
   
           my @headings=();
           my @sequences=();
           my $found=0;
           foreach (keys(%ENV)) {
               if(/form\.heading/) {
                   $found++;
                   push(@headings, $_);
               } elsif(/form\.sequence/) {
                   $found++;
                   push(@sequences, $_);
               } elsif(/form\./) {
                   $found++;
               }
           }
   
           if($found) {
               $CacheData{'form.headings'}=join(":::",@headings);
               $CacheData{'form.sequences'}=join(":::",@sequences);
           }
   
           if(defined($ENV{'form.reselect'})) {
               my @reselected = (ref($ENV{'form.reselect'}) ? 
                                 @{$ENV{'form.reselect'}}
                                 : ($ENV{'form.reselect'}));
               foreach (@reselected) {
                   if(/heading/) {
                       $CacheData{'form.headings'}.=":::".$_;
                   } elsif(/sequence/) {
                       $CacheData{'form.sequences'}.=":::".$_;
                   }
               }
           }
   
           if(defined($ENV{'form.reset'}) || (!$found && !$isCached)) {
               $CacheData{'form.reset'}='true';
               $CacheData{'form.status'}='Active';
               $CacheData{'form.sort'}='username';
               $CacheData{'form.headings'}='ALLHEADINGS';
               $CacheData{'form.sequences'}='ALLSEQUENCES';
           } else {
               $CacheData{'form.reset'}='false';
           }
   
           untie(%CacheData);
       }
   
       return;
   }
   
   =pod
   
   =item &SpaceColumns()
   
   Determines the width of all the columns in the chart.  It is based on
   the max of the data for that column and its header.
   
   =over 4
   
   Input: $students, $studentInformation, $headings, $ChartDB
   
   $students: An array pointer to a list of students (username:domain)
   
   $studentInformatin: The type of data for the student information.  It is
   used as part of the key in $CacheData.
   
   $headings: The name of the student information columns.
   
   $ChartDB: The name of the cache database which is opened for read/write.
   
   Output: None - All data stored in cache.
   
   =back
   
   =cut
   
 sub SpaceColumns {  sub SpaceColumns {
     my ($students,$studentInformation,$headings,$ChartDB)=@_;      my ($students,$studentInformation,$headings,$ChartDB)=@_;
Line 689  sub SpaceColumns { Line 1269  sub SpaceColumns {
     return;      return;
 }  }
   
   # ----- END PROCESSING FUNCTIONS ---------------------------------------
   
   =pod
   
   =head1 HELPER FUNCTIONS
   
   These are just a couple of functions do various odd and end 
   jobs.
   
   =cut
   
   # ----- HELPER FUNCTIONS -----------------------------------------------
   
   =pod
   
   =item &ProcessFullName()
   
   Takes lastname, generation, firstname, and middlename (or some partial
   set of this data) and returns the full name version as a string.
   
   =cut
   
 sub ProcessFullName {  sub ProcessFullName {
     my ($lastname, $generation, $firstname, $middlename)=@_;      my ($lastname, $generation, $firstname, $middlename)=@_;
     my $Str = '';      my $Str = '';
Line 729  sub ProcessFullName { Line 1331  sub ProcessFullName {
     return $Str;      return $Str;
 }  }
   
   =pod
   
   =item &SortStudents()
   
   Determines which students to display and in which order.  Which are 
   displayed are determined by their status(active/expired).  The order
   is determined by the sort button pressed (default to username).  The
   type of sorting is username, lastname, or section.
   
   =over 4
   
   Input: $students, $CacheData
   
   $students: A array pointer to a list of students (username:domain)
   
   $CacheData: A pointer to the hash tied to the cached data
   
   Output: @order
   
   @order: An ordered list of students (username:domain)
   
   =back
   
   =cut
   
 sub SortStudents {  sub SortStudents {
     my ($CacheData)=@_;      my ($students,$CacheData)=@_;
     my @students = split(/:::/,$CacheData->{'NamesOfStudents'});  
 #    my @students=&Apache::lonnet::str2array($CacheData->{'NamesOfStudents'});  
   
     my @sorted1Students=();      my @sorted1Students=();
     foreach (@students) {      foreach (@$students) {
         my ($end,$start)=split(/\:/,$CacheData->{$_.':date'});          my ($end,$start)=split(/\:/,$CacheData->{$_.':date'});
         my $active=1;          my $active=1;
         my $now=time;          my $now=time;
         my $Status=$ENV{'form.status'};          my $Status=$CacheData->{'form.status'};
         $Status = ($Status) ? $Status : 'Active';          $Status = ($Status) ? $Status : 'Active';
         if((($end) && $now > $end) && (($Status eq 'Active'))) {           if((($end) && $now > $end) && (($Status eq 'Active'))) { 
             $active=0;               $active=0; 
Line 752  sub SortStudents { Line 1377  sub SortStudents {
         }          }
     }      }
   
     my $Pos = $ENV{'form.sort'};      my $Pos = $CacheData->{'form.sort'};
     my %sortData;      my %sortData;
     if($Pos eq 'Last Name') {      if($Pos eq 'Last Name') {
  for(my $index=0; $index<scalar @sorted1Students; $index++) {   for(my $index=0; $index<scalar @sorted1Students; $index++) {
Line 772  sub SortStudents { Line 1397  sub SortStudents {
     }      }
   
     my @order = ();      my @order = ();
     foreach my $key (sort keys(%sortData)) {      foreach my $key (sort(keys(%sortData))) {
  push (@order,$sortData{$key});   push (@order,$sortData{$key});
     }      }
   
     return @order;      return @order;
 }  }
   
   =pod
   
   =item &TestCacheData()
   
   Determine if the cache database can be accessed with a tie.  It waits up to
   ten seconds before returning failure.  This function exists to help with
   the problems with stopping the data download.  When an abort occurs and the
   user quickly presses a form button and httpd child is created.  This
   child needs to wait for the other to finish (hopefully within ten seconds).
   
   =over 4
   
   Input: $ChartDB
   
   $ChartDB: The name of the cache database to be opened
   
   Output: -1, 0, 1
   
   -1: Couldn't tie database
    0: Use cached data
    1: New cache database created, use that.
   
   =back
   
   =cut
   
 sub TestCacheData {  sub TestCacheData {
     my ($ChartDB)=@_;      my ($ChartDB)=@_;
     my $isCached=-1;      my $isCached=-1;
     my %testData;      my %testData;
     my $tieTries=0;      my $tieTries=0;
   
     if ((-e "$ChartDB") && ($ENV{'form.sort'} ne 'Recalculate Chart')) {      if ((-e "$ChartDB") && (!defined($ENV{'form.recalculate'}))) {
  $isCached = 1;   $isCached = 1;
     } else {      } else {
  $isCached = 0;   $isCached = 0;
     }      }
   
     while($tieTries < 3) {      while($tieTries < 10) {
         my $result=0;          my $result=0;
         if($isCached) {          if($isCached) {
             $result=tie(%testData,'GDBM_File',$ChartDB,&GDBM_READER,0640);              $result=tie(%testData,'GDBM_File',$ChartDB,&GDBM_READER,0640);
Line 804  sub TestCacheData { Line 1455  sub TestCacheData {
         $tieTries++;          $tieTries++;
         sleep 1;          sleep 1;
     }      }
     if($tieTries >= 3) {      if($tieTries >= 10) {
         return -1;          return -1;
     }      }
   
Line 813  sub TestCacheData { Line 1464  sub TestCacheData {
     return $isCached;      return $isCached;
 }  }
   
 sub ExtractStudentData {  =pod
     my ($courseData, $name, $ChartDB)=@_;  
   
     my %CacheData;  =item &ShouldShowColumn()
     if(tie(%CacheData,'GDBM_File',$ChartDB,&GDBM_WRCREAT,0640)) {  
         my ($checkForError) = keys(%$courseData);  Determine if a specified column should be shown on the chart.
         if($checkForError =~ /^(con_lost|error|no_such_host)/i) {  
             $CacheData{$name.':error'}='Could not download course data.';  =over 4
         } else {  
             foreach my $key (keys (%$courseData)) {  Input: $cache, $test
                 $CacheData{$name.':'.$key}=$courseData->{$key};  
             }  $cache: A pointer to the hash tied to the cached data
         }  
         untie(%CacheData);  $test: The form name of the column (heading.$headingIndex) or 
   (sequence.$sequenceIndex)
   
   Output: 0 (false), 1 (true)
   
   =back
   
   =cut
   
   sub ShouldShowColumn {
       my ($cache,$test)=@_;
   
       if($cache->{'form.reset'} eq 'true') {
           return 1;
     }      }
   
     return;      my $headings=$cache->{'form.headings'};
       my $sequences=$cache->{'form.sequences'};
       if($headings eq 'ALLHEADINGS' || $sequences eq 'ALLSEQUENCES' ||
          $headings=~/$test/ || $sequences=~/$test/) {
           return 1;
       }
   
       return 0;
 }  }
   
 # ----- END HELPER FUNCTIONS --------------------------------------------  # ----- END HELPER FUNCTIONS --------------------------------------------
   
   =pod
   
   =head1 Handler and main function(BuildChart)
   
   The handler does some initial error checking and then passes the torch to
   BuildChart.  BuildChart calls all the appropriate functions to get the
   job done.  These are the only two functions that use print ($r).  All other
   functions return strings to BuildChart to be printed.
   
   =cut
   
   =pod
   
   =item &BuildChart()
   
    The following is the process that BuildChart goes through to create the
     html document.
   
    -Start the lonchart document
    -Test for access to the CacheData
    -Download class list information if not using cached data 
    -Sort students and print out table desciptive data
    -Output student data
    -If recalculating, store a list of students, but only if all their data was 
     downloaded.  Leave off the others.
    -End document
   
   =over 4
   
   Input: $r
   
   $r:  Used to print html
   
   Output: None
   
   =back
   
   =cut
   
 sub BuildChart {  sub BuildChart {
     my ($r)=@_;      my ($r)=@_;
     my $c = $r->connection;      my $c = $r->connection;
Line 856  sub BuildChart { Line 1565  sub BuildChart {
         $r->rflush();          $r->rflush();
         return;          return;
     }      }
       &ProcessFormData($ChartDB, $isCached);
   
     # Download class list information if not using cached data      # Download class list information if not using cached data
       my %CacheData;
     my @students=();      my @students=();
     my @studentInformation=('username','domain','section','id','fullname');      my @studentInformation=('username','domain','section','id','fullname');
     my @headings=('User Name','Domain','Section','PID','Full Name');      my @headings=('User Name','Domain','Section','PID','Full Name');
Line 881  sub BuildChart { Line 1592  sub BuildChart {
         &SpaceColumns(\@students,\@studentInformation,\@headings,          &SpaceColumns(\@students,\@studentInformation,\@headings,
                       $ChartDB);                        $ChartDB);
         if($c->aborted()) { return; }          if($c->aborted()) { return; }
       } else {
           if(!$c->aborted() && tie(%CacheData,'GDBM_File',$ChartDB,
                                    &GDBM_READER,0640)) {
               @students=split(/:::/,$CacheData{'NamesOfStudents'});
           }
     }      }
   
     # Sort students and print out table desciptive data      # Sort students and print out table desciptive data
     my %CacheData;      my $downloadTime=0;
     if(tie(%CacheData,'GDBM_File',$ChartDB,&GDBM_READER,0640)) {      if(tie(%CacheData,'GDBM_File',$ChartDB,&GDBM_READER,0640)) {
         if(!$c->aborted()) { @students=&SortStudents(\%CacheData); }          if(!$c->aborted()) { @students=&SortStudents(\@students,\%CacheData); }
  if(!$c->aborted()) { $r->print(&CreateLegend()); }          if(defined($CacheData{'time'})) { $downloadTime=$CacheData{'time'}; }
  if(!$c->aborted()) { $r->print(&CreateForm()); }          else { $downloadTime=localtime(); }
  if(!$c->aborted()) { $r->print('<h3>'.(scalar @students).          if(!$c->aborted()) { $r->print('<h3>'.$downloadTime.'</h3>'); }
                                        ' students</h3>'); }          if(!$c->aborted()) { $r->print('<h1>'.(scalar @students).
                                          ' students</h1>'); }
  if(!$c->aborted()) { $r->rflush(); }   if(!$c->aborted()) { $r->rflush(); }
    if(!$c->aborted()) { $r->print(&CreateLegend()); }
           if(!$c->aborted()) { $r->print('<table border="0"><tbody>'); }
    if(!$c->aborted()) { $r->print(&CreateForm(\%CacheData)); }
    if(!$c->aborted()) { $r->print(&CreateColumnSelectionBox(
                                                          \%CacheData,
                                                          \@headings)); }
           if(!$c->aborted()) { $r->print('</tbody></table>'); }
           if(!$c->aborted()) { $r->print('<b>Note: Uncheck the boxes above a'); }
           if(!$c->aborted()) { $r->print(' column to remove that column from'); }
           if(!$c->aborted()) { $r->print(' the display.</b></pre>'); }
           if(!$c->aborted()) { $r->print('<table border="0" cellpadding="0" '); }
           if(!$c->aborted()) { $r->print('cellspacing="0"><tbody>'); }
    if(!$c->aborted()) { $r->print(&CreateColumnSelectors(
                                                          \%CacheData,
                                                          \@headings)); }
  if(!$c->aborted()) { $r->print(&CreateTableHeadings(   if(!$c->aborted()) { $r->print(&CreateTableHeadings(
                                                          \%CacheData,                                                           \%CacheData,
                                                          \@studentInformation,                                                            \@studentInformation, 
  \@headings,    \@headings, 
  $spacePadding)); }   $spacePadding)); }
           if(!$c->aborted()) { $r->print('</tbody></table>'); }
    if(!$c->aborted()) { $r->rflush(); }
  untie(%CacheData);   untie(%CacheData);
     } else {      } else {
  $r->print("Init2: Unable to tie hash to db file");   $r->print("Init2: Unable to tie hash to db file");
  return;   return;
     }      }
   
       # Output student data
     my @updateStudentList = ();      my @updateStudentList = ();
     my $courseData;      my $courseData;
       $r->print('<pre>');
     foreach (@students) {      foreach (@students) {
         if($c->aborted()) {          if($c->aborted()) {
             if(!$isCached &&   
                tie(%CacheData,'GDBM_File',$ChartDB,&GDBM_WRCREAT,0640)) {  
                 $CacheData{'NamesOfStudents'}=join(":::", @updateStudentList);  
 #    $CacheData{'NamesOfStudents'}=  
 #            &Apache::lonnet::arrayref2str(\@updateStudentList);  
                 untie(%CacheData);  
             }  
             last;              last;
         }          }
   
         if(!$isCached) {          if(!$isCached) {
             $courseData=&DownloadStudentCourseInformation($_, $cid);              $courseData=&DownloadStudentCourseInformation($_, $cid);
             if($c->aborted()) { next; }              if($c->aborted()) { last; }
             push(@updateStudentList, $_);              push(@updateStudentList, $_);
             &ExtractStudentData($courseData, $_, $ChartDB);              &ProcessStudentData($courseData, $_, $ChartDB);
         }          }
         $r->print(&FormatStudentData($_, $cid, \@studentInformation,          $r->print(&FormatStudentData($_, \@studentInformation,
                                      $spacePadding, $ChartDB));                                       $spacePadding, $ChartDB));
         $r->rflush();          $r->rflush();
     }      }
   
     $r->print('</body></html>');      # If recalculating, store a list of students, but only if all their 
       # data was downloaded.  Leave off the others.
       if(!$isCached && tie(%CacheData,'GDBM_File',$ChartDB,&GDBM_WRCREAT,0640)) {
           $CacheData{'NamesOfStudents'}=join(":::", @updateStudentList);
   #    $CacheData{'NamesOfStudents'}=
   #            &Apache::lonnet::arrayref2str(\@updateStudentList);
           untie(%CacheData);
       }
   
       # End document
       $r->print('</pre></body></html>');
     $r->rflush();      $r->rflush();
   
     return;      return;
Line 936  sub BuildChart { Line 1675  sub BuildChart {
   
 # ================================================================ Main Handler  # ================================================================ Main Handler
   
   =pod
   
   =item &handler()
   
   The handler checks for permission to access the course data and for 
   initial header problem.  Then it passes the torch to the work horse
   function BuildChart.
   
   =over 4
   
   Input: $r
   
   $r: This is the object that is used to print.
   
   Output: A Value (OK or HTTP_NOT_ACCEPTABLE)
   
   =back
   
   =cut
   
 sub handler {  sub handler {
     my $r=shift;      my $r=shift;
 #    $jr=$r;  #    $jr=$r;

Removed from v.1.45  
changed lines
  Added in v.1.55


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