MDL-41752 question statistics class moved and improved

quiz_question_statistics_stats renamed to question_statistics_calculator
separate class question_statistics used to store calculated stats
and api changed, also code generally cleaned up.

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index d68ce28..80309ba 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -864,11 +864,9 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2012062000.01);
     }
 
-
     // Moodle v2.3.0 release upgrade line
     // Put any upgrade step following this
 
-
     if ($oldversion < 2012062500.02) {
         // Drop some old backup tables, not used anymore
 
@@ -1497,7 +1495,6 @@ function xmldb_main_upgrade($oldversion) {
     // Moodle v2.4.0 release upgrade line
     // Put any upgrade step following this
 
-
     if ($oldversion < 2012120300.01) {
         // Make sure site-course has format='site' //MDL-36840
 

diff --git a/mod/quiz/report/statistics/classes/calculated.php b/mod/quiz/report/statistics/classes/calculated.php
index 40a6210..8103b7c 100644 (file)
--- a/mod/quiz/report/statistics/classes/calculated.php
+++ b/mod/quiz/report/statistics/classes/calculated.php
@@ -166,7 +166,6 @@ class quiz_statistics_calculated {
         }
     }
 
-
     /**
      * @var array of names of properties of this class that are cached in db record.
      */

diff --git a/mod/quiz/report/statistics/classes/calculator.php b/mod/quiz/report/statistics/classes/calculator.php
index 997ee73..85c8cb7 100644 (file)
--- a/mod/quiz/report/statistics/classes/calculator.php
+++ b/mod/quiz/report/statistics/classes/calculator.php
@@ -90,7 +90,6 @@ class quiz_statistics_calculator {
             }
         }
 
-
         $quizstats->cache(quiz_statistics_qubaids_condition($quizid, $currentgroup, $groupstudents, $useallattempts));
 
         return $quizstats;

diff --git a/mod/quiz/report/statistics/db/install.php b/mod/quiz/report/statistics/db/install.php
index 4a15c7d..e148f9e 100644 (file)
--- a/mod/quiz/report/statistics/db/install.php
+++ b/mod/quiz/report/statistics/db/install.php
@@ -21,10 +21,8 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 defined('MOODLE_INTERNAL') || die();
 
-
 /**
  * Post-install script
  */

diff --git a/mod/quiz/report/statistics/db/upgrade.php b/mod/quiz/report/statistics/db/upgrade.php
index 4beb458..3581dfe 100644 (file)
--- a/mod/quiz/report/statistics/db/upgrade.php
+++ b/mod/quiz/report/statistics/db/upgrade.php
@@ -22,10 +22,8 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 defined('MOODLE_INTERNAL') || die();
 
-
 /**
  * Quiz statistics report upgrade code.
  */

diff --git a/mod/quiz/report/statistics/lib.php b/mod/quiz/report/statistics/lib.php
index 2dc0751..416981b 100644 (file)
--- a/mod/quiz/report/statistics/lib.php
+++ b/mod/quiz/report/statistics/lib.php
@@ -22,10 +22,8 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 defined('MOODLE_INTERNAL') || die();
 
-
 /**
  * Serve questiontext files in the question text when they are displayed in this report.
  *

diff --git a/mod/quiz/report/statistics/report.php b/mod/quiz/report/statistics/report.php
index aab3d00..5179ee8 100644 (file)
--- a/mod/quiz/report/statistics/report.php
+++ b/mod/quiz/report/statistics/report.php
@@ -22,7 +22,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->dirroot . '/mod/quiz/report/statistics/statistics_form.php');
@@ -106,7 +105,6 @@ class quiz_statistics_report extends quiz_default_report {
 
         $qubaids = quiz_statistics_qubaids_condition($quiz->id, $currentgroup, $groupstudents, $useallattempts);
 
-
         // If recalculate was requested, handle that.
         if ($recalculate && confirm_sesskey()) {
             $this->clear_cached_data($qubaids);
@@ -532,7 +530,6 @@ class quiz_statistics_report extends quiz_default_report {
             $quizstats = $quizcalc->calculate($quiz->id, $currentgroup, $useallattempts,
                                                $groupstudents, count($questions), $qcalc->get_sum_of_mark_variance());
 
-
             if ($quizstats->s()) {
                 $this->calculate_responses_for_all_questions_and_subquestions($qubaids, $questions, $subquestionstats);
             }

diff --git a/mod/quiz/report/statistics/statistics_form.php b/mod/quiz/report/statistics/statistics_form.php
index a583ea9..02fb2f4 100644 (file)
--- a/mod/quiz/report/statistics/statistics_form.php
+++ b/mod/quiz/report/statistics/statistics_form.php
@@ -22,12 +22,10 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->libdir . '/formslib.php');
 
-
 /**
  * This is the settings form for the quiz statistics report.
  *

diff --git a/mod/quiz/report/statistics/statistics_graph.php b/mod/quiz/report/statistics/statistics_graph.php
index 6f762b3..bb21b0f 100644 (file)
--- a/mod/quiz/report/statistics/statistics_graph.php
+++ b/mod/quiz/report/statistics/statistics_graph.php
@@ -28,7 +28,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 require_once(dirname(__FILE__) . '/../../../../config.php');
 require_once($CFG->libdir . '/graphlib.php');
 require_once($CFG->dirroot . '/mod/quiz/locallib.php');

diff --git a/mod/quiz/report/statistics/statistics_question_table.php b/mod/quiz/report/statistics/statistics_question_table.php
index 9265181..4bfc411 100644 (file)
--- a/mod/quiz/report/statistics/statistics_question_table.php
+++ b/mod/quiz/report/statistics/statistics_question_table.php
@@ -22,12 +22,10 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->libdir . '/tablelib.php');
 
-
 /**
  * This table shows statistics about a particular question.
  *

diff --git a/mod/quiz/report/statistics/statistics_table.php b/mod/quiz/report/statistics/statistics_table.php
index d186bee..73217a5 100644 (file)
--- a/mod/quiz/report/statistics/statistics_table.php
+++ b/mod/quiz/report/statistics/statistics_table.php
@@ -22,12 +22,10 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->libdir.'/tablelib.php');
 
-
 /**
  * This table has one row for each question in the quiz, with sub-rows when
  * random questions appear. There are columns for the various statistics.

diff --git a/mod/quiz/report/statistics/tests/statistics_test.php b/mod/quiz/report/statistics/tests/statistics_test.php
index 258062c..cc29888 100644 (file)
--- a/mod/quiz/report/statistics/tests/statistics_test.php
+++ b/mod/quiz/report/statistics/tests/statistics_test.php
@@ -23,7 +23,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
@@ -31,7 +30,6 @@ require_once($CFG->libdir . '/questionlib.php');
 require_once($CFG->dirroot . '/mod/quiz/locallib.php');
 require_once($CFG->dirroot . '/mod/quiz/report/reportlib.php');
 
-
 /**
  * Test helper subclass of question_statistics
  *

diff --git a/question/classes/statistics/questions/calculated.php b/question/classes/statistics/questions/calculated.php
index 05add67..e8e3404 100644 (file)
--- a/question/classes/statistics/questions/calculated.php
+++ b/question/classes/statistics/questions/calculated.php
@@ -38,7 +38,6 @@ class calculated {
 
     public $questionid;
 
-
     // These first fields are the final fields cached in the db and shown in reports.
 
     // See : http://docs.moodle.org/dev/Quiz_statistics_calculations#Position_statistics .
@@ -175,5 +174,4 @@ class calculated {
         $this->timemodified = $record->timemodified;
     }
 
-
 }

diff --git a/question/classes/statistics/questions/calculator.php b/question/classes/statistics/questions/calculator.php
index db8b574..55bb803 100644 (file)
--- a/question/classes/statistics/questions/calculator.php
+++ b/question/classes/statistics/questions/calculator.php
@@ -171,7 +171,7 @@ class calculator {
             foreach ($lateststeps as $step) {
                 $this->secondary_steps_walker($step, $this->questionstats[$step->slot], $summarks, $summarksavg);
 
-                if ($this->questionstats[$step->slot]->subquestion) {
+                if ($this->questionstats[$step->slot]->subquestions) {
                     $this->secondary_steps_walker($step, $this->subquestionstats[$step->questionid], $summarks, $summarksavg);
                 }
             }
@@ -217,7 +217,7 @@ class calculator {
     public function get_cached($qubaids) {
         global $DB;
         $timemodified = time() - self::TIME_TO_CACHE;
-        $questionstatrecs = $DB->get_record_select('question_statistics', 'hashcode = ? AND timemodified > ?',
+        $questionstatrecs = $DB->get_records_select('question_statistics', 'hashcode = ? AND timemodified > ?',
                                          array($qubaids->get_hash_code(), $timemodified));
 
         $questionids = array();
@@ -250,7 +250,8 @@ class calculator {
         global $DB;
 
         $timemodified = time() - self::TIME_TO_CACHE;
-        return $DB->get_field_select('question_statistics', 'timemodified', 'hashcode = ? AND timemodified > ?',
+        return $DB->get_field_select('question_statistics', 'timemodified', 'hashcode = ? AND timemodified > ? '.
+                                                          'ORDER BY timemodified DESC LIMIT 1',
                                      array($qubaids->get_hash_code(), $timemodified));
     }
 
@@ -404,8 +405,6 @@ class calculator {
             $stats->negcovar = 0;
         }
 
-
-
         if ($stats->markvariance * $stats->othermarkvariance) {
             $stats->discriminationindex = 100 * $stats->covariance /
                 sqrt($stats->markvariance * $stats->othermarkvariance);

diff --git a/question/engine/statisticslib.php b/question/engine/statisticslib.php
index ab99fc0..363c102 100644 (file)
--- a/question/engine/statisticslib.php
+++ b/question/engine/statisticslib.php
@@ -24,10 +24,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 defined('MOODLE_INTERNAL') || die();
 
-
 /**
  * Question statistics cron code. Deletes cached stats more than a certain age.
  */