L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-70110-311' of https://github.com/septatrix/moodle into MOODLE_311_STABLE

Browse Source
This commit is contained in:
Sara Arjona
2021-05-06 13:16:06 +02:00
parent d0e0d3963b a05e94a03e
commit 61cfcb9253
2 changed files with 86 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/externallib.php
+3 -2
View File
@@ -754,14 +754,15 @@ class mod_assign_external extends external_api {
$placeholders = array('assignid1' => $assign->get_instance()->id,
'assignid2' => $assign->get_instance()->id);
$submissionmaxattempt = 'SELECT mxs.userid, MAX(mxs.attemptnumber) AS maxattempt
$submissionmaxattempt = 'SELECT mxs.userid, mxs.groupid, MAX(mxs.attemptnumber) AS maxattempt
FROM {assign_submission} mxs
WHERE mxs.assignment = :assignid1 GROUP BY mxs.userid';
WHERE mxs.assignment = :assignid1 GROUP BY mxs.userid, mxs.groupid';
$sql = "SELECT mas.id, mas.assignment,mas.userid,".
"mas.timecreated,mas.timemodified,mas.status,mas.groupid,mas.attemptnumber ".
"FROM {assign_submission} mas ".
"JOIN ( " . $submissionmaxattempt . " ) smx ON mas.userid = smx.userid ".
"AND mas.groupid = smx.groupid ".
"WHERE mas.assignment = :assignid2 AND mas.attemptnumber = smx.maxattempt";
if (!empty($params['status'])) {
mod/assign/tests/externallib_test.php
+83
View File
@@ -455,6 +455,9 @@ class mod_assign_external_testcase extends externallib_advanced_testcase {
$this->assertEquals(1, count($result['assignments']));
}
/**
* Test get_submissions with teamsubmission enabled
*/
public function test_get_submissions_group_submission() {
global $DB;
@@ -497,6 +500,86 @@ class mod_assign_external_testcase extends externallib_advanced_testcase {
$this->assertEquals(0, $submission['userid']);
}
/**
* Test get_submissions with teamsubmission enabled
* and a group having a higher attemptnumber than another
*/
public function test_get_submissions_group_submission_attemptnumber() {
global $DB;
$this->resetAfterTest(true);
$result = $this->create_assign_with_student_and_teacher([
'assignsubmission_onlinetext_enabled' => 1,
'attemptreopenmethod' => 'manual',
'teamsubmission' => 1,
]);
$assignmodule = $result['assign'];
$course = $result['course'];
$teacher = $result['teacher'];
$student1 = $result['student'];
$student2 = self::getDataGenerator()->create_user();
// Enrol second user into the course.
$studentrole = $DB->get_record('role', ['shortname' => 'student']);
$this->getDataGenerator()->enrol_user($student2->id, $course->id, $studentrole->id);
$group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
groups_add_member($group1, $student1);
$group2 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
groups_add_member($group2, $student2);
$this->setUser($student1);
mod_assign_external::save_submission(
$assignmodule->id,
[
'onlinetext_editor' => [
'text' => 'Group 1, Submission 1',
'format' => FORMAT_PLAIN,
'itemid' => file_get_unused_draft_itemid(),
]
]
);
$this->setUser($student2);
mod_assign_external::save_submission(
$assignmodule->id,
[
'onlinetext_editor' => [
'text' => 'Group 2, Submission 1',
'format' => FORMAT_PLAIN,
'itemid' => file_get_unused_draft_itemid(),
]
]
);
mod_assign_external::submit_for_grading($assignmodule->id, 1);
$this->setUser($teacher);
mod_assign_external::save_grade($assignmodule->id, $student2->id, 0, -1, 1, "", 1);
$this->setUser($student2);
mod_assign_external::save_submission(
$assignmodule->id,
[
'onlinetext_editor' => [
'text' => 'Group 2, Submission 2',
'format' => FORMAT_PLAIN,
'itemid' => file_get_unused_draft_itemid(),
]
]
);
$this->setUser($teacher);
$result = mod_assign_external::get_submissions([$assignmodule->id]);
$result = external_api::clean_returnvalue(mod_assign_external::get_submissions_returns(), $result);
$this->assertEquals(1, count($result['assignments']));
[$assignment] = $result['assignments'];
$this->assertEquals($assignmodule->id, $assignment['assignmentid']);
$this->assertEquals(2, count($assignment['submissions']));
[$submission1, $submission2] = $assignment['submissions'];
$this->assertEquals("Group 1, Submission 1", $submission1['plugins'][0]['editorfields'][0]['text']);
$this->assertEquals("Group 2, Submission 2", $submission2['plugins'][0]['editorfields'][0]['text']);
}
/**
* Test get_user_flags
*/