Revert "MDL-38254 Assignment Module: add avaialble message to all assignment types"

This reverts commit 079a76bb37.
This commit is contained in:
Dan Poltawski
2013-04-11 16:53:33 +08:00
parent 932d87f841
commit bf944109f0
3 changed files with 3 additions and 15 deletions
-6
View File
@@ -165,12 +165,6 @@ 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();
@@ -122,9 +122,7 @@ class assignment_online extends assignment_base {
$button->render();
}
} else if ($this->isopen()){ //fix for #4206
echo $OUTPUT->heading(get_string('emptysubmission','assignment'), 3);
} else if ($this->assignment->timeavailable > time()) {
echo $OUTPUT->heading(get_string('futureaassignment','assignment'), 3);
echo '<div style="text-align:center">'.get_string('emptysubmission', 'assignment').'</div>';
}
}
echo $OUTPUT->box_end();
@@ -85,12 +85,8 @@ class assignment_uploadsingle extends assignment_base {
}
}
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);
}
if (is_enrolled($this->context, $USER, 'mod/assignment:submit') && $this->isopen() && (!$filecount || $this->assignment->resubmit || !$submission->timemarked)) {
$this->view_upload_form();
}
$this->view_footer();