mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-68605 mod_assign: return grp submissns from ws

Browse Source 
Co-authored-by: Septatrix <24257556+Septatrix@users.noreply.github.com>
This commit is contained in:
Tim Schroeder 2020-05-04 21:00:07 +02:00
parent 49a9e8b07d
commit 3786de22f2
No known key found for this signature in database
GPG Key ID: 44FD4F625FBA67CD
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/assign/externallib.php
View File

@ -794,7 +794,11 @@ class mod_assign_external extends external_api {
'gradingstatus' => $assign->get_grading_status($submissionrecord->userid)
);
if ($assign->can_view_submission($submissionrecord->userid)) {
if (($assign->get_instance()->teamsubmission
&& $assign->can_view_group_submission($submissionrecord->groupid))
|| (!$assign->get_instance()->teamsubmission
&& $assign->can_view_submission($submissionrecord->userid))
) {
$submissions[] = $submission;
}
}

42
mod/assign/tests/externallib_test.php
View File

@ -454,6 +454,48 @@ class mod_assign_external_testcase extends externallib_advanced_testcase {
$this->assertEquals(1, count($result['assignments']));
}
public function test_get_submissions_group_submission() {
global $DB;
$this->resetAfterTest(true);
$result = $this->create_assign_with_student_and_teacher(array(
'assignsubmission_onlinetext_enabled' => 1,
'teamsubmission' => 1
));
$assignmodule = $result['assign'];
$student = $result['student'];
$teacher = $result['teacher'];
$course = $result['course'];
$context = context_course::instance($course->id);
$teacherrole = $DB->get_record('role', array('shortname' => 'teacher'));
$group = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
$cm = get_coursemodule_from_instance('assign', $assignmodule->id);
$context = context_module::instance($cm->id);
$assign = new mod_assign_testable_assign($context, $cm, $course);
groups_add_member($group, $student);
$this->setUser($student);
$submission = $assign->get_group_submission($student->id, $group->id, true);
$sid = $submission->id;
$this->setUser($teacher);
$assignmentids[] = $assignmodule->id;
$result = mod_assign_external::get_submissions($assignmentids);
$result = external_api::clean_returnvalue(mod_assign_external::get_submissions_returns(), $result);
$this->assertEquals(1, count($result['assignments']));
$assignment = $result['assignments'][0];
$this->assertEquals($assignmodule->id, $assignment['assignmentid']);
$this->assertEquals(1, count($assignment['submissions']));
$submission = $assignment['submissions'][0];
$this->assertEquals($sid, $submission['id']);
$this->assertEquals($group->id, $submission['groupid']);
$this->assertEquals(0, $submission['userid']);
}
/**
* Test get_user_flags
*/