--- loncom/interface/lonstatistics.pm	2003/10/03 15:34:58	1.78.2.1
+++ loncom/interface/lonstatistics.pm	2005/12/13 16:32:22	1.127
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstatistics.pm,v 1.78.2.1 2003/10/03 15:34:58 albertel Exp $
+# $Id: lonstatistics.pm,v 1.127 2005/12/13 16:32:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,20 +38,6 @@ lonstatistics
 
 Main handler for statistics and chart.
 
-=head1 PACKAGES USED
-
-    use strict;
-    use Apache::Constants qw(:common :http);
-    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::lonpercentage;
-    use Apache::lonmysql;
 =over 4
 
 =cut
@@ -64,26 +50,29 @@ use vars qw(
     @FullClasslist 
     @Students
     @Sections 
-    @SelectedSections
     %StudentData
     @StudentDataOrder
     @SelectedStudentData
-    $top_map 
-    @Sequences 
-    @SelectedMaps
-    @Assessments);
+    $enrollment_status);
 
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::lonhomework;
 use Apache::loncommon;
 use Apache::loncoursedata;
 use Apache::lonhtmlcommon;
+use Apache::lonmysql;
+use Apache::lonlocal;
+use Time::HiRes;
+#
+# Statistics Packages
 use Apache::lonproblemanalysis();
+use Apache::lonsubmissiontimeanalysis();
+use Apache::loncorrectproblemplot();
 use Apache::lonproblemstatistics();
 use Apache::lonstudentassessment();
 use Apache::lonpercentage;
-use Apache::lonmysql;
-use Time::HiRes;
+use Apache::lonstudentsubmissions();
+use Apache::lonsurveyreports();
 
 #######################################################
 #######################################################
@@ -134,8 +123,6 @@ undef the following package variables:
 
 =item @Sections
 
-=item @SelectedSections
-
 =item %StudentData
 
 =item @StudentDataOrder
