Merge branch 'MDL-57791_master-fix5' of git://github.com/dmonllao/moodle

diff --git a/analytics/classes/model.php b/analytics/classes/model.php
index a76acd5..79352cb 100644 (file)
--- a/analytics/classes/model.php
+++ b/analytics/classes/model.php
@@ -467,8 +467,8 @@ class model {
         if ($this->is_static()) {
             $this->get_analyser()->add_log(get_string('noevaluationbasedassumptions', 'analytics'));
             $result = new \stdClass();
-            $result->status = self::OK;
-            return $result;
+            $result->status = self::NO_DATASET;
+            return array($this->get_time_splitting()->get_id() => $result);
         }
 
         $options['evaluation'] = true;

diff --git a/lang/en/analytics.php b/lang/en/analytics.php
index 6ce2124..2dbae2c 100644 (file)
--- a/lang/en/analytics.php
+++ b/lang/en/analytics.php
@@ -59,10 +59,11 @@ $string['insightinfomessage'] = 'The system generated some insights for you: {$a
 $string['insightinfomessagehtml'] = 'The system generated some insights for you: <a href="{$a}">{$a}</a>.';
 $string['invalidtimesplitting'] = 'Model with id {$a} needs a time splitting method before it can be used to train';
 $string['invalidanalysablefortimesplitting'] = 'It can not be analysed using {$a} time splitting method';
-$string['modeloutputdir'] = 'Models output directory';
-$string['modeloutputdirinfo'] = 'Directory where prediction processors store all evaluation info. Useful for debugging and research.';
 $string['nocourses'] = 'No courses to analyse';
 $string['nodata'] = 'No data available';
+$string['modeloutputdir'] = 'Models output directory';
+$string['modeloutputdirinfo'] = 'Directory where prediction processors store all evaluation info. Useful for debugging and research.';
+$string['noevaluationbasedassumptions'] = 'Models based on assumptions can not be evaluated';
 $string['noinsightsmodel'] = 'This model does not generate insights';
 $string['noinsights'] = 'No insights reported';
 $string['nonewdata'] = 'No new data available';