Change to workshop_grades - only return grades when in the final phase (phase 6).

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index e15823bd6e279a62e5cf26ff14c51d09e5512bb8..556a141d354ac606313d08989f253a8a4822a0fc 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -554,16 +554,21 @@ function workshop_delete_instance($id) {
 ///////////////////////////////////////////////////////////////////////////////
 function workshop_grades($workshopid) {
 /// Must return an array of grades, indexed by user, and a max grade.
+/// only retruns grades in phase 6
 global $CFG;
 
-       if ($bestsubmissions = get_records_sql("SELECT userid, max(finalgrade) finalgrade FROM
-                       {$CFG->prefix}workshop_submissions WHERE workshopid = $workshopid GROUP
-                       BY userid")) {
-               foreach ($bestsubmissions as $bestgrade) {
-                       $return->grades[$bestgrade->userid] = $bestgrade->finalgrade;
-                       }
-               }               
-    $return->maxgrade = get_field("workshop", "grade", "id", "$workshopid");
+       if ($workshop = get_record("workshop", "id", $workshopid)) {
+        if ($workshop->phase == 6) {
+            if ($bestsubmissions = get_records_sql("SELECT userid, max(finalgrade) finalgrade FROM
+                               {$CFG->prefix}workshop_submissions WHERE workshopid = $workshopid GROUP
+                               BY userid")) {
+                       foreach ($bestsubmissions as $bestgrade) {
+                               $return->grades[$bestgrade->userid] = $bestgrade->finalgrade;
+                }
+            }
+               }
+               $return->maxgrade = $workshop->grade;
+    }
     return $return;
 }