--- loncom/interface/lonstatistics.pm	2003/02/25 20:47:47	1.60
+++ loncom/interface/lonstatistics.pm	2003/10/08 15:32:00	1.85
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstatistics.pm,v 1.60 2003/02/25 20:47:47 matthew Exp $
+# $Id: lonstatistics.pm,v 1.85 2003/10/08 15:32:00 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,8 +51,7 @@ Main handler for statistics and chart.
     use Apache::lonproblemstatistics;
     use Apache::lonstudentassessment;
     use Apache::lonpercentage;
-    use GDBM_File;
-
+    use Apache::lonmysql;
 =over 4
 
 =cut
@@ -61,20 +60,31 @@ package Apache::lonstatistics;
 
 use strict;
 use Apache::Constants qw(:common :http);
+use vars qw(
+    @FullClasslist 
+    @Students
+    @Sections 
+    @SelectedSections
+    %StudentData
+    @StudentDataOrder
+    @SelectedStudentData
+    $top_map 
+    @Sequences 
+    @SelectedMaps
+    @Assessments);
+
 use Apache::lonnet();
 use Apache::lonhomework;
 use Apache::loncommon;
 use Apache::loncoursedata;
 use Apache::lonhtmlcommon;
-use Apache::lonproblemanalysis;
-use Apache::lonproblemstatistics;
-use Apache::lonstudentassessment;
+use Apache::lonproblemanalysis();
+use Apache::lonproblemstatistics();
+use Apache::lonstudentassessment();
 use Apache::lonpercentage;
-use GDBM_File;
-
-use vars qw/@FullClasslist @Students @Sections @SelectedSections
-    $curr_student $prev_student $next_student 
-    $top_map @Sequences @Assessments /;
+use Apache::lonmysql;
+use Apache::lonlocal;
+use Time::HiRes;
 
 #######################################################
 #######################################################
@@ -104,10 +114,6 @@ use vars qw/@FullClasslist @Students @Se
 #
 # Classlist variables
 #
-my @FullClasslist;
-my @Students;
-my @Sections;
-my @SelectedSections;
 my $curr_student;
 my $prev_student;
 my $next_student;
@@ -131,6 +137,12 @@ undef the following package variables:
 
 =item @SelectedSections
 
+=item %StudentData
+
+=item @StudentDataOrder
+
+=item @SelectedStudentData
+
 =item $curr_student
 
 =item $prev_student
