--- loncom/interface/loncoursedata.pm	2004/03/26 22:01:30	1.128
+++ loncom/interface/loncoursedata.pm	2004/04/06 15:45:13	1.130
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.128 2004/03/26 22:01:30 matthew Exp $
+# $Id: loncoursedata.pm,v 1.130 2004/04/06 15:45:13 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2056,21 +2056,6 @@ sub get_problem_statistics {
     # Drop the temporary table
     $dbh->do('DROP TABLE '.$stats_table);  # May return an error
     #
-    # Store in metadata
-    if ($num) {
-	my %storestats=();
-        #
-        my $urlres=(&Apache::lonnet::decode_symb($symb))[2];
-        #
-	$storestats{$courseid.'___'.$urlres.'___timestamp'}=time;       
-	$storestats{$courseid.'___'.$urlres.'___stdno'}=$num;
-	$storestats{$courseid.'___'.$urlres.'___avetries'}=$mean;	   
-	$storestats{$courseid.'___'.$urlres.'___difficulty'}=$DegOfDiff;
-        #
-	$urlres=~/^(\w+)\/(\w+)/; 
-	&Apache::lonnet::put('nohist_resevaldata',\%storestats,$1,$2); 
-    }
-    #
     # Return result
     return { num_students => $num,
              tries        => $tries,
@@ -2160,6 +2145,38 @@ sub populate_weight_table {
 
 =pod
 
+=item &limit_by_start_end_times
+
+Build SQL WHERE condition which limits the data collected by the start
+and end times provided
+
+Inputs: $starttime, $endtime, $table
+
+Returns: $time_limits
+
+=cut
+
+##########################################################
+##########################################################
+sub limit_by_start_end_time {
+    my ($starttime,$endtime,$table) = @_;
+    my $time_requirements = undef;
+    if (defined($starttime)) {
+        $time_requirements .= $table.".timestamp>='".$starttime."'";
+        if (defined($endtime)) {
+            $time_requirements .= " AND ".$table.".timestamp<='".$endtime."'";
+        }
+    } elsif (defined($endtime)) {
+        $time_requirements .= $table.".timestamp<='".$endtime."'";
+    }
+    return $time_requirements;
+}
+
+##########################################################
+##########################################################
+
+=pod
+
 =item &limit_by_section_and_status
 
 Build SQL WHERE condition which limits the data collected by section and
@@ -2215,7 +2232,7 @@ sub RNK_student { return 0; };
 sub RNK_score   { return 1; };
 
 sub rank_students_by_scores_on_resources {
-    my ($resources,$Sections,$enrollment,$courseid) = @_;
+    my ($resources,$Sections,$enrollment,$courseid,$starttime,$endtime) = @_;
     return if (! defined($resources) || ! ref($resources) eq 'ARRAY');
     if (! defined($courseid)) {
         $courseid = $ENV{'request.course.id'};
@@ -2228,6 +2245,7 @@ sub rank_students_by_scores_on_resources
     my $symb_limits = '('.join(' OR ',map {'a.symb_id='.&get_symb_id($_);
                                        } @$resources
                                ).')';
+    my $time_limits = &limit_by_start_end_time($starttime,$endtime,'a');
     my $request = 'SELECT b.student,SUM(a.awarded*w.weight) AS score FROM '.
         $performance_table.' AS a '.
         'NATURAL LEFT JOIN '.$weight_table.' AS w '.
@@ -2239,6 +2257,9 @@ sub rank_students_by_scores_on_resources
     if (defined($enrollment_limits)) {
         $request .= $enrollment_limits.' AND ';
     }
+    if (defined($time_limits)) {
+        $request .= $time_limits.' AND ';
+    }
     if ($symb_limits ne '()') {
         $request .= $symb_limits.' AND ';
     }
@@ -2272,18 +2293,22 @@ Returns: the sum of the score on the pro
 ########################################################
 ########################################################
 sub get_sum_of_scores {
-    my ($resource,$part,$students,$courseid) = @_;
+    my ($resource,$part,$students,$courseid,$starttime,$endtime) = @_;
     if (! defined($courseid)) {
         $courseid = $ENV{'request.course.id'};
     }
     #
     &setup_table_names($courseid);
     my $dbh = &Apache::lonmysql::get_dbh();
+    my $time_limits = &limit_by_start_end_time($starttime,$endtime,'a');
     my $request = 'SELECT SUM(a.awarded*w.weight),SUM(w.weight) FROM '.
         $performance_table.' AS a '.
         'NATURAL LEFT JOIN '.$weight_table.' AS w ';
     $request .= 'WHERE a.symb_id='.&get_symb_id($resource->{'symb'}).
         ' AND a.part_id='.&get_part_id($part);
+    if (defined($time_limits)) {
+        $request .= ' AND '.$time_limits;
+    }
     if (defined($students)) {
         $request .= ' AND ('.
             join(' OR ',map {'a.student_id='.&get_student_id(split(':',$_));
@@ -2300,6 +2325,147 @@ sub get_sum_of_scores {
     return ($rows->[0],$rows->[1]);
 }
 
+########################################################
+########################################################
+
+=pod
+
+=item &score_stats
+
+Inputs: $Sections, $enrollment, $symbs, $starttime,
+        $endtime, $courseid
+
+$Sections, $enrollment, $starttime, $endtime, and $courseid are the same as 
+elsewhere in this module.  
+$symbs is an array ref of symbs
+
+Returns: minimum, maximum, mean, s.d., number of students, and maximum
+  possible of student scores on the given resources
+
+=cut
+
+########################################################
+########################################################
+sub score_stats {
+    my ($Sections,$enrollment,$symbs,$starttime,$endtime,$courseid)=@_;
+    if (! defined($courseid)) {
+        $courseid = $ENV{'request.course.id'};
+    }
+    #
+    &setup_table_names($courseid);
+    my $dbh = &Apache::lonmysql::get_dbh();
+    #
+    my ($section_limits,$enrollment_limits)=
+        &limit_by_section_and_status($Sections,$enrollment,'b');
+    my $time_limits = &limit_by_start_end_time($starttime,$endtime,'a');
+    my @Symbids = map { &get_symb_id($_); } @{$symbs};
+    #
+    my $stats_table = $courseid.'_problem_stats';
+    my $symb_restriction = join(' OR ',map {'a.symb_id='.$_;} @Symbids);
+    my $request = 'DROP TABLE '.$stats_table;
+    $dbh->do($request);
+    $request = 
+        'CREATE TEMPORARY TABLE '.$stats_table.' '.
+        'SELECT a.student_id,'.
+        'SUM(a.awarded*w.weight) AS score FROM '.
+        $performance_table.' AS a '.
+        'NATURAL LEFT JOIN '.$weight_table.' AS w '.
+        'LEFT JOIN '.$student_table.' AS b ON a.student_id=b.student_id '.
+        'WHERE ('.$symb_restriction.')';
+    if ($time_limits) {
+        $request .= ' AND '.$time_limits;
+    }
+    if ($section_limits) {
+        $request .= ' AND '.$section_limits;
+    }
+    if ($enrollment_limits) {
+        $request .= ' AND '.$enrollment_limits;
+    }
+    $request .= ' GROUP BY a.student_id';
+#    &Apache::lonnet::logthis('request = '.$/.$request);
+    my $sth = $dbh->prepare($request);
+    $sth->execute();
+    $request = 
+        'SELECT AVG(score),STD(score),MAX(score),MIN(score),COUNT(score) '.
+        'FROM '.$stats_table;
+    my ($ave,$std,$max,$min,$count) = &execute_SQL_request($dbh,$request);
+#    &Apache::lonnet::logthis('request = '.$/.$request);
+    
+    $request = 'SELECT SUM(weight) FROM '.$weight_table.
+        ' WHERE ('.$symb_restriction.')';
+    my ($max_possible) = &execute_SQL_request($dbh,$request);
+    # &Apache::lonnet::logthis('request = '.$/.$request);
+    return($min,$max,$ave,$std,$count,$max_possible);
+}
+
+
+########################################################
+########################################################
+
+=pod
+
+=item &count_stats
+
+Inputs: $Sections, $enrollment, $symbs, $starttime,
+        $endtime, $courseid
+
+$Sections, $enrollment, $starttime, $endtime, and $courseid are the same as 
+elsewhere in this module.  
+$symbs is an array ref of symbs
+
+Returns: minimum, maximum, mean, s.d., and number of students
+  of the number of items correct on the given resources
+
+=cut
+
+########################################################
+########################################################
+sub count_stats {
+    my ($Sections,$enrollment,$symbs,$starttime,$endtime,$courseid)=@_;
+    if (! defined($courseid)) {
+        $courseid = $ENV{'request.course.id'};
+    }
+    #
+    &setup_table_names($courseid);
+    my $dbh = &Apache::lonmysql::get_dbh();
+    #
+    my ($section_limits,$enrollment_limits)=
+        &limit_by_section_and_status($Sections,$enrollment,'b');
+    my $time_limits = &limit_by_start_end_time($starttime,$endtime,'a');
+    my @Symbids = map { &get_symb_id($_); } @{$symbs};
+    #
+    my $stats_table = $courseid.'_problem_stats';
+    my $symb_restriction = join(' OR ',map {'a.symb_id='.$_;} @Symbids);
+    my $request = 'DROP TABLE '.$stats_table;
+    $dbh->do($request);
+    $request = 
+        'CREATE TEMPORARY TABLE '.$stats_table.' '.
+        'SELECT a.student_id,'.
+        'COUNT(a.award) AS count FROM '.
+        $performance_table.' AS a '.
+        'LEFT JOIN '.$student_table.' AS b ON a.student_id=b.student_id '.
+        'WHERE ('.$symb_restriction.')'.
+        " AND a.award!='INCORRECT_ATTEMPTED'";
+    if ($time_limits) {
+        $request .= ' AND '.$time_limits;
+    }
+    if ($section_limits) {
+        $request .= ' AND '.$section_limits;
+    }
+    if ($enrollment_limits) {
+        $request .= ' AND '.$enrollment_limits;
+    }
+    $request .= ' GROUP BY a.student_id';
+    &Apache::lonnet::logthis('request = '.$/.$request);
+    my $sth = $dbh->prepare($request);
+    $sth->execute();
+    $request = 
+        'SELECT AVG(count),STD(count),MAX(count),MIN(count),COUNT(count) '.
+        'FROM '.$stats_table;
+    my ($ave,$std,$max,$min,$count) = &execute_SQL_request($dbh,$request);
+    &Apache::lonnet::logthis('request = '.$/.$request);
+    return($min,$max,$ave,$std,$count);
+}
 
 ######################################################
 ######################################################