--- loncom/interface/lonstatistics.pm	2004/02/20 16:38:49	1.99
+++ loncom/interface/lonstatistics.pm	2004/06/04 17:41:35	1.102
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstatistics.pm,v 1.99 2004/02/20 16:38:49 matthew Exp $
+# $Id: lonstatistics.pm,v 1.102 2004/06/04 17:41:35 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -471,13 +471,22 @@ assessments.
 #######################################################
 #######################################################
 sub Sequences_with_Assess {
+    my ($mode) = @_;
+    $mode = 'selected' if (! defined($mode));
     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);
+    foreach my $sequence (@Sequences) {
+        next if ($sequence->{'num_assess'} < 1);
+        if ($mode eq 'all') {
             push (@Sequences_to_Show,$sequence);
+        } elsif ($mode eq 'selected') {
+            foreach my $map_symb (@SelectedMaps) {
+                if ($sequence->{'symb'} eq $map_symb || $map_symb eq 'all'){
+                    push (@Sequences_to_Show,$sequence);
+                    last; # Only put it in once
+                }
+            }
         }
+
     }
     return @Sequences_to_Show;
 }
@@ -971,7 +980,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.'">'.$field.
             '</a></th>';
     }
     $Str .= '</tr>'."\n";
@@ -1112,8 +1124,8 @@ sub handler {
     # 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=>&mt('Statistics'),
-                                            text =>&mt('Statistics'),
+                                            title=>'Statistics',
+                                            text =>'Statistics',
                                             faq=>139,
                                             bug=>'Statistics and Charts'});
     if (! exists($ENV{'form.reportSelected'}) || 
@@ -1162,41 +1174,35 @@ sub handler {
         } elsif($GoToPage eq 'problem_statistics') {
             &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>'/adm/statistics?reportselected=problem_statistics',
-                  text=>&mt('Overall Problem Statistics'),
-                  faq=>139,bug=>'Statistics and Charts'});
+                  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=>&mt('Detailed Problem Analysis'),
-                  faq=>139,bug=>'Statistics and Charts'});
+                  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=>&mt('Submission Time Plots'),
-                      faq=>139,bug=>'Statistics and Charts'});
+                      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=>&mt('Student Submission Reports'),
-                  faq=>139,bug=>'Statistics and Charts'});
+                  text=>'Student Submission Reports'});
             &Apache::lonstudentsubmissions::BuildStudentSubmissionsPage($r,$c);
         } elsif($GoToPage eq 'correct_problems_plot') {
             &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>'/adm/statistics?reportselected=correct_problems_plot',
-                  text=>&mt('Correct Problems Plot'),
-                  faq=>139,bug=>'Statistics and Charts'});
+                  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=>&mt('Chart'),
-                  faq=>139,bug=>'Statistics and Charts'});
+                  text=>'Chart'});
             &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);
         }
         #