From 2612e21bd4450bf94b7e5ac259e2d0b0b3bbcf7b Mon Sep 17 00:00:00 2001 From: Rossiani Wijaya Date: Thu, 4 Apr 2013 11:04:22 +0800 Subject: [PATCH] MDL-38254 Assignment Module: add avaialble message to all assignment types --- mod/assignment/lib.php | 6 ++++++ mod/assignment/type/online/assignment.class.php | 4 +++- mod/assignment/type/uploadsingle/assignment.class.php | 8 ++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 7bd8064743a..5d4d136f1f9 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -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(); diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php index a917d31eb4a..103a8ddaab4 100644 --- a/mod/assignment/type/online/assignment.class.php +++ b/mod/assignment/type/online/assignment.class.php @@ -127,7 +127,9 @@ class assignment_online extends assignment_base { $button->render(); } } else if ($this->isopen()){ //fix for #4206 - echo '
'.get_string('emptysubmission', 'assignment').'
'; + 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(); diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php index 039071cf33f..7f399e78fd8 100644 --- a/mod/assignment/type/uploadsingle/assignment.class.php +++ b/mod/assignment/type/uploadsingle/assignment.class.php @@ -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();