--- loncom/interface/lonstatistics.pm	2004/04/01 18:49:39	1.101
+++ loncom/interface/lonstatistics.pm	2004/06/04 21:42:18	1.103
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstatistics.pm,v 1.101 2004/04/01 18:49:39 matthew Exp $
+# $Id: lonstatistics.pm,v 1.103 2004/06/04 21:42:18 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;
 }
@@ -896,7 +905,13 @@ Ensures all student data is up to date.
 ###############################################
 ###############################################
 sub Gather_Full_Student_Data {
-    my ($r) = @_;
+    my ($r,$formname,$inputname) = @_;
+    my $status_type;
+    if (defined($formname)) {
+        $status_type = 'inline';
+    } else {
+        $status_type = 'popup';
+    }
     my $c = $r->connection();
     #
     &Apache::loncoursedata::clear_internal_caches();
@@ -906,7 +921,8 @@ sub Gather_Full_Student_Data {
     # Open the progress window
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
         ($r,&mt('Student Data Compilation Status'),
-         &mt('Student Data Compilation Progress'), scalar(@Students));
+         &mt('Student Data Compilation Progress'), scalar(@Students),
+         $status_type,undef,$formname,$inputname);
     #
     while (my $student = shift @Students) {
         return if ($c->aborted());