From f589788af136c96ddd081fdd139b1c940c1188db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Monlla=C3=B3?= Date: Tue, 1 Oct 2019 09:24:25 +0800 Subject: [PATCH] MDL-66806 analytics: No predictions for hidden courses --- .../analytics/target/course_enrolments.php | 4 ++++ course/tests/targets_test.php | 21 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/course/classes/analytics/target/course_enrolments.php b/course/classes/analytics/target/course_enrolments.php index f2fc3e75104..233fa099d9f 100644 --- a/course/classes/analytics/target/course_enrolments.php +++ b/course/classes/analytics/target/course_enrolments.php @@ -115,6 +115,10 @@ abstract class course_enrolments extends \core_analytics\local\target\binary { return get_string('coursenotyetstarted', 'course'); } + if (!$fortraining && !$course->get_course_data()->visible) { + return get_string('hiddenfromstudents'); + } + if (!$this->students = $course->get_students()) { return get_string('nocoursestudents', 'course'); } diff --git a/course/tests/targets_test.php b/course/tests/targets_test.php index 7c9a1d12310..90a9710cad9 100644 --- a/course/tests/targets_test.php +++ b/course/tests/targets_test.php @@ -130,6 +130,27 @@ class core_analytics_targets_testcase extends advanced_testcase { ], 'isvalid' => get_string('completionnotenabledforcourse', 'completion') ], + 'coursehiddentraining' => [ + 'params' => [ + 'enablecompletion' => 1, + 'startdate' => mktime(0, 0, 0, $month - 1, 24, $year - 1), + 'enddate' => mktime(0, 0, 0, $month - 1, 23, $year), + 'students' => true, + 'visible' => '0', + ], + 'isvalid' => true, + ], + 'coursehiddenprediction' => [ + 'params' => [ + 'enablecompletion' => 1, + 'startdate' => mktime(0, 0, 0, $month - 1, 24, $year), + 'enddate' => mktime(0, 0, 0, $month - 1, 23, $year + 1), + 'students' => true, + 'visible' => '0', + ], + 'isvalid' => get_string('hiddenfromstudents'), + 'fortraining' => false + ], ]; }