--- loncom/interface/loncoursedata.pm	2004/02/18 20:48:21	1.120
+++ loncom/interface/loncoursedata.pm	2004/03/07 20:53:40	1.121
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.120 2004/02/18 20:48:21 matthew Exp $
+# $Id: loncoursedata.pm,v 1.121 2004/03/07 20:53:40 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -182,7 +182,7 @@ sub get_sequence_assessment_data {
             next;
         }
         next if (! ref($curRes));
-        next if (! $curRes->is_problem());# && !$curRes->randomout);
+        next if (! $curRes->is_problem() && $curRes->src() !~ /\.survey$/);
         # Okay, from here on out we only deal with assessments
         $title = $curRes->title();
         $title =~ s/\:/\&\#058;/g;
@@ -2232,7 +2232,7 @@ sub get_response_time_data {
 ################################################
 ################################################
 sub get_student_scores {
-    my ($Sections,$Symbs,$enrollment,$courseid) = @_;
+    my ($Sections,$Symbs,$enrollment,$courseid,$starttime,$endtime) = @_;
     $courseid = $ENV{'request.course.id'} if (! defined($courseid));
     &setup_table_names($courseid);
     my $dbh = &Apache::lonmysql::get_dbh();
@@ -2243,8 +2243,8 @@ sub get_student_scores {
     if (defined($Symbs)  && @$Symbs) {
         $symb_requirements = '('.
             join(' OR ', map{ "(a.symb_id='".&get_symb_id($_->{'symb'}).
-                                  "' AND a.part_id='".&get_part_id($_->{'part'}).
-                                  "')"
+                              "' AND a.part_id='".&get_part_id($_->{'part'}).
+                              "')"
                               } @$Symbs).')';
     }
     #
@@ -2259,6 +2259,16 @@ sub get_student_scores {
     if (defined($enrollment) && $enrollment ne 'Any') {
         $enrollment_requirements = "b.status='".$enrollment."'";
     }
+    #
+    my $time_requirements = undef;
+    if (defined($starttime)) {
+        $time_requirements .= "a.timestamp>='".$starttime."'";
+        if (defined($endtime)) {
+            $time_requirements .= " AND a.timestamp<='".$endtime."'";
+        }
+    } elsif (defined($endtime)) {
+        $time_requirements .= "a.timestamp<='".$endtime."'";
+    }
     ##
     ##
     my $request = 'CREATE TEMPORARY TABLE IF NOT EXISTS '.$tmptable.
@@ -2281,7 +2291,10 @@ sub get_student_scores {
     if (defined($enrollment_requirements)) {
         $request .= $enrollment_requirements.' AND ';
     }
-    $request =~ s/ AND $//;
+    if (defined($time_requirements)) {
+        $request .= $time_requirements.' AND ';
+    }
+    $request =~ s/ AND $//; # Strip of the trailing ' AND '.
     $request .= ' GROUP BY a.student_id';
 #    &Apache::lonnet::logthis("request = \n".$request);
     my $sth = $dbh->prepare($request);