moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-44098: Late submissions with extension calculate period of lateness incorrectly

Browse source
This commit is contained in:
Gregory Faller 2014-05-27 11:12:14 +09:30 • committed by Damyon Wiese
parent c792d01c78
commit 556483d47d
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
mod/assign/gradingtable.php
View file

@ -915,20 +915,21 @@ class assign_grading_table extends table_sql implements renderable {
$instance = $this->assignment->get_instance(); $instance = $this->assignment->get_instance();
$due = $instance->duedate;
if ($row->extensionduedate) {
$due = $row->extensionduedate;
}
if ($this->assignment->is_any_submission_plugin_enabled()) { if ($this->assignment->is_any_submission_plugin_enabled()) {
$o .= $this->output->container(get_string('submissionstatus_' . $row->status, 'assign'), $o .= $this->output->container(get_string('submissionstatus_' . $row->status, 'assign'),
array('class'=>'submissionstatus' .$row->status)); array('class'=>'submissionstatus' .$row->status));
if ($instance->duedate && if ($due && $row->timesubmitted > $due) {
$row->timesubmitted > $instance->duedate) { $usertime = format_time($row->timesubmitted - $due);
if (!$row->extensionduedate || $latemessage = get_string('submittedlateshort',
$row->timesubmitted > $row->extensionduedate) { 'assign',
$usertime = format_time($row->timesubmitted - $instance->duedate); $usertime);
$latemessage = get_string('submittedlateshort', $o .= $this->output->container($latemessage, 'latesubmission');
'assign',
$usertime);
$o .= $this->output->container($latemessage, 'latesubmission');
}
} }
if ($row->locked) { if ($row->locked) {
$lockedstr = get_string('submissionslockedshort', 'assign'); $lockedstr = get_string('submissionslockedshort', 'assign');
@ -944,10 +945,6 @@ class assign_grading_table extends table_sql implements renderable {
if (!$row->timesubmitted) { if (!$row->timesubmitted) {
$now = time(); $now = time();
$due = $instance->duedate;
if ($row->extensionduedate) {
$due = $row->extensionduedate;
}
if ($due && ($now > $due)) { if ($due && ($now > $due)) {
$overduestr = get_string('overdue', 'assign', format_time($now - $due)); $overduestr = get_string('overdue', 'assign', format_time($now - $due));
$o .= $this->output->container($overduestr, 'overduesubmission'); $o .= $this->output->container($overduestr, 'overduesubmission');