@@ -158,7 +145,6 @@ sub clear_classlist_variables {
     undef(@FullClasslist);
     undef(@Students);
     undef(@Sections);
-    undef(@SelectedSections);
     undef(%StudentData);
     undef(@SelectedStudentData);
     undef($curr_student);
@@ -184,8 +170,6 @@ the following package variables:
 
 =item @Sections
 
-=item @SelectedSections
-
 =item %StudentData
 
 =item @SelectedStudentData
@@ -210,42 +194,30 @@ sub PrepareClasslist {
     &clear_classlist_variables();
     #
     # Retrieve the classlist
-    my $cid  = $ENV{'request.course.id'};
-    my $cdom = $ENV{'course.'.$cid.'.domain'};
-    my $cnum = $ENV{'course.'.$cid.'.num'};
-    my ($classlist,$field_names) = &Apache::loncoursedata::get_classlist($cid,
-                                                                  $cdom,$cnum);
-    if (exists($ENV{'form.Section'})) {
-        if (ref($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');
-        }
-    }
+    my $cid  = $env{'request.course.id'};
+    my $cdom = $env{'course.'.$cid.'.domain'};
+    my $cnum = $env{'course.'.$cid.'.num'};
+    my ($classlist,$field_names) = &Apache::loncoursedata::get_classlist($cdom,
+									$cnum);
+    my @selected_sections = &get_selected_sections();
     #
     # Deal with instructors with restricted section access
-    if ($ENV{'request.course.sec'} !~ /^\s*$/) {
-        @SelectedSections = ($ENV{'request.course.sec'});
+    if ($env{'request.course.sec'} !~ /^\s*$/) {
+        @selected_sections = ($env{'request.course.sec'});
     }
     #
     # Set up %StudentData
-    @StudentDataOrder = qw/fullname username domain id section status/;
+    @StudentDataOrder = qw/fullname username domain id section status comments/;
     foreach my $field (@StudentDataOrder) {
-        $StudentData{$field}->{'title'} = $field;
-        $StudentData{$field}->{'base_width'} = length($field);
+        $StudentData{$field}->{'title'} = &mt($field);
+        $StudentData{$field}->{'base_width'} = length(&mt($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'}));
+    $enrollment_status = 'Active';
+    $enrollment_status = $env{'form.Status'} if (exists($env{'form.Status'}));
     #
     # Process the classlist
     while (my ($student,$student_data) = each (%$classlist)) {
@@ -272,11 +244,11 @@ sub PrepareClasslist {
         $Sections{$section}++;
         #
         # Only put in the list those students we are interested in
-        foreach my $sect (@SelectedSections) {
+        foreach my $sect (@selected_sections) {
             if ( (($sect eq 'all') || 
                   ($section eq $sect)) &&
-                 (($studenthash->{'status'} eq $requested_status) || 
-                  ($requested_status eq 'Any')) 
+                 (($studenthash->{'status'} eq $enrollment_status) || 
+                  ($enrollment_status eq 'Any')) 
                  ){
                 push (@Students,$studenthash);
                 last;
@@ -285,8 +257,8 @@ sub PrepareClasslist {
     }
     #
     # Put the consolidated section data in the right place
-    if ($ENV{'request.course.sec'} !~ /^\s*$/) {
-        @Sections = ($ENV{'request.course.sec'});
+    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
@@ -294,16 +266,17 @@ sub PrepareClasslist {
     #
     # 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;
+    $sortby = $env{'form.sort'} if (exists($env{'form.sort'}));
+    my @TmpStudents = sort { lc($a->{$sortby}) cmp lc($b->{$sortby}) ||
+                             lc($a->{'fullname'}) cmp lc($b->{'fullname'}) ||
+			     lc($a->{'username'}) cmp lc($b->{'username'}) } @Students;
     @Students = @TmpStudents;
     # 
     # Now deal with that current student thing....
     $curr_student = undef;
-    if (exists($ENV{'form.SelectedStudent'})) {
+    if (exists($env{'form.SelectedStudent'})) {
         my ($current_uname,$current_dom) = 
-            split(':',$ENV{'form.SelectedStudent'});
+            split(':',$env{'form.SelectedStudent'});
         my $i;
         for ($i = 0; $i<=$#Students; $i++) {
             next if (($Students[$i]->{'username'} ne $current_uname) || 
@@ -325,12 +298,9 @@ sub PrepareClasslist {
         }
     }
     #
-    if (exists($ENV{'form.StudentData'})) {
-        if (ref($ENV{'form.StudentData'}) eq 'ARRAY') {
-            @SelectedStudentData = @{$ENV{'form.StudentData'}};
-        } else {
-            @SelectedStudentData = ($ENV{'form.StudentData'});
-        }
+    if (exists($env{'form.StudentData'})) {
+	@SelectedStudentData = 
+	    &Apache::loncommon::get_env_multiple('form.StudentData');
     } else {
         @SelectedStudentData = ('username');
     }
@@ -344,61 +314,34 @@ sub PrepareClasslist {
     return;
 }
 
-
 #######################################################
 #######################################################
 
 =pod
 
-=item get_students
+=item get_selected_sections
 
-Returns a list of the selected students
+Returns an array of the selected sections
 
 =cut
 
 #######################################################
 #######################################################
-sub get_students {
-    if (! @Students) {
-        &PrepareClasslist()
+sub get_selected_sections {
+    my @selected_sections = 
+	&Apache::loncommon::get_env_multiple('form.Section');
+    @selected_sections = ('all') if (! @selected_sections);
+    foreach (@selected_sections) {
+        if ($_ eq 'all') {
+            @selected_sections = ('all');
+        }
     }
-    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;
+    #
+    # Deal with instructors with restricted section access
+    if ($env{'request.course.sec'} !~ /^\s*$/) {
+        @selected_sections = ($env{'request.course.sec'});
+    }
+    return @selected_sections;
 }
 
 #######################################################
@@ -406,34 +349,61 @@ sub previous_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;
-}
-
-#######################################################
-#######################################################
+=item &section_and_enrollment_description
 
-=pod
+Returns a string describing the currenly selected section(s) and 
+enrollment status.  
 
-=item &clear_sequence_variables()
+Inputs: mode = 'plaintext' or 'localized'  (defaults to 'localized')
+    'plaintext' is used for example in Excel spreadsheets.
+Returns: scalar description string.
 
 =cut
 
 #######################################################
 #######################################################
-sub clear_sequence_variables {
-    undef($top_map);
-    undef(@Sequences);
-    undef(@Assessments);
+sub section_and_enrollment_description {
+    my ($mode) = @_;
+    if (! defined($mode)) { $mode = 'localized'; }
+    my @sections = &Apache::lonstatistics::get_selected_sections();
+    my $description;
+    if ($mode eq 'localized') {
+        $description = &mt('Unable to determine section and enrollment');
+    } elsif ($mode eq 'plaintext') {
+        $description = 'Unable to determine section and enrollment';
+    } else {
+        $description = 'Bad parameter passed to lonstatistics::section_and_enrollment_description';
+        &Apache::lonnet::logthis($description);
+    }
+    if (scalar(@sections) == 1 && $sections[0] ne 'all') {
+        if ($mode eq 'localized') {
+            $description = &mt('Section [_1]. [_2] enrollment status.',
+                               $sections[0],$env{'form.Status'});
+        } elsif ($mode eq 'plaintext') {
+            $description = 'Section '.$sections[0].'. '.
+                $env{'form.Status'}.' enrollment status.';
+        }
+    } elsif (scalar(@sections) && $sections[0] eq 'all') {
+        if ($mode eq 'localized') {
+            $description = &mt('All sections. [_1] enrollment status.',
+                               $env{'form.Status'});
+        } elsif ($mode eq 'plaintext') {
+            $description = 'All sections. '.
+                $env{'form.Status'}.' enrollment status.';
+        }
+    } elsif (scalar(@sections)) {
+        my $lastsection = pop(@sections);
+        if ($mode eq 'localized') {
+            $description = &mt('Sections [_1] and [_2]. [_3] enrollment status.',
+                               join(', ',@sections),$lastsection,
+                               $env{'form.Status'});
+        } elsif ($mode eq 'plaintext') {
+            $description = 
+                'Sections '.join(', ',@sections).' and '.$lastsection.'. '.
+                $env{'form.Status'}.' enrollment status.';
+        }
+    }
+    return $description;
 }
 
 #######################################################
@@ -441,52 +411,37 @@ sub clear_sequence_variables {
 
 =pod
 
-=item &SetSelectedMaps($elementname)
+=item get_students
 
-Sets the @SelectedMaps array from $ENV{'form.'.$elementname};
+Returns a list of the selected students
 
 =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');
+sub get_students {
+    if (! @Students) {
+        &PrepareClasslist()
     }
+    return @Students;
 }
 
-
 #######################################################
 #######################################################
 
 =pod
 
-=item &Sequences_with_Assess()
+=item &current_student()
 
-Returns an array containing the subset of @Sequences which contain
-assessments.
+Returns a pointer to a hash containing data about the currently
+selected student.
 
 =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;
+sub current_student { 
+    return $curr_student;
 }
 
 #######################################################
@@ -494,40 +449,17 @@ sub Sequences_with_Assess {
 
 =pod
 
-=item &PrepareCourseData($r)
+=item &previous_student()
+
+Returns a pointer to a hash containing data about the student prior
+in the list of students.  Or something.  
 
 =cut
 
 #######################################################
 #######################################################
-sub PrepareCourseData {
-    my ($r) = @_;
-    &clear_sequence_variables();
-    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');
-        return;
-    }
-    $top_map = $top if (ref($top));
-    @Sequences = @{$sequences} if (ref($sequences) eq 'ARRAY');
-    @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;
+sub previous_student { 
+    return $prev_student;
 }
 
 #######################################################
@@ -535,60 +467,17 @@ sub PrepareCourseData {
 
 =pod
 
-=item &log_sequence($sequence,$recursive,$padding)
+=item &next_student()
 
-Write data about the sequence to a logfile.  If $recursive is not
-undef the data is written recursively.  $padding is used for recursive
-calls.
+Returns a pointer to a hash containing data about the next student
+to be viewed.
 
 =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;
+sub next_student { 
+    return $next_student;
 }
 
 ##############################################
@@ -654,12 +543,96 @@ sub StudentDataSelect {
     return $Str;
 }
 
+#######################################################
+#######################################################
+
+=pod
+
+=item &get_selected_maps($elementname)
+
+Input: Name of the <select> form element used to specify the maps.
+
+Returns: Array of symbs of selected maps or the description 'all'.
+   If form.$elementname does not exist, 'all' is returned.
+
+=cut
+
+#######################################################
+#######################################################
+sub get_selected_maps {
+    my ($elementname) = @_;
+    my @selected_maps = 
+	&Apache::loncommon::get_env_multiple('form.'.$elementname);
+    @selected_maps = ('all') if (! @selected_maps);
+    foreach my $map (@selected_maps) {
+        if ($map eq 'all') {
+            @selected_maps = ('all');
+            last;
+        }
+    }
+    return @selected_maps;
+}
+
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &selected_sequences_with_assessments
+
+Retrieve the sequences which were selected by the user to show.  
+
+Input: $mode: scalar.  Either 'selected' or 'all'.  If not specified,
+    'selected' is used.
+
+Returns: an array containing a navmap object and navmap resources, 
+    or an array containing a scalar with an error message.
+
+=cut
+
+#######################################################
+#######################################################
+sub selected_sequences_with_assessments {
+    my ($mode) = @_;
+    $mode = 'selected' if (! defined($mode));
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    if (!defined($navmap)) {
+        return ('Can not open Coursemap');
+    }
+    #
+    my @sequences = $navmap->retrieveResources(undef,
+                                               sub { shift->is_map(); },1,0,1);
+    my @sequences_with_assessments;
+    for my $sequence ($navmap->getById('0.0'), @sequences) {
+	if ($navmap->hasResource($sequence,sub { shift->is_problem(); },0,1)){
+            push(@sequences_with_assessments,$sequence);
+        }
+    }
+    #
+    my @sequences_to_show;
+    foreach my $sequence (@sequences_with_assessments) {
+        if ($mode eq 'all') {
+            push (@sequences_to_show,$sequence);
+        } elsif ($mode eq 'selected') {
+            foreach my $map_symb (&get_selected_maps('Maps')) {
+                if ($sequence->symb eq $map_symb || $map_symb eq 'all'){
+                    push (@sequences_to_show,$sequence);
+                    last; # Only put it in once
+                }
+            }
+        }
+
+    }
+    return $navmap,@sequences_to_show;
+}
+
 ##############################################
 ##############################################
 
 =pod 
 
-=item &MapSelect($elementname,$status,$numvisible,$restriction) 
+=item &map_select($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.
@@ -673,69 +646,56 @@ If the top sequence is selected, the val
 
 =item $numvisible The number of options to be visible
 
-=item $restriction Code reference to subroutine which returns true or 
-false.  The code must expect a reference to a sequence data structure.
-
 =back
 
 =cut
 
 ##############################################
 ##############################################
-sub MapSelect {
-    my ($elementname,$status,$numvisible,$restriction)=@_;
+sub map_select {
+    my ($elementname,$status,$numvisible)=@_;
     if ($numvisible < 1) {
         return;
     }
     #
     # Set up array of selected items
-    &SetSelectedMaps($elementname);
-    #
-    # Set up the restriction call
-    if (! defined($restriction)) {
-        $restriction = sub { 1; };
-    }
+    my @selected_maps = &get_selected_maps($elementname);
     #
     # Build the form element
-    my $Str = "\n";
-    $Str .= '<select name="'.$elementname.'" ';
+    my $form = "\n";
+    $form .= '<select name="'.$elementname.'" ';
     if ($status ne 'single') {
-        $Str .= 'multiple="true" ';
-    }
-    $Str .= 'size="'.$numvisible.'" >'."\n";
-    #
-    # Deal with 'all'
-    foreach (@SelectedMaps) {
-        if ($_ eq 'all') {
-            @SelectedMaps = ('all');
-            last;
-        }
+        $form .= 'multiple="true" ';
     }
+    $form .= 'size="'.$numvisible.'" >'."\n";
     #
     # Put in option for 'all'
-    $Str .= '    <option value="all" ';
-    foreach (@SelectedMaps) {
-        if ($_ eq 'all') {
-            $Str .= 'selected ';
-            last;
-        }
+    $form .= '    <option value="all" ';
+    if ($selected_maps[0] eq 'all') {
+        $form .= 'selected ';
     }
-    $Str .= ">all</option>\n";
+    $form .= ">all</option>\n";
     #
     # Loop through the sequences
-    foreach my $seq (@Sequences) {
-        next if (! $restriction->($seq));
-        $Str .= '    <option value="'.$seq->{'symb'}.'" ';
-        foreach (@SelectedMaps) {
-            if ($seq->{'symb'} eq $_) {
-                $Str .= 'selected ';
+    my @sequences = &selected_sequences_with_assessments('all');
+    my $navmap;
+    if (!ref($sequences[0])) {
+        return $sequences[0];
+    } else {
+        $navmap = shift(@sequences);
+    }
+    foreach my $seq (@sequences){
+        $form .= '    <option value="'.$seq->symb.'" ';
+        foreach (@selected_maps) {
+            if ($seq->symb eq $_) {
+                $form .= 'selected ';
                 last;
             }
         }
-        $Str .= '>'.$seq->{'title'}."</option>\n";
+        $form .= '>'.$seq->compTitle."</option>\n";
     }
-    $Str .= "</select>\n";
-    return $Str;
+    $form .= "</select>\n";
+    return $form;
 }
 
 ##############################################
@@ -748,7 +708,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
+Uses the package variables @Sections
 =over 4
 
 =item $elementname The name of the HTML form element
@@ -785,7 +745,7 @@ sub SectionSelect {
     # Loop through the sequences
     foreach my $s (@Sections) {
         $Str .= '    <option value="'.$s.'" ';
-        foreach (@SelectedSections) {
+        foreach (&get_selected_sections()) {
             if ($s eq $_) {
                 $Str .= 'selected ';
                 last;
@@ -801,43 +761,69 @@ sub SectionSelect {
 ##################################################
 sub DisplayClasslist {
     my ($r)=@_;
+    &Apache::lonhtmlcommon::add_breadcrumb
+        ({text=>'Select One Student'});
+    #
+    # Output some of the standard interface components
+    my $Str;
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Select One Student');
+    $Str .= '<p><table cellspacing="5">'."\n";
+    $Str .= '<tr>';
+    $Str .= '<th align="center"><b>'.&mt('Sections').'</b></th>';
+    $Str .= '<th align="center"><b>'.&mt('Enrollment Status').'</b></th>';
+    $Str .= '</tr>'.$/;
+    $Str .= '<tr>';
+    $Str .= '<td>'.
+        &Apache::lonstatistics::SectionSelect('Section','multiple',5).
+        '</td>';
+    $Str .= '<td>'.
+        &Apache::lonhtmlcommon::StatusOptions(undef,undef,5).
+        '</td>';
+    
+    $Str .= '</tr>'.$/;
+    $Str .= '</table></p>';
+    $Str .= '<input type="submit" name="selectstudent" value="'.
+        &mt('Update Display').'" />';
+    $r->print($Str);
+    $r->rflush();
     #
-    my @Fields = ('fullname','username','domain','id','section');
+    my @Fields = ('fullname','username','domain','id','section','status');
     #
-    my $Str='';
+    $Str = '';
+    my @selected_sections = &get_selected_sections();
     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>';
+        if ($selected_sections[0] eq 'all') { 
+            if (lc($env{'form.Status'}) eq 'any') {
+                $Str .= '<h2>'.
+                    &mt('There are no students in the course.').
+                    '</h2>';
+            } elsif (lc($env{'form.Status'}) eq 'active') {
+                $Str .= '<h2>'.
+                &mt('There are no currently enrolled students in the course.').
+                    '</h2>';
+            } elsif (lc($env{'form.Status'}) eq 'expired') {
+                $Str .= '<h2>'.
+                    &mt('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>';
+            if (lc($env{'form.Status'}) eq 'any') {
+                $Str .= '<h2>'.
+                    &mt('There are no students in the selected sections.').
+                    '</h2>';
+            } elsif (lc($env{'form.Status'}) eq 'active') {
+                $Str .= '<h2>'.
+                    &mt('There are no currently enrolled students in the selected sections.').
+                    '</h2>';
+            } elsif (lc($env{'form.Status'}) eq 'expired') {
+                $Str .= '<h2>'.
+                    &mt('There are no previously enrolled students in the selected sections.').
+                    '</h2>';
             }
         }
         $Str.= '<a href="/adm/statistics?reportSelected=student_assessment">'.
-            'Return to the chart.</a>';
+            &mt('Click here to return to the chart').'</a>';
         $r->print($Str);
         $r->rflush();
         return;
@@ -848,7 +834,10 @@ sub DisplayClasslist {
     $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?reportSelected=classlist&sort='.$field.'">'.$field.
+        $Str .= '<th><a href="/adm/statistics?'.
+            'reportSelected=student_assessment&'.
+            'selectstudent=1&'.
+            'sort='.$field.'">'.&mt($field).
             '</a></th>';
     }
     $Str .= '</tr>'."\n";
@@ -868,11 +857,13 @@ sub DisplayClasslist {
             if ($field eq 'fullname' || $field eq 'username') {
                 $Str .= '<a href="/adm/statistics?reportSelected=';
                 $Str .= &Apache::lonnet::escape('student_assessment');
-                $Str .= '&sort='.&Apache::lonnet::escape($ENV{'form.sort'});
+                $Str .= '&sort='.&Apache::lonnet::escape($env{'form.sort'});
                 $Str .= '&SelectedStudent=';
                 $Str .= &Apache::lonnet::escape($sname).'">';
                 $Str .= $student->{$field}.'&nbsp';
                 $Str .= '</a>';
+            } elsif ($field eq 'status') {
+                $Str .= &mt($student->{$field});
             } else {
                 $Str .= $student->{$field};
             }
@@ -891,31 +882,58 @@ sub DisplayClasslist {
 ##############################################
 ##############################################
 sub CreateMainMenu {
-    my ($status,$reports,$current)=@_;
     #
-    my $Str = '';
+    # 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 => 'submissiontime_analysis',
+                     name => &mt('Submission Time Plots'),
+                     short_description => 
+    &mt('Display and analysis of submission times on assessments.'),
+                 },
+                   { internal_name => 'student_submission_reports',
+                     name => &mt('Student Submission Reports'),
+                     short_description => 
+    &mt('Prepare reports of student submissions.'),
+                 },
+                   { internal_name => 'survey_reports',
+                     name => &mt('Survey Reports'),
+                     short_description => 
+    &mt('Prepare reports on survey results.'),
+                 },
+                   { internal_name => 'correct_problems_plot',
+                     name => &mt('Correct Problems Plot'),
+                     short_description => 
+    &mt('Display a histogram of student performance in the course.'),
+                 },
+#                   { 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',
+                   );
     #
-    $Str  = '<input type="hidden" name="reportSelected" value="'.$current.'">';
-#    $Str .= '<table border="0"><tbody><tr>'."\n";
-#    $Str .= '<td align="center"><b>Report:</b></td>'."\n";
-#    $Str .= '<td align="center">';
-#    $Str .= '<select name="reportSelected" '.
-#        'onchange="document.Statistics.submit()">'."\n";
-#    foreach (sort(keys(%$reports))) {
-#        $Str .= '<option value="'.$_.'"';
-#        if($current eq $_) {
-#            $Str .= ' selected';
-#        }
-#        $Str .= '>'.$reports->{$_}.'</option>'."\n";
-#    }
-#    $Str .= '</select></td>'."\n";
-#    #
-#    $Str .= '<td>'.('&nbsp;'x30).'</td>';
-#    $Str .= '<td align="center">'.
-#        '<input type="submit" name="ClearCache" value="Clear Caches" />'.
-#            "</td>\n";
-#    $Str .= '</tr></tbody></table>'."\n";
-#    $Str .= '<hr>'."\n";
+    # Create the menu
+    my $Str;
+    $Str .= '<h2>'.&mt('Please select a report to generate').'</h2>';
+    foreach my $reportdata (@reports) {
+        $Str .='    <h3><a href="/adm/statistics?reportSelected='.
+            $reportdata->{'internal_name'}.'" >'.
+            $reportdata->{'name'}."</a></h3>\n";
+        $Str .= '    '.('&nbsp;'x8).$reportdata->{'short_description'}.
+            "\n";
+    }
+    $Str .="</dl>\n";
     #
     return $Str;
 }
@@ -926,113 +944,144 @@ sub handler {
     my $r=shift;
     my $c = $r->connection();
     #
-    &Apache::loncoursedata::clear_internal_caches();
-    #
     # 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'});
+         $env{'course.'.$env{'request.course.id'}.'.home'});
     if ($loaderror) { return $loaderror; }
     #
     # Check for access
-    if (! &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
-        $ENV{'user.error.msg'}=
+    if (! &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
+        $env{'user.error.msg'}=
             $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'}=
+                      $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'}) {
-            $r->content_type('text/xml');
-        } else {
-            $r->content_type('text/html');
-        }
-        &Apache::loncommon::no_cache($r);
-        $r->send_http_header;
-        return OK;
-    }
-    #
     # Send the header
-    $r->content_type('text/html');
+    &Apache::loncommon::no_cache($r);
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
+    if ($r->header_only) { return OK; }
     #
     # Extract form elements from query string
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['sort','reportSelected',
                                              'SelectedStudent']);
-    if (! exists($ENV{'form.reportSelected'})) {
-        $ENV{'form.reportSelected'} = 'student_assessment';
-    }
     #
     # Give the LON-CAPA page header
-    $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'));
-    $r->rflush();
-    #
-    if (! &Apache::lonmysql::verify_sql_connection()) {
-        my $serveradmin = $r->dir_config('lonAdmEMail');
-        $r->print(<<END);
-<h2><font color="Red">Unable to connect to database!</font></h2>
-<p>
-Please notify the server administrator <b>$serveradmin</b>.
-</p><p>
-Course Statistics and Charts cannot be retrieved until the database is
-restarted.  Your data is intact but cannot be displayed at this time.
-</p>
-</body>
-</html>
-END
-        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">');
-    #
-    # Print main menu
-    my %reports = ('classlist'          => 'Class list',
-                   'problem_statistics' => 'Problem Statistics',
-                   'student_assessment' => 'Problem Status Chart',
-#                   'percentage'         => 'Correct-problems Plot',
-#                   'option_response'    => 'Option Response Analysis',
-#                   'activitylog'        => 'Activity Log',
-                   );
-    $r->print(&CreateMainMenu($ENV{'form.status'},
-                              \%reports,$ENV{'form.reportSelected'}));
+    my $style = <<ENDSTYLE;
+<style type="text/css">
+    ul.sub_studentans { list-style-type: none }
+    ul.sub_correctans { list-style-type: none }
+    tr.even           { background-color: \#CCCCCC }
+    td.essay          { border: 1px solid gray; }
+</style>
+ENDSTYLE
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>'.
+              &mt('Course Statistics and Charts').
+              '</title>'.$style.
+              "</head>\n".
+              &Apache::loncommon::bodytag('Course Statistics and Charts'));
     $r->rflush();
+    # 
+    # Either print out a menu for them or send them to a report
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/statistics',
+                                            title=>'Statistics',
+                                            text =>'Statistics',
+                                            faq=>139,
+                                            bug=>'Statistics and Charts'});
+    if (! exists($env{'form.reportSelected'}) || 
+        $env{'form.reportSelected'} eq '') {
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs
+                  (undef,&mt('Statistics Main Page')).
+                  &CreateMainMenu());
+    } else {
     #
-    my $GoToPage = $ENV{'form.reportSelected'};
-    if($GoToPage eq 'activitylog') {
+        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'});
+        }
+        #
+        # 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 'option_response') {
-#        &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);
+        } elsif($GoToPage eq 'problem_statistics') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>'/adm/statistics?reportselected=problem_statistics',
+                  text=>'Overall Problem Statistics'});
+            &Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c);
+        } elsif($GoToPage eq 'problem_analysis') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>'/adm/statistics?reportselected=problem_analysis',
+                  text=>'Detailed Problem Analysis'});
+            &Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c);
+        } elsif($GoToPage eq 'submissiontime_analysis') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>
+                      '/adm/statistics?reportselected=submissiontime_analysis',
+                      text=>'Submission Time Plots'});
+            &Apache::lonsubmissiontimeanalysis::BuildSubmissionTimePage($r,$c);
+        } elsif($GoToPage eq 'student_submission_reports') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>
+                  '/adm/statistics?reportselected=student_submission_reports',
+                  text=>'Student Submission Reports'});
+            &Apache::lonstudentsubmissions::BuildStudentSubmissionsPage($r,$c);
+        } elsif($GoToPage eq 'survey_reports') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>
+                  '/adm/statistics?reportselected=survey_reports',
+                  text=>'Survey Reports'});
+            &Apache::lonsurveyreports::BuildSurveyReportsPage($r,$c);
+        } elsif($GoToPage eq 'correct_problems_plot') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>'/adm/statistics?reportselected=correct_problems_plot',
+                  text=>'Correct Problems Plot'});
+            &Apache::loncorrectproblemplot::BuildCorrectProblemsPage($r,$c);
+        } elsif($GoToPage eq 'student_assessment') {
+            &Apache::lonhtmlcommon::clear_breadcrumbs();
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>'/adm/statistics?reportselected=student_assessment',
+                  text=>'Chart'});
+            &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);
+        }
+        #
+        $r->print("</form>\n");
     }
-    #
-    $r->print("</form>\n");
     $r->print("</body>\n</html>\n");
     $r->rflush();
     #