From raeburn at source.lon-capa.org  Tue Mar 13 12:48:18 2018
From: raeburn at source.lon-capa.org (raeburn)
Date: Tue, 13 Mar 2018 16:48:18 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface loncoursedata.pm
Message-ID: <cvsraeburn1520959698@cvsserver>

raeburn		Tue Mar 13 16:48:18 2018 EDT

  Modified files:              
    /loncom/interface	loncoursedata.pm 
  Log:
  - Bug 6601
  
  
Index: loncom/interface/loncoursedata.pm
diff -u loncom/interface/loncoursedata.pm:1.203 loncom/interface/loncoursedata.pm:1.204
--- loncom/interface/loncoursedata.pm:1.203	Sun Mar 11 12:44:22 2018
+++ loncom/interface/loncoursedata.pm	Tue Mar 13 16:48:18 2018
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.203 2018/03/11 12:44:22 raeburn Exp $
+# $Id: loncoursedata.pm,v 1.204 2018/03/13 16:48:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1677,22 +1677,13 @@
     #
     $request = 'SELECT MAX(tries),MIN(tries) FROM '.$stats_table.
         ' WHERE awarded>0';
-    if (defined($time_requirements)) {
-        $request .= ' AND '.$time_requirements;
-    }
     my ($max,$min) = &execute_SQL_request($dbh,$request);
     #
     $request = 'SELECT SUM(awarded) FROM '.$stats_table;
-    if (defined($time_requirements)) {
-        $request .= ' AND '.$time_requirements;
-    }
     my ($Solved) = &execute_SQL_request($dbh,$request);
     #
     $request = 'SELECT SUM(awarded) FROM '.$stats_table.
         " WHERE solved='correct_by_override'";
-    if (defined($time_requirements)) {
-        $request .= ' AND '.$time_requirements;
-    }
     my ($solved) = &execute_SQL_request($dbh,$request);
     #
     $Solved -= $solved;



From raeburn at source.lon-capa.org  Wed Mar 14 13:07:29 2018
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 14 Mar 2018 17:07:29 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface
	loncoursedata.pm
Message-ID: <cvsraeburn1521047249@cvsserver>

raeburn		Wed Mar 14 17:07:29 2018 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncoursedata.pm 
  Log:
  - For 2.11
    Backport 1.204.
  
  
Index: loncom/interface/loncoursedata.pm
diff -u loncom/interface/loncoursedata.pm:1.201.2.1 loncom/interface/loncoursedata.pm:1.201.2.2
--- loncom/interface/loncoursedata.pm:1.201.2.1	Sun Mar 11 12:49:53 2018
+++ loncom/interface/loncoursedata.pm	Wed Mar 14 17:07:29 2018
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.201.2.1 2018/03/11 12:49:53 raeburn Exp $
+# $Id: loncoursedata.pm,v 1.201.2.2 2018/03/14 17:07:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1677,22 +1677,13 @@
     #
     $request = 'SELECT MAX(tries),MIN(tries) FROM '.$stats_table.
         ' WHERE awarded>0';
-    if (defined($time_requirements)) {
-        $request .= ' AND '.$time_requirements;
-    }
     my ($max,$min) = &execute_SQL_request($dbh,$request);
     #
     $request = 'SELECT SUM(awarded) FROM '.$stats_table;
-    if (defined($time_requirements)) {
-        $request .= ' AND '.$time_requirements;
-    }
     my ($Solved) = &execute_SQL_request($dbh,$request);
     #
     $request = 'SELECT SUM(awarded) FROM '.$stats_table.
         " WHERE solved='correct_by_override'";
-    if (defined($time_requirements)) {
-        $request .= ' AND '.$time_requirements;
-    }
     my ($solved) = &execute_SQL_request($dbh,$request);
     #
     $Solved -= $solved;