@@ -148,6 +160,8 @@ sub clear_classlist_variables {
     undef(@Students);
     undef(@Sections);
     undef(@SelectedSections);
+    undef(%StudentData);
+    undef(@SelectedStudentData);
     undef($curr_student);
     undef($prev_student);
     undef($next_student);
@@ -173,6 +187,10 @@ the following package variables:
 
 =item @SelectedSections
 
+=item %StudentData
+
+=item @SelectedStudentData
+
 =item $curr_student
 
 =item $prev_student
@@ -189,7 +207,6 @@ upon the calling context.
 #######################################################
 #######################################################
 sub PrepareClasslist {
-    my $r = shift;
     my %Sections;
     &clear_classlist_variables();
     #
@@ -201,26 +218,49 @@ sub PrepareClasslist {
                                                                   $cdom,$cnum);
     if (exists($ENV{'form.Section'})) {
         if (ref($ENV{'form.Section'})) {
-            @SelectedSections = @$ENV{'form.Section'};
-            # Remove the empty sections
-            for (my $i=0; $i<=$#SelectedSections; $i++) {
-                if ($SelectedSections[$i] =~ /^\s*$/) {
-                    splice(@SelectedSections,$i,1);
-                }
-            }
-        } else {
-            if ($ENV{'form.Section'} !~ /^\s*$/) {
-                @SelectedSections = ($ENV{'form.Section'});
-            }
+            @SelectedSections = @{$ENV{'form.Section'}};
+        } elsif ($ENV{'form.Section'} !~ /^\s*$/) {
+            @SelectedSections = ($ENV{'form.Section'});
+        }
+    }
+    @SelectedSections = ('all') if (! @SelectedSections);
+    foreach (@SelectedSections) {
+        if ($_ eq 'all') {
+            @SelectedSections = ('all');
         }
     }
-    @SelectedSections = ('any') if (! @SelectedSections);
+    #
+    # Deal with instructors with restricted section access
+    if ($ENV{'request.course.sec'} !~ /^\s*$/) {
+        @SelectedSections = ($ENV{'request.course.sec'});
+    }
+    #
+    # Set up %StudentData
+    @StudentDataOrder = qw/fullname username domain id section status/;
+    foreach my $field (@StudentDataOrder) {
+        $StudentData{$field}->{'title'} = $field;
+        $StudentData{$field}->{'base_width'} = length($field);
+        $StudentData{$field}->{'width'} = 
+                               $StudentData{$field}->{'base_width'};
+    }
+    #
+    # get the status requested
+    my $requested_status = 'Active';
+    $requested_status = $ENV{'form.Status'} if (exists($ENV{'form.Status'}));
     #
     # Process the classlist
     while (my ($student,$student_data) = each (%$classlist)) {
         my $studenthash = ();
         for (my $i=0; $i< scalar(@$field_names);$i++) {
-            $studenthash->{$field_names->[$i]}=$student_data->[$i];
+            my $field = $field_names->[$i];
+            # Store the data
+            $studenthash->{$field}=$student_data->[$i];
+            # Keep track of the width of the fields
+            next if (! exists($StudentData{$field}));
+            my $length = length($student_data->[$i]);
+            if ($StudentData{$field}->{'width'} < $length) {
+                $StudentData{$field}->{'width'} = $length; 
+            }
         }
         push (@FullClasslist,$studenthash);
         #
@@ -234,7 +274,11 @@ sub PrepareClasslist {
         #
         # Only put in the list those students we are interested in
         foreach my $sect (@SelectedSections) {
-            if (($sect eq 'any') || ($section eq $sect)) {
+            if ( (($sect eq 'all') || 
+                  ($section eq $sect)) &&
+                 (($studenthash->{'status'} eq $requested_status) || 
+                  ($requested_status eq 'Any')) 
+                 ){
                 push (@Students,$studenthash);
                 last;
             }
@@ -242,20 +286,25 @@ sub PrepareClasslist {
     }
     #
     # Put the consolidated section data in the right place
-    @Sections = sort {$a cmp $b} keys(%Sections);
+    if ($ENV{'request.course.sec'} !~ /^\s*$/) {
+        @Sections = ($ENV{'request.course.sec'});
+    } else {
+        @Sections = sort {$a cmp $b} keys(%Sections);
+        unshift(@Sections,'all'); # Put 'all' at the front of the list
+    }
     #
     # Sort the Students
     my $sortby = 'fullname';
     $sortby = $ENV{'form.sort'} if (exists($ENV{'form.sort'}));
     my @TmpStudents = sort { $a->{$sortby} cmp $b->{$sortby} ||
                              $a->{'fullname'} cmp $b->{'fullname'} } @Students;
-
     @Students = @TmpStudents;
     # 
     # Now deal with that current student thing....
-    if (exists($ENV{'form.StudentAssessmentStudent'})) {
+    $curr_student = undef;
+    if (exists($ENV{'form.SelectedStudent'})) {
         my ($current_uname,$current_dom) = 
-            split(':',$ENV{'form.StudentAssessmentStudent'});
+            split(':',$ENV{'form.SelectedStudent'});
         my $i;
         for ($i = 0; $i<=$#Students; $i++) {
             next if (($Students[$i]->{'username'} ne $current_uname) || 
@@ -263,27 +312,113 @@ sub PrepareClasslist {
             $curr_student = $Students[$i];
             last; # If we get here, we have our student.
         }
-        if ($i == 0) {
-            $prev_student = 'none';
-        } else {
-            $prev_student = $Students[$i-1];
+        if (defined($curr_student)) {
+            if ($i == 0) {
+                $prev_student = undef;
+            } else {
+                $prev_student = $Students[$i-1];
+            }
+            if ($i == $#Students) {
+                $next_student = undef;
+            } else {
+                $next_student = $Students[$i+1];
+            }
         }
-        if ($i == $#Students) {
-            $next_student = 'none';
+    }
+    #
+    if (exists($ENV{'form.StudentData'})) {
+        if (ref($ENV{'form.StudentData'}) eq 'ARRAY') {
+            @SelectedStudentData = @{$ENV{'form.StudentData'}};
         } else {
-            $next_student = $Students[$i+1];
+            @SelectedStudentData = ($ENV{'form.StudentData'});
         }
+    } else {
+        @SelectedStudentData = ('username');
     }
+    foreach (@SelectedStudentData) {
+        if ($_ eq 'all') {
+            @SelectedStudentData = ('all');
+            last;
+        }
+    }
+    #
+    return;
 }
 
+
 #######################################################
 #######################################################
-#
-# Course Sequences variables
-#
-my $top_map;
-my @Sequences;
-my @Assessments;
+
+=pod
+
+=item get_students
+
+Returns a list of the selected students
+
+=cut
+
+#######################################################
+#######################################################
+sub get_students {
+    if (! @Students) {
+        &PrepareClasslist()
+    }
+    return @Students;
+}
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &current_student()
+
+Returns a pointer to a hash containing data about the currently
+selected student.
+
+=cut
+
+#######################################################
+#######################################################
+sub current_student { 
+    return $curr_student;
+}
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &previous_student()
+
+Returns a pointer to a hash containing data about the student prior
+in the list of students.  Or something.  
+
+=cut
+
+#######################################################
+#######################################################
+sub previous_student { 
+    return $prev_student;
+}
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &next_student()
+
+Returns a pointer to a hash containing data about the next student
+to be viewed.
+
+=cut
+
+#######################################################
+#######################################################
+sub next_student { 
+    return $next_student;
+}
 
 #######################################################
 #######################################################
@@ -307,6 +442,59 @@ sub clear_sequence_variables {
 
 =pod
 
+=item &SetSelectedMaps($elementname)
+
+Sets the @SelectedMaps array from $ENV{'form.'.$elementname};
+
+=cut
+
+#######################################################
+#######################################################
+sub SetSelectedMaps {
+    my $elementname = shift;
+    if (exists($ENV{'form.'.$elementname})) {
+        if (ref($ENV{'form.'.$elementname})) {
+            @SelectedMaps = @{$ENV{'form.'.$elementname}};
+        } else {
+            @SelectedMaps = ($ENV{'form.'.$elementname});
+        }
+    } else {
+        @SelectedMaps = ('all');
+    }
+}
+
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &Sequences_with_Assess()
+
+Returns an array containing the subset of @Sequences which contain
+assessments.
+
+=cut
+
+#######################################################
+#######################################################
+sub Sequences_with_Assess {
+    my @Sequences_to_Show;
+    foreach my $map_symb (@SelectedMaps) {
+        foreach my $sequence (@Sequences) {
+            next if ($sequence->{'symb'} ne $map_symb && $map_symb ne 'all');
+            next if ($sequence->{'num_assess'} < 1);
+            push (@Sequences_to_Show,$sequence);
+        }
+    }
+    return @Sequences_to_Show;
+}
+
+#######################################################
+#######################################################
+
+=pod
+
 =item &PrepareCourseData($r)
 
 =cut
@@ -316,7 +504,8 @@ sub clear_sequence_variables {
 sub PrepareCourseData {
     my ($r) = @_;
     &clear_sequence_variables();
-    my ($top,$sequences,$assessments) = &Apache::loncoursedata::get_sequence_assessment_data();
+    my ($top,$sequences,$assessments) = 
+        &Apache::loncoursedata::get_sequence_assessment_data();
     if (! defined($top) || ! ref($top)) {
         # There has been an error, better report it
         &Apache::lonnet::logthis('top is undefined');
@@ -324,29 +513,146 @@ sub PrepareCourseData {
     }
     $top_map = $top if (ref($top));
     @Sequences = @{$sequences} if (ref($sequences) eq 'ARRAY');
-    @Assessments = @{$assessments} if (ref($assessments) eq 'HASH');
+    @Assessments = @{$assessments} if (ref($assessments) eq 'ARRAY');
+    #
+    # Compute column widths
+    foreach my $seq (@Sequences) {
+        my $name_length = length($seq->{'title'});
+        my $num_parts = $seq->{'num_assess_parts'};
+        #
+        # Use 3 digits for each the sum and total, which means 7 total...
+        my $num_col = $num_parts+7;
+        if ($num_col < $name_length) {
+            $num_col = $name_length;
+        }
+        $seq->{'base_width'} = $name_length;
+        $seq->{'width'} = $num_col;
+    }
+    return;
+}
+
+#######################################################
+#######################################################
 
 =pod
 
-    ##
-    ## Debugging code
-    ##
-    foreach my $s (@Sequences) {
-        next if ($s->{'title'} ne 'Bioenergetics: Enzyme Regulation');
-        &Apache::lonnet::logthis('-----------------------------------');
-        &Apache::lonnet::logthis('title      = '.$s->{'title'});
-        &Apache::lonnet::logthis('symb       = '.$s->{'symb'});
-        &Apache::lonnet::logthis('num_assess = '.$s->{'num_assess'});
-        foreach my $a (@{$s->{'contents'}}) {
-            &Apache::lonnet::logthis('   --------------------------------');
-            &Apache::lonnet::logthis('   title      = '.$a->{'title'});
-            &Apache::lonnet::logthis('   symb       = '.$a->{'symb'});
+=item &log_sequence($sequence,$recursive,$padding)
+
+Write data about the sequence to a logfile.  If $recursive is not
+undef the data is written recursively.  $padding is used for recursive
+calls.
+
+=cut
+
+#######################################################
+#######################################################
+sub log_sequence {
+    my ($seq,$recursive,$padding) = @_;
+    $padding = '' if (! defined($padding));
+    if (ref($seq) ne 'HASH') {
+        &Apache::lonnet::logthis('log_sequence passed bad sequnce');
+        return;
+    }
+    &Apache::lonnet::logthis($padding.'sequence '.$seq->{'title'});
+    while (my($key,$value) = each(%$seq)) {
+        next if ($key eq 'contents');
+        if (ref($value) eq 'ARRAY') {
+            for (my $i=0;$i< scalar(@$value);$i++) {
+                &Apache::lonnet::logthis($padding.$key.'['.$i.']='.
+                                         $value->[$i]);
+            }
+        } else {
+            &Apache::lonnet::logthis($padding.$key.'='.$value);
         }
     }
+    if (defined($recursive)) {
+        &Apache::lonnet::logthis($padding.'-'x20);
+        &Apache::lonnet::logthis($padding.'contains:');
+        foreach my $item (@{$seq->{'contents'}}) {
+            if ($item->{'type'} eq 'container') {
+                &log_sequence($item,$recursive,$padding.'    ');
+            } else {
+                &Apache::lonnet::logthis($padding.'title = '.$item->{'title'});
+                while (my($key,$value) = each(%$item)) {
+                    next if ($key eq 'title');
+                    if (ref($value) eq 'ARRAY') {
+                        for (my $i=0;$i< scalar(@$value);$i++) {
+                            &Apache::lonnet::logthis($padding.$key.'['.$i.']='.
+                                                     $value->[$i]);
+                        }
+                    } else {
+                        &Apache::lonnet::logthis($padding.$key.'='.$value);
+                    }
+                }
+            }
+        }
+        &Apache::lonnet::logthis($padding.'end contents of '.$seq->{'title'});
+        &Apache::lonnet::logthis($padding.'-'x20);
+    }
+    return;
+}
+
+##############################################
+##############################################
+
+=pod 
+
+=item &StudentDataSelect($elementname,$status,$numvisible,$selected)
+
+Returns html for a selection box allowing the user to choose one (or more) 
+of the fields of student data available (fullname, username, id, section, etc)
+
+=over 4
+
+=item $elementname The name of the HTML form element
+
+=item $status 'multiple' or 'single' selection box
+
+=item $numvisible The number of options to be visible
+
+=back
 
 =cut
 
-    return;
+##############################################
+##############################################
+sub StudentDataSelect {
+    my ($elementname,$status,$numvisible)=@_;
+    if ($numvisible < 1) {
+        return;
+    }
+    #
+    # Build the form element
+    my $Str = "\n";
+    $Str .= '<select name="'.$elementname.'" ';
+    if ($status ne 'single') {
+        $Str .= 'multiple="true" ';
+    }
+    $Str .= 'size="'.$numvisible.'" >'."\n";
+    #
+    # Deal with 'all'
+    $Str .= '    <option value="all" ';
+    foreach (@SelectedStudentData) {
+        if ($_ eq 'all') {
+            $Str .= 'selected ';
+            last;
+        }
+    }
+    $Str .= ">all</option>\n";
+    #
+    # Loop through the student data fields
+    foreach my $item (@StudentDataOrder) {
+        $Str .= '    <option value="'.$item.'" ';
+        foreach (@SelectedStudentData) {
+            if ($item eq $_ ) {
+                $Str .= 'selected ';
+                last;
+            }
+        }
+        $Str .= '>'.$item."</option>\n";
+    }
+    $Str .= "</select>\n";
+    return $Str;
 }
 
 ##############################################
@@ -354,7 +660,7 @@ sub PrepareCourseData {
 
 =pod 
 
-=item &MapSelect($elementname,$status,$numvisible,$selected,$restriction) 
+=item &MapSelect($elementname,$status,$numvisible,$restriction) 
 
 Returns html for a selection box allowing the user to choose one (or more) 
 of the sequences in the course.  The values of the sequences are the symbs.
@@ -368,10 +674,6 @@ If the top sequence is selected, the val
 
 =item $numvisible The number of options to be visible
 
-=item $selected Array ref to the names of the already selected maps.
-If undef, $ENV{'form.'.$elementname} is used.  
-If $ENV{'form.'.$elementname} is also empty, none will be selected.
-
 =item $restriction Code reference to subroutine which returns true or 
 false.  The code must expect a reference to a sequence data structure.
 
@@ -382,30 +684,13 @@ false.  The code must expect a reference
 ##############################################
 ##############################################
 sub MapSelect {
-    my ($elementname,$status,$numvisible,$selected,$restriction)=@_;
+    my ($elementname,$status,$numvisible,$restriction)=@_;
     if ($numvisible < 1) {
         return;
     }
     #
     # Set up array of selected items
-    my @Selected;
-    if (! defined($selected)) {
-        if (exists($ENV{'form.'.$elementname})) {
-            if (ref($ENV{'form.'.$elementname})) {
-                @Selected = @$ENV{'form.'.$elementname};
-            } else {
-                @Selected = ($ENV{'form.'.$elementname});
-            }
-        } else {
-            @Selected = ();
-        }
-    } else {
-        if (ref($selected)) {
-            @Selected = @$selected;
-        } else {
-            @Selected = ($selected);
-        }
-    }
+    &SetSelectedMaps($elementname);
     #
     # Set up the restriction call
     if (! defined($restriction)) {
@@ -420,23 +705,40 @@ sub MapSelect {
     }
     $Str .= 'size="'.$numvisible.'" >'."\n";
     #
+    # Deal with 'all'
+    foreach (@SelectedMaps) {
+        if ($_ eq 'all') {
+            @SelectedMaps = ('all');
+            last;
+        }
+    }
+    #
+    # Put in option for 'all'
+    $Str .= '    <option value="all" ';
+    foreach (@SelectedMaps) {
+        if ($_ eq 'all') {
+            $Str .= 'selected ';
+            last;
+        }
+    }
+    $Str .= ">all</option>\n";
+    #
     # Loop through the sequences
-    foreach my $s (@Sequences) {
-        next if (! $restriction->($s));
-        $Str .= '    <option value="'.$s->{'symb'}.'" ';
-        foreach (@Selected) {
-            if ($s->{'symb'} eq $_) {
+    foreach my $seq (@Sequences) {
+        next if (! $restriction->($seq));
+        $Str .= '    <option value="'.$seq->{'symb'}.'" ';
+        foreach (@SelectedMaps) {
+            if ($seq->{'symb'} eq $_) {
                 $Str .= 'selected ';
                 last;
             }
         }
-        $Str .= '>'.$s->{'title'}."</option>\n";
+        $Str .= '>'.$seq->{'title'}."</option>\n";
     }
     $Str .= "</select>\n";
     return $Str;
 }
 
-
 ##############################################
 ##############################################
 
@@ -447,6 +749,7 @@ sub MapSelect {
 Returns html for a selection box allowing the user to choose one (or more) 
 of the sections in the course.  
 
+Uses the package variables @Sections and @SelectedSections
 =over 4
 
 =item $elementname The name of the HTML form element
@@ -455,13 +758,6 @@ of the sections in the course.
 
 =item $numvisible The number of options to be visible
 
-=item $selected Array ref to the names of the already selected sections.
-If undef, $ENV{'form.'.$elementname} is used.  
-If $ENV{'form.'.$elementname} is also empty, none will be selected.
-
-=item $restriction Code reference to subroutine which returns true or 
-false.  The code must expect a reference to a sequence data structure.
-
 =back
 
 =cut
@@ -474,6 +770,11 @@ sub SectionSelect {
         return;
     }
     #
+    # Make sure we have the data we need to continue
+    if (! @Sections) {
+        &PrepareClasslist()
+    }
+    #
     # Build the form element
     my $Str = "\n";
     $Str .= '<select name="'.$elementname.'" ';
@@ -486,7 +787,7 @@ sub SectionSelect {
     foreach my $s (@Sections) {
         $Str .= '    <option value="'.$s.'" ';
         foreach (@SelectedSections) {
-            if ($s eq $_ || $_ =~ /^(any|all)$/) {
+            if ($s eq $_) {
                 $Str .= 'selected ';
                 last;
             }
@@ -497,390 +798,208 @@ sub SectionSelect {
     return $Str;
 }
 
-##############################################
-##############################################
-
-sub CheckFormElement {
-    my ($cache, $ENVName, $cacheName, $default)=@_;
-
-    if(defined($ENV{'form.'.$ENVName})) {
-        $cache->{$cacheName} = $ENV{'form.'.$ENVName};
-    } elsif(!defined($cache->{$cacheName})) {
-        $cache->{$cacheName} = $default;
-    } else {
-        $ENV{'form.'.$ENVName} = $cache->{$cacheName};
-    }
-    return;
-}
-
-sub ProcessFormData{
-    my ($cache)=@_;
-
-    $cache->{'reportKey'} = 'false';
-
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['download',
-                                             'reportSelected',
-                                             'StudentAssessmentStudent',
-                                             'ProblemStatisticsSort']);
-    &CheckFormElement($cache, 'DownloadAll', 'DownloadAll', 'false');
-    if ($cache->{'DownloadAll'} ne 'false') {
-        # Clean the hell out of that cache!
-        # We cannot untie the hash at this scope (stupid libgd :( )
-        # So, remove every single key.  What a waste of time....
-        # Of course, if you are doing this you are probably resigned
-        # to waiting a while.
-        &Apache::lonnet::logthis("Cleaning out the cache file");
-        while (my ($key,undef)=each(%$cache)) {
-            next if ($key eq 'DownloadAll');
-            delete($cache->{$key});
-        }
-    }
-    &CheckFormElement($cache, 'Status', 'Status', 'Active');
-    &CheckFormElement($cache, 'postdata', 'reportSelected', 'Class list');
-    &CheckFormElement($cache, 'reportSelected', 'reportSelected', 
-                      'Class list');
-    $cache->{'reportSelected'} = 
-        &Apache::lonnet::unescape($cache->{'reportSelected'});
-    &CheckFormElement($cache, 'sort', 'sort', 'fullname');
-    &CheckFormElement($cache, 'download', 'download', 'false');
-    &CheckFormElement($cache, 'StatisticsMaps', 
-                      'StatisticsMaps', 'All Maps');
-    &CheckFormElement($cache, 'StatisticsProblemSelect',
-		      'StatisticsProblemSelect', 'All Problems');
-    &CheckFormElement($cache, 'StatisticsPartSelect',
-		      'StatisticsPartSelect', 'All Parts');
-    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'};
-    }
-
-    # student assessment
-    if(defined($ENV{'form.CreateStudentAssessment'}) ||
-       defined($ENV{'form.NextStudent'}) ||
-       defined($ENV{'form.PreviousStudent'})) {
-        $cache->{'reportSelected'} = 'Student Assessment';
-    }
-    if(defined($ENV{'form.NextStudent'})) {
-        $cache->{'StudentAssessmentMove'} = 'next';
-    } elsif(defined($ENV{'form.PreviousStudent'})) {
-        $cache->{'StudentAssessmentMove'} = 'previous';
-    } else {
-        $cache->{'StudentAssessmentMove'} = 'selected';
-    }
-    &CheckFormElement($cache, 'StudentAssessmentStudent', 
-                      'StudentAssessmentStudent', 'All Students');
-    $cache->{'StudentAssessmentStudent'} = 
-        &Apache::lonnet::unescape($cache->{'StudentAssessmentStudent'});
-    &CheckFormElement($cache, 'DefaultColumns', 'DefaultColumns', 'false');
-
-    # Problem analysis
-    &CheckFormElement($cache, 'Interval', 'Interval', '1');
-
-    # ProblemStatistcs
-    &CheckFormElement($cache, 'DisplayCSVFormat',
-                      'DisplayFormat', 'Display Table Format');
-    &CheckFormElement($cache, 'ProblemStatisticsAscend',
-                      'ProblemStatisticsAscend', 'Ascending');
-    &CheckFormElement($cache, 'ProblemStatisticsSort',
-                      'ProblemStatisticsSort', 'Homework Sets Order');
-    &CheckFormElement($cache, 'DisplayLegend', 'DisplayLegend', 
-		      'Hide Legend');
-    &CheckFormElement($cache, 'SortProblems', 'SortProblems', 
-                      'Sort Within Sequence');
-
-    # Search only form elements
-    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;
-            }
-        }
-    }
-
-    $cache->{'reportKey'} = 'false';
-    if($cache->{'reportSelected'} eq 'Analyze') {
-        $cache->{'reportKey'} = 'Analyze';
-    } elsif($cache->{'reportSelected'} eq 'DoDiffGraph') {
-        $cache->{'reportKey'} = 'DoDiffGraph';
-    } elsif($cache->{'reportSelected'} eq 'PercentWrongGraph') {
-        $cache->{'reportKey'} = 'PercentWrongGraph';
-    }
-
-    if(defined($ENV{'form.DoDiffGraph'})) {
-        $cache->{'reportSelected'} = 'DoDiffGraph';
-        $cache->{'reportKey'} = 'DoDiffGraph';
-    } elsif(defined($ENV{'form.PercentWrongGraph'})) {
-        $cache->{'reportSelected'} = 'PercentWrongGraph';
-        $cache->{'reportKey'} = 'PercentWrongGraph';
-    }
-
-    foreach (keys(%ENV)) {
-        if(/form\.Analyze/) {
-            $cache->{'reportSelected'} = 'Analyze';
-            $cache->{'reportKey'} = 'Analyze';
-            my $data;
-            (undef, $data)=split(':::', $_);
-            $cache->{'AnalyzeInfo'}=$data;
-        } 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;
-}
+#######################################################
+#######################################################
 
 =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
+=item &CreateAndParseOutputSelector()
 
-@order: An ordered list of students (username:domain)
-
-=back
+Construct a selection list of options for output and parse output selections.
 
 =cut
 
-sub SortStudents {
-    my ($cache)=@_;
+#######################################################
+#######################################################
+sub OutputDescriptions {
+    my (@OutputOptions) = @_;
+    my $Str = '';
+    $Str .= "<h2>Output Modes</h2>\n";
+    $Str .= "<dl>\n";
+    foreach my $outputmode (@OutputOptions) {
+	$Str .="    <dt>".$outputmode->{'name'}."</dt>\n";
+	$Str .="        <dd>".$outputmode->{'description'}."</dd>\n";
+    }
+    $Str .= "</dl>\n";
+    return $Str;
+}
 
-    my @students = split(':::',$cache->{'NamesOfStudents'});
-    my @sorted1Students=();
-    foreach (@students) {
-        if($cache->{'Status'} eq 'Any' || 
-           $cache->{$_.':Status'} eq $cache->{'Status'}) {
-            push(@sorted1Students, $_);
+sub CreateAndParseOutputSelector {
+    my ($elementname,$default,@OutputOptions) = @_;
+    my $output_mode;
+    my $show;
+    my $Str = '';
+    #
+    # Format for output options is 'mode, restrictions';
+    my $selected = $default;
+    if (exists($ENV{'form.'.$elementname})) {
+        if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) {
+            $selected = $ENV{'form.'.$elementname}->[0];
+        } else {
+            $selected = $ENV{'form.'.$elementname};
         }
     }
-
-    my $sortBy = '';
-    if(defined($cache->{'sort'})) {
-        $sortBy = ':'.$cache->{'sort'};
-    } else {
-        $sortBy = ':fullname';
+    #
+    # Set package variables describing output mode
+    $output_mode = 'html';
+    $show        = 'all';
+    foreach my $option (@OutputOptions) {
+        next if ($option->{'value'} ne $selected);
+        $output_mode = $option->{'mode'};
+        $show        = $option->{'show'};
     }
-    my @order = sort { lc($cache->{$a.$sortBy}) cmp lc($cache->{$b.$sortBy}) ||
-                       lc($cache->{$a.':fullname'}) cmp lc($cache->{$b.':fullname'}) } 
-                @sorted1Students;
-
-    return \@order;
+    #
+    # Build the form element
+    $Str = qq/<select size="5" name="$elementname">/;
+    foreach my $option (@OutputOptions) {
+        if (exists($option->{'special'}) && 
+            $option->{'special'} =~ /do not show/) {
+            next;
+        }
+        $Str .= "\n".'    <option value="'.$option->{'value'}.'"';
+        $Str .= " selected " if ($option->{'value'} eq $selected);
+        $Str .= ">".&mt($option->{'name'})."<\/option>";
+    }
+    $Str .= "\n</select>";
+    return ($Str,$output_mode,$show);
 }
 
-=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.
+=pod 
 
-$ChartDB: The name of the cache database which is opened for read/write.
+=item &Gather_Student_Data()
 
-Output: None - All data stored in cache.
-
-=back
+Ensures all student data is up to date.
 
 =cut
 
-sub SpaceColumns {
-    my ($students,$studentInformation,$headings,$cache)=@_;
-
-    # Initialize Lengths
-    for(my $index=0; $index<(scalar @$headings); $index++) {
-        my @titleLength=split(//,$headings->[$index]);
-        $cache->{$studentInformation->[$index].':columnWidth'}=
-            scalar @titleLength;
-    }
-
-    foreach my $name (@$students) {
-        foreach (@$studentInformation) {
-            my @dataLength=split(//,$cache->{$name.':'.$_});
-            my $length=(scalar @dataLength);
-            if($length > $cache->{$_.':columnWidth'}) {
-                $cache->{$_.':columnWidth'}=$length;
-            }
-        }
+###############################################
+###############################################
+sub Gather_Student_Data {
+    my ($r) = @_;
+    my $c = $r->connection();
+    #
+    &Apache::loncoursedata::clear_internal_caches();
+    #
+    my @Sequences = &Apache::lonstatistics::Sequences_with_Assess();
+    #
+    my @Students = @Apache::lonstatistics::Students;
+    #
+    # Open the progress window
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+        ($r,'Statistics Compilation Status',
+         'Statistics Compilation Progress', scalar(@Students));
+    #
+    while (my $student = shift @Students) {
+        return if ($c->aborted());
+        my ($status,undef) = &Apache::loncoursedata::ensure_current_data
+            ($student->{'username'},$student->{'domain'},
+             $ENV{'request.course.id'});
+        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+                                                 'last student');
     }
-
-    return;
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+    $r->rflush();
 }
 
-sub PrepareData {
-    my ($c, $cacheDB, $studentInformation, $headings,$r)=@_;
-
-    # Test for access to the cache data
-    my $courseID=$ENV{'request.course.id'};
-    my $isRecalculate=0;
-    if(defined($ENV{'form.Recalculate'})) {
-        $isRecalculate=1;
-    }
-
-    my $isCached = &Apache::loncoursedata::TestCacheData($cacheDB,
-                                                         $isRecalculate);
-    if($isCached < 0) {
-        return "Unable to tie hash to db file.";
-    }
-
-    # Download class list information if not using cached data
-    my %cache;
-    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) {
-        return "Unable to tie hash to db file.";
-    }
-
-#    if(!$isCached) {
-        my $processTopResourceMapReturn=
-            &Apache::loncoursedata::ProcessTopResourceMap(\%cache, $c);
-        if($processTopResourceMapReturn ne 'OK') {
-            untie(%cache);
-            return $processTopResourceMapReturn;
-        }
- #   }
-
-    if($c->aborted()) {
-        untie(%cache);
-        return 'aborted'; 
-    }
-
-    my $classlist=&Apache::loncoursedata::DownloadClasslist($courseID,
-                                                $cache{'ClasslistTimestamp'},
-                                                $c);
-    foreach (keys(%$classlist)) {
-        if(/^(con_lost|error|no_such_host)/i) {
-            untie(%cache);
-            return "Error getting student data.";
-        }
-    }
+###############################################
+###############################################
 
-    if($c->aborted()) {
-        untie(%cache);
-        return 'aborted'; 
-    }
+=pod 
 
-    # Active is a temporary solution, remember to change
-    Apache::loncoursedata::ProcessClasslist(\%cache,$classlist,$courseID,$c);
-    if($c->aborted()) {
-        untie(%cache);
-        return 'aborted'; 
-    }
+=item &Gather_Full_Student_Data()
 
-    &ProcessFormData(\%cache);
-    my $students = &SortStudents(\%cache);
-    &SpaceColumns($students, $studentInformation, $headings, \%cache);
-    $cache{'updateTime:columnWidth'}=24;
+Ensures all student data is up to date.
 
-    my $download = $cache{'download'};
-    my $downloadAll = $cache{'DownloadAll'};
-    my @allStudents=();
-    if($download ne 'false') {
-        $cache{'download'} = 'false';
-    } elsif($downloadAll ne 'false') {
-        $cache{'DownloadAll'} = 'false';
-        if($downloadAll eq 'sorted') {
-            @allStudents = @$students;
-        } else {
-            @allStudents = split(':::', $cache{'NamesOfStudents'});
-        }
-    }
-
-    untie(%cache);
+=cut
 
-    if($download ne 'false') {
-        my @who = ($download);
-        if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'false',
-                                                             $cacheDB, 'true',
-                                                             'false', $courseID,
-                                                             $r, $c) ne 'OK') {
-            return 'Stop at download individual';
-        }
-    } elsif($downloadAll ne 'false') {
-        if(&Apache::loncoursedata::DownloadStudentCourseData(\@allStudents,
-                                                             'false',
-                                                             $cacheDB, 'true',
-                                                             'true', $courseID,
-                                                             $r, $c) ne 'OK') {
-            return 'Stop at download all';
-        }
+###############################################
+###############################################
+sub Gather_Full_Student_Data {
+    my ($r) = @_;
+    my $c = $r->connection();
+    #
+    &Apache::loncoursedata::clear_internal_caches();
+    #
+    my @Students = @Apache::lonstatistics::Students;
+    #
+    # Open the progress window
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+        ($r,&mt('Student Data Compilation Status'),
+         &mt('Student Data Compilation Progress'), scalar(@Students));
+    #
+    while (my $student = shift @Students) {
+        return if ($c->aborted());
+        my ($status,undef) = &Apache::loncoursedata::ensure_current_full_data
+            ($student->{'username'},$student->{'domain'},
+             $ENV{'request.course.id'});
+        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+                                                 &mt('last student'));
     }
-
-    return ('OK', $students);
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+    $r->rflush();
 }
 
+##################################################
+##################################################
 sub DisplayClasslist {
     my ($r)=@_;
     #
     my @Fields = ('fullname','username','domain','id','section');
     #
     my $Str='';
+    if (! @Students) {
+        if ($SelectedSections[0] eq 'all') { 
+            if (lc($ENV{'form.Status'}) eq 'any') {
+                $Str .= '<h2>There are no students in the course.</h2>';
+            } elsif (lc($ENV{'form.Status'}) eq 'active') {
+                $Str .= '<h2>There are no currently enrolled students in '.
+                    'the course.</h2>';
+            } elsif (lc($ENV{'form.Status'}) eq 'expired') {
+                $Str .= '<h2>There are no previously enrolled '.
+                    'students in the course.</h2>';
+            }
+        } else { 
+            my $sections;
+            if (@SelectedSections == 1) {
+                $sections = 'section '.$SelectedSections[0];
+            } elsif (@SelectedSections > 2) {
+                $sections = 'sections '.join(', ',@SelectedSections);
+                $sections =~ s/, ([^,])*$/, and $1/;
+            } else {
+                $sections = 'sections '.join(' and ',@SelectedSections);
+            }
+            if (lc($ENV{'form.Status'}) eq 'any') {
+                $Str .= '<h2>There are no students in '.$sections.'.</h2>';
+            } elsif (lc($ENV{'form.Status'}) eq 'active') {
+                $Str .= '<h2>There are no currently enrolled students '.
+                    'in '.$sections.'.</h2>';
+            } elsif (lc($ENV{'form.Status'}) eq 'expired') {
+                $Str .= '<h2>There are no previously enrolled students '.
+                    'in '.$sections.'.</h2>';
+            }
+        }
+        $Str.= '<a href="/adm/statistics?reportSelected=student_assessment">'.
+            'Return to the chart.</a>';
+        $r->print($Str);
+        $r->rflush();
+        return;
+    }
+
+    # "Click" is asinine but it is probably not my place to change the world.
+    $Str .= '<h2>Click on a students name or username to view their chart</h2>';
     $Str .= '<table border="0"><tr><td bgcolor="#777777">'."\n";
     $Str .= '<table border="0" cellpadding="3"><tr bgcolor="#e6ffff">'."\n";
     foreach my $field (@Fields) {
-        $Str .= '<th><a href="/adm/statistics?sort='.$field.'">'.$field.
+        $Str .= '<th><a href="/adm/statistics?reportSelected=classlist&sort='.$field.'">'.$field.
             '</a></th>';
     }
     $Str .= '</tr>'."\n";
     #
     my $alternate = 0;
-    foreach my $student (@Students) {
+    foreach my $student (@Students) { # @Students is a package variable
         my $sname = $student->{'username'}.':'.$student->{'domain'};
         if($alternate) {
             $Str .= '<tr bgcolor="#ffffe6">';
@@ -891,11 +1010,12 @@ sub DisplayClasslist {
         #
         foreach my $field (@Fields) {
             $Str .= '<td>';
-            if ($field eq 'fullname') {
+            if ($field eq 'fullname' || $field eq 'username') {
                 $Str .= '<a href="/adm/statistics?reportSelected=';
-                $Str .= &Apache::lonnet::escape('Student Assessment');
-                $Str .= '&StudentAssessmentStudent=';
-                $Str .= &Apache::lonnet::escape($student->{$field}).'">';
+                $Str .= &Apache::lonnet::escape('student_assessment');
+                $Str .= '&sort='.&Apache::lonnet::escape($ENV{'form.sort'});
+                $Str .= '&SelectedStudent=';
+                $Str .= &Apache::lonnet::escape($sname).'">';
                 $Str .= $student->{$field}.'&nbsp';
                 $Str .= '</a>';
             } else {
@@ -913,249 +1033,74 @@ sub DisplayClasslist {
     return;
 }
 
-sub BuildClasslist {
-    my ($cacheDB,$students,$studentInformation,$headings,$r)=@_;
-
-    my %cache;
-    unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
-        return '<html><body>Unable to tie database.</body></html>';
-    }
-
-#    my $Ptr = '';
-#    $Ptr .= '<table border="0"><tbody>';
-#    $Ptr .= '<tr><td align="right"><b>Select Sections</b>';
-#    $Ptr .= '</td>'."\n";
-#    $Ptr .= '<td align="left">'."\n";
-#    my @sectionsSelected = split(':',$cache{'sectionsSelected'});
-#    my @sections = split(':',$cache{'sectionList'});
-#    $Ptr .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections,
-#                                                          \@sectionsSelected,
-#                                                          'Statistics');
-#    $Ptr .= '</td></tr></table><br>';
-#    $r->print($Ptr);
-#    $r->rflush();
-#    my %mySections = ();
-#    foreach (@sections) { $mySections{$_} = 'True'; }
-#    $r->print("<br>$cache{'sectionsSelected'}<br>");
-
-    my $Str='';
-    $Str .= '<table border="0"><tr><td bgcolor="#777777">'."\n";
-    $Str .= '<table border="0" cellpadding="3"><tr bgcolor="#e6ffff">'."\n";
-
-    my $displayString = '<td align="left"><a href="/adm/statistics?';
-    $displayString .= 'sort=LINKDATA">DISPLAYDATA&nbsp</a></td>'."\n";
-    $Str .= &Apache::lonhtmlcommon::CreateHeadings(\%cache,
-                                                   $studentInformation,
-                                                   $headings, $displayString);
-    $Str .= '</tr>'."\n";
-
-    my $alternate=0;
-    foreach (@$students) {
-#        if ($mySections{$cache{$_.':'.'section'}} ne 'True') {next;}
-        my ($username, $domain) = split(':', $_);
-        if($alternate) {
-            $Str .= '<tr bgcolor="#ffffe6">';
-        } else {
-            $Str .= '<tr bgcolor="#ffffc6">';
-        }
-        $alternate = ($alternate + 1) % 2;
-        foreach my $data (@$studentInformation) {
-            $Str .= '<td>';
-            if($data eq 'fullname') {
-                $Str .= '<a href="/adm/statistics?reportSelected=';
-                $Str .= &Apache::lonnet::escape('Student Assessment');
-                $Str .= '&StudentAssessmentStudent=';
-                $Str .= &Apache::lonnet::escape($cache{$_.':'.$data}).'">';
-                $Str .= $cache{$_.':'.$data}.'&nbsp';
-                $Str .= '</a>';
-            } elsif($data eq 'updateTime') {
-                $Str .= '<a href="/adm/statistics?reportSelected=';
-                $Str .= &Apache::lonnet::escape('Class list');
-                $Str .= '&download='.$_.'">';
-                $Str .= $cache{$_.':'.$data}.'&nbsp';
-                $Str .= '&nbsp</a>';
-            } else {
-                $Str .= $cache{$_.':'.$data}.'&nbsp';
-            }
-
-            $Str .= '</td>'."\n";
-        }
-    }
-
-    $Str .= '</tr>'."\n";
-    $Str .= '</table></td></tr></table>'."\n";
-    $r->print($Str);
-    $r->rflush();
-
-    untie(%cache);
-
-    return;
-}
-
+##############################################
+##############################################
 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>Select a Report</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)=@_;
-
-    my $c = $r->connection;
-    my @studentInformation=('fullname','section','id','domain','username',
-                            'updateTime');
-    my @headings=('Full Name', 'Section', 'PID', 'Domain', 'User Name',
-                  'Last Updated');
-    my $spacing = '   ';
-
-    my %reports = ('classlist'          => 'Class list',
-                   'problem_statistics' => 'Problem Statistics',
-                   'student_assessment' => 'Student Assessment',
-		   'percentage'         => 'Correct-problems Plot',
-#                   'activitylog'        => 'Activity Log',
-                   'reportSelected'     => 'Class list');
-
-    my %cache;
-    my $courseID=$ENV{'request.course.id'};
-    my $cacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
-                  "_$ENV{'user.domain'}_$courseID\_statistics.db";
-
-    $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'));
-
-    my ($returnValue, $students) = &PrepareData($c, $cacheDB,
-                                                \@studentInformation,
-                                                \@headings,$r);
-    if($returnValue ne 'OK') {
-        $r->print($returnValue."\n".'</body></html>');
-        return OK;
-    }
-    if(!$c->aborted()) {
-        &Apache::loncoursedata::CheckForResidualDownload($cacheDB,
-                                                         'true', 'true',
-                                                         $courseID,
-                                                         $r, $c);
-    }
-
-    my $GoToPage;
-    if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
-        $GoToPage = $cache{'reportSelected'};
-        $reports{'reportSelected'} = $cache{'reportSelected'};
-        if(defined($cache{'reportKey'}) &&
-           !exists($reports{$cache{'reportKey'}}) &&
-           $cache{'reportKey'} ne 'false') {
-            $reports{$cache{'reportKey'}} = $cache{'reportSelected'};
-        }
-
-        if(defined($cache{'OptionResponses'})) {
-            $reports{'problem_analysis'} = 'Option Response Analysis';
-        }
-
-        $r->print('<form name="Statistics" ');
-        $r->print('method="post" action="/adm/statistics">');
-        $r->print(&CreateMainMenu($cache{'Status'}, \%reports));
-        $r->rflush();
-        untie(%cache);
-    } else {
-        $r->print('<html><body>Unable to tie database.</body></html>');
-        return OK;
-    }
+    #
+    # Define menu data
+    my @reports = ({ internal_name => 'problem_statistics',
+                     name => &mt('Overall Problem Statistics'),
+                     short_description => 
+    &mt('Student performance statistics on all problems.'),
+                 },
+                   { internal_name => 'problem_analysis',
+                     name => &mt('Detailed Problem Analysis'),
+                     short_description => 
+    &mt('Detailed statistics and graphs of student performance on problems.'),
+                 },
+                   { internal_name => 'student_assessment',
+                     name => &mt('Problem Status Chart'),
+                     short_description => 
+    &mt('Brief view of each students performance in course.'),
+                 },
+                   # 'percentage'  => 'Correct-problems Plot',
+                   # 'activitylog' => 'Activity Log',
+                   );
 
-    if($GoToPage eq 'Activity Log') {
-        &Apache::lonproblemstatistics::Activity();
-    } elsif($GoToPage eq 'Problem Statistics') {
-        &Apache::lonproblemstatistics::BuildProblemStatisticsPage($cacheDB,
-                                                                  $students,
-                                                                  $courseID,
-                                                                  $c,$r);
-    } elsif($GoToPage eq 'Option Response Analysis') {
-        &Apache::lonproblemanalysis::BuildProblemAnalysisPage($cacheDB, $r);
-    } elsif($GoToPage eq 'Student Assessment') {
-        &Apache::lonstudentassessment::BuildStudentAssessmentPage($cacheDB,
-                                                          $students,
-                                                          $courseID,
-                                                          'Statistics',
-                                                          \@headings,
-                                                          $spacing,
-                                                          \@studentInformation,
-                                                          $r, $c);
-    } elsif($GoToPage eq 'Analyze') {
-        &Apache::lonproblemanalysis::BuildAnalyzePage($cacheDB, $students,
-                                                      $courseID, $r);
-    } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') {
-        my $courseDescription = $ENV{'course.'.$courseID.'.description'};
-        $courseDescription =~ s/\ /"_"/eg;
-        &Apache::lonproblemstatistics::BuildGraphicChart($GoToPage, $cacheDB,
-                                                         $courseDescription,
-                                                         $students, $courseID,
-                                                         $r, $c);
-    } elsif($GoToPage eq 'Class list') {
-        &DisplayClasslist($r);
-#        &BuildClasslist($cacheDB, $students, \@studentInformation,
-#                        \@headings, $r);
-    } elsif($GoToPage eq 'Correct-problems Plot') {
-	&Apache::lonpercentage::BuildPercentageGraph($cacheDB, $students,
-						     $courseID, $c, $r);
+    #
+    # Create the menu
+    my $Str;
+    $Str =  "<h2>".&mt('Statistics and Problem Analysis')."</h2>\n";
+    $Str .= &mt('Please select a report to generate.');
+    $Str .= "<dl>\n";
+    foreach my $reportdata (@reports) {
+        $Str .='    <dt><a href="/adm/statistics?reportSelected='.
+            $reportdata->{'internal_name'}.'" >'.
+            $reportdata->{'name'}."</a></dt>\n";
+        $Str .= '        <dd>'.$reportdata->{'short_description'}.
+            "</dd>\n";
     }
-
-    $r->print('</form>'."\n");
-    $r->print("\n".'</body>'."\n".'</html>');
-    $r->rflush();
-
-    return OK;
+    $Str .="</dl>\n";
+    #
+    return $Str;
 }
 
-# ================================================================ Main Handler
-
+##############################################
+##############################################
 sub handler {
     my $r=shift;
-
-#    $jr = $r;
-
+    my $c = $r->connection();
+    #
+    # Check for overloading
     my $loaderror=&Apache::lonnet::overloaderror($r);
     if ($loaderror) { return $loaderror; }
     $loaderror=
        &Apache::lonnet::overloaderror($r,
          $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
     if ($loaderror) { return $loaderror; }
-
-    unless(&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
+    #
+    # Check for access
+    if (! &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
         $ENV{'user.error.msg'}=
-        $r->uri.":vgr:0:0:Cannot view grades for complete course";
-        return HTTP_NOT_ACCEPTABLE;
+            $r->uri.":vgr:0:0:Cannot view grades for complete course";
+        if (! &Apache::lonnet::allowed('vgr',
+                      $ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {
+            $ENV{'user.error.msg'}=
+                $r->uri.":vgr:0:0:Cannot view grades with given role";
+            return HTTP_NOT_ACCEPTABLE;
+        }
     }
-
+    #
     # Set document type for header only
     if($r->header_only) {
         if ($ENV{'browser.mathml'}) {
@@ -1167,34 +1112,95 @@ sub handler {
         $r->send_http_header;
         return OK;
     }
-
-    unless($ENV{'request.course.fn'}) {
-	my $requrl=$r->uri;
-        $ENV{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
-        return HTTP_NOT_ACCEPTABLE;
-    }
-
+    #
+    # Send the header
     $r->content_type('text/html');
     $r->send_http_header;
-
+    #
+    # Extract form elements from query string
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['sort']);
-
-    &PrepareClasslist($r);
-
-    &PrepareCourseData($r);
-
-    &BuildStatistics($r);
-
+                                            ['sort','reportSelected',
+                                             'SelectedStudent']);
+    #
+    # Give the LON-CAPA page header
+    $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'));
+    $r->rflush();
+    # 
+    # Either print out a menu for them or send them to a report
+    if (! exists($ENV{'form.reportSelected'}) || 
+        $ENV{'form.reportSelected'} eq '') {
+        $r->print(&CreateMainMenu());
+    } else {
+    #
+        if (! &Apache::lonmysql::verify_sql_connection()) {
+            my $serveradmin = $r->dir_config('lonAdmEMail');
+            $r->print('<h2><font color="Red">'.
+                      &mt('Unable to connect to database!').
+                      '</font></h2>');
+            $r->print('<p>'.
+                      &mt('Please notify the server administrator ').
+                      '<b>'.$serveradmin.'</b></p>');
+            $r->print('<p>'.
+                      &mt('Course Statistics and Charts cannot be '.
+                          'retrieved until the database is restarted.  '.
+                          'Your data is intact but cannot be displayed '.
+                          'at this time.').'</p>');
+            $r->print('</body></html>');
+            return;
+        }
+        #
+        # Clean out the caches
+        if (exists($ENV{'form.ClearCache'})) {
+            &Apache::loncoursedata::delete_caches($ENV{'requres.course.id'});
+        }
+        #
+        # Set up the statistics and chart environment
+        &PrepareClasslist();
+        &PrepareCourseData($r);
+        #
+        # Begin form output
+        $r->print('<form name="Statistics" ');
+        $r->print('method="post" action="/adm/statistics">');
+        $r->rflush();
+        #
+        my $GoToPage = $ENV{'form.reportSelected'};
+        $r->print('<input type="hidden" name="reportSelected" value="'.
+                  $GoToPage.'">');
+        if($GoToPage eq 'activitylog') {
+#        &Apache::lonproblemstatistics::Activity();
+        } elsif($GoToPage eq 'problem_statistics') {
+            &Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c);
+        } elsif($GoToPage eq 'problem_analysis') {
+            &Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c);
+        } elsif($GoToPage eq 'student_assessment') {
+            &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);
+        } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') {
+#        &Apache::lonproblemstatistics::BuildGraphicChart($r,$c);
+        } elsif($GoToPage eq 'Correct-problems Plot') {
+            #	&Apache::lonpercentage::BuildPercentageGraph($r,$c);
+        }
+        #
+        $r->print("</form>\n");
+    }
+    $r->print("</body>\n</html>\n");
+    $r->rflush();
+    #
     return OK;
 }
+
 1;
 
+#######################################################
+#######################################################
+
 =pod
 
 =back
 
 =cut
 
+#######################################################
+#######################################################
+
 __END__