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

Merge branch 'MDL-61585_35' of git://github.com/dmonllao/moodle into MOODLE_35_STABLE

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2019-03-14 01:16:14 +01:00
commit cca1025271
2 changed files with 63 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

62
lib/db/upgrade.php
View file

@ -2400,5 +2400,67 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2018051704.04);
}
if ($oldversion < 2018051705.01) {
// Add missing indicators to course_dropout.
$params = [
'target' => '\core\analytics\target\course_dropout',
'trained' => 0,
'enabled' => 0,
];
$models = $DB->get_records('analytics_models', $params);
foreach ($models as $model) {
$indicators = json_decode($model->indicators);
$potentiallymissingindicators = [
'\core_course\analytics\indicator\completion_enabled',
'\core_course\analytics\indicator\potential_cognitive_depth',
'\core_course\analytics\indicator\potential_social_breadth',
'\core\analytics\indicator\any_access_after_end',
'\core\analytics\indicator\any_access_before_start',
'\core\analytics\indicator\any_write_action_in_course',
'\core\analytics\indicator\read_actions'
];
$missing = false;
foreach ($potentiallymissingindicators as $potentiallymissingindicator) {
if (!in_array($potentiallymissingindicator, $indicators)) {
// Add the missing indicator to sites upgraded before 2017072000.02.
$indicators[] = $potentiallymissingindicator;
$missing = true;
}
}
if ($missing) {
$model->indicators = json_encode($indicators);
$model->version = time();
$model->timemodified = time();
$DB->update_record('analytics_models', $model);
}
}
// Add missing indicators to no_teaching.
$params = [
'target' => '\core\analytics\target\no_teaching',
];
$models = $DB->get_records('analytics_models', $params);
foreach ($models as $model) {
$indicators = json_decode($model->indicators);
if (!in_array('\core_course\analytics\indicator\no_student', $indicators)) {
// Add the missing indicator to sites upgraded before 2017072000.02.
$indicators[] = '\core_course\analytics\indicator\no_student';
$model->indicators = json_encode($indicators);
$model->version = time();
$model->timemodified = time();
$DB->update_record('analytics_models', $model);
}
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2018051705.01);
}
return true;
}

2
version.php
View file

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2018051705.00; // 20180517 = branching date YYYYMMDD - do not modify!
$version = 2018051705.01; // 20180517 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.