assignment intro hiding before available date is now optional in advanced upload...

diff --git a/lang/en_utf8/assignment.php b/lang/en_utf8/assignment.php
index b3ee042331f9b6e76bb4b647e78c6e1c2006a24a..76051e7b77901260853582d580203c0c9de07e85 100644 (file)
--- a/lang/en_utf8/assignment.php
+++ b/lang/en_utf8/assignment.php
@@ -74,6 +74,7 @@ $string['helpuploadsingle'] = '<p>This type of assignment allows each participan
    single file, of any type.</p> <p>This might be a Word processor document, an image, 
    a zipped web site, or anything you ask them to submit.</p>';
 $string['late'] = '$a late';
+$string['hideintro'] = 'Hide description before available date';
 $string['maximumgrade'] = 'Maximum grade';
 $string['maximumsize'] = 'Maximum size';
 $string['modulename'] = 'Assignment';

diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index e1d284cda3dd4328a8d113e8040b7b3b5daf34b6..6127b1e5aa29884f43bc6a384c7fdab82ce45e38 100644 (file)
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -23,8 +23,8 @@ class assignment_upload extends assignment_base {
         $this->view_header();
 
         if ($this->assignment->timeavailable > time()
-          and !has_capability('mod/assignment:grade', $this->context)) {
-            //not open yet === no instructions
+          and !has_capability('mod/assignment:grade', $this->context)      // grading user can see it anytime
+          and $this->assignment->var3) {                                   // force hiding before available date
             print_simple_box_start('center', '', '', '', 'generalbox', 'intro');
             print_string('notavailableyet', 'assignment');
             print_simple_box_end();

diff --git a/mod/assignment/type/upload/mod.html b/mod/assignment/type/upload/mod.html
index f5f14a1d835ba603f6e84a00819e85346616c0fa..9823f6d928c1c5883d3c2542222351da21478211 100644 (file)
--- a/mod/assignment/type/upload/mod.html
+++ b/mod/assignment/type/upload/mod.html
@@ -5,6 +5,9 @@
     if (empty($form->var2)) {
         $form->var2 = 0; // enable notes
     }
+    if (empty($form->var3)) {
+        $form->var3 = 0; // force intro hiding before available date
+    }
     if (empty($form->resubmit)) {
         $form->resubmit = 1; // allow deleting
     }
@@ -64,6 +67,17 @@
     </td>
 </tr>
 
+<tr>
+    <td align="right"><b><?php print_string("hideintro", "assignment") ?>:</b></td>
+    <td>
+    <?php
+        $options = array(0=>get_string("no"), 1=>get_string("yes"));
+        choose_from_menu($options, "var3", $form->var3, "");
+        helpbutton("hideintro", get_string("hideintro", "assignment"), "assignment");
+    ?>
+    </td>
+</tr>
+
 <tr>
     <td align="right"><b><?php print_string("emailteachers", "assignment") ?>:</b></td>
     <td>