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

This commit is contained in:
Andrew Nicols 2017-07-27 14:23:52 +08:00
commit 048009ea35
2 changed files with 5 additions and 4 deletions

View File

@ -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;

View File

@ -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';