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

MDL-42350 mod_assign: fixed display of submission button

Browse Source
This commit is contained in:
Sam Hemelryk
2013-11-04 15:50:25 +08:00
parent 32bf2cfc64
commit 7a47babb9e
1 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/locallib.php
+38 -16
View File
@@ -3593,22 +3593,9 @@ class assign {
}
}
$showsubmit = ($submission || $teamsubmission) && $showlinks && $this->submissions_open($user->id);
if ($teamsubmission && ($teamsubmission->status == ASSIGN_SUBMISSION_STATUS_SUBMITTED)) {
$showsubmit = false;
}
if ($teamsubmission && $this->submission_empty($teamsubmission)) {
$showsubmit = false;
}
if ($submission && ($submission->status == ASSIGN_SUBMISSION_STATUS_SUBMITTED)) {
$showsubmit = false;
}
if ($submission && $this->submission_empty($submission)) {
$showsubmit = false;
}
if (!$this->get_instance()->submissiondrafts) {
$showsubmit = false;
}
$showsubmit = ($showlinks && $this->submissions_open($user->id));
$showsubmit = ($showsubmit && $this->show_submit_button($submission, $teamsubmission));
$extensionduedate = null;
if ($flags) {
$extensionduedate = $flags->extensionduedate;
@@ -3740,6 +3727,41 @@ class assign {
return $o;
}
/**
* Returns true if the submit subsission button should be shown to the user.
*
* @param stdClass $submission The users own submission record.
* @param stdClass $teamsubmission The users team submission record if there is one
* @return bool
*/
protected function show_submit_button($submission = null, $teamsubmission = null) {
if ($teamsubmission) {
if ($teamsubmission->status === ASSIGN_SUBMISSION_STATUS_SUBMITTED) {
// The assignment submission has been completed.
return false;
} else if ($this->submission_empty($teamsubmission)) {
// There is nothing to submit yet.
return false;
} else if ($submission && $submission->status === ASSIGN_SUBMISSION_STATUS_SUBMITTED) {
// The user has already clicked the submit button on the team submission.
return false;
}
} else if ($submission) {
if ($submission->status === ASSIGN_SUBMISSION_STATUS_SUBMITTED) {
// The assignment submission has been completed.
return false;
} else if ($this->submission_empty($submission)) {
// There is nothing to submit.
return false;
}
} else {
// We've not got a valid submission or team submission.
return false;
}
// Last check is that this instance allows drafts.
return $this->get_instance()->submissiondrafts;
}
/**
* Get the grades for all previous attempts.
* For each grade - the grader is a full user record,