From: rkingdon <rkingdon>
Date: Mon, 13 Oct 2003 15:23:56 +0000 (+0000)
Subject: Change to workshop_grades - only return grades when in the final phase (phase 6).
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=8dfe0fa64fbc324d88e4cdcdfecbd6c85a7eec61;p=moodle.git

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 e15823bd6e..556a141d35 100644
--- 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;
 }