Fixes for "wierd assignment error" - Bug #549, from Scott Elliott

diff --git a/lang/en/assignment.php b/lang/en/assignment.php
index c9db86fc8be785b5c4dca5f6bf816c799c9f9b86..235c14b04db2dc82556ba0394e07fe26b42366d7 100644 (file)
--- a/lang/en/assignment.php
+++ b/lang/en/assignment.php
@@ -27,6 +27,7 @@ $string['maximumsize'] = "Maximum size";
 $string['modulename'] = "Assignment";
 $string['modulenameplural'] = "Assignments";
 $string['newsubmissions'] = "Assignments submitted";
+$string['notgradedyet'] = "Not graded yet";
 $string['notsubmittedyet'] = "Not submitted yet";
 $string['overwritewarning'] = "Warning: uploading again will REPLACE your current submission";
 $string['saveallfeedback'] = "Save all my feedback";

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index f671135af4df1a038e264a2ecf9b13a03b994afc..0404f03a764112d403e3e74279796525d7441463 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -84,17 +84,21 @@ function assignment_user_complete($course, $user, $mod, $assignment) {
         }
 
         print_simple_box_start();
-        echo "<P><FONT SIZE=1>";
+        echo "<p><font size=1>";
         echo get_string("lastmodified").": ";
         echo userdate($submission->timemodified);
         echo assignment_print_difference($assignment->timedue - $submission->timemodified);
-        echo "</FONT></P>";
+        echo "</font></p>";
 
         assignment_print_user_files($assignment, $user);
 
-        echo "<BR>";
+        echo "<br />";
 
-        assignment_print_feedback($course, $submission);
+        if (empty($submission->timemarked)) {
+            print_string("notgradedyet", "assignment");
+        } else {
+            assignment_print_feedback($course, $submission);
+        }
 
         print_simple_box_end();