mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 02:22:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-49075-master' of https://github.com/lucisgit/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2015-03-03 15:32:13 +08:00
commit 596b86d6b2
2 changed files with 35 additions and 8 deletions

19
mod/assign/locallib.php

@ -7087,16 +7087,19 @@ class assign {
$where, $params);
foreach ($graderesults as $result) {
$gradebookgrade = clone $result;
// Now get the feedback.
if ($gradebookplugin) {
$grade = $this->get_user_grade($result->userid, false);
if ($grade) {
$gradebookgrade->feedback = $gradebookplugin->text_for_gradebook($grade);
$gradebookgrade->feedbackformat = $gradebookplugin->format_for_gradebook($grade);
$gradingstatus = $this->get_grading_status($result->userid);
if (!$this->get_instance()->markingworkflow || $gradingstatus == ASSIGN_MARKING_WORKFLOW_STATE_RELEASED) {
$gradebookgrade = clone $result;
// Now get the feedback.
if ($gradebookplugin) {
$grade = $this->get_user_grade($result->userid, false);
if ($grade) {
$gradebookgrade->feedback = $gradebookplugin->text_for_gradebook($grade);
$gradebookgrade->feedbackformat = $gradebookplugin->format_for_gradebook($grade);
}
}
$grades[$gradebookgrade->userid] = $gradebookgrade;
}
$grades[$gradebookgrade->userid] = $gradebookgrade;
}
$graderesults->close();

24
mod/assign/tests/locallib_test.php

@ -1787,6 +1787,10 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
$output = $assign->view_student_summary($this->students[0], true);
$this->assertEquals(false, strpos($output, '50.0'));
// Make sure the grade isn't pushed to the gradebook.
$grades = $assign->get_user_grades_for_gradebook($this->students[0]->id);
$this->assertEmpty($grades);
// Mark the submission and set to inmarking.
$this->setUser($this->teachers[0]);
$data = new stdClass();
@ -1799,6 +1803,10 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
$output = $assign->view_student_summary($this->students[0], true);
$this->assertEquals(false, strpos($output, '50.0'));
// Make sure the grade isn't pushed to the gradebook.
$grades = $assign->get_user_grades_for_gradebook($this->students[0]->id);
$this->assertEmpty($grades);
// Mark the submission and set to readyforreview.
$this->setUser($this->teachers[0]);
$data = new stdClass();
@ -1811,6 +1819,10 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
$output = $assign->view_student_summary($this->students[0], true);
$this->assertEquals(false, strpos($output, '50.0'));
// Make sure the grade isn't pushed to the gradebook.
$grades = $assign->get_user_grades_for_gradebook($this->students[0]->id);
$this->assertEmpty($grades);
// Mark the submission and set to inreview.
$this->setUser($this->teachers[0]);
$data = new stdClass();
@ -1823,6 +1835,10 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
$output = $assign->view_student_summary($this->students[0], true);
$this->assertEquals(false, strpos($output, '50.0'));
// Make sure the grade isn't pushed to the gradebook.
$grades = $assign->get_user_grades_for_gradebook($this->students[0]->id);
$this->assertEmpty($grades);
// Mark the submission and set to readyforrelease.
$this->setUser($this->teachers[0]);
$data = new stdClass();
@ -1835,6 +1851,10 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
$output = $assign->view_student_summary($this->students[0], true);
$this->assertEquals(false, strpos($output, '50.0'));
// Make sure the grade isn't pushed to the gradebook.
$grades = $assign->get_user_grades_for_gradebook($this->students[0]->id);
$this->assertEmpty($grades);
// Mark the submission and set to released.
$this->setUser($this->teachers[0]);
$data = new stdClass();
@ -1846,6 +1866,10 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
$this->setUser($this->students[0]);
$output = $assign->view_student_summary($this->students[0], true);
$this->assertNotEquals(false, strpos($output, '50.0'));
// Make sure the grade is pushed to the gradebook.
$grades = $assign->get_user_grades_for_gradebook($this->students[0]->id);
$this->assertEquals(50, (int)$grades[$this->students[0]->id]->rawgrade);
}
public function test_markerallocation() {