--- loncom/interface/lonstatistics.pm	2002/07/25 21:23:51	1.32
+++ loncom/interface/lonstatistics.pm	2002/07/26 19:49:26	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstatistics.pm,v 1.32 2002/07/25 21:23:51 stredwic Exp $
+# $Id: lonstatistics.pm,v 1.34 2002/07/26 19:49:26 stredwic Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,6 +51,7 @@ use Apache::lonchart;
 use HTML::TokeParser;
 use GDBM_File;
 
+#my $jr;
 
 sub CheckFormElement {
     my ($cache, $ENVName, $cacheName, $default)=@_;
@@ -70,7 +71,8 @@ sub ProcessFormData{
     $cache->{'reportKey'} = 'false';
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['sort','download','reportSelected',
+                                            ['sort','download',
+                                             'reportSelected',
                                              'StudentAssessmentStudent']);
     &CheckFormElement($cache, 'Status', 'Status', 'Active');
     &CheckFormElement($cache, 'postdata', 'reportSelected', 'Class list');
@@ -98,6 +100,34 @@ sub ProcessFormData{
                       'StudentAssessmentStudent', 'All Students');
     $cache->{'StudentAssessmentStudent'} = 
         &Apache::lonnet::unescape($cache->{'StudentAssessmentStudent'});
+    &CheckFormElement($cache, 'DefaultColumns', 'DefaultColumns', 'false');
+
+    if(defined($ENV{'form.Section'})) {
+        my @sectionsSelected = (ref($ENV{'form.Section'}) ?
+                               @{$ENV{'form.Section'}} :
+                                ($ENV{'form.Section'}));
+        $cache->{'sectionsSelected'} = join(':', @sectionsSelected);
+    } elsif(!defined($cache->{'sectionsSelected'})) {
+        $cache->{'sectionsSelected'} = $cache->{'sectionList'};
+    }
+
+    my @headingColumns=();
+    my @sequenceColumns=();
+    my $foundColumn = 0;
+    if(defined($ENV{'form.ReselectColumns'})) {
+        my @reselected = (ref($ENV{'form.ReselectColumns'}) ? 
+                          @{$ENV{'form.ReselectColumns'}}
+                          : ($ENV{'form.ReselectColumns'}));
+        foreach (@reselected) {
+            if(/HeadingColumn/) {
+                push(@headingColumns, $_);
+                $foundColumn = 1;
+            } elsif(/SequenceColumn/) {
+                push(@sequenceColumns, $_);
+                $foundColumn = 1;
+            }
+        }
+    }
 
     foreach (keys(%ENV)) {
         if(/form\.Analyze:::/) {
@@ -111,9 +141,33 @@ sub ProcessFormData{
             $cache->{'AnalyzeProblem'} = $problem;
             
             &CheckFormElement($cache, 'Interval', 'Interval', '1');
+        } elsif(/form\.HeadingColumn/) {
+            my $value = $_;
+            $value =~ s/form\.//;
+            push(@headingColumns, $value);
+            $foundColumn=1;
+        } elsif(/form\.SequenceColumn/) {
+            my $value = $_;
+            $value =~ s/form\.//;
+            push(@sequenceColumns, $value);
+            $foundColumn=1;
         }
     }
 
+    if($foundColumn) {
+        $cache->{'HeadingsFound'} = join(':', @headingColumns);
+        $cache->{'SequencesFound'} = join(':', @sequenceColumns);;
+    }
+    if(!defined($cache->{'HeadingsFound'}) || 
+       $cache->{'DefaultColumns'} ne 'false') {
+        $cache->{'HeadingsFound'}='HeadingColumnFull Name';
+    }
+    if(!defined($cache->{'SequencesFound'}) ||
+       $cache->{'DefaultColumns'} ne 'false') {
+        $cache->{'SequencesFound'}='All Sequences';
+    }
+    $cache->{'DefaultColumns'} = 'false';
+
     return;
 
     # Select page to display
@@ -459,6 +513,44 @@ sub BuildClasslist {
     return $Str;
 }
 
+sub CreateMainMenu {
+    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 .= &Apache::lonhtmlcommon::StatusOptions($status, 'Statistics');
+    $Str .= '</td>'."\n";
+
+    $Str .= '</tr></tbody></table>'."\n";
+    $Str .= '<hr>'."\n";
+
+    return $Str;
+}
+
 sub BuildStatistics {
     my ($r)=@_;
 
@@ -502,9 +594,7 @@ sub BuildStatistics {
         $r->print(&Apache::lonhtmlcommon::Title('LON-CAPA Statistics'));
         $r->print('<form name="Statistics" ');
         $r->print('method="post" action="/adm/statistics">');
-        $r->print(&Apache::lonhtmlcommon::CreateStatisticsMainMenu(
-                                                             $cache{'Status'}, 
-                                                             \%reports));
+        $r->print(&CreateMainMenu($cache{'Status'}, \%reports));
         untie(%cache);
     } else {
         $r->print('<html><body>Unable to tie database.</body></html>');
@@ -558,6 +648,8 @@ sub BuildStatistics {
 sub handler {
     my $r=shift;
 
+#    $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";