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

Merge branch 'MDL-49075-27' of https://github.com/lucisgit/moodle into MOODLE_27_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2015-03-03 15:44:23 +08:00
parent 379c492a98 2ceee45b76
commit 81e8eb60a9
2 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/locallib.php
+11 -8
View File
@@ -6986,16 +6986,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();
mod/assign/tests/locallib_test.php
+24
View File
@@ -1618,6 +1618,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();
@@ -1630,6 +1634,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();
@@ -1642,6 +1650,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();
@@ -1654,6 +1666,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();
@@ -1666,6 +1682,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();
@@ -1677,6 +1697,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() {