diff --git a/mod/assign/classes/privacy/provider.php b/mod/assign/classes/privacy/provider.php index bbe0713eead..c706711901b 100644 --- a/mod/assign/classes/privacy/provider.php +++ b/mod/assign/classes/privacy/provider.php @@ -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) diff --git a/mod/assign/tests/privacy_test.php b/mod/assign/tests/privacy_test.php index a9800bc0ba1..ac2ee025561 100644 --- a/mod/assign/tests/privacy_test.php +++ b/mod/assign/tests/privacy_test.php @@ -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);