--- loncom/interface/lonhtmlcommon.pm	2002/07/22 21:21:32	1.2
+++ loncom/interface/lonhtmlcommon.pm	2002/07/25 21:23:51	1.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.2 2002/07/22 21:21:32 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.4 2002/07/25 21:23:51 stredwic Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,18 +57,16 @@ sub MapOptions {
 }
 
 sub StudentOptions {
-    my ($cache, $students, $selectedName, $page)=@_;
+    my ($cache, $students, $selectedName, $page, $formName)=@_;
 
     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;
-    $Str .= '<option';
-    if($selectedName eq 'All Students') {
-        $Str .= ' selected';
-        $selected = 1;
-    }
-    $Str .= '>All Students</option>'."\n";
 
     foreach (@$students) {
 	$Str .= '<option';
@@ -82,11 +80,18 @@ sub StudentOptions {
     }
 
     $Str .= '<option';
-    if(!$selected) {
+    if($selectedName eq 'No Student Selected') {
         $Str .= ' selected';
+        $selected = 1;
     }
     $Str .= '>No Student Selected</option>'."\n";
 
+    $Str .= '<option';
+    if(!$selected) {
+        $Str .= ' selected';
+    }
+    $Str .= '>All Students</option>'."\n";
+
     $Str .= '</select>'."\n";
 
     return $Str;
@@ -181,11 +186,11 @@ This function generates the column headi
 
 =over 4
 
-Inputs: $CacheData, $studentInformation, $headings, $spacePadding
+Inputs: $CacheData, $keyID, $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 
+$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
 
 $headings: The names of the headings for the student information
@@ -200,19 +205,26 @@ $Str: A formatted string of the table co
 
 =cut
 
-sub CreateStudentInformationHeadings {
-    my ($data,$studentInformation,$headings,$displayString)=@_;
+sub CreateHeadings {
+    my ($data,$keyID,$headings,$displayString,$format)=@_;
     my $Str='';
+    my $formatting = '';
 
     for(my $index=0; $index<(scalar @$headings); $index++) {
-#        if(!&ShouldShowColumn($data, 'ChartHeading'.$index)) {
-#            next;
-#        }
- 	my $data=$headings->[$index];
-        my $linkdata=$studentInformation->[$index];
+ 	my $currentHeading=$headings->[$index];
+        if($format eq 'preformatted') {
+            my @dataLength=split(//,$currentHeading);
+            my $length=scalar @dataLength;
+            $formatting = (' 'x
+                      ($data->{$keyID->[$index].':columnWidth'}-$length));
+        }
+        my $linkdata=$keyID->[$index];
+
         my $tempString = $displayString;
         $tempString =~ s/LINKDATA/$linkdata/;
-        $tempString =~ s/DISPLAYDATA/$data/;
+        $tempString =~ s/DISPLAYDATA/$currentHeading/;
+        $tempString =~ s/FORMATTING/$formatting/;
+
         $Str .= $tempString;
     }
 
@@ -228,13 +240,13 @@ username, domain, section, full name, an
 
 =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
 
 $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.
 
@@ -249,22 +261,24 @@ $Str: Formatted string.
 =cut
 
 sub FormatStudentInformation {
-    my ($cache,$name,$studentInformation,$spacePadding)=@_;
+    my ($data,$name,$keyID,$displayString,$format)=@_;
     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(!&ShouldShowColumn($cache, 'ChartHeading'.$index)) {
-            next;
+        if($format eq 'preformatted') {
+            my @dataLength=split(//,$currentColumn);
+            my $length=scalar @dataLength;
+            $currentColumn.= (' 'x
+                     ($data->{$keyID->[$index].':columnWidth'}-$length));
         }
-        $data=$cache->{$name.':'.$studentInformation->[$index]};
-	$Str .= $data;
 
-	my @dataLength=split(//,$data);
-	my $length=scalar @dataLength;
-	$Str .= (' 'x($cache->{$studentInformation->[$index].'Length'}-
-                      $length));
-	$Str .= $spacePadding;
+        my $tempString = $displayString;
+        $tempString =~ s/DISPLAYDATA/$currentColumn/;
+
+        $Str .= $tempString;
     }
 
     return $Str;