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

MDL-63149 mod_survey: Add userid param to mod_survey calendar callbacks

Browse source
This commit is contained in:
Shamim Rezaie 2019-03-07 17:28:02 +11:00
parent 89d1238962
commit a44fb747cf
2 changed files with 88 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
mod/survey/lib.php
View file

@ -1112,20 +1112,28 @@ function survey_check_updates_since(cm_info $cm, $from, $filter = array()) {
* *
* @param calendar_event $event * @param calendar_event $event
* @param \core_calendar\action_factory $factory * @param \core_calendar\action_factory $factory
* @param int $userid User id to use for all capability checks, etc. Set to 0 for current user (default).
* @return \core_calendar\local\event\entities\action_interface|null * @return \core_calendar\local\event\entities\action_interface|null
*/ */
function mod_survey_core_calendar_provide_event_action(calendar_event $event, function mod_survey_core_calendar_provide_event_action(calendar_event $event,
\core_calendar\action_factory $factory) { \core_calendar\action_factory $factory,
$cm = get_fast_modinfo($event->courseid)->instances['survey'][$event->instance]; int $userid = 0) {
global $USER;
if (empty($userid)) {
$userid = $USER->id;
}
$cm = get_fast_modinfo($event->courseid, $userid)->instances['survey'][$event->instance];
$context = context_module::instance($cm->id); $context = context_module::instance($cm->id);
if (!has_capability('mod/survey:participate', $context)) { if (!has_capability('mod/survey:participate', $context, $userid)) {
return null; return null;
} }
$completion = new \completion_info($cm->get_course()); $completion = new \completion_info($cm->get_course());
$completiondata = $completion->get_data($cm, false); $completiondata = $completion->get_data($cm, false, $userid);
if ($completiondata->completionstate != COMPLETION_INCOMPLETE) { if ($completiondata->completionstate != COMPLETION_INCOMPLETE) {
return null; return null;

76
mod/survey/tests/lib_test.php
View file

@ -193,6 +193,41 @@ class mod_survey_lib_testcase extends advanced_testcase {
$this->assertTrue($actionevent->is_actionable()); $this->assertTrue($actionevent->is_actionable());
} }
public function test_survey_core_calendar_provide_event_action_for_user() {
global $CFG;
$this->resetAfterTest();
$this->setAdminUser();
// Create the activity.
$course = $this->getDataGenerator()->create_course();
$survey = $this->getDataGenerator()->create_module('survey', array('course' => $course->id));
// Create a student and enrol into the course.
$student = $this->getDataGenerator()->create_and_enrol($course, 'student');
// Create a calendar event.
$event = $this->create_action_event($course->id, $survey->id,
\core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
// Now log out.
$CFG->forcelogin = true; // We don't want to be logged in as guest, as guest users might still have some capabilities.
$this->setUser();
// Create an action factory.
$factory = new \core_calendar\action_factory();
// Decorate action event for the student.
$actionevent = mod_survey_core_calendar_provide_event_action($event, $factory, $student->id);
// Confirm the event was decorated.
$this->assertInstanceOf('\core_calendar\local\event\value_objects\action', $actionevent);
$this->assertEquals(get_string('view'), $actionevent->get_name());
$this->assertInstanceOf('moodle_url', $actionevent->get_url());
$this->assertEquals(1, $actionevent->get_item_count());
$this->assertTrue($actionevent->is_actionable());
}
public function test_survey_core_calendar_provide_event_action_as_non_user() { public function test_survey_core_calendar_provide_event_action_as_non_user() {
global $CFG; global $CFG;
@ -255,6 +290,47 @@ class mod_survey_lib_testcase extends advanced_testcase {
$this->assertNull($actionevent); $this->assertNull($actionevent);
} }
public function test_survey_core_calendar_provide_event_action_already_completed_for_user() {
global $CFG;
$this->resetAfterTest();
$this->setAdminUser();
$CFG->enablecompletion = 1;
// Create the activity.
$course = $this->getDataGenerator()->create_course(array('enablecompletion' => 1));
$survey = $this->getDataGenerator()->create_module('survey', array('course' => $course->id),
array('completion' => 2, 'completionview' => 1, 'completionexpected' => time() + DAYSECS));
// Create 2 students and enrol them into the course.
$student1 = $this->getDataGenerator()->create_and_enrol($course, 'student');
$student2 = $this->getDataGenerator()->create_and_enrol($course, 'student');
// Get some additional data.
$cm = get_coursemodule_from_instance('survey', $survey->id);
// Create a calendar event.
$event = $this->create_action_event($course->id, $survey->id,
\core_completion\api::COMPLETION_EVENT_TYPE_DATE_COMPLETION_EXPECTED);
// Mark the activity as completed for the $student1.
$completion = new completion_info($course);
$completion->set_module_viewed($cm, $student1->id);
// Now log in as $student2.
$this->setUser($student2);
// Create an action factory.
$factory = new \core_calendar\action_factory();
// Decorate action event for $student1.
$actionevent = mod_survey_core_calendar_provide_event_action($event, $factory, $student1->id);
// Ensure result was null.
$this->assertNull($actionevent);
}
/** /**
* Creates an action event. * Creates an action event.
* *