mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-38254' of git://github.com/rwijaya/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2013-04-10 12:08:46 +08:00
commit e870c16077
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/assignment/lib.php
View File

@ -165,6 +165,12 @@ class assignment_base {
$this->view_dates();
if ($this->isopen() && $this->assignment->timedue > 0 && $this->assignment->timedue < time()) {
echo $OUTPUT->heading(get_string('closedassignment','assignment'), 3);
} else if ($this->assignment->timeavailable > time()) {
echo $OUTPUT->heading(get_string('futureaassignment','assignment'), 3);
}
$this->view_feedback();
$this->view_footer();

4
mod/assignment/type/online/assignment.class.php
View File

@ -127,7 +127,9 @@ class assignment_online extends assignment_base {
$button->render();
}
} else if ($this->isopen()){ //fix for #4206
echo '<div style="text-align:center">'.get_string('emptysubmission', 'assignment').'</div>';
echo $OUTPUT->heading(get_string('emptysubmission','assignment'), 3);
} else if ($this->assignment->timeavailable > time()) {
echo $OUTPUT->heading(get_string('futureaassignment','assignment'), 3);
}
}
echo $OUTPUT->box_end();

8
mod/assignment/type/uploadsingle/assignment.class.php
View File

@ -85,8 +85,12 @@ class assignment_uploadsingle extends assignment_base {
}
}
if (is_enrolled($this->context, $USER, 'mod/assignment:submit') && $this->isopen() && (!$filecount || $this->assignment->resubmit || !$submission->timemarked)) {
$this->view_upload_form();
if (is_enrolled($this->context, $USER, 'mod/assignment:submit') && (!$filecount || $this->assignment->resubmit || !$submission->timemarked)) {
if ($this->isopen()) {
$this->view_upload_form();
} else if ($this->assignment->timeavailable > time()) {
echo $OUTPUT->heading(get_string('futureaassignment','assignment'), 3);
}
}
$this->view_footer();