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

Merge branch 'MDL-62366-34' of git://github.com/zig-moodle/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
David Monllao
2018-05-10 18:14:10 +02:00
parent 464a6c7f7e 42caaedf5e
commit 20f9ff3a10
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/classes/privacy/provider.php
+2 -2
View File
@@ -376,7 +376,7 @@ class provider implements metadataprovider, pluginprovider, preference_provider
'timemodified' => transform::datetime($grade->timemodified),
'grader' => transform::user($grade->grader),
'grade' => $grade->grade,
'attemptnumber' => $grade->attemptnumber
'attemptnumber' => ($grade->attemptnumber + 1)
];
writer::with_context($context)
->export_data(array_merge($currentpath, [get_string('privacy:gradepath', 'mod_assign')]), $gradedata);
@@ -395,7 +395,7 @@ class provider implements metadataprovider, pluginprovider, preference_provider
'timemodified' => transform::datetime($submission->timemodified),
'status' => get_string('submissionstatus_' . $submission->status, 'mod_assign'),
'groupid' => $submission->groupid,
'attemptnumber' => $submission->attemptnumber,
'attemptnumber' => ($submission->attemptnumber + 1),
'latest' => transform::yesno($submission->latest)
];
writer::with_context($context)
mod/assign/tests/privacy_test.php
+2 -2
View File
@@ -214,8 +214,8 @@ class mod_assign_privacy_testcase extends provider_testcase {
// Check Submissions.
$this->assertEquals($submissiontext, $writer->get_data(['attempt 1', 'Submission Text'])->text);
$this->assertEquals($submissiontext2, $writer->get_data(['attempt 2', 'Submission Text'])->text);
$this->assertEquals(0, $writer->get_data(['attempt 1', 'submission'])->attemptnumber);
$this->assertEquals(1, $writer->get_data(['attempt 2', 'submission'])->attemptnumber);
$this->assertEquals(1, $writer->get_data(['attempt 1', 'submission'])->attemptnumber);
$this->assertEquals(2, $writer->get_data(['attempt 2', 'submission'])->attemptnumber);
// Check grades.
$this->assertEquals($grade1, $writer->get_data(['attempt 1', 'grade'])->grade);
$this->assertEquals($grade2, $writer->get_data(['attempt 2', 'grade'])->grade);