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

Merge branch 'm27_MDL-46842' of https://github.com/greg-or/moodle-mod_assign into MOODLE_27_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2014-08-26 01:59:25 +02:00
parent 3fda0a9736 1f316df7d9
commit 2f64ea2a2e
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/locallib.php
+7 -18
View File
@@ -1843,13 +1843,18 @@ class assign {
}
$result = $DB->update_record('assign_grades', $grade);
// Only push to gradebook if the update is for the latest attempt.
// If the conditions are met, allow another attempt.
$submission = null;
if ($this->get_instance()->teamsubmission) {
$submission = $this->get_group_submission($grade->userid, 0, false);
} else {
$submission = $this->get_user_submission($grade->userid, false);
}
$this->reopen_submission_if_required($grade->userid,
$submission,
false);
// Only push to gradebook if the update is for the latest attempt.
// Not the latest attempt.
if ($submission && $submission->attemptnumber != $grade->attemptnumber) {
return true;
@@ -5143,17 +5148,6 @@ class assign {
}
$this->update_grade($grade);
// If the conditions are met, allow another attempt.
$submission = null;
if ($this->get_instance()->teamsubmission) {
$submission = $this->get_group_submission($userid, 0, false, -1);
} else {
$submission = $this->get_user_submission($userid, false, -1);
}
$this->reopen_submission_if_required($userid,
$submission,
false);
// Allow teachers to skip sending notifications.
if (optional_param('sendstudentnotifications', true, PARAM_BOOL)) {
$this->notify_grade_modified($grade);
@@ -6549,12 +6543,7 @@ class assign {
$this->process_outcomes($userid, $data);
}
if ($data->attemptnumber == -1) {
// We only allow another attempt when grading the latest submission.
$this->reopen_submission_if_required($userid,
$submission,
!empty($data->addattempt));
}
return true;
}