Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.2 and 1.5

version 1.2, 2002/07/22 21:21:32 version 1.5, 2002/07/26 16:22:09
Line 57  sub MapOptions { Line 57  sub MapOptions {
 }  }
   
 sub StudentOptions {  sub StudentOptions {
     my ($cache, $students, $selectedName, $page)=@_;      my ($cache, $students, $selectedName, $page, $formName)=@_;
   
     my $Str = '';      my $Str = '';
     $Str = '<select name="'.(($page)?$page:'').'Student">'."\n";      $Str .= '<select name="'.(($page)?$page:'').'Student"';
       if($formName) {
           $Str .= ' onchange="document.'.$formName.'.submit()"';
       }
       $Str .= '>'."\n";
   
     my $selected=0;      my $selected=0;
     $Str .= '<option';  
     if($selectedName eq 'All Students') {  
         $Str .= ' selected';  
         $selected = 1;  
     }  
     $Str .= '>All Students</option>'."\n";  
   
     foreach (@$students) {      foreach (@$students) {
  $Str .= '<option';   $Str .= '<option';
Line 82  sub StudentOptions { Line 80  sub StudentOptions {
     }      }
   
     $Str .= '<option';      $Str .= '<option';
     if(!$selected) {      if($selectedName eq 'No Student Selected') {
         $Str .= ' selected';          $Str .= ' selected';
           $selected = 1;
     }      }
     $Str .= '>No Student Selected</option>'."\n";      $Str .= '>No Student Selected</option>'."\n";
   
       $Str .= '<option';
       if(!$selected) {
           $Str .= ' selected';
       }
       $Str .= '>All Students</option>'."\n";
   
     $Str .= '</select>'."\n";      $Str .= '</select>'."\n";
   
     return $Str;      return $Str;
Line 115  sub StatusOptions { Line 120  sub StatusOptions {
     $Str .= '</select>'."\n";      $Str .= '</select>'."\n";
 }  }
   
   sub MultipleSectionSelect {
       my ($sections,$selectedSections)=@_;
   
       my $Str = '';
       $Str .= '<select name="Section" multiple="" size="4">'."\n";
   
       foreach (@$sections) {
           $Str .= '<option';
           foreach my $selected (@$selectedSections) {
               if($_ eq $selected) {
                   $Str .= ' selected=""';
               }
           }
           $Str .= '>'.$_.'</option>'."\n";
       }
       $Str .= '</select>'."\n";
   
       return $Str;
   }
   
 sub Title {  sub Title {
     my ($pageName)=@_;      my ($pageName)=@_;
   
Line 130  sub Title { Line 155  sub Title {
     $Str .= '</h1></td><td align="right">'."\n";      $Str .= '</h1></td><td align="right">'."\n";
     $Str .= '<img align="right" src=/adm/lonIcons/lonlogos.gif>';      $Str .= '<img align="right" src=/adm/lonIcons/lonlogos.gif>';
     $Str .= '</td></tr></table>'."\n";      $Str .= '</td></tr></table>'."\n";
 #    $Str .= '<h3>Current Time: '.localtime(time).'</h3><br><br><br>'."\n";  
   
     return $Str;  
 }  
   
 sub CreateStatisticsMainMenu {  
     my ($status, $reports)=@_;  
   
     my $Str = '';  
   
     $Str .= '<table border="0"><tbody><tr>'."\n";  
     $Str .= '<td></td><td></td>'."\n";  
     $Str .= '<td align="center"><b>Analysis Reports:</b></td>'."\n";  
     $Str .= '<td align="center"><b>Student Status:</b></td></tr>'."\n";  
     $Str .= '<tr>'."\n";  
     $Str .= '<td align="center"><input type="submit" name="Refresh" ';  
     $Str .= 'value="Refresh" /></td>'."\n";  
     $Str .= '<td align="center"><input type="submit" name="DownloadAll" ';  
     $Str .= 'value="Update All Student Data" /></td>'."\n";  
     $Str .= '<td align="center">';  
     $Str .= '<select name="reportSelected" onchange="document.';  
     $Str .= 'Statistics.submit()">'."\n";  
   
     foreach (sort(keys(%$reports))) {  
         next if($_ eq 'reportSelected');  
         $Str .= '<option name="'.$_.'"';  
         if($reports->{'reportSelected'} eq $reports->{$_}) {  
             $Str .= ' selected=""';  
         }  
         $Str .= '>'.$reports->{$_}.'</option>'."\n";  
     }  
     $Str .= '</select></td>'."\n";  
   
     $Str .= '<td align="center">';  
     $Str .= &StatusOptions($status, 'Statistics');  
     $Str .= '</td>'."\n";  
   
     $Str .= '</tr></tbody></table>'."\n";  
     $Str .= '<hr>'."\n";  
   
     return $Str;      return $Str;
 }  }
Line 181  This function generates the column headi Line 167  This function generates the column headi
   
 =over 4  =over 4
   
 Inputs: $CacheData, $studentInformation, $headings, $spacePadding  Inputs: $CacheData, $keyID, $headings, $spacePadding
   
 $CacheData: pointer to a hash tied to the cached data database  $CacheData: pointer to a hash tied to the cached data database
   
 $studentInformation: a pointer to an array containing the names of the data   $keyID: 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  held in a column and is used as part of a key into $CacheData
   
 $headings: The names of the headings for the student information  $headings: The names of the headings for the student information
Line 200  $Str: A formatted string of the table co Line 186  $Str: A formatted string of the table co
   
 =cut  =cut
   
 sub CreateStudentInformationHeadings {  sub CreateHeadings {
     my ($data,$studentInformation,$headings,$displayString)=@_;      my ($data,$keyID,$headings,$displayString,$format)=@_;
     my $Str='';      my $Str='';
       my $formatting = '';
   
     for(my $index=0; $index<(scalar @$headings); $index++) {      for(my $index=0; $index<(scalar @$headings); $index++) {
 #        if(!&ShouldShowColumn($data, 'ChartHeading'.$index)) {    my $currentHeading=$headings->[$index];
 #            next;          if($format eq 'preformatted') {
 #        }              my @dataLength=split(//,$currentHeading);
   my $data=$headings->[$index];              my $length=scalar @dataLength;
         my $linkdata=$studentInformation->[$index];              $formatting = (' 'x
                         ($data->{$keyID->[$index].':columnWidth'}-$length));
           }
           my $linkdata=$keyID->[$index];
   
         my $tempString = $displayString;          my $tempString = $displayString;
         $tempString =~ s/LINKDATA/$linkdata/;          $tempString =~ s/LINKDATA/$linkdata/;
         $tempString =~ s/DISPLAYDATA/$data/;          $tempString =~ s/DISPLAYDATA/$currentHeading/;
           $tempString =~ s/FORMATTING/$formatting/;
   
         $Str .= $tempString;          $Str .= $tempString;
     }      }
   
Line 228  username, domain, section, full name, an Line 221  username, domain, section, full name, an
   
 =over 4  =over 4
   
 Input: $cache, $name, $studentInformation, $spacePadding  Input: $cache, $name, $keyID, $spacePadding
   
 $cache: This is a pointer to a hash that is tied to the cached data  $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  $name:  The name and domain of the current student in name:domain format
   
 $studentInformation: A pointer to an array holding the names used to  $keyID: 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.  remove data from the hash.  They represent the name of the data to be removed.
   
Line 249  $Str: Formatted string. Line 242  $Str: Formatted string.
 =cut  =cut
   
 sub FormatStudentInformation {  sub FormatStudentInformation {
     my ($cache,$name,$studentInformation,$spacePadding)=@_;      my ($data,$name,$keyID,$displayString,$format)=@_;
     my $Str='';      my $Str='';
     my $data;      my $currentColumn;
   
       for(my $index=0; $index<(scalar @$keyID); $index++) {
           $currentColumn=$data->{$name.':'.$keyID->[$index]};
   
     for(my $index=0; $index<(scalar @$studentInformation); $index++) {          if($format eq 'preformatted') {
         if(!&ShouldShowColumn($cache, 'ChartHeading'.$index)) {              my @dataLength=split(//,$currentColumn);
             next;              my $length=scalar @dataLength;
               $currentColumn.= (' 'x
                        ($data->{$keyID->[$index].':columnWidth'}-$length));
         }          }
         $data=$cache->{$name.':'.$studentInformation->[$index]};  
  $Str .= $data;  
   
  my @dataLength=split(//,$data);          my $tempString = $displayString;
  my $length=scalar @dataLength;          $tempString =~ s/DISPLAYDATA/$currentColumn/;
  $Str .= (' 'x($cache->{$studentInformation->[$index].'Length'}-  
                       $length));          $Str .= $tempString;
  $Str .= $spacePadding;  
     }      }
   
     return $Str;      return $Str;

Removed from v.1.2  
changed lines
  Added in v.1.5


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