MDL-57791 analytics: Always absolute full class names

Some extra tiny changes as well.
reskit · Jul 24, 2017 · 3a39628 · 3a39628
1 parent 1cc2b4b
commit 3a39628
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 12 deletions.
diff --git a/admin/settings/analytics.php b/admin/settings/analytics.php
@@ -65,7 +65,7 @@
 
         $timesplittingoptions = array();
         $timesplittingdefaults = array('\\core_analytics\\local\\time_splitting\\quarters_accum',
-            '\\core_analytics\\local\\time_splitting\\quarters');
+            '\\core_analytics\\local\\time_splitting\\quarters', '\\core_analytics\\local\\time_splitting\\no_splitting');
         foreach ($alltimesplittings as $key => $timesplitting) {
             $timesplittingoptions[$key] = $timesplitting->get_name();
         }

diff --git a/admin/tool/models/classes/output/renderer.php b/admin/tool/models/classes/output/renderer.php
@@ -42,11 +42,11 @@ class renderer extends plugin_renderer_base {
     /**
      * Defer to template.
      *
-     * @param templatable $templatable
+     * @param \tool_models\output\models_list $templatable
      * @return string HTML
      */
-    protected function render_models_list(templatable $templatable) {
-        $data = $templatable->export_for_template($this);
+    protected function render_models_list(\tool_models\output\models_list $modelslist) {
+        $data = $modelslist->export_for_template($this);
         return parent::render_from_template('tool_models/models_list', $data);
     }
 

diff --git a/analytics/classes/calculable.php b/analytics/classes/calculable.php
@@ -75,7 +75,7 @@ abstract class calculable {
      * @return string
      */
     public static function get_name() {
-        return get_called_class();
+        return '\\' . get_called_class();
     }
 
     /**

diff --git a/analytics/classes/local/indicator/binary.php b/analytics/classes/local/indicator/binary.php
@@ -91,7 +91,7 @@ public function get_calculation_outcome($value, $subtype = false) {
      */
     public static function get_feature_headers() {
         // Just 1 single feature obtained from the calculated value.
-        return array(get_called_class());
+        return array('\\' . get_called_class());
     }
 
     /**

diff --git a/analytics/classes/local/indicator/community_of_inquiry_activity.php b/analytics/classes/local/indicator/community_of_inquiry_activity.php
@@ -511,7 +511,7 @@ protected function cognitive_calculate_sample($sampleid, $tablename, $starttime
 
             switch ($potentiallevel) {
                 case 5:
-                    // Cognitive level 4 is to comment on feedback.
+                    // Cognitive level 5 is to submit after feedback.
                     if ($this->any_feedback('submitted', $cm, $contextid, $user)) {
                         $score += $scoreperlevel * 5;
                         break;

diff --git a/analytics/classes/local/indicator/discrete.php b/analytics/classes/local/indicator/discrete.php
@@ -50,7 +50,7 @@ protected static function get_classes() {
      * @return string[]
      */
     public static function get_feature_headers() {
-        $fullclassname = get_called_class();
+        $fullclassname = '\\' . get_called_class();
 
         $headers = array($fullclassname);
         foreach (self::get_classes() as $class) {

diff --git a/analytics/classes/local/indicator/linear.php b/analytics/classes/local/indicator/linear.php
@@ -51,7 +51,7 @@ protected static function include_averages() {
      */
     public static function get_feature_headers() {
 
-        $fullclassname = get_called_class();
+        $fullclassname = '\\' . get_called_class();
 
         if (static::include_averages()) {
             // The calculated value + context indicators.

diff --git a/analytics/classes/local/time_splitting/base.php b/analytics/classes/local/time_splitting/base.php
@@ -389,7 +389,7 @@ protected function get_headers($indicators, $target = false) {
 
         // The target as well.
         if ($target) {
-            $headers[] = get_class($target);
+            $headers[] = $target->get_id();
         }
 
         return $headers;

diff --git a/analytics/classes/manager.php b/analytics/classes/manager.php
@@ -106,7 +106,10 @@ public static function get_all_models($enabled = false, $trained = false, $predi
 
         $models = array();
         foreach ($modelobjs as $modelobj) {
-            $models[$modelobj->id] = new \core_analytics\model($modelobj);
+            $model = new \core_analytics\model($modelobj);
+            if ($model->is_available()) {
+                $models[$modelobj->id] = $model;
+            }
         }
         return $models;
     }

diff --git a/analytics/classes/model.php b/analytics/classes/model.php
@@ -135,6 +135,26 @@ public function __construct($model) {
         $this->model = $model;
     }
 
+    /**
+     * Quick safety check to discard site models which required components are not available anymore.
+     *
+     * @return bool
+     */
+    public function is_available() {
+        $target = $this->get_target();
+        if (!$target) {
+            return false;
+        }
+        $analyser = $this->get_target();
+
+        $classname = $target->get_analyser_class();
+        if (!class_exists($classname)) {
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * Returns the model id.
      *
@@ -1217,7 +1237,7 @@ private static function indicator_classes($indicators) {
                 if (!is_object($indicator) && !is_scalar($indicator)) {
                     $indicator = strval($indicator);
                 } else if (is_object($indicator)) {
-                    $indicator = get_class($indicator);
+                    $indicator = '\\' . get_class($indicator);
                 }
                 throw new \moodle_exception('errorinvalidindicator', 'analytics', '', $indicator);
             }