Merge branch 'MDL-38254' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 04:08:46 +0000 (12:08 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 04:08:46 +0000 (12:08 +0800)
mod/assignment/lib.php
mod/assignment/type/online/assignment.class.php
mod/assignment/type/uploadsingle/assignment.class.php

index 7bd8064..5d4d136 100644 (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();
index a917d31..103a8dd 100644 (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();
index 039071c..7f399e7 100644 (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();