Don't show grades at all when grades not being used bug 1710

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 4ed4aa54664729484256a660c3e3da8227527809..0fd16af2b6b25c08c5a45f771e68d943dea87ab4 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -181,7 +181,7 @@ function assignment_user_complete($course, $user, $mod, $assignment) {
         if (empty($submission->timemarked)) {
             print_string("notgradedyet", "assignment");
         } else {
-            assignment_print_feedback($course, $submission);
+            assignment_print_feedback($course, $submission, $assignment);
         }
 
         print_simple_box_end();
@@ -576,7 +576,7 @@ function assignment_print_submission($assignment, $user, $submission, $teachers,
     echo "</TABLE><BR CLEAR=ALL>\n";
 }
 
-function assignment_print_feedback($course, $submission) {
+function assignment_print_feedback($course, $submission, $assignment) {
     global $CFG, $THEME, $RATING;
 
     if (! $teacher = get_record("user", "id", $submission->teacher)) {
@@ -597,10 +597,12 @@ function assignment_print_feedback($course, $submission) {
     echo "\n<TR><TD WIDTH=100% BGCOLOR=\"$THEME->cellcontent\">";
 
     echo "<P ALIGN=RIGHT><FONT SIZE=-1><I>";
-    if ($submission->grade or $submission->timemarked) {
-        echo get_string("grade").": $submission->grade";
-    } else {
-        echo get_string("nograde");
+    if ($assignment->grade) {
+        if ($submission->grade or $submission->timemarked) {
+            echo get_string("grade").": $submission->grade";
+        } else {
+            echo get_string("nograde");
+        }
     }
     echo "</I></FONT></P>";
 

diff --git a/mod/assignment/view.php b/mod/assignment/view.php
index b286bffee0977f97610ea2e2c326d140b07a3600..0aaf8bb9cfbe2d5e1f7f6f35a92e60d1bd821938 100644 (file)
--- a/mod/assignment/view.php
+++ b/mod/assignment/view.php
@@ -106,7 +106,7 @@
                 if (isset($scalegrades)) {
                     $submission->grade = $scalegrades[$submission->grade];
                 }
-                assignment_print_feedback($course, $submission);
+                assignment_print_feedback($course, $submission, $assignment);
             }
         } else {
             if ($submission and $submission->timemodified) {
@@ -127,7 +127,7 @@
                 if (isset($scalegrades)) {
                     $submission->grade = $scalegrades[$submission->grade];
                 }
-                assignment_print_feedback($course, $submission);
+                assignment_print_feedback($course, $submission, $assignment);
             }
             if (!$submission->timemarked or $assignment->resubmit) {
                 if ($submission and $submission->timemodified) {