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

MDL-66733 grade: Add helper to get correct user date for grade

Browse source
This commit is contained in:
Andrew Nicols 2019-08-28 09:24:16 +08:00
parent 1c3efe48f8
commit 4bb39eabc7
8 changed files with 99 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/gradelib.php
View file

@ -1619,3 +1619,22 @@ function grade_floats_different($f1, $f2) {
function grade_floats_equal($f1, $f2) {
return (grade_floatval($f1) === grade_floatval($f2));
}
/**
* Get the most appropriate grade date for a grade item given the user that the grade relates to.
*
* @param \stdClass $grade
* @param \stdClass $user
* @return int
*/
function grade_get_date_for_user_grade(\stdClass $grade, \stdClass $user): int {
// The `datesubmitted` is the time that the grade was created.
// The `dategraded` is the time that it was modified or overwritten.
// If the grade was last modified by the user themselves use the date graded.
// Otherwise use date submitted.
if ($grade->usermodified == $user->id || empty($grade->datesubmitted)) {
return $grade->dategraded;
} else {
return $grade->datesubmitted;
}
}

66
lib/tests/gradelib_test.php
View file

@ -151,4 +151,70 @@ class core_gradelib_testcase extends advanced_testcase {
// Now because of the failure, two things need updating.
$this->assertEquals(2, $DB->count_records('grade_items', ['courseid' => $course->id, 'needsupdate' => 1]));
}
/**
* Tests for the grade_get_date_for_user_grade function.
*
* @dataProvider grade_get_date_for_user_grade_provider
* @param stdClass $grade
* @param stdClass $user
* @param int $expected
*/
public function test_grade_get_date_for_user_grade(stdClass $grade, stdClass $user, int $expected): void {
$this->assertEquals($expected, grade_get_date_for_user_grade($grade, $user));
}
/**
* Data provider for tests of the grade_get_date_for_user_grade function.
*
* @return array
*/
public function grade_get_date_for_user_grade_provider(): array {
$u1 = (object) [
'id' => 42,
];
$u2 = (object) [
'id' => 930,
];
$d1 = 1234567890;
$d2 = 9876543210;
$g1 = (object) [
'usermodified' => $u1->id,
'dategraded' => $d1,
'datesubmitted' => $d2,
];
$g2 = (object) [
'usermodified' => $u1->id,
'dategraded' => $d1,
'datesubmitted' => 0,
];
return [
'If the user is the last person to have modified the grade_item then show the date that it was graded' => [
$g1,
$u1,
$d1,
],
'If the user is not the last person to have modified the grade_item, ' .
'and there is no submission date, then show the date that it was submitted' => [
$g1,
$u2,
$d2,
],
'If the user is not the last person to have modified the grade_item, ' .
'but there is no submission date, then show the date that it was graded' => [
$g2,
$u2,
$d1,
],
'If the user is the last person to have modified the grade_item, ' .
'and there is no submission date, then still show the date that it was graded' => [
$g2,
$u1,
$d1,
],
];
}
}