--- loncom/interface/Attic/lonchart.pm	2002/07/01 21:12:06	1.49
+++ loncom/interface/Attic/lonchart.pm	2002/07/02 21:48:36	1.52
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonchart.pm,v 1.49 2002/07/01 21:12:06 stredwic Exp $
+# $Id: lonchart.pm,v 1.52 2002/07/02 21:48:36 stredwic Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,6 +46,10 @@
 #
 ###
 
+=pod
+
+=cut
+
 package Apache::lonchart;
 
 use strict;
@@ -55,15 +59,15 @@ use Apache::loncommon();
 use HTML::TokeParser;
 use GDBM_File;
 
-my $jr; 
+#my $jr; 
 # ----- FORMAT PRINT DATA ----------------------------------------------
 
 sub FormatStudentInformation {
-    my ($cache,$name,$studentInformation,$reselected,$spacePadding)=@_;
-    my $Str='<pre>';
+    my ($cache,$name,$studentInformation,$spacePadding)=@_;
+    my $Str='';
 
     for(my $index=0; $index<(scalar @$studentInformation); $index++) {
-        if(!&ShouldShowColumn($reselected, 'heading', $index)) {
+        if(!&ShouldShowColumn($cache, 'heading'.$index)) {
             next;
         }
 	my $data=$cache->{$name.':'.$studentInformation->[$index]};
@@ -80,7 +84,7 @@ sub FormatStudentInformation {
 }
 
 sub FormatStudentData {
-    my ($reselected,$name,$coid,$studentInformation,$spacePadding,$ChartDB)=@_;
+    my ($name,$coid,$studentInformation,$spacePadding,$ChartDB)=@_;
     my ($sname,$sdom) = split(/\:/,$name);
     my $Str;
     my %CacheData;
@@ -91,26 +95,19 @@ sub FormatStudentData {
     # Handle Student information ------------------------------------------
     # Handle user data
     $Str=&FormatStudentInformation(\%CacheData, $name, $studentInformation, 
-                                   $reselected, $spacePadding);
+                                   $spacePadding);
 
     # Handle errors
     if($CacheData{$name.':error'} =~ /environment/) {
+        $Str .= '<br>';
         untie(%CacheData);
-        $Str .= '</pre>';
         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/) {
+        $Str .= '<br>';
         untie(%CacheData);
-        $Str .= '</pre>';
-	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>';
+        return $Str;
     }
 
     # Handle problem data ------------------------------------------------
@@ -120,7 +117,7 @@ sub FormatStudentData {
     my $problemsSolved  = 0;
     my $numberOfParts   = 0;
     foreach my $sequence (split(/\:/,$CacheData{'orderedSequences'})) {
-        if(!&ShouldShowColumn($reselected, 'sequence', $sequence)) {
+        if(!&ShouldShowColumn(\%CacheData, 'sequence'.$sequence)) {
             next;
         }
 
@@ -215,19 +212,21 @@ sub FormatStudentData {
         $Str .= $spacePadding;
     }
 
-    $Str .= '<font color="#000088">'.$problemsSolved.
-	    ' / '.$totalProblems.'</font></pre>';
+    my $outputProblemsSolved = sprintf( "%4d", $problemsSolved );
+    my $outputTotalProblems  = sprintf( "%4d", $totalProblems );
+    $Str .= '<font color="#000088">'.$outputProblemsSolved.
+	    ' / '.$outputTotalProblems.'</font><br>';
 
     untie(%CacheData);
     return $Str;
 }
 
 sub CreateTableHeadings {
-    my ($CacheData,$studentInformation,$headings,$reselected,$spacePadding)=@_;
+    my ($CacheData,$studentInformation,$headings,$spacePadding)=@_;
     my $Str='<pre>';
 
     for(my $index=0; $index<(scalar @$headings); $index++) {
-        if(!&ShouldShowColumn($reselected, 'heading', $index)) {
+        if(!&ShouldShowColumn($CacheData, 'heading'.$index)) {
             next;
         }
 
@@ -242,7 +241,7 @@ sub CreateTableHeadings {
     }
 
     foreach my $sequence (split(/\:/,$CacheData->{'orderedSequences'})) {
-        if(!&ShouldShowColumn($reselected, 'sequence', $sequence)) {
+        if(!&ShouldShowColumn($CacheData, 'sequence'.$sequence)) {
             next;
         }
 
@@ -262,16 +261,16 @@ sub CreateTableHeadings {
 }
 
 sub CreateColumnSelectionBox {
-    my ($CacheData,$studentInformation,$headings,$reselected,$spacePadding)=@_;
+    my ($CacheData,$studentInformation,$headings,$spacePadding)=@_;
 
     my $missing=0;
-    my $notThere='<br><br><b>Select column to view:</b><br><br>';
+    my $notThere='<tr><td align="right"><b>Select column to view:</b>';
     my $name;
-    $notThere .= '&nbsp;&nbsp;&nbsp';
+    $notThere .= '<td align="left">';
     $notThere .= '<select name="reselect" size="4" multiple="true">'."\n";
 
     for(my $index=0; $index<(scalar @$headings); $index++) {
-        if(&ShouldShowColumn($reselected, 'heading', $index)) {
+        if(&ShouldShowColumn($CacheData, 'heading'.$index)) {
             next;
         }
         $name = $headings->[$index];
@@ -281,7 +280,7 @@ sub CreateColumnSelectionBox {
     }
 
     foreach my $sequence (split(/\:/,$CacheData->{'orderedSequences'})) {
-        if(&ShouldShowColumn($reselected, 'sequence', $sequence)) {
+        if(&ShouldShowColumn($CacheData, 'sequence'.$sequence)) {
             next;
         }
         $name = $CacheData->{$sequence.':title'};
@@ -291,22 +290,22 @@ sub CreateColumnSelectionBox {
     }
 
     if($missing) {
-        $notThere .= '</select><br><br>';
+        $notThere .= '</select>';
     } else {
-        $notThere='';
+        $notThere='<tr><td>';
     }
 
-    return $notThere;
+    return $notThere.'</td></tr></tbody></table>';
 }
 
 sub CreateColumnSelectors {
-    my ($CacheData,$studentInformation,$headings,$reselected,$spacePadding)=@_;
+    my ($CacheData,$studentInformation,$headings,$spacePadding)=@_;
 
     my $found=0;
     my ($name, $length, $position);
     my $present='<pre>';
     for(my $index=0; $index<(scalar @$headings); $index++) {
-        if(!&ShouldShowColumn($reselected, 'heading', $index)) {
+        if(!&ShouldShowColumn($CacheData, 'heading'.$index)) {
             next;
         }
         $name = $headings->[$index];
@@ -322,7 +321,7 @@ sub CreateColumnSelectors {
     }
 
     foreach my $sequence (split(/\:/,$CacheData->{'orderedSequences'})) {
-        if(!&ShouldShowColumn($reselected, 'sequence', $sequence)) {
+        if(!&ShouldShowColumn($CacheData, 'sequence'.$sequence)) {
             next;
         }
         $name = $CacheData->{$sequence.':title'};
@@ -348,50 +347,58 @@ sub CreateColumnSelectors {
 }
 
 sub CreateForm {
+    my ($CacheData)=@_;
     my $OpSel1='';
     my $OpSel2='';
     my $OpSel3='';
-    my $Status = $ENV{'form.status'};
+    my $Status = $CacheData->{'form.status'};
     if ( $Status eq 'Any' ) { $OpSel3='selected'; }
     elsif ($Status eq 'Expired' ) { $OpSel2 = 'selected'; }
     else { $OpSel1 = 'selected'; }
 
-    my $Ptr = '<form name="stat" method="post" action="/adm/chart" >'."\n";
-    $Ptr .= '<input type="submit" name="sort" value="Recalculate Chart"/>';
-    $Ptr .= "\n";
+    my $Ptr .= '<form name="stat" method="post" action="/adm/chart" >'."\n";
+    $Ptr .= '<table border="0"><tbody>';
+    $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 .= '<input type="submit" name="refresh" value="Refresh Chart"/>';
-    $Ptr .= "\n";
-    $Ptr .= '<br><br>';
-    $Ptr .= '<b> Sort by: &nbsp; </b>'."\n";
+    $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 .= '&nbsp;&nbsp;&nbsp;';
     $Ptr .= '<input type="submit" name="sort" value="Last Name" />'."\n";
     $Ptr .= '&nbsp;&nbsp;&nbsp;';
     $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".
-            '&nbsp;&nbsp;&nbsp;'.
+            '</td><td align="left">'.
             '<select name="status">'. 
             '<option '.$OpSel1.' >Active</option>'."\n".
             '<option '.$OpSel2.' >Expired</option>'."\n".
 	    '<option '.$OpSel3.' >Any</option> </select> '."\n";
+    $Ptr .= '</td></tr>';
 
     return $Ptr;
 }
 
 sub CreateLegend {
-    my $Str = '<h1>'.$ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
-              '</h1><h3>'.localtime().
-              "</h3><p><pre>1..9: correct by student in 1..9 tries\n".
+    my $Str = "<p><pre>".
+              "1..9: correct by student in 1..9 tries\n".
               "   *: correct by student in more than 9 tries\n".
 	      "   +: correct by override\n".
               "   -: incorrect by override\n".
 	      "   .: incorrect attempted\n".
 	      "   #: ungraded attempted\n".
               "    : not attempted\n".
-	      "   x: excused</pre><p>"; 
+	      "   x: excused".
+              "</pre><p>"; 
     return $Str;
 }
 
@@ -404,6 +411,9 @@ sub StartDocument {
     $Str .= '<script>window.focus();</script>';
     $Str .= '<img align=right src=/adm/lonIcons/lonlogos.gif>';
     $Str .= '<h1>Assessment Chart</h1>';
+    $Str .= '<h3>'.localtime().'</h3>';
+    $Str .= '<h1>'.$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+    $Str .= '</h1>';
 
     return $Str;
 }
@@ -513,6 +523,17 @@ sub ProcessTopResourceMap {
 	    push(@finishResource, $lastResourceID);
 
 	    $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_'.
 				  $hash{'src_'.$currentResourceID}};
 	    $currentResourceID=$hash{'map_start_'.
@@ -574,12 +595,6 @@ sub ProcessTopResourceMap {
 
 	    if(defined($CacheData{$currentSequence.':problems'})) {
 		# Capture sequence information here
-		if(!defined($CacheData{'orderedSequences'})) {
-		    $CacheData{'orderedSequences'}=$currentSequence;
-		} else {
-		    $CacheData{'orderedSequences'}.=':'.$currentSequence;
-		}
-
 		$CacheData{$currentSequence.':title'}=
 		    $hash{'title_'.$currentResourceID};
 
@@ -605,13 +620,16 @@ sub ProcessTopResourceMap {
 		    $CacheData{$currentSequence.':columnWidth'}=
                         (scalar @titleLength);
 		}
-	    }
+	    } else {
+                $CacheData{'orderedSequences'}=~s/$currentSequence//;
+                $CacheData{'orderedSequences'}=~s/::/:/g;
+                $CacheData{'orderedSequences'}=~s/^:|:$//g;
+            }
 
 	    $currentSequence=pop(@sequences);
 	    if($currentSequence eq $topLevelSequenceNumber) {
 		last;
 	    }
-	#else
 	}
 
 	# MOVE!!!
@@ -722,7 +740,7 @@ sub ProcessStudentInformation {
     }
 
     # Get student's section number
-    my $sec=&ProcessSection($section, $courseID, $ENV{'form.status'});
+    my $sec=&ProcessSection($section, $courseID, $CacheData->{'form.status'});
     if($sec != -1) {
 	$CacheData->{$name.':section'}=$sec;
     } else {
@@ -840,7 +858,7 @@ sub SortStudents {
         my ($end,$start)=split(/\:/,$CacheData->{$_.':date'});
         my $active=1;
         my $now=time;
-        my $Status=$ENV{'form.status'};
+        my $Status=$CacheData->{'form.status'};
         $Status = ($Status) ? $Status : 'Active';
         if((($end) && $now > $end) && (($Status eq 'Active'))) { 
             $active=0; 
@@ -853,7 +871,7 @@ sub SortStudents {
         }
     }
 
-    my $Pos = $ENV{'form.sort'};
+    my $Pos = $CacheData->{'form.sort'};
     my %sortData;
     if($Pos eq 'Last Name') {
 	for(my $index=0; $index<scalar @sorted1Students; $index++) {
@@ -886,13 +904,13 @@ sub TestCacheData {
     my %testData;
     my $tieTries=0;
 
-    if ((-e "$ChartDB") && ($ENV{'form.sort'} ne 'Recalculate Chart')) {
+    if ((-e "$ChartDB") && (!defined($ENV{'form.recalculate'}))) {
 	$isCached = 1;
     } else {
 	$isCached = 0;
     }
 
-    while($tieTries < 3) {
+    while($tieTries < 10) {
         my $result=0;
         if($isCached) {
             $result=tie(%testData,'GDBM_File',$ChartDB,&GDBM_READER,0640);
@@ -905,7 +923,7 @@ sub TestCacheData {
         $tieTries++;
         sleep 1;
     }
-    if($tieTries >= 3) {
+    if($tieTries >= 10) {
         return -1;
     }
 
@@ -939,28 +957,94 @@ sub ExtractStudentData {
 }
 
 sub ShouldShowColumn {
-    my ($reselected,$type,$value)=@_;
+    my ($cache,$test)=@_;
 
-    if($ENV{'form.sort'} eq 'Recalculate Chart') {
+    if($cache->{'form.reset'} eq 'true') {
         return 1;
     }
 
-    if(defined($ENV{'form.'.$type.$value})) {
+    my $headings=$cache->{'form.headings'};
+    my $sequences=$cache->{'form.sequences'};
+    if($headings eq 'ALLHEADINGS' || $sequences eq 'ALLSEQUENCES' ||
+       $headings=~/$test/ || $sequences=~/$test/) {
         return 1;
     }
 
-    return &CheckForStringInArray($reselected, $type.$value);
+#    my $reselected=$cache->{'form.reselect'};
+#    if($reselected=~/$test/) {
+#        return 1;
+#    }
+
+    return 0;
 }
 
-sub CheckForStringInArray {
-    my ($inputArray,$checkString)=@_;
-    foreach (@$inputArray) {
-#        $jr->print('a:'.$_.' b:'.$checkString.'<br>');
-        if($_ eq $checkString) {
-            return 1;
+sub ProcessFormData {
+    my ($ChartDB)=@_;
+    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'})) {
+            $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 0;
+
+    return;
 }
 
 # ----- END HELPER FUNCTIONS --------------------------------------------
@@ -980,10 +1064,6 @@ sub BuildChart {
     my $cid=$ENV{'request.course.id'};
     my $ChartDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
                   "_$ENV{'user.domain'}_$cid\_chart.db";
-    # $ENV{'form.domains'} can be either a scalar or an array reference.
-    # We need an array.
-    my @reselected = (ref($ENV{'form.reselect'}) ? @{$ENV{'form.reselect'}}
-                      : ($ENV{'form.reselect'}));
 
     $isCached=&TestCacheData($ChartDB);
     if($isCached < 0) {
@@ -991,6 +1071,7 @@ sub BuildChart {
         $r->rflush();
         return;
     }
+    &ProcessFormData($ChartDB);
 
     # Download class list information if not using cached data
     my %CacheData;
@@ -1027,28 +1108,25 @@ sub BuildChart {
     # Sort students and print out table desciptive data
     if(tie(%CacheData,'GDBM_File',$ChartDB,&GDBM_READER,0640)) {
         if(!$c->aborted()) { @students=&SortStudents(\@students,\%CacheData); }
-	if(!$c->aborted()) { $r->print(&CreateLegend()); }
+        if(!$c->aborted()) { $r->print('<h1>'.(scalar @students).
+                                       ' students</h1>'); }
 	if(!$c->aborted()) { $r->rflush(); }
-	if(!$c->aborted()) { $r->print(&CreateForm()); }
+	if(!$c->aborted()) { $r->print(&CreateLegend()); }
+	if(!$c->aborted()) { $r->print(&CreateForm(\%CacheData)); }
 	if(!$c->aborted()) { $r->print(&CreateColumnSelectionBox(
                                                        \%CacheData,
                                                        \@studentInformation, 
 						       \@headings, 
-                                                       \@reselected,
                                                        $spacePadding)); }
-        if(!$c->aborted()) { $r->print('<h3>'.(scalar @students).
-                                       ' students</h3>'); }
 	if(!$c->aborted()) { $r->print(&CreateColumnSelectors(
                                                        \%CacheData,
                                                        \@studentInformation, 
 						       \@headings, 
-                                                       \@reselected,
                                                        $spacePadding)); }
 	if(!$c->aborted()) { $r->print(&CreateTableHeadings(
                                                          \%CacheData,
                                                          \@studentInformation, 
 							 \@headings, 
-                                                         \@reselected,
 							 $spacePadding)); }
 	if(!$c->aborted()) { $r->rflush(); }
 	untie(%CacheData);
@@ -1059,31 +1137,31 @@ sub BuildChart {
 
     my @updateStudentList = ();
     my $courseData;
+    $r->print('<pre>');
     foreach (@students) {
         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;
         }
 
         if(!$isCached) {
             $courseData=&DownloadStudentCourseInformation($_, $cid);
-            if($c->aborted()) { next; }
+            if($c->aborted()) { last; }
             push(@updateStudentList, $_);
             &ExtractStudentData($courseData, $_, $ChartDB);
         }
-        $r->print(&FormatStudentData(\@reselected, $_, $cid, 
-                                     \@studentInformation,
+        $r->print(&FormatStudentData($_, $cid, \@studentInformation,
                                      $spacePadding, $ChartDB));
         $r->rflush();
     }
 
-    $r->print('</body></html>');
+    if(!$isCached && tie(%CacheData,'GDBM_File',$ChartDB,&GDBM_WRCREAT,0640)) {
+        $CacheData{'NamesOfStudents'}=join(":::", @updateStudentList);
+#		    $CacheData{'NamesOfStudents'}=
+#		            &Apache::lonnet::arrayref2str(\@updateStudentList);
+        untie(%CacheData);
+    }
+
+    $r->print('</pre></body></html>');
     $r->rflush();
 
     return;
@@ -1093,7 +1171,7 @@ sub BuildChart {
 
 sub handler {
     my $r=shift;
-    $jr=$r;
+#    $jr=$r;
     unless(&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
 	$ENV{'user.error.msg'}=
         $r->uri.":vgr:0:0:Cannot view grades for complete course";