--- loncom/interface/lonstatistics.pm	2003/04/18 15:50:55	1.66
+++ loncom/interface/lonstatistics.pm	2003/05/12 22:07:17	1.68
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstatistics.pm,v 1.66 2003/04/18 15:50:55 matthew Exp $
+# $Id: lonstatistics.pm,v 1.68 2003/05/12 22:07:17 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -240,6 +240,10 @@ sub PrepareClasslist {
     }
 
     #
+    # 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 = ();
@@ -266,7 +270,11 @@ sub PrepareClasslist {
         #
         # Only put in the list those students we are interested in
         foreach my $sect (@SelectedSections) {
-            if (($sect eq 'all') || ($section eq $sect)) {
+            if ( (($sect eq 'all') || 
+                  ($section eq $sect)) &&
+                 (($studenthash->{'status'} eq $requested_status) || 
+                  ($requested_status eq 'Any')) 
+                 ){
                 push (@Students,$studenthash);
                 last;
             }
@@ -832,12 +840,16 @@ sub CreateMainMenu {
     #
     $Str .= '<table border="0"><tbody><tr>'."\n";
     $Str .= '<td></td>'."\n";
+    $Str .= '<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="Update Display" /></td>'."\n";
+    $Str .= '<td align="center">'.
+        '<input type="submit" name="Refresh" value="Update Display" />'.
+            "</td>\n";
+    $Str .= '<td align="center">'.
+        '<input type="submit" name="ClearCache" value="Clear Caches" />'.
+            "</td>\n";
     #
     $Str .= '<td align="center">';
     $Str .= '<select name="reportSelected" >'."\n";
@@ -850,10 +862,6 @@ sub CreateMainMenu {
     }
     $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";
     #
@@ -925,6 +933,11 @@ 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($r);
     &PrepareCourseData($r);