moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Adrian Greeve 2019-05-16 13:23:22 +08:00
commit d15589bc08
4 changed files with 48 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
analytics/classes/analysis.php
View file

@ -216,6 +216,7 @@ class analysis {
$result = new \stdClass();
$timesplitting->set_modelid($this->analyser->get_modelid());
if (!$timesplitting->is_valid_analysable($analysable)) {
$result->status = \core_analytics\model::ANALYSABLE_REJECTED_TIME_SPLITTING_METHOD;
$result->message = get_string('invalidanalysablefortimesplitting', 'analytics',

9
analytics/classes/local/time_splitting/base.php
View file

@ -100,6 +100,15 @@ abstract class base {
$this->validate_ranges();
}
/**
* Assigns the model id to this time-splitting method it case it needs it.
*
* @param int $modelid
*/
public function set_modelid(int $modelid) {
$this->modelid = $modelid;
}
/**
* get_analysable
*

2
analytics/classes/model.php
View file

@ -1014,6 +1014,7 @@ class model {
// Append new elements (we can not get duplicates because sample-analysable relation is N-1).
$timesplitting = $this->get_time_splitting();
$timesplitting->set_modelid($this->get_id());
$timesplitting->set_analysable($data->analysable);
$range = $timesplitting->get_range_by_index($rangeindex);
@ -1076,6 +1077,7 @@ class model {
$analysable = $this->get_analyser()->get_sample_analysable($sampleid);
$timesplitting = $this->get_time_splitting();
$timesplitting->set_modelid($this->get_id());
$timesplitting->set_analysable($analysable);
$range = $timesplitting->get_range_by_index($rangeindex);
if ($range